bug修复

src/store/index.js

@@ -59,8 +59,8 @@ export default createStore({
          * @公共站点下拉列表
          * @param {*} state 
          */
-        publicSiteList(state) {
-            api
+        async publicSiteList(state) {
+            await api
                 .SiteList({})
                 .then((requset) => {
                     if (requset.status === 'SUCCESS') {

src/views/alarmManage/index.vue

@@ -11,6 +11,7 @@
               placeholder="请选择"
               style="width: 200px"
               clearable
+              filterable
             >
               <el-option
                 v-for="item in store.state.siteList"

src/views/dataManage/chainAnalysis/index.vue

@@ -6,6 +6,7 @@
           v-model="store.state.siteId"
           placeholder="选择站点"
           @change="siteChange"
+          filterable
         >
           <el-option
             v-for="item in store.state.siteList"

src/views/dataManage/demandAnalysis/index.vue

@@ -6,6 +6,7 @@
           v-model="store.state.siteId"
           @change="siteChange"
           placeholder="选择站点"
+          filterable
         >
           <el-option
             v-for="item in store.state.siteList"

src/views/dataManage/energyReport/index.vue

@@ -6,6 +6,7 @@
           v-model="store.state.siteId"
           @change="siteChange"
           placeholder="选择站点"
+          filterable
         >
           <el-option
             v-for="item in store.state.siteList"

src/views/dataManage/sameAnalysis/ehcarts/index.vue

@@ -58,14 +58,14 @@ export default defineComponent({
   name: 'CurveCom',
   props: {
     ecahrtsData: Object,
-  
+    typeSrarch: Number,
   },
 
   setup(props) {
     props
     const store = useStore()
     const sumeChartRef = ref(null)
-    const newData=ref([])
+    const newData = ref([])
 
     // const listData = ref([])
 
@@ -73,7 +73,8 @@ export default defineComponent({
     // num
     const num = computed(() => store.state.Home.worksChartData.num)
     const newDataName = ref('')
-    const aa=ref('')
+    const aa = ref('')
+    const dataTime = ref([])
 
     // 读取数据 func
     const loading = ref(true)
@@ -81,7 +82,7 @@ export default defineComponent({
       loading.value = false
       // console.log('props.ecahrtsData')
       // console.log(props.ecahrtsData)
-      aa.value=props.ecahrtsData[0]?props.ecahrtsData[0].name:'';
+      aa.value = props.ecahrtsData[0] ? props.ecahrtsData[0].name : ''
       var jsona = JSON.stringify(props.ecahrtsData)
       var jsonb = jsona.replace(/"list"/g, '"data"')
       newData.value = JSON.parse(jsonb)
@@ -98,93 +99,122 @@ export default defineComponent({
         }
       })
       console.log(newData.value)
+
+      var arr1 = props.ecahrtsData[0].listDate
+
+      if (props.typeSrarch == 1) {
+        dataTime.value = arr1.map(function (item) {
+          return item.toString().substring(5,10);
+        })
+        console.log('dataTime.value')
+        console.log(dataTime.value)
+      } else if (props.typeSrarch == 2) {
+       dataTime.value = arr1.map(function (item) {
+          return item.toString().substring(5,7)+'月';
+        })
+      }else{
+         dataTime.value = arr1.map(function (item) {
+          return item
+        })
+      }
     }
+
     function ecahrts() {
       let myChart = echarts.init(sumeChartRef.value)
-      myChart.setOption({
-        color: ['#FEB70D', '#50F335', '#0DC8FE','#e4ff40','#ff409a','#ff4040'],
-        title: {
-          text: '同比分析',
-          left: 'center',
-          textStyle: {
-            color: '#9d9d9d',
-            fontSize: 14,
-            fontWeight: 600,
+      myChart.setOption(
+        {
+          color: [
+            '#FEB70D',
+            '#50F335',
+            '#0DC8FE',
+            '#e4ff40',
+            '#ff409a',
+            '#ff4040',
+          ],
+          title: {
+            text: '同比分析',
+            left: 'center',
+            textStyle: {
+              color: '#9d9d9d',
+              fontSize: 14,
+              fontWeight: 600,
+            },
           },
-        },
-        tooltip: {
-          trigger: 'axis',
-        },
-        // 图列组件
-        legend: {
-          itemHeight: 10, //改变圆圈大小
-          itemWidth: 26, //改变圆圈大小
-          itemGap: 30,
-          textStyle: {
-            color: 'black',
+          tooltip: {
+            trigger: 'axis',
           },
+          // 图列组件
+          legend: {
+            itemHeight: 10, //改变圆圈大小
+            itemWidth: 26, //改变圆圈大小
+            itemGap: 30,
+            textStyle: {
+              color: 'black',
+            },
 
-          left: 'center',
-          bottom: '0',
-        },
-        toolbox: {
-          show: true,
-          feature: {
-            saveAsImage: { show: true, color: 'black' },
+            left: 'center',
+            bottom: '0',
           },
-          iconStyle: {
-            borderColor: '#666',
-          },
-        },
-        grid: {
-          left: '3%',
-          right: '4%',
-          bottom: '5%',
-          containLabel: true,
-        },
-        xAxis: {
-          type: 'category',
-          boundaryGap: true,
-          data: props.ecahrtsData[0]?props.ecahrtsData[0].listDate:'',
-          axisTick: {
-            show: false, //去除刻度线
-          },
-          axisLabel: {
-            color: 'black', // 文本颜色
-          },
-          axisLine: {
-            show: false, // 去除轴线
-          },
-        },
-        yAxis: {
-          name: yName,
-          nameTextStyle: {
-            color: 'black',
-            fontSize: 10,
+          toolbox: {
+            show: true,
+            feature: {
+              saveAsImage: { show: true, color: 'black' },
+            },
+            iconStyle: {
+              borderColor: '#666',
+            },
           },
-          type: 'value',
-          axisTick: {
-            show: true, //去除刻度线
+          grid: {
+            left: '3%',
+            right: '4%',
+            bottom: '5%',
+            containLabel: true,
           },
-          axisLabel: {
-            color: 'black', // 文本颜色
+          xAxis: {
+            type: 'category',
+            boundaryGap: true,
+            data: props.ecahrtsData[0] ? dataTime.value : '',
+            axisTick: {
+              show: false, //去除刻度线
+            },
+            axisLabel: {
+              color: 'black', // 文本颜色
+            },
+            axisLine: {
+              show: false, // 去除轴线
+            },
           },
-          axisLine: {
-            show: true, // 去除轴线
-            lineStyle: {
+          yAxis: {
+            name: yName,
+            nameTextStyle: {
               color: 'black',
+              fontSize: 10,
             },
-          },
-          splitNumber: 5,
-          splitLine: {
-            show: true,
-            lineStyle: {
-              color: '#9d9d9d',
+            type: 'value',
+            axisTick: {
+              show: true, //去除刻度线
+            },
+            axisLabel: {
+              color: 'black', // 文本颜色
+            },
+            axisLine: {
+              show: true, // 去除轴线
+              lineStyle: {
+                color: 'black',
+              },
+            },
+            splitNumber: 5,
+            splitLine: {
+              show: true,
+              lineStyle: {
+                color: '#9d9d9d',
+              },
             },
           },
+          series: newData.value,
         },
-        series: newData.value,
-      },true)
+        true
+      )
       window.onresize = function () {
         // 自适应大小
         myChart.resize()
@@ -193,9 +223,15 @@ export default defineComponent({
 
     const writeValue = (val) => {
       val
-     
+
       getData()
-       ecahrts()
+      ecahrts()
+    }
+     const writeValue2 = (val) => {
+      val
+
+      getData()
+  
     }
 
     //监听变化
@@ -211,6 +247,20 @@ export default defineComponent({
       { lazy: true }
     )
 
+    //监听变化
+    watch(
+      () => props.typeSrarch,
+      (newVal, oldVal, clear) => {
+        // alert(props.typeSrarch)
+        // 执行异步任务，并得到关闭异步任务的 id
+        // console.log(newVal)
+        let id = writeValue2(newVal, oldVal)
+        // 如果 watch 监听被重复执行了，则会先清除上次未完成的异步任务
+        clear(() => clearTimeout(id))
+      },
+      { lazy: true }
+    )
+
     onMounted(() => {
       getData()
       ecahrts()
@@ -229,7 +279,8 @@ export default defineComponent({
       num,
       newDataName,
       newData,
-      ecahrts
+      ecahrts,
+      dataTime,
     }
   },
 })

src/views/dataManage/sameAnalysis/index.vue

@@ -6,6 +6,7 @@
           v-model="store.state.siteId"
           @change="siteChange"
           placeholder="选择站点"
+          filterable
         >
           <el-option
             v-for="item in store.state.siteList"
@@ -81,6 +82,7 @@
       <div class="sameEcharts">
         <echarts
           :ecahrtsData="ecahrtsData"
+          :typeSrarch="typeSrarch"
           v-if="flag && ecahrtsData[0]"
         ></echarts>
       </div>

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

@@ -2,24 +2,24 @@
   <div class="communicate">
     <div class="comTop">
       <div class="comTopLeft">
-         选择站点:
-                <el-select 
-                  v-model="store.state.siteId"
-                  placeholder="请选择"
-                  style="width: 150px;margin-right:20px"
-                >
-                  <el-option
-                    v-for="site in store.state.siteList"
-                    :key="site"
-                    :label="site.siteName"
-                    :value="site.id"
-                  ></el-option>
-                </el-select>
+        <!-- 选择站点:
+        <el-select
+          v-model="store.state.siteId"
+          placeholder="请选择"
+          style="width: 220px; margin-right: 20px"
+        >
+          <el-option
+            v-for="site in store.state.siteList"
+            :key="site"
+            :label="site.siteName"
+            :value="site.id"
+          ></el-option>
+        </el-select> -->
         <el-input
-          placeholder="搜索设备或编号"
+          placeholder="搜索设备名"
           v-model="filterText"
           class="comTopLeftInput"
-         
+          style="width: 150px"
         >
           <!-- <template #suffix>
             <i class="el-icon-search el-input__icon"></i>
@@ -28,11 +28,12 @@
 
         <el-button
           type="primary"
-            icon="el-icon-search"
-            class="search-button"
+          icon="el-icon-search"
+          class="search-button"
           @click="Select()"
-          >搜索</el-button
         >
+          搜索
+        </el-button>
         <el-button
           class="search-button"
           icon="el-icon-plus"
@@ -304,6 +305,7 @@ export default defineComponent({
           size: pageSize.value,
           current: currentPage.value,
           deviceName: filterText.value,
+          siteId: store.state.siteId,
         })
         .then((requset) => {
           if (requset.status === 'SUCCESS') {
@@ -344,7 +346,7 @@ export default defineComponent({
         deviceAddress: row.deviceAddress,
         deviceType: Number(row.deviceType),
         sim: row.sim,
-        id:row.id
+        id: row.id,
       }
     }
 
@@ -428,7 +430,7 @@ export default defineComponent({
       accessToken,
       handleProgress,
       handleUpAvatar,
-      store
+      store,
     }
   },
 })

src/views/deviceManage/powerEquip/powerDialog/listDialog.vue

@@ -75,13 +75,13 @@
           width=""
         ></el-table-column>
         <el-table-column
-          prop="monitoringEquipment"
+          prop="monitorDeviceName"
           label="监控设备"
           sortable
           width=""
         ></el-table-column>
         <el-table-column
-          prop="communicationEquipment"
+          prop="deviceName"
           label="通信设备"
           sortable
           width=""

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

@@ -4,6 +4,7 @@
       <div class="videoTopLeft">
         选择站点:
         <el-select
+        filterable
           v-model="store.state.siteId"
           placeholder="请选择"
           style="width: 150px; margin-right: 20px"
@@ -16,7 +17,7 @@
           ></el-option>
         </el-select>
         <el-input
-          placeholder="搜索设备或编号"
+          placeholder="搜索设备名"
           v-model="filterText"
           class="videoTopLeftInput"
         >

src/views/siteManage/addSiteCom.vue

@@ -39,8 +39,8 @@
 <script>
 import { defineComponent, ref, watchEffect, onMounted } from 'vue'
 
-import * as api from '@/api/siteManage/index'
-import { ElMessage } from 'element-plus'
+// import * as api from '@/api/siteManage/index'
+// import { ElMessage } from 'element-plus'
 import { useStore } from 'vuex'
 
 export default defineComponent({
@@ -65,8 +65,13 @@ export default defineComponent({
 
     // open(): Dialog弹窗打开之前做的事
     const open = () => {
+       store.commit('publicSiteList')  
+       listData.value=store.state.siteList
       store.state.basicInfoConst = 1
-      form.value = props.itemInfo.value
+      form.value = props.itemInfo.value;
+      
+      console.log('listData.value')
+      console.log(listData.value)
       // alert(props.groupingId)
     }
 
@@ -115,18 +120,19 @@ export default defineComponent({
     }
 
     //站点模板下拉列表
-    function list() {
-      api.list({}).then((requset) => {
-        if (requset.status === 'SUCCESS') {
-          listData.value = requset.data
-        } else {
-          ElMessage.error(requset.msg)
-        }
-      })
-    }
+    // function list() {
+    //   api.list({}).then((requset) => {
+    //     if (requset.status === 'SUCCESS') {
+    //       listData.value = requset.data
+    //     } else {
+    //       ElMessage.error(requset.msg)
+    //     }
+    //   })
+    // }
 
     onMounted(() => {
-      list()
+      
+      // list()
     })
 
     return {

src/views/siteManage/basicInfo/index.vue

@@ -481,8 +481,12 @@ export default defineComponent({
                 message: '保存成功',
                 type: 'success',
               })
+
+             
+
               store.state.basicInfoSiteName = ''
               formStatus.value = '修改'
+               
               context.emit('func')
             } else {
               ElMessage.error(requset.msg)

src/views/siteManage/index.vue

@@ -272,6 +272,7 @@ export default defineComponent({
     }
 
     const handleNodeClick = (data, obj, node) => {
+      activeName.value='first'
       data, node
       flag2.value = true
 

src/views/siteManage/variableList/index.vue

@@ -95,12 +95,12 @@
         sortable
       ></el-table-column>
       <el-table-column
-        prop="monitoringEquipment"
+        prop="monitorDeviceName"
         label="监控设备"
         width="150px"
       ></el-table-column>
       <el-table-column
-        prop="communicationEquipment"
+        prop="deviceName"
         label="通信设备"
         width=""
       ></el-table-column>
@@ -156,13 +156,14 @@
     <!-- 分页start -->
     <div class="paginationBlock">
       <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="currentPage"
+        v-model:currentPage="currentPage"
         :page-sizes="[15, 20, 25, 30]"
         :page-size="pageSize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        background
       ></el-pagination>
     </div>
     <!-- 分页end -->
@@ -201,9 +202,11 @@ export default defineComponent({
     store
     const tableItem = reactive([])
     const tableData = ref()
+
     const currentPage = ref(1)
-    const pageSize = ref(15)
+    const pageSize = ref(10)
     const total = ref(0)
+
     const select = ref(1)
     // const siteId = ref(1)
     const variableName = ref('')
@@ -291,11 +294,13 @@ export default defineComponent({
     )
     onMounted(() => {})
 
-    const handleSizeChange = (val) => {
-      console.log(`每页 ${val} 条`)
+     const handleSizeChange = (val) => {
+      pageSize.value = val
+      query()
     }
     const handleCurrentChange = (val) => {
-      console.log(`当前页: ${val}`)
+      currentPage.value = val
+      query()
     }
 
     // input输入框无法输入解决
@@ -374,6 +379,7 @@ export default defineComponent({
           dataArea: select.value,
           siteId: props.siteId,
           variableName: variableName.value,
+          
         })
         .then((requset) => {
           if (requset.status === 'SUCCESS') {
@@ -408,6 +414,7 @@ export default defineComponent({
       select,
       showDialog,
       dialogTitle,
+
       total,
       pageSize,
       currentPage,

src/views/siteManage/watchDog/index.vue

@@ -396,6 +396,7 @@ export default defineComponent({
       closeDialog,
       handleDelete,
       cancelEvent,
+      
       handleSizeChange,
       handleCurrentChange,