670控制中心小问题修复

src/api/equipmentManagement/repairRecords/index.ts

@@ -89,8 +89,9 @@ function getRepairList(data) {
             "repairPart": data.repairPart,
             "repairReason": data.repairReason,
             "repairPerson": data.repairPerson,
-            "repairBeginTime": data.repairBeginTime,
-            "repairEndTime": data.repairEndTime,
+            "repairBeginTime":data.Date?data.Date[0]:'',
+            "repairEndTime": data.Date?data.Date[1]:'',
+            "searchValue":data.searchValue,
             "pageNum": data.pageNum,
             "pageSize": data.pageSize
         }

src/views/controlCenter/670/index.vue

@@ -2,7 +2,7 @@
   <div class="device-page p-2">
     <!-- 头部信息栏 -->
     <div class="header-bar">
-      <div>设备名称：{{ deviceDetail.deviceName }}</div>
+      <div>设备名称：{{ deviceDetail.deviceName }}，IMEI:{{deviceDetail.deviceImei  }}</div>
       <div>设备型号：{{ deviceDetail.typeName }}</div>
       <div class="device-status">
         设备状态：
@@ -372,8 +372,7 @@ const deviceDetail = ref<any>({
 });
 
 //模式设置
-const handleModeClick = async (id: string, type: string) => {
-  
+const handleModeClick = async (id: string, type: string) => {  
   if (Status[type] == id) {
     return;
   }
@@ -406,8 +405,7 @@ const handleModeClick = async (id: string, type: string) => {
       });
     };
 
