Merge branch 'master' of http://116.63.33.55/git/read_opc

chuanyi_client2/src/components/HeaderMain/index.vue

@@ -179,7 +179,7 @@
               </el-form-item>
               <!-- 值改变读取 -->
               <el-form-item v-if="groupRateForm.readMode == 1" label='' prop="modeValue">
-                <el-input v-model="groupRateForm.modeValue" placeholder="请输入偏差值/偏差率" style="width: 200px;margin-right: 50px;"></el-input>
+                <el-input v-model="groupRateForm.modeValue" placeholder="请输入偏差值/偏差率" maxlength="6" style="width: 200px;margin-right: 50px;"></el-input>
                 <el-radio-group v-model="groupRateForm.readModeType">
                   <el-radio :label="0">偏差绝对值</el-radio>
                   <el-radio :label="1">偏差率(%)</el-radio>
@@ -187,7 +187,7 @@
               </el-form-item>
               <!-- 条件读取 -->
               <el-form-item v-if="groupRateForm.readMode == 2" label='' prop="modeValue">
-                <el-input v-model="groupRateForm.modeValue" placeholder="请输入条件值" style="width: 120px;margin-right: 20px;"></el-input>
+                <el-input v-model="groupRateForm.modeValue" placeholder="请输入条件值" maxlength="6" style="width: 120px;margin-right: 20px;"></el-input>
                 <el-radio-group v-model="groupRateForm.eventMode">
                   <el-radio :label="0">大于</el-radio>
                   <el-radio :label="1">小于</el-radio>
@@ -196,20 +196,6 @@
                 <el-button size="mini" type="info" @click="addEventDataItem" style="float: right;width: 95px;margin-top: 4px;">选择数据项</el-button>
                 <span style="float: right;color: #8a8888;font-size: 12px;line-height: 12px;">{{reportEventConfigForm.itemName}}</span>
               </el-form-item>
-<!--              <el-form-item :label="modeValueTips" prop="modeValue" v-if="groupRateForm.readMode != '1'" class="cy-mv">-->
-<!--                <el-input v-model="groupRateForm.modeValue" :placeholder="'请输入' + modeValueTips" maxlength="8">-->
-<!--                  <template slot="append" v-if="groupRateForm.readMode == '0'">-->
-<!--                    <el-select v-model="groupRateForm.modeValueUnit" @change="readModeValueUnitChange" placeholder="">-->
-<!--                      <el-option-->
-<!--                          v-for="dict in modeValueUnitList"-->
-<!--                          :key="dict.value"-->
-<!--                          :label="dict.key"-->
-<!--                          :value="dict.value"-->
-<!--                      ></el-option>-->
-<!--                    </el-select>-->
-<!--                  </template>-->
-<!--                </el-input>-->
-<!--              </el-form-item>-->
               <el-form-item label='日期设置' prop="daySetting" style="margin-top: 20px;">
                 <el-checkbox-group v-model="groupRateForm.daySetting">
                   <el-checkbox name="daySetting" label="MON">周一</el-checkbox>
@@ -343,7 +329,7 @@
               <el-tree :data="chooseItemDataListByTree"
                        ref="chooseItemTree"
                        :indent="0"
-                       node-key="xid"
+                       node-key="id"
                        show-checkbox
                        :check-on-click-node="true"
                        :highlight-current="true"
@@ -568,17 +554,6 @@ export default {
         isLeaf: 'leaf'
       },
       delFlag: true,
