修改数据组

chuanyi_client2/src/components/HeaderMain/index.vue

@@ -100,8 +100,8 @@
     <ul v-show="visibleGroupChildMenu"
         :style="{ left: menuLeft + 'px', top: menuTop + 'px' }"
         class="contextmenu contextmenu-black">
-      <li v-if="this.chooseGroupData && this.chooseGroupData.runState != 1" @click="runOrStopGroup(1)">运行</li>
-      <li v-if="this.chooseGroupData && this.chooseGroupData.runState == 1" @click="runOrStopGroup(0)">停止</li>
+      <li v-if="this.chooseGroupData && this.chooseGroupData.runState == 0" @click="runOrStopGroup(1)">运行</li>
+      <li v-if="this.chooseGroupData && this.chooseGroupData.runState != 0" @click="runOrStopGroup(0)">停止</li>
       <li @click="updateGroup">修改</li>
       <li @click="delGroup">删除</li>
     </ul>
@@ -655,7 +655,8 @@ export default {
         ]
       },
       // 驱动数据返回类型：0 通用 1 WINCC
-      hasLeavesFlag: 0
+      hasLeavesFlag: 0,
+      groupIntervalTag: null
     }
   },
   props: ['refreshReportTemplateData'],
@@ -715,6 +716,15 @@ export default {
   },
   created() {
     // this.getReadMode()
+
+    let _this = this
+    if (this.groupIntervalTag) clearInterval(this.groupIntervalTag)
+    this.groupIntervalTag = setInterval(() => {
+      _this.refreshGroupData()
+    }, 10 * 1000)
+  },
+  destroyed() {
+    if (this.groupIntervalTag) clearInterval(this.groupIntervalTag)
   },
   methods: {
     sortChange({ prop, order }) {
@@ -1364,8 +1374,10 @@ export default {
       //   }
       // }
       let node = this.$refs.groupTree.getNode(-1)
-      node.loaded = false
-      node.expand()
+      if (node) {
+        node.loaded = false
+        node.expand()
+      }
     },
     /** 修改报表模板标题 */
     updateReportName() {

chuanyi_client2/src/views/report_template/index.vue

@@ -570,9 +570,11 @@
               <div v-if="deviceReportCondition.startItemId" style="margin-left: 20px;">
                 <span>{{ deviceReportCondition.startItemName }}</span>&nbsp;&nbsp;
                 <span><b>等于</b></span>&nbsp;&nbsp;
-                <el-input-number v-model="deviceReportCondition.startValue" placeholder="请输入值"
-                                 :min="0" :max="99999" :controls="false" :precision="0"
-                                 style="width: 120px;margin-right: 50px;"></el-input-number>
+<!--                <el-input-number v-model="deviceReportCondition.startValue" placeholder="请输入值"-->
+<!--                                 :min="0" :max="99999" :controls="false" :precision="0"-->
+<!--                                 style="width: 120px;margin-right: 50px;"></el-input-number>-->
+                <el-input v-model="deviceReportCondition.startValue" placeholder="请输入值"
+                                 style="width: 120px;margin-right: 50px;"></el-input>
               </div>
             </div>
             <div class="device-condition">
@@ -584,9 +586,11 @@
               <div v-if="deviceReportCondition.endItemId" style="margin-left: 20px;">
                 <span>{{ deviceReportCondition.endItemName }}</span>&nbsp;&nbsp;
                 <span><b>等于</b></span>&nbsp;&nbsp;
-                <el-input-number v-model="deviceReportCondition.endValue" placeholder="请输入值"
-                                 :min="0" :max="99999" :controls="false" :precision="0"
-                                 style="width: 120px;margin-right: 50px;"></el-input-number>
+<!--                <el-input-number v-model="deviceReportCondition.endValue" placeholder="请输入值"-->
+<!--                                 :min="0" :max="99999" :controls="false" :precision="0"-->
+<!--                                 style="width: 120px;margin-right: 50px;"></el-input-number>-->
+                <el-input v-model="deviceReportCondition.endValue" placeholder="请输入值"
+                                 style="width: 120px;margin-right: 50px;"></el-input>
               </div>
             </div>
             <div class="device-condition">
@@ -889,10 +893,10 @@ export default {
         isGenCountTime: '0',
         startItemId: null,
         startItemName: null,
-        startValue: 0,
+        startValue: '',
         endItemId: null,
         endItemName: null,
-        endValue: 0
+        endValue: ''
       },
       // 数据项取值条件
       itemConditionForm: {
@@ -1985,10 +1989,10 @@ export default {
         isGenCountTime: '0',
         startItemId: null,
         startItemName: null,
-        startValue: 0,
+        startValue: '',
         endItemId: null,
         endItemName: null,
-        endValue: 0
+        endValue: ''
       }
       this.hasBelongDataFlag = false
       if (type == 2) this.hasBelongDataFlag = true