Merge branch 'langfang-develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_WEBFRONT into langfang-test

src/views/plant/processData/basicCommunication/addOrEdit.vue

@@ -247,6 +247,17 @@
             </el-select>
           </template>
         </el-table-column>
+        <el-table-column
+          :label="getColumnName('OPCComRule-OPCDesc')"
+          prop="OPCComRule-OPCDesc"
+        >
+          <template slot-scope="scope">
+            <el-input
+              style="width: 100%"
+              v-model="scope.row['OPCComRule-OPCDesc']"
+            />
+          </template>
+        </el-table-column>
         <el-table-column
           :label="getColumnName('OPCComRule-DBlockAddress')"
           prop="OPCComRule-DBlockAddress"
@@ -394,6 +405,7 @@ export default {
       OPCComRuleDefault:{
         "OPCComRule-RuleId": undefined,
         "OPCComRule-ActionType": undefined,
+        'OPCComRule-OPCDesc':undefined,
         "OPCComRule-DBlockAddress": undefined,
         "OPCComRule-DBlockValueType": undefined,
         "OPCComRule-DBlockValue": undefined,