bug修复

src/assets/css/index.scss

@@ -590,6 +590,10 @@ ul li {
 }
 
 // 实时评分 
+.descIcon {
+    cursor: pointer
+}
+
 .descIcon img {
     position: relative;
     top: 2px;

src/views/alarmManage/index.vue

@@ -270,7 +270,7 @@ export default defineComponent({
     const cellStyle = ({ row, column, rowIndex, columnIndex }) => {
       row, column, rowIndex
       // console.log(row, column, rowIndex)
-      if (columnIndex === 0) {
+      if (columnIndex !== 0) {
         return `color:#0284E8;cursor:pointer`
       }
       if (columnIndex) {

src/views/dataManage/energyReport/tables/index.vue

@@ -7,9 +7,10 @@
         stripe
         style="max-width: 100%"
         :key="Math.random()"
+          :header-cell-style="headClass"
       >
         <template v-for="(item, index) in cols" :key="index">
-          <el-table-column :prop="item.prop" :label="item.label" align="center">
+          <el-table-column :prop="item.prop" :label="item.label" align="center" min-width="120">
             <template #default="scope">
               <span>
                 {{ scope.row[item.prop] }}
@@ -37,8 +38,8 @@ export default defineComponent({
     
     //处理数据
     const getData = async () => {
-      console.log('table子组件中的props.tableDatas')
-      console.log(props.tableDatas.listDate)
+      // console.log('table子组件中的props.tableDatas')
+      // console.log(props.tableDatas.listDate)
       var aa = props.tableDatas.listDate
       var newArr=[]
       aa.forEach((item, index) => {
@@ -47,7 +48,7 @@ export default defineComponent({
 
       newArr.push({ label: '合计', prop: 'total' },{ label: '单位', prop: 'unit' })
       newArr.unshift({ label: '名称', prop: 'name' })
-      console.log(newArr)
+      // console.log(newArr)
       cols.value = newArr
 
       var bb = props.tableDatas.list
@@ -58,7 +59,7 @@ export default defineComponent({
       obj.name = props.tableDatas.name
       obj.unit = 'kWh'
       obj.total = sum(props.tableDatas.list).toFixed(2)
-      console.log(obj)
+      // console.log(obj)
       tableData6.value[0] = obj
     }
     const cols = ref([
@@ -83,9 +84,11 @@ export default defineComponent({
 
     // 表头样式设置
     const headClass = () => {
-      return 'background:#FAFAFA !important;color: black;'
+      return 'background:#FAFAFA !important;color: black'
     }
 
+    
+
     // 求和
     function sum(arr) {
       var s = 0
@@ -106,7 +109,7 @@ export default defineComponent({
       (newVal, oldVal, clear) => {
         // 执行异步任务，并得到关闭异步任务的 id
         // alert(1)
-        console.log(newVal)
+        // console.log(newVal)
         let id = writeValue(newVal, oldVal)
         // 如果 watch 监听被重复执行了，则会先清除上次未完成的异步任务
         clear(() => clearTimeout(id))
@@ -121,6 +124,7 @@ export default defineComponent({
       headClass,
       Update, //修改偏差配置事件
       cols,
+      // cellStyle,
       tableData6,
       // newArr
      

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

@@ -118,13 +118,13 @@
         ></el-table-column>
         <el-table-column
           prop="offlineDuration"
-          label="离线时长"
+          label="离线时长（小时）"
           align="center"
           width=""
         ></el-table-column>
         <el-table-column
           prop="onlineDuration"
-          label="在线时长"
+          label="在线时长（小时）"
           align="center"
           width=""
         ></el-table-column>

src/views/deviceManage/powerEquip/index.vue

@@ -10,7 +10,7 @@
         <div class="first">
           <div class="insertBox" v-if="deviceNumData.length == ''">
             <div class="firstTop">
-              <div class="firstTopLeft">
+              <div class="firstTopLeft ">
                 <!-- 选择站点:
                 <el-select
                   v-model="store.state.siteId"
@@ -24,15 +24,28 @@
                     :value="site.id"
                   ></el-option>
                 </el-select> -->
-
-                <span class="firstTopLeftTitle">站点名称:</span>
-                <el-input
-                  placeholder="输入关键字进行过滤"
-                  v-model="filterText"
-                  class="firstTopLeftInput"
-                >
-             
-                </el-input>
+                <div class="filter-item">
+                  <span class="firstTopLeftTitle">站点名称:</span>
+                  <el-input
+                    placeholder="输入关键字进行过滤"
+                    v-model="filterText"
+                    class="firstTopLeftInput"
+                  ></el-input>
+                </div>
+                <div class="filter-item">
+                  <span class="firstTopLeftTitle">联系人:</span>
+                  <el-input
+                    v-model="userName"
+                    class="firstTopLeftInput"
+                  ></el-input>
+                </div>
+                <div class="filter-item">
+                  <span class="firstTopLeftTitle">手机号:</span>
+                  <el-input
+                    v-model="phone"
+                    class="firstTopLeftInput"
+                  ></el-input>
+                </div>
 
                 <el-button
                   type="primary"
@@ -56,8 +69,7 @@
 
             <div class="firstContent">
               <el-table
-                :data="
-                  tableData"
+                :data="tableData"
                 border
                 stripe
                 :header-cell-style="headClass"
@@ -129,7 +141,7 @@
               :Height="Height"
               :refresh="refresh"
               @updateRow="update"
-               @func="getMsgFormSon"
+              @func="getMsgFormSon"
             ></deviceDetails>
           </div>
 
@@ -146,8 +158,11 @@
       <el-tab-pane label="视频监测设备" name="videoEquip">
         <video-Equip :Height="Height" :activeName="activeName"></video-Equip>
       </el-tab-pane>
-      <el-tab-pane label="通信设备"  name="communicateEquip">
-        <communicate-Equip :Height="Height" :activeName="activeName"></communicate-Equip>
+      <el-tab-pane label="通信设备" name="communicateEquip">
+        <communicate-Equip
+          :Height="Height"
+          :activeName="activeName"
+        ></communicate-Equip>
       </el-tab-pane>
       <!-- <el-tab-pane label="通道列表" name="channelList">
         <channel-List :Height="Height"></channel-List>
@@ -157,7 +172,7 @@
 </template>
 <script>
 import { useStore } from 'vuex'
-import { defineComponent, ref, reactive, onMounted } from 'vue'
+import { defineComponent, ref, reactive, onMounted, watch } from 'vue'
 import deviceDetails from './deviceDetails.vue'
 import videoEquip from './videoEquip/index.vue'
 import insertDialog from './powerDialog/insertDialog.vue'
@@ -187,6 +202,8 @@ export default defineComponent({
     const refresh = ref(false) //设备列表详情table 是否重新调用
     const activeName = ref('powerEquip')
     const filterText = ref('')
+    const userName = ref('')
+    const phone = ref('')
     const show = ref(false)
     const updateTitle = ref('')
 
@@ -251,7 +268,9 @@ export default defineComponent({
         .monitorDeviceList({
           size: pageSize.value,
           current: currentPage.value,
-          siteName:filterText.value
+          siteName: filterText.value,
+          userName:userName.value,
+          phone:phone.value
         })
         .then((requset) => {
           if (requset.status === 'SUCCESS') {
@@ -282,13 +301,10 @@ export default defineComponent({
       monitorDeviceList()
     }
 
-
     const getMsgFormSon = () => {
       deviceNumData.value = ''
     }
 
-
-
     // 表头样式设置
     const headClass = () => {
       return 'background:#FAFAFA !important;color: black;'
@@ -298,9 +314,22 @@ export default defineComponent({
     window.addEventListener('resize', () => {
       Height.value = window.innerHeight - 300 + 'px'
     })
+
+    watch(
+      () => activeName.value,
+      (newVal) => {
+        newVal
+        if (newVal == 'powerEquip') {
+          // deviceNewsList()
+          deviceNumData.value = ''
+        }
+      }
+    )
+
     onMounted(() => {
       monitorDeviceList()
     })
+
     return {
       refresh,
       Height,
@@ -308,6 +337,8 @@ export default defineComponent({
       tableData,
       activeName,
       filterText,
+      userName,
+      phone,
       show,
       addItem,
       update,
@@ -347,7 +378,7 @@ export default defineComponent({
     height: 32px;
     line-height: 32px;
     .firstTopLeft {
-      width: 70%;
+      width: 100%;
       .goBack {
         margin-right: 15px;
       }
@@ -400,4 +431,11 @@ export default defineComponent({
   margin-top: 15px;
   float: right;
 }
+.filter-item{
+  display:inline-block;
+  margin-right:20px;
+  .firstTopLeftInput{
+    width:180px!important
+  }
+}
 </style>

src/views/planOutage/index.vue

@@ -82,6 +82,8 @@
         min-width="155px"
       ></el-table-column>
       <el-table-column prop="creator" label="提交人"  min-width="110px"></el-table-column>
+      <el-table-column prop="contacts" label="联系人"  min-width="110px"></el-table-column>
+      <el-table-column prop="phone" label="联系方式"  min-width="110px"></el-table-column>
       <el-table-column prop="type" label="状态" width="">
         <template #default="scope">
           <span

src/views/powerQuality/harmonicReport/index.vue

@@ -29,7 +29,6 @@
               v-model="deviceCode"
               placeholder="请选择"
               style="width: 150px"
-              @change="listSelect()"
             >
               <el-option
                 v-for="device in deviceList"
@@ -48,7 +47,7 @@
               :type="dateType"
               placeholder="请选择"
               style="width: 150px"
-              @change="listSelect()"
+            
               :clearable="false"
               :editable="false"
             ></el-date-picker>
@@ -126,6 +125,7 @@ import { useStore } from 'vuex'
 import { defineComponent, onMounted, ref } from 'vue'
 import * as api from '@/api/powerQuality/harmonicReport'
 import { ElMessage } from 'element-plus'
+import { ElNotification } from 'element-plus'
 
 export default defineComponent({
   name: 'VariableList',
@@ -148,19 +148,19 @@ export default defineComponent({
     const curveComList = ref([
       {
         name: 'A相电流（A）',
-        icontitle: 'ia',
+        icontitle: 'Ia',
         dateList: [],
         data: [],
       },
       {
         name: 'B相电流（A）',
-        icontitle: 'ib',
+        icontitle: 'Ib',
         dateList: [],
         data: [],
       },
       {
         name: 'C相电流（A）',
-        icontitle: 'ic',
+        icontitle: 'Ic',
         dateList: [],
         data: [],
       },
@@ -188,10 +188,10 @@ export default defineComponent({
       value == 'dayValue'
         ? (dateType.value = 'date')
         : (dateType.value = 'month')
-      listSelect()
     }
 
     function listSelect() {
+
       let list = {}
 
       if (listTabPosition.value == 'dayValue') {
@@ -209,8 +209,15 @@ export default defineComponent({
           endTime: store.state.monthList[1] + ' ' + '23:59:59',
         }
       }
+      if(!deviceCode.value){
+          ElNotification({
+          title: '提示',
+          message: '请选择左侧设备信息',
+          type: 'warning',
+        })
 
-      api.rtRealScore(list).then((requset) => {
+      }else{
+        api.rtRealScore(list).then((requset) => {
         if (requset.status === 'SUCCESS') {
           tableList.value = requset.data
            console.log('tableList.value')
@@ -233,9 +240,17 @@ export default defineComponent({
             curveComList.value[2].dateList.push(val.dataTime)
           })
         } else {
+          
           ElMessage.error(requset.msg)
+         
+
+          
         }
       })
+
+      }
+
+      
     }
 
     onMounted(() => {

src/views/powerQuality/realTimeMonitoring/realScore.vue

@@ -43,7 +43,7 @@
           <el-button
             type="primary"
             class="search-button"
-            style="margin-left: 30px"
+            style="margin-left: 30px;cursor:pointer!important"
             @click="realScore()"
           >
             刷新

src/views/powerQuality/unbalanceAnalysis/voltageChart.vue

@@ -79,7 +79,7 @@ export default defineComponent({
           data: voltageChart.value.dataTime,
         },
         yAxis: {
-          name: 'kV',
+          name: 'V',
           nameTextStyle: {
             color: 'black',
             fontSize: 10,

src/views/siteManage/camera/index.vue

@@ -4,14 +4,19 @@
     <div class="filter-container mb-20">
       <div class="left">
         <div>
-          <a class="" style="margin-right: 30px">
+          <span class="" style="margin-right: 30px">
             【{{ labelCom }}】站点的所有摄像头设备
-            
-          </a>
+          </span>
           <el-button icon="el-icon-plus" type="success" @click="addItem()">
             新增
           </el-button>
-          <a href="./static/伍继摄像头导入模板.xlsx" download class="downloadMb" >模板下载</a>
+          <a
+            href="./static/伍继摄像头导入模板.xlsx"
+            download
+            class="downloadMb"
+          >
+            模板下载
+          </a>
         </div>
       </div>
 
@@ -21,6 +26,7 @@
           :action="fileUrl + '/device/deviceImport'"
           :on-progress="handleProgress"
           :on-success="handleUpAvatar"
+          :on-error="handleError"
           multiple
           :limit="1"
           :headers="{
@@ -186,13 +192,7 @@
 
 <script>
 import { useStore } from 'vuex'
-import {
-  defineComponent,
-  ref,
-  reactive,
-  onMounted,
-  watch
-} from 'vue'
+import { defineComponent, ref, reactive, onMounted, watch } from 'vue'
 import DialogComponent from './dialogComponent'
 import checkVideo from './checkVideo'
 import * as api from '@/api/siteManage/camera.js'
@@ -232,7 +232,7 @@ export default defineComponent({
     const count = ref(0)
     const loadingStatus = ref(false)
     const timer = ref('')
-    const deviceCode=ref('')
+    const deviceCode = ref('')
 
     // 表头样式设置
     const headClass = () => {
@@ -302,15 +302,14 @@ export default defineComponent({
 
     // 关闭操作
     const closeDialog = () => {
-    showDialog.value = false
-   
+      showDialog.value = false
+
       videoMonitoringDeviceList()
       chk_video()
     }
     const closeDialog2 = () => {
       showDialog2.value = false
-      count.value=0
-    
+      count.value = 0
     }
 
     //删除 是否删除  ---- 是
@@ -332,6 +331,7 @@ export default defineComponent({
     const cancelEvent = () => {
       console.log('cancel!')
     }
+
     //导入
     const handleProgress = (file, fileList) => {
       file
@@ -360,6 +360,16 @@ export default defineComponent({
       })
       videoMonitoringDeviceList()
     }
+
+    const handleError = (res) => {
+      let myError = res.toString() //转字符串
+      myError = myError.replace('Error: ', '') //去掉前面的
+      myError = JSON.parse(myError) //转对象
+      ElMessage.error({
+        message: myError.msg,
+        type: 'error',
+      })
+    }
     //导出
     const DataReportExport = () => {
       api
@@ -426,16 +436,15 @@ export default defineComponent({
                       resource: '',
                     }
                     dialogTitle.value = '查看视频'
-                    showDialog2.value = true;
+                    showDialog2.value = true
                   } else {
                     store.state.siteCameraTimer = setTimeout(chk_video, 5000)
                   }
                 } else {
                   if (reCount.value > 7) {
-                 
                     loadingStatus.value = false
                     alert('远程摄像头链接超时，请稍后再试')
-               
+
                     break
                   }
                   store.state.siteCameraTimer = setTimeout(chk_video, 5000)
@@ -466,7 +475,7 @@ export default defineComponent({
 
     // 查看视频
     const open_video = (item) => {
-      deviceCode.value=item.deviceCode
+      deviceCode.value = item.deviceCode
       if (openId.value != item.deviceCode) {
         openId.value = item.deviceCode
       }
@@ -561,7 +570,6 @@ export default defineComponent({
 
     onMounted(() => {})
 
-
     return {
       deviceData,
       showDialog,
@@ -609,7 +617,8 @@ export default defineComponent({
       loadingStatus,
       open_video,
       timer,
-      deviceCode
+      deviceCode,
+      handleError,
     }
   },
 })

src/views/siteManage/variableList/index.vue

@@ -4,10 +4,10 @@
     <div class="filter-container mb-20">
       <div class="left">
         <div>
-          <a class="" style="margin-right: 30px">
+          <span class="" style="margin-right: 30px">
             【{{ labelCom }}】 站点的所有变量
             
-          </a>
+          </span>
           <el-button icon="el-icon-plus" type="success" @click="addItem()">
             新增
           </el-button>

src/views/siteManage/watchDog/index.vue

@@ -2,7 +2,7 @@
   <div class="siteManage-main watchDog">
     <!-- 筛选start -->
     <div class="filter-container mb-20">
-      <a class="">【{{ labelCom }}】站点的所有监控设备 <a href="./static/伍继监控设备导入模板.xlsx" download class="downloadMb" >模板下载</a></a>
+      <span class="">【{{ labelCom }}】站点的所有监控设备 <a href="./static/伍继监控设备导入模板.xlsx" download class="downloadMb" >模板下载</a></span>
               
 
       <!-- <el-button icon="el-icon-plus" type="success" @click="addItem()">新增</el-button > -->
@@ -62,13 +62,13 @@
       ></el-table-column>
       <el-table-column
         prop="ratedVoltage"
-        label="额定电压"
+        label="额定电压 (kV)"
         align="center"
         width=""
       ></el-table-column>
       <el-table-column
         prop="ratedCurrent"
-        label="额定电流"
+        label="额定电流 (A)"
         align="center"
         width=""
       ></el-table-column>

src/views/systemManage/rolePermission/index.vue

@@ -125,6 +125,7 @@ export default defineComponent({
           ElMessage.error(requset.msg)
         }
       })
+
     }
 
     const listTabsChange = (value, item) => {
@@ -138,10 +139,13 @@ export default defineComponent({
       // console.log(radio1.value)
     }
     function roleMenuTreeselect() {
+      menuData.value = []
       api.roleMenuTreeselect({}, radio1.value).then((requset) => {
         if (requset.code == 200) {
           menuData.value = requset.data.menus
           checkedKeys.value = requset.data.checkedKeys
+
+          //当返回值没有选中菜单时,否
           if (!checkedKeys.value.length) {
             menuData.value.map((item) => {
               item.authority2 = '0'
@@ -159,10 +163,11 @@ export default defineComponent({
             }
           } else {
             menuData.value.map(function (item) {
+              item.authority2 = '0'
               checkedKeys.value.map(function (num) {
                 if (JSON.stringify(item).indexOf(num) != -1) {
                   item.authority2 = '1'
-                }
+                } 
               })
             })
             console.log(11111)

src/views/systemManage/rolePermission/roleInfoCom/index.vue

@@ -13,8 +13,12 @@
             v-model="scope.row.authority2"
             @change="listTabsChange(scope.row)"
           >
-            <el-radio label="1"  :disabled="radio1==1? true: false">是</el-radio>
-            <el-radio label="0" :disabled="radio1==1? true: false">否</el-radio>
+            <el-radio label="1" :disabled="radio1 == 1 ? true : false">
+              是
+            </el-radio>
+            <el-radio label="0" :disabled="radio1 == 1 ? true : false">
+              否
+            </el-radio>
           </el-radio-group>
         </template>
       </el-table-column>
@@ -71,41 +75,30 @@ export default defineComponent({
     const listTabsChange = (value) => {
       saveArr.value = []
       value
-      console.log(' props.menuData')
+      console.log('props.menuData')
       console.log(props.menuData)
 
       props.menuData.forEach(function (item) {
         if (item.authority2 == '1') {
           saveArr.value.push(item.id)
+          var aa = item.children
+          aa.forEach(function (item) {
+              saveArr.value.push(item.id)
+            
+          })
         }
       })
       console.log('saveArr.value')
       console.log(saveArr.value)
     }
 
-    onMounted(() => {
-      // if (props.radio1 == 1) {
-      //   alert(1)
-      //   props.menuData.forEach(function (item) {
-      //     item.authority2 = '1'
-      //     saveArr.value.push(item.id)
-      //   })
-      //   console.log(' props.menuData')
-      //   console.log(props.menuData)
-      // } else {
-      //   props.menuData.forEach(function (item) {
-      //     if (item.authority2 == '1') {
-      //       saveArr.value.push(item.id)
-      //     }
-      //   })
-      // }
-    })
+    onMounted(() => {})
     //监听变化
     watch(
       () => props.radio1,
       (newVal) => {
         newVal
-        
+
         // console.log('newVal')
         // console.log(newVal)
         // if (newVal == '1') {