-    dic.promise.then((res) => {
-  
+    dic.promise.then((res) => {  
       if (res.code === 200) {
         Status[type] = id;
         ElMessage.closeAll();
@@ -419,12 +417,13 @@ const handleModeClick = async (id: string, type: string) => {
           
           callback();
         }
+
       } else {
         proxy?.$modal.msgError(res.msg);
       }
     });
   };
-  if(type == 'sosMode' && Status.sosMode=== '1' && id==='0'){
+  if(type == 'sosMode' && Status.sosMode=== '1' && id==='0' && timer){
     showClose();
     return;
   }
@@ -444,7 +443,7 @@ const handleModeClick = async (id: string, type: string) => {
               clearInterval(timer);
               timer = null;
               hideConfirm();
-              handleModeClick('sosMode','1');
+              handleModeClick('1','sosMode');
              deviceDetail.value.staSOSGrade="0";
               return;
             }
@@ -563,11 +562,13 @@ function showClose() {
   Status.confirm.Visible = true;
   Status.confirm.OkTxt = '关闭';
   Status.confirm.OkCallback=()=>{
-    handleModeClick('sosMode','0');
-    deviceDetail.value.staSOSGrade="0";
-    clearInterval(timer);
+      clearInterval(timer);
     timer=null;
+    handleModeClick('0','sosMode');
+    deviceDetail.value.staSOSGrade="0";
+  
     Status.timeOut=0;
+    
     hideConfirm();
   }
 }

src/views/debugCenter/debugPanel/index.vue

@@ -357,6 +357,7 @@ function resetQuery() {
   keys.forEach((k) => {
     queryParams[k] = cfg[k];
   });
+  handleQuery();
 }
 
 // 设备类型

src/views/equipmentManagement/devices/shareManage.vue

@@ -205,9 +205,12 @@ var dic = reactive({
   '3': '开机画面',
   '4': '人员信息登记',
   '5': '发送信息',
-  '6': '产品信息'
+  '6': '产品信息',
+  '41':'静电探测',
+  '42':'SOS'
 });
 
+
 var power = computed(() => {
   let arr = [];
   let keys = Object.keys(dic);

src/views/equipmentManagement/repairRecords/index.vue

@@ -9,7 +9,14 @@
         </div>
 
         <div class="rightSearch">
-          <el-input :suffix-icon="'Search'" v-model="advanceSearch.searchValue" class="responsive-input" placeholder="名称" @input="txtSearch">
+          <el-input
+            :suffix-icon="'Search'"
+            clearable
+            v-model="advanceSearch.searchValue"
+            class="responsive-input"
+            placeholder="名称"
+            @input="txtSearch"
+          >
           </el-input>
 
           <el-button style="margin-left: 10px" type="primary" @click.stop="ToggleAdvance()">高级筛选</el-button>
@@ -17,13 +24,13 @@
       </div>
       <div class="advanceSearch" v-show="Status.ShowAdvanceSearch">
         <el-form :inline="true" :model="advanceSearch" class="demo-form-inline">
-          <el-form-item label="设备名称">
-            <!-- <el-input placeholder="请选择" v-model="selectedRow['deviceName']" :readonly="true" @click.stop="ShowDevice('Search', false)" /> -->
+          <!-- <el-form-item label="设备名称">
+            <el-input placeholder="请选择" v-model="selectedRow['deviceName']" :readonly="true" @click.stop="ShowDevice('Search', false)" /> 
 
             <el-select v-model="advanceSearch.deviceId" placeholder="选择设备" clearable filterable>
               <el-option v-for="item in deviceDist" :key="item.deviceId" :label="item.deviceName" :value="item.deviceId" />
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
 
           <el-form-item label="维修人员">
             <el-input v-model="advanceSearch.repairPerson" placeholder="请输入人员名称" clearable />
@@ -35,34 +42,18 @@
           <el-form-item label="维修原因">
             <el-input v-model="advanceSearch.repairReason" placeholder="请输入" clearable />
           </el-form-item>
-
           <el-form-item label="维修时间">
-            <el-col :span="7">
-              <el-form-item prop="date1" style="margin-right: 0px">
-                <el-date-picker
-                  v-model="advanceSearch.repairBeginTime"
-                  type="date"
-                  placeholder="开始日期"
-                  format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD"
-                  style="width: 100%"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="1">
-              <span class="text-gray-500">-</span>
-            </el-col>
-            <el-col :span="7">
-              <el-form-item prop="date2" style="margin-right: 0px">
-                <el-date-picker
-                  v-model="advanceSearch.repairEndTime"
-                  format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD"
-                  placeholder="结束日期"
-                  style="width: 100%"
-                />
-              </el-form-item>
-            </el-col>
+            <el-date-picker
+              v-model="advanceSearch.Date"
+              type="daterange"
+              format="YYYY-MM-DD"
+              style="width: 240px;"
+              value-format="YYYY-MM-DD"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :size="'default'"
+            />
             <div>
               <el-button style="margin-left: 5px" type="primary" @click.stop="Search()">查询</el-button>
               <el-button type="primary" @click.stop="Reset()">重置</el-button>
@@ -161,7 +152,6 @@
                   <!-- 图片缩略图 -->
                   <img :src="file.url" class="el-upload-list__item-thumbnail" />
 
-               
                   <!-- 操作按钮组 -->
                   <div class="el-upload-list__item-actions">
                     <!-- 自定义删除按钮 -->
@@ -192,11 +182,11 @@
               <el-icon>
                 <Plus />
               </el-icon>
-                 <template #file="{ file, index }">
+              <template #file="{ file, index }">
                 <!-- 图片预览区域 -->
                 <div class="el-upload-list__item">
                   <!-- 图片缩略图 -->
-                  <img :src="file.url" class="el-upload-list__item-thumbnail" />            
+                  <img :src="file.url" class="el-upload-list__item-thumbnail" />
                   <!-- 操作按钮组 -->
                   <div class="el-upload-list__item-actions">
                     <!-- 自定义删除按钮 -->
@@ -209,7 +199,6 @@
                 </div>
               </template>
             </el-upload>
-          
           </el-form-item>
         </el-form>
       </div>
@@ -382,8 +371,7 @@ var advanceSearch = reactive({
   'repairPart': '',
   'repairReason': '',
   'repairPerson': '',
-  'repairBeginTime': '',
-  'repairEndTime': '',
+  Date: [],
   pageNum: 1,
   pageSize: 10
 });
@@ -447,8 +435,7 @@ function Reset() {
     'repairPart': '',
     'repairReason': '',
     'repairPerson': '',
-    'repairBeginTime': '',
-    'repairEndTime': ''
+    'Date': []
   };
   selectedRow.value.deviceName = '';
   let keys = Object.keys(defVal);
@@ -469,7 +456,7 @@ function txtSearch() {
   // 等待 500ms 无输入后执行查询
   searchIntval = setTimeout(() => {
     Search();
-  }, 200);
+  }, 500);
 }
 
 //获取列表数据
@@ -655,27 +642,22 @@ function ResetFormData() {
   cEdit.isEdit = false;
   cEdit.imageIds = [];
 
-
   selectedRow.value = { deviceName: '', deviceId: '' };
 
   clearUploadFiles();
 }
 
 var dropImg = (type, file, index) => {
-  
-
   let runDrop = () => {
-    
     if (type == 'after') {
       afterFiles.value.splice(index, 1);
     }
     if (type == 'before') {
-      beforeFiles.value.splice(index, 1);    
+      beforeFiles.value.splice(index, 1);
     }
-    if(file.id){
+    if (file.id) {
       cEdit.imageIds.push(file.id);
     }
-     
   };
   confirm('您确认删除此记录吗?', runDrop, hideConfirm, '提示');
 };
@@ -707,11 +689,10 @@ function SaveFormData() {
     if (beforeFile.value.length > 0) {
       for (let i = 0; i < beforeFile.value.length; i++) {
         let file = beforeFile.value[i];
-        if(file && !file.id){
+        if (file && !file.id) {
           formData.append('beforeFile', file);
-        }        
+        }
       }
-    
     }
 
     if (afterFile.value.length > 0) {
@@ -719,10 +700,9 @@ function SaveFormData() {
 
       for (let i = 0; i < afterFile.value.length; i++) {
         let file = afterFile.value[i];
-        if(file && !file.id){
+        if (file && !file.id) {
           formData.append('afterFile', file);
         }
-        
       }
     }