From 5e72dfd6e9cfbe6ce2d4f703ca04a518cc4e8a6d Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Fri, 23 Aug 2024 15:18:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=88=87=E6=8D=A2=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8Abug=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/base/bracelet/index.vue         | 29 +++++++++++++++-------
 src/views/base/device/index.vue           |  2 +-
 src/views/base/engineering/index.vue      | 21 ++++++++--------
 src/views/construction/sideband/index.vue | 30 ++++++++++++++---------
 4 files changed, 49 insertions(+), 33 deletions(-)

diff --git a/src/views/base/bracelet/index.vue b/src/views/base/bracelet/index.vue
index 039b23d..a646d72 100644
--- a/src/views/base/bracelet/index.vue
+++ b/src/views/base/bracelet/index.vue
@@ -575,8 +575,8 @@
       />
       
       <!-- 手环箱管理页面绑定手环弹窗 -->
-      <el-dialog :title="title" :visible.sync="showShall" width="1000px" height="1000px" append-to-body>
-        <el-form :model="queryShBoxall" ref="queryForm"  size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-dialog :title="title" :visible.sync="showShall" width="1000px" height="1000px" append-to-body @close="cancelOne">
+        <el-form :model="queryShBoxall" ref="queryFormThree"  size="small" :inline="true" v-show="showSearch" label-width="100px">
         <el-form-item  prop="shCode">
           <el-input
             v-model="queryShBoxall.shCode"
@@ -646,8 +646,8 @@
         </el-table-column>
       </el-table>
       <pagination
-        v-show="totalTwo>0"
-        :total="totalTwo"
+        v-show="totalThree>0"
+        :total="totalThree"
         :page.sync="queryShBoxall.pageNum"
         :limit.sync="queryShBoxall.pageSize"
         @pagination="getListBoxall"
@@ -1160,6 +1160,10 @@
           }
         },
 
+        cancelOne() {
+          this.showShall = false;
+          this.resetQueryThree();
+        },
         // 取消按钮
         cancel() {
             this.showsh = false;
@@ -1259,7 +1263,7 @@
         
         /** 重置按钮操作 */
         resetQueryThree() {
-            this.resetForm("queryForm");
+            this.resetForm("queryFormThree");
             this.handleQueryShBind();
         },
 
@@ -1611,9 +1615,16 @@
 
 
         handleClick(tab, event) {
-          this.getList();
-          this.getboxList();
-        console.log(tab, event);
+          if(tab.name == 'first'){
+            this.resetForm("queryFormOne");
+            this.getList();
+          }else if(tab.name == 'second'){
+            this.resetForm("queryForm");
+            this.getboxList();
+          }
+          // this.getList();
+          // this.getboxList();
+        // console.log(tab, event);
       },
       getShboxName(e,row){
         this.queryshCode.shboxId = row.shboxId;
@@ -1823,7 +1834,7 @@
             this.queryShBoxall.shboxId = this.shboxId;
             listShBind(this.queryShBoxall).then(response => {
               this.shBindList = response.rows;
-              this.totalTwo = response.total;
+              this.totalThree = response.total;
               this.loadingSix = false;
             });
         },
diff --git a/src/views/base/device/index.vue b/src/views/base/device/index.vue
index 452272f..38413f2 100644
--- a/src/views/base/device/index.vue
+++ b/src/views/base/device/index.vue
@@ -184,7 +184,7 @@
 
         <!-- 查看设备属性弹窗 -->
         <el-dialog :title="title" :visible.sync="showDeviceAttribute" width="1200px" height="1000px" append-to-body>
-          <el-form :model="queryDeviceAttribute" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form :model="queryDeviceAttribute" ref="queryFormDeviceAttribute" size="small" :inline="true" v-show="showSearch" label-width="68px">
           <el-form-item  prop="dataCode">
           <el-input
             v-model="queryDeviceAttribute.dataCode"
diff --git a/src/views/base/engineering/index.vue b/src/views/base/engineering/index.vue
index 8b2ab05..516dc7c 100644
--- a/src/views/base/engineering/index.vue
+++ b/src/views/base/engineering/index.vue
@@ -1,6 +1,14 @@
 <template>
     <div class="app-container">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form-item  prop="departName">
+          <el-input
+            v-model="queryParams.departName"
+            placeholder="请输入项目部名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
         <el-form-item  prop="proName">
           <el-input
             v-model="queryParams.proName"
@@ -39,15 +47,6 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item  prop="departName">
-          <el-input
-            v-model="queryParams.departName"
-            placeholder="请输入项目部名称"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -132,7 +131,7 @@
 
       <!-- 杆塔弹窗 -->
       <el-dialog :title="title" :visible.sync="showGt" width="1000px" height="1000px" append-to-body>
-          <el-form :model="queryGt" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form :model="queryGt" ref="queryFormGt" size="small" :inline="true" v-show="showSearch" label-width="68px">
           <el-form-item  prop="gtCode">
           <el-input
             v-model="queryGt.gtCode"
@@ -802,7 +801,7 @@
 
         /** 杆塔重置按钮操作 */
         resetQueryGt() {
-            this.resetForm("queryForm");
+            this.resetForm("queryFormGt");
             this.currentSelectionGt = []//重置清除已选列表
             this.handleQueryGt();
         },
diff --git a/src/views/construction/sideband/index.vue b/src/views/construction/sideband/index.vue
index 2d5858c..67cb46f 100644
--- a/src/views/construction/sideband/index.vue
+++ b/src/views/construction/sideband/index.vue
@@ -37,7 +37,7 @@
           />
         </el-form-item>
 
-        <el-form-item prop="bindTime">
+        <!-- <el-form-item prop="bindTime">
         <el-date-picker
           v-model="queryParams.bindTime"
           style="width: 240px"
@@ -45,7 +45,19 @@
           placeholder="绑定时间"
           type="date"
         ></el-date-picker>
-      </el-form-item>
+      </el-form-item> -->
+
+      <el-form-item  label="绑定时间">
+          <el-date-picker
+          v-model="dateRange"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+        </el-form-item>
 
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
@@ -337,6 +349,8 @@
         proList: [],
         //施工杆塔
         GtList:[],
+        //绑定时间
+        dateRange: [],
         // 查询参数
         queryParams: {
           pageNum: 1,
@@ -440,7 +454,7 @@
         /** 查询边带列表 */
         getList() {
             this.loading = true;
-            listSideband(this.queryParams).then(response => {
+            listSideband(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
               this.postList = response.rows;
               this.total = response.total;
               this.loading = false;
@@ -497,23 +511,15 @@
         },
         /** 重置按钮操作 */
         resetQuery() {
+            this.dateRange = [];
             this.resetForm("queryForm");
             this.handleQuery();
         },
         // 多选框选中数据
         handleSelectionChange(selection) {
-          // forEach.(selection, function(item){
-          //   this.idLists.push({id: item.deviceId, type: item.deviceTypeName})
-          // })
-          console.log(selection)
           selection.map(item => {
             this.idLists.push({id: item.deviceId, type: item.deviceTypeName})
           })
-          // forEach(selection, function(item){
-          //   this.idLists.push({id: item.deviceId, type: item.deviceTypeName})
-          // })
-          // this.idLists.push({id: selection.map(item => item.deviceId), type: selection.map(item => item.deviceTypeName)})
-
             this.single = selection.length!=1
             this.multiple = !selection.length
         },