bug修复

src/views/alarmManage/index.vue

@@ -30,7 +30,7 @@
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               style="width: auto"
-              @change="listSelect()"
+        
             ></el-date-picker>
           </div>
           <el-button

src/views/deviceManage/powerEquip/communicateEquip/index.vue

@@ -51,6 +51,7 @@
           :action="fileUrl + 'device/deviceImport'"
           :on-progress="handleProgress"
           :on-success="handleUpAvatar"
+          :on-error="handleError"
           multiple
           :limit="1"
           :headers="{
@@ -267,6 +268,15 @@ export default defineComponent({
       })
       Select()
     }
+    const handleError = (res) => {
+      let myError = res.toString() //转字符串
+      myError = myError.replace('Error: ', '') //去掉前面的
+      myError = JSON.parse(myError) //转对象
+      ElMessage.error({
+        message: myError.msg,
+        type: 'error',
+      })
+    }
 
     //导出
     const DataReportExport = () => {
@@ -441,6 +451,7 @@ export default defineComponent({
       accessToken,
       handleProgress,
       handleUpAvatar,
+      handleError,
       store,
     }
   },

src/views/powerQuality/harmonicReport/tableCom.vue

@@ -32,9 +32,9 @@
         <el-table-column prop="address" label="95%"></el-table-column>
       </el-table-column> -->
       <el-table-column prop="dataTime" label="时间" width="" />
-      <el-table-column label="A相" prop="ia" />
-      <el-table-column label="B相" prop="ib" />
-      <el-table-column label="C相" prop="ic" />
+      <el-table-column label="A相(A)" prop="ia" />
+      <el-table-column label="B相(A)" prop="ib" />
+      <el-table-column label="C相(A)" prop="ic" />
     </el-table>
     <!-- 表格end -->
 
@@ -127,7 +127,7 @@ export default {
     headCellStyle({ row, column, rowIndex, columnIndex }) {
       row, column
       if (columnIndex !== 0 && rowIndex === 0) {
-        return `text-align:center;`
+        // return `text-align:center;`
       } else {
         return ''
       }

src/views/powerQuality/realTimeMonitoring/realScore.vue

@@ -338,8 +338,9 @@ export default defineComponent({
      await api.deviceListOne({ siteId: store.state.siteId }).then((requset) => {
         if (requset.status === 'SUCCESS') {
           deviceList.value = requset.data
-          deviceCode.value = requset.data[0].deviceCode
-          realScore()
+          // deviceCode.value = requset.data[0].deviceCode
+          deviceCode.value = requset.data[0]?requset.data[0].deviceCode:''
+          // realScore()
         } else {
           ElMessage.error(requset.msg)
         }

src/views/powerQuality/unbalanceAnalysis/index.vue

@@ -164,7 +164,6 @@ export default defineComponent({
             deviceList.value = requset.data
             deviceCode.value = requset.data[0]?requset.data[0].deviceCode:''
 
-             rtRealScore()
           } else {
             ElMessage.error(requset.msg)
           }

src/views/siteManage/variableList/index.vue

@@ -54,6 +54,7 @@
           :action="fileUrl + 'deviceAnalogVariableList/variableListImport'"
           :on-progress="handleProgress"
           :on-success="handleUpAvatar"
+          :on-error="handleError"
           multiple
           :limit="1"
           :headers="{
@@ -247,6 +248,15 @@ export default defineComponent({
       })
       query()
     }
+    const handleError = (res) => {
+      let myError = res.toString() //转字符串
+      myError = myError.replace('Error: ', '') //去掉前面的
+      myError = JSON.parse(myError) //转对象
+      ElMessage.error({
+        message: myError.msg,
+        type: 'error',
+      })
+    }
 
     //是否删除  ---- 否
     const cancelEvent = () => {
@@ -442,6 +452,7 @@ export default defineComponent({
       accessToken,
       handleProgress,
       handleUpAvatar,
+      handleError
     }
   },
 })

src/views/siteManage/watchDog/index.vue

@@ -2,8 +2,16 @@
   <div class="siteManage-main watchDog">
     <!-- 筛选start -->
     <div class="filter-container mb-20">
-      <span class="">【{{ labelCom }}】站点的所有监控设备 <a href="./static/伍继监控设备导入模板.xlsx" download class="downloadMb" >模板下载</a></span>
-              
+      <span class="">
+        【{{ labelCom }}】站点的所有监控设备
+        <a
+          href="./static/伍继监控设备导入模板.xlsx"
+          download
+          class="downloadMb"
+        >
+          模板下载
+        </a>
+      </span>
 
       <!-- <el-button icon="el-icon-plus" type="success" @click="addItem()">新增</el-button > -->
 
@@ -13,6 +21,7 @@
           :action="fileUrl + '/deviceAttribute/deviceAttributeImport'"
           :on-progress="handleProgress"
           :on-success="handleUpAvatar"
+          :on-error="handleError"
           multiple
           :limit="1"
           :headers="{
@@ -306,8 +315,15 @@ export default defineComponent({
       })
       deviceNewsList()
     }
-
-   
+    const handleError = (res) => {
+      let myError = res.toString() //转字符串
+      myError = myError.replace('Error: ', '') //去掉前面的
+      myError = JSON.parse(myError) //转对象
+      ElMessage.error({
+        message: myError.msg,
+        type: 'error',
+      })
+    }
 
     function goVariableList() {
       emit('func')
@@ -345,7 +361,7 @@ export default defineComponent({
         })
     }
 
-     //监听变化
+    //监听变化
     watch(
       () => props.siteId,
       (newVal) => {
@@ -366,7 +382,7 @@ export default defineComponent({
       }
     )
 
-     onMounted(() => {
+    onMounted(() => {
       // console.log('props.siteId')
       // console.log(props.siteId)
     })
@@ -398,7 +414,7 @@ export default defineComponent({
       closeDialog,
       handleDelete,
       cancelEvent,
-      
+
       handleSizeChange,
       handleCurrentChange,
 
@@ -409,6 +425,7 @@ export default defineComponent({
       accessToken,
       handleProgress,
       handleUpAvatar,
+      handleError,
 
       labelCom,
     }

src/views/systemManage/userManage/dialogComponent.vue

@@ -85,6 +85,7 @@
           type="primary"
           @click="submitForm('formInfo')"
           :disabled="isDisable"
+          v-if="dialogTitle !== '查看'"
         >
           确定
         </el-button>