From 54016236bdc50a44492e563e65d1d0c72918813e Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期二, 26 三月 2024 09:55:34 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/zgyw-ui

---
 src/views/system/threshold/index.vue |   25 -------------------------
 src/views/system/report/index.vue    |   10 ++++++++++
 2 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/src/views/system/report/index.vue b/src/views/system/report/index.vue
index 458bf4d..6f360b9 100644
--- a/src/views/system/report/index.vue
+++ b/src/views/system/report/index.vue
@@ -17,6 +17,16 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="鎶ュ绫诲瀷" prop="reportType">
+        <el-select
+          v-model="queryParams.reportType"
+          placeholder="鎶ュ绫诲瀷"
+          clearable
+        >
+          <el-option label="浜嬪墠鎶ュ" value="浜嬪墠鎶ュ" />
+          <el-option label="浜嬪悗鎶ュ" value="浜嬪悗鎶ュ" />
+        </el-select>
+      </el-form-item>
       <el-form-item label="鎶ュ鏃堕棿">
         <el-date-picker
           v-model="daterangeCreateTime"
diff --git a/src/views/system/threshold/index.vue b/src/views/system/threshold/index.vue
index 9144c2b..a334492 100644
--- a/src/views/system/threshold/index.vue
+++ b/src/views/system/threshold/index.vue
@@ -12,31 +12,6 @@
         >鏂板
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['ycl:threshold:edit']"
-        >淇敼
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['ycl:threshold:remove']"
-        >鍒犻櫎
-        </el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="thresholdList" @selection-change="handleSelectionChange">

--
Gitblit v1.8.0