-      modeValueTips: '模式值',
-      modeValueUnitList: [{
-        'key': '秒',
-        'value': '1'
-      }, {
-        'key': '分',
-        'value': '2'
-      }, {
-        'key': '时',
-        'value': '3'
-      }],
       // 记录模式
       readModeList: [{
         'key': '按周期读取数据',
@@ -751,7 +726,7 @@ export default {
       const data = traverseNode(this.$refs.chooseItemTree.store.root.childNodes)
       if (this.isSelectAllItem) {
         let arr = traverseVisible(data)
-        let ids = Array.from(arr, ({ xid }) => xid)
+        let ids = Array.from(arr, ({ id }) => id)
         this.$refs.chooseItemTree.setCheckedKeys(ids)
       } else {
         this.$refs.chooseItemTree.setCheckedNodes([])
@@ -971,7 +946,6 @@ export default {
         daySetting: [],
         valuePeriod: ['00:00:00', '23:59:59']
       }
-      this.modeValueTips = '模式值'
       this.chooseItemDataView = false
       this.getDataSourceList()
       this.groupDialogVisible = true
@@ -1368,14 +1342,11 @@ export default {
         this.updateGroupItem()
       }
     },
-    /** 记录模式值单位改变事件 */
-    readModeValueUnitChange(val) {
-      console.log(val + ', ' + this.groupRateForm.modeValueUnit)
-    },
     /** 记录模式值改变事件 */
     readModeChange(val) {
       this.groupRateForm.modeValue = null
       this.groupRateForm.readMode = val
+      this.$refs.groupRateForm.clearValidate()
     },
     /** 获取右侧数据源类型列表 */
     getDataSourceList() {
@@ -1579,7 +1550,7 @@ export default {
             data => data.$treeNodeId === nodeId, "label")
         for (let i = 0; i < this.leavesChooseList.length; i ++) {
           let temp = {
-            'xid': uuidv4(),
+            'id': uuidv4(),
             'label': channelName.join('.') + '.' + this.leavesChooseList[i],
             'nodeIdentifier': null,
             'nodeIndex': null,
@@ -1606,7 +1577,7 @@ export default {
           const nodeId = checkedNode.$treeNodeId;
           let channelName = this.treeFindPath(this.itemDataListByTree, data => data.$treeNodeId === nodeId, "label")
           let temp = {
-            'xid': uuidv4(),
+            'id': uuidv4(),
             'label': channelName.join('.'),
             'nodeIdentifier': checkedNode.nodeIdentifier,
             'nodeIndex': checkedNode.nodeIndex,
@@ -1642,7 +1613,11 @@ export default {
         }
       }
       this.chooseItemDataListByTree = arr
-      this.$refs.itemTree.setCheckedKeys([])
+      this.isSelectAllItem = false
+      setTimeout(() => {
+        this.$refs.itemTree.setCheckedKeys([])
+        this.$refs.chooseItemTree.setCheckedNodes([])
+      }, 100)
     },
     /** 移除全部数据项 */
     removeAllCheckNodesBtnEvent() {

chuanyi_client2/src/components/LeftMenu/index.vue

@@ -165,8 +165,8 @@
       </el-form>
       <span slot='footer'>
           <el-button type="warning" @click='handleConnect(1)'>连接测试</el-button>
-<!--          <el-button type="primary" @click='handleConnect(2)'>确定</el-button>-->
-          <el-button type="primary" @click='handleSaveDatasource'>确定</el-button>
+          <el-button type="primary" @click='handleConnect(2)'>确定</el-button>
+<!--          <el-button type="primary" @click='handleSaveDatasource'>确定</el-button>-->
           <el-button @click='handleCancel("conn")'>取消</el-button>
       </span>
     </el-dialog>
@@ -577,7 +577,8 @@ export default {
       } else if (type == 3) {
         this.saveConnect(params)
       } else {
-        this.connDialogVisible = false
+        this.saveConnect(params)
+        // this.connDialogVisible = false
       }
     },
     /** 测试连接 */

chuanyi_client2/src/views/data_model/index.vue

@@ -87,7 +87,7 @@
           <el-input v-model="dataModelForm.remark" placeholder="请输入名称" maxlength="20" show-word-limit></el-input>
         </el-form-item>
         <el-form-item label="四则运算表达式" prop="operationRule">
-          <el-input v-model="dataModelForm.operationRule" style="width: calc(100% - 85px);" placeholder="请输入四则运算表达式"></el-input>
+          <el-input v-model="dataModelForm.operationRule" style="width: calc(100% - 85px);" maxlength="100" show-word-limit placeholder="请输入四则运算表达式"></el-input>
           <el-button @click="testEditEvent" style="float: right;width: 80px;">测试</el-button>
           <span style="font-size: 12px;">
             提示：四则运算支持的英文符号&nbsp;【<b>+</b>】、【<b>-</b>】、【<b>*</b>】、【<b>/</b>】、【<b>()</b>】，真实数据值使用固定字符串&nbsp;【<b>calcVal</b>】
@@ -411,4 +411,11 @@ export default {
   margin-right: 20px!important;
   margin-top: -20px!important;
 }
+
+.cy-nav-sx {
+  float: left !important;
+  margin-top: -23px !important;
+  margin-left: 120px !important;
+  display: flex;
+}
 </style>