From 0ee16e9f5dd31c6c98df1a5fdcf081c8eb7f80df Mon Sep 17 00:00:00 2001
From: zmc <zmc_li@foxmail.com>
Date: 星期二, 14 十一月 2023 13:15:55 +0800
Subject: [PATCH] 修改了获取风险值的请求接口

---
 src/views/data_management/HistoryData.vue |   39 +++++++++++++++++++++++++++------------
 1 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/views/data_management/HistoryData.vue b/src/views/data_management/HistoryData.vue
index 19f4f5d..86454df 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,
@@ -128,7 +128,6 @@
 
     // 椤靛彿鏀瑰彉鏃惰Е鍙�
     handleCurrentChange(val) {
-      console.log('褰撳墠椤典负锛�', val);
       // 灏嗗綋鍓嶉〉鍙风粰currentPage
       this.currentPage = val;
 
@@ -210,6 +209,7 @@
 </script>
 
 <template>
+  <div class="history-container"> 
   <el-row>
     <el-col ref="h1" class="head-row">
       <el-card>
@@ -217,12 +217,10 @@
           <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>
                 </el-form-item>
@@ -232,14 +230,21 @@
                   </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">
@@ -291,10 +296,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 +319,8 @@
 .font-label {
   margin-top: 3px;
   font-weight: bold;
+  font-size: 14px;
+  color: #333333;
 }
 
 .demo-form-inline {
@@ -322,7 +333,11 @@
   /* 浠庤灏句綅缃紑濮嬫帓鍒� */
 }
 
+.el-table {
+  /* color: #303133 */
+  color: rgb(59, 60, 63)
+}
 .el-pagination {
-  margin: 10px 0px;
+  margin: 10px 10px;
 }
 </style>

--
Gitblit v1.9.3