From 67c066315cb3cfe3e9bdd8bafe73cde154445df6 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 15 四月 2024 09:15:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/system/threshold/index.vue |   42 +++++++++++++++++++++---------------------
 src/views/system/report/index.vue    |   14 ++++++++------
 2 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/src/views/system/report/index.vue b/src/views/system/report/index.vue
index b302426..474fafb 100644
--- a/src/views/system/report/index.vue
+++ b/src/views/system/report/index.vue
@@ -175,13 +175,14 @@
         </el-form-item>
         <el-form-item label="鎶ュ鏃堕棿" prop="expirTime">
           <el-date-picker
-            v-model="expirTime"
+            v-model="form.expirTime"
             style="width: 240px"
             value-format="yyyy-MM-dd"
             type="daterange"
             range-separator="-"
             start-placeholder="寮�濮嬫棩鏈�"
             end-placeholder="缁撴潫鏃ユ湡"
+            @change="handleExpirTimeChange"
           ></el-date-picker>
         </el-form-item>
         <el-form-item label="鎶ュ鍐呭" prop="reportContent">
@@ -458,13 +459,14 @@
         this.auditingForm = {}
       });
     },
+    handleExpirTimeChange() {
+      if (null != this.form.expirTime && '' != this.form.expirTime) {
+        this.form["beginCreateTime"] = this.form.expirTime[0];
+        this.form["endCreateTime"] = this.form.expirTime[1];
+      }
+    },
     /** 鎻愪氦鎸夐挳 */
     submitForm() {
-
-      if (null != this.expirTime && '' != this.expirTime) {
-        this.form["beginCreateTime"] = this.expirTime[0];
-        this.form["endCreateTime"] = this.expirTime[1];
-      }
 
       // todo 鍒ゆ柇鏄簨鍓嶆姤澶�
 
diff --git a/src/views/system/threshold/index.vue b/src/views/system/threshold/index.vue
index 8b6e629..2f3d7f1 100644
--- a/src/views/system/threshold/index.vue
+++ b/src/views/system/threshold/index.vue
@@ -1,18 +1,18 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['ycl:threshold:add']"
-        >鏂板
-        </el-button>
-      </el-col>
-    </el-row>
+<!--    <el-row :gutter="10" class="mb8">-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['ycl:threshold:add']"-->
+<!--        >鏂板-->
+<!--        </el-button>-->
+<!--      </el-col>-->
+<!--    </el-row>-->
 
     <el-table v-loading="loading" :data="thresholdList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
@@ -50,14 +50,14 @@
             v-hasPermi="['ycl:threshold:edit']"
           >淇敼
           </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['ycl:threshold:remove']"
-          >鍒犻櫎
-          </el-button>
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['ycl:threshold:remove']"-->
+<!--          >鍒犻櫎-->
+<!--          </el-button>-->
         </template>
       </el-table-column>
     </el-table>

--
Gitblit v1.8.0