From 73cb3ec2b1660610e3621d7614ad308f2c19331d Mon Sep 17 00:00:00 2001
From: zmc <zmc_li@foxmail.com>
Date: 星期四, 16 十一月 2023 17:19:38 +0800
Subject: [PATCH] 1.修改了综合风险模型表格数据的获取 2.修改了时间选择器
---
src/views/data_management/HistoryData.vue | 57 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 32 insertions(+), 25 deletions(-)
diff --git a/src/views/data_management/HistoryData.vue b/src/views/data_management/HistoryData.vue
index 19f4f5d..f6fcc1a 100644
--- a/src/views/data_management/HistoryData.vue
+++ b/src/views/data_management/HistoryData.vue
@@ -1,8 +1,8 @@
<script>
-import TimeSelectWithShortCuts from '@/sfc/TimeSelectWithShortCuts.vue';
+import TimeShortCuts from '@/sfc/TimeShortCuts.vue';
import ScenarioType from '@/sfc/ScenarioType.vue';
import InputSearch from '@/sfc/InputSearch.vue';
-
+import { ElMessage } from 'element-plus'
import AreaAndmonitorType from '@/sfc/AreaAndmonitorType.vue'
import { useCommonFunction } from '../../utils/common.js';
@@ -13,7 +13,7 @@
export default {
components: {
- TimeSelectWithShortCuts,
+ TimeShortCuts,
ScenarioType,
InputSearch,
ButtonClick,
@@ -32,6 +32,8 @@
// 缁撴潫鏃堕棿
endTime: ''
},
+ // 鎼滅储妗嗕紶閫掍笂鏉ョ殑璁惧缂栧彿
+ tempMnCode :'',
// 杩斿洖鐨勬暟鎹�
tableData: [],
// 琛ㄦ牸鏁版嵁
@@ -128,7 +130,6 @@
// 椤靛彿鏀瑰彉鏃惰Е鍙�
handleCurrentChange(val) {
- console.log('褰撳墠椤典负锛�', val);
// 灏嗗綋鍓嶉〉鍙风粰currentPage
this.currentPage = val;
@@ -142,10 +143,7 @@
// 鏌ヨ鏁版嵁
handleSubmit() {
- // if (this.isExceedOneMonth(this.form.beginTime, this.form.endTime)) {
- // alert('鏃堕棿璺ㄥ害涓嶈兘瓒呰繃涓�涓湀');
- // return;
- // }
+
this.loading = true;
this.queryButton = true
let params = {};
@@ -162,7 +160,6 @@
if (this.scenarioType.length != 0) {
params['scenarioType'] = this.scenarioType.join();
}
-
this.$http.get('/dust/history1', { params: params }).then((response) => {
// 淇濆瓨杩斿洖鐨�
this.tableData = response.data.data.rows;
@@ -210,6 +207,7 @@
</script>
<template>
+ <div class="history-container">
<el-row>
<el-col ref="h1" class="head-row">
<el-card>
@@ -217,13 +215,12 @@
<div class="demo-form-inline">
<el-row>
<el-col>
-
<el-form-item>
<AreaAndmonitorType></AreaAndmonitorType>
</el-form-item>
+
<el-form-item>
- <template #label> </template>
- <InputSearch isNeedDefaultSite="1" @submit-value="(n) => (form.name = n)">
+ <InputSearch isNeedDefaultSite="1" @submit-value="(n) => (form.name = n) ">
</InputSearch>
</el-form-item>
<el-form-item>
@@ -232,25 +229,25 @@
</template>
<el-input v-model="form.number" clearable placeholder="璇疯緭鍏�"></el-input>
</el-form-item>
+ </el-col>
+
+ <el-col>
<el-form-item>
+ <TimeShortCuts time-type="week" @submit-time="giveTime"></TimeShortCuts>
+ </el-form-item>
+
+ <el-form-item>
<ScenarioType @submitScenarioType="(val) => (scenarioType = val)">
</ScenarioType>
</el-form-item>
+
</el-col>
- <el-form-item>
- <TimeSelectWithShortCuts @submit-time="giveTime"></TimeSelectWithShortCuts>
- </el-form-item>
+
+
</el-row>
</div>
<div class="button-and-export">
<el-form-item>
- <!-- <el-button
- type="primary"
- @click="handleSubmit"
- style="margin-left: 10px"
- ><el-icon style="margin-right: 6px;font-size: 1.2em;"><i-ep-Search/></el-icon>鏌ヨ</el-button
- >
- <el-button type="success" @click="exportDom" round><el-icon style="margin-right: 6px;margin-bottom:2px;font-size: 1.2em;"><i-ep-Download ></i-ep-Download></el-icon>瀵煎嚭鏁版嵁</el-button> -->
<ButtonClick style="margin-right: 12px;" content="鎼滅储" type="primary" :loading="queryButton" @do-search="handleSubmit"></ButtonClick>
<ButtonExportExcel content="瀵煎嚭鏁版嵁" type="success" :loading="exportButton" @do-export="exportDom"></ButtonExportExcel>
</el-form-item>
@@ -291,10 +288,14 @@
<el-empty v-show="isNoData" :image-size="200" />
</el-row>
+</div>
</template>
-<style lang="scss" scoped>
-// 鏁翠綋宸﹀杈硅窛
+<style scoped>
+.history-container {
+ min-width: 1200px;
+}
+/* // 鏁翠綋宸﹀杈硅窛 */
.el-row {
margin-left: 10px;
}
@@ -310,6 +311,8 @@
.font-label {
margin-top: 3px;
font-weight: bold;
+ font-size: 14px;
+ color: #333333;
}
.demo-form-inline {
@@ -322,7 +325,11 @@
/* 浠庤灏句綅缃紑濮嬫帓鍒� */
}
+.el-table {
+ /* color: #303133 */
+ color: rgb(59, 60, 63)
+}
.el-pagination {
- margin: 10px 0px;
+ margin: 10px 10px;
}
</style>
--
Gitblit v1.9.3