ming 3 年之前
父節點
當前提交
a3879f05e0

+ 2 - 0
src/views/dataManage/chainAnalysis/ehcarts/index.vue

@@ -25,6 +25,8 @@ export default defineComponent({
       loading.value = false
       var aa = props.echartsDataOne.listDate
       var bb = props.echartsDataOne.listDate2
+       console.log(aa)
+      console.log(bb)
      
       resultListDate.value = aa.map(function (index, item) {
         return index +' / '+ bb[item]

+ 1 - 1
src/views/dataManage/chainAnalysis/index.vue

@@ -238,7 +238,7 @@ export default defineComponent({
         })
        
         if (echartsDataObj.value.length == []) {
-          ElMessage.error('暂无结果')
+          ElMessage.warning('暂无结果')
         }
       } else {
         console.log('', 1)

+ 4 - 0
src/views/dataManage/energyReport/index.vue

@@ -231,6 +231,10 @@ export default defineComponent({
             if (requset.status === 'SUCCESS') {
               flag.value = true
               echartsData.value = requset.data[0]
+
+              if (echartsData.value == []) {
+          ElMessage.warning('暂无结果')
+        }
             } else {
               ElMessage.error(requset.msg)
             }

+ 1 - 1
src/views/dataManage/sameAnalysis/index.vue

@@ -179,7 +179,7 @@ export default defineComponent({
               ecahrtsData.value = requset.data
 
               if (!ecahrtsData.value[0]) {
-                ElMessage.error('暂无结果')
+                ElMessage.warning('暂无结果')
               }
             } else {
               ElMessage.error(requset.msg)

+ 26 - 1
src/views/deviceManage/powerEquip/communicateEquip/dialog/cloneDialog.vue

@@ -46,6 +46,25 @@
             clearable
           />
         </el-form-item>
+
+        <el-form-item label="选择站点:" v-if="form.type != 1">
+          <el-select
+              v-model="store.state.siteId"
+              @change="siteChange"
+              placeholder="请选择"
+              clearable
+              filterable
+            >
+              <el-option
+                v-for="item in store.state.siteList"
+                :key="item.id"
+                :label="item.siteName"
+                :value="item.id"
+              ></el-option>
+            </el-select>
+        </el-form-item>
+        
+       
         <el-form-item label="选择设备:" v-if="form.type != 1">
           <el-select
             filterable
@@ -179,11 +198,15 @@ export default defineComponent({
     function resetForm() {
       ruleForm.value.resetFields()
     }
+    // 通过站点切换下拉框 change事件改变
+    const siteChange = () => {
+      select_deviceList()
+    }
 
     function select_deviceList() {
       api
         .deviceList({
-          siteId: 0,
+          siteId: store.state.siteId,
         })
         .then((requset) => {
           if (requset.status === 'SUCCESS') {
@@ -208,6 +231,8 @@ export default defineComponent({
     })
 
     return {
+      siteChange,
+      store,
       open,
       close,
       clone,

+ 1 - 1
src/views/powerQuality/asseReport/scoreReport.vue

@@ -381,7 +381,7 @@ export default defineComponent({
             deviceCode.value= requset.data[0].deviceCode
      
           }else{
-              ElMessage.error('暂无数据')
+              ElMessage.warning('暂无数据')
           }
         } else {
           ElMessage.error(requset.msg)

+ 8 - 2
src/views/powerQuality/harmonicReport/curveCom.vue

@@ -29,12 +29,11 @@ export default defineComponent({
     // 读取数据 func
     const loading = ref(true)
     const getData = async () => {
-      // loading.value = true
-      // await store.dispatch("Home/queryWorksChartData");
       loading.value = false
     }
 
     function ecahrts() {
+    
       let myChart = echarts.init(worksChartRef.value)
 
       // 绘制图表
@@ -136,7 +135,14 @@ export default defineComponent({
     const writeValue = (val) => {
       val
       //   console.log(val)
+      loading.value = true
+      
       ecahrts()
+      setTimeout(()=>{
+        getData()
+      },200)
+      
+
     }
     // 定义 watch 监听
     watch(

+ 1 - 1
src/views/powerQuality/harmonicReport/index.vue

@@ -219,7 +219,7 @@ export default defineComponent({
           tableList.value = requset.data
       
           if (tableList.value.length==0) {
-            ElMessage.error('暂无结果')
+            ElMessage.warning('暂无结果')
           }
           curveComList.value[0].data = []
           curveComList.value[0].dateList = []

+ 1 - 1
src/views/powerQuality/unbalanceAnalysis/index.vue

@@ -191,7 +191,7 @@ export default defineComponent({
             echartsData.value = requset.data
 
             if(!echartsData.value[0]){
-               ElMessage.error('暂无数据') 
+               ElMessage.warning('暂无数据') 
                return
             }