From 7bff2912d690c89523bce2a001ea1dd4931e14f7 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期二, 12 三月 2024 09:03:35 +0800
Subject: [PATCH] OPC

---
 jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java       |    4 +-
 jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java          |    4 +-
 jcdm-ui/src/views/main/da/collectionParamConf/index.vue                    |   58 ++++++++++++++--------------
 jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java |   10 ++++
 4 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
index 3897220..b836551 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
@@ -50,8 +50,8 @@
     public List<String> getSubList(){
         List<String> lists = new ArrayList<>();
         lists.add(OPCElement.OP_OP010_RecordSN);//璇锋眰涓嬪彂SN鍙�
-        lists.add(OPCElement.OP_OP010_RecordData);//璇锋眰璁板綍鏁版嵁
-        lists.add(OPCElement.OP_OP020_RecordData);//璇锋眰璁板綍鏁版嵁
+        lists.add(OPCElement.OP_OP230_RecordData);//璇锋眰璁板綍鏁版嵁
+        lists.add(OPCElement.OP_OP240_RecordData);//璇锋眰璁板綍鏁版嵁
         return lists;
     }
 }
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java
index e17d97f..4832124 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java
@@ -11,12 +11,12 @@
      * OP010
      */
     public static final String OP_OP010_RecordSN = "TestOP.OP1010.RecordSN";//璇锋眰涓嬪彂SN鍙�
-    public static final String OP_OP010_RecordData = "TestOP.OP1010.RecordData";//璇锋眰璁板綍鏁版嵁
+    public static final String OP_OP230_RecordData = "TestOP.OP1010.RecordData";//璇锋眰璁板綍鏁版嵁
 
     /**
      * OP020
      */
-    public static final String OP_OP020_RecordData = "TestOP.OP2020.RecordData";//璇锋眰璁板綍鏁版嵁
+    public static final String OP_OP240_RecordData = "TestOP.OP2020.RecordData";//璇锋眰璁板綍鏁版嵁
 
 
 
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
index f841abe..2434042 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
@@ -74,10 +74,18 @@
                         recordDataDoneValue = "11";
 
                         //杩涚珯淇濆瓨鏁版嵁
-                        //inSaveDate(thoroughfare,device)
+//                        inSaveDate(thoroughfare,device)
                         //璁板綍鏁版嵁瀹屾垚
                         String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone";
                         miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(recordDataDoneValue).build());
+
+                        //缁欏墠绔彂宸ヤ欢鍒颁綅淇″彿
+
+                        //璇锋眰宸ュ崟
+
+
+
+
                     }else if("2".equals(tabVlaue)){
 
                         //鍑虹珯淇濆瓨鏁版嵁
diff --git a/jcdm-ui/src/views/main/da/collectionParamConf/index.vue b/jcdm-ui/src/views/main/da/collectionParamConf/index.vue
index d64ac9f..866cb8b 100644
--- a/jcdm-ui/src/views/main/da/collectionParamConf/index.vue
+++ b/jcdm-ui/src/views/main/da/collectionParamConf/index.vue
@@ -125,9 +125,19 @@
         <el-table border v-loading="loading" :data="collectionParamConfList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center" />
 <!--          <el-table-column label="涓婚敭id" align="center" prop="id" />-->
-          <el-table-column label="浜у搧缂栫爜" align="center" width="150" prop="productCode">
-          </el-table-column>
+<!--          <el-table-column label="浜у搧缂栫爜" align="center" width="150" prop="productCode">-->
+<!--          </el-table-column>-->
           <el-table-column label="宸ュ簭缂栧彿" align="center" width="80" prop="processesCode">
+          </el-table-column>
+          <el-table-column label="宸ュ簭鍚嶇О" width="150" align="center" prop="processesName">
+          </el-table-column>
+          <el-table-column label="閲囬泦鍦板潃" align="center" width="180" prop="gatherAddress">
+          </el-table-column>
+          <el-table-column label="閲囬泦椤哄簭" align="center" width="80" prop="gatherSequence">
+          </el-table-column>
+          <el-table-column label="璁惧" width="150" align="center" prop="device">
+          </el-table-column>
+          <el-table-column label="椤圭洰" align="center" prop="project">
           </el-table-column>
 <!--          <el-table-column label="鍙傛暟闆嗙紪鐮�" align="center" width="130" prop="parameterSetCode">-->
 <!--          </el-table-column>-->
@@ -139,16 +149,16 @@
           </el-table-column>
 <!--          <el-table-column label="鏄惁浣滀负瀵规瘮鍙傛暟" align="center" prop="contrastParameterFlag">-->
 <!--          </el-table-column>-->
-
-          <el-table-column label="閲囬泦鍦板潃" align="center" width="180" prop="gatherAddress">
-          </el-table-column>
-          <el-table-column label="閲囬泦椤哄簭" align="center" width="80" prop="gatherSequence">
-          </el-table-column>
-
           <el-table-column label="鍙傛暟绫诲瀷" align="center" width="130" prop="collectParameterType">
           </el-table-column>
           <el-table-column label="鍗曚綅" align="center" width="80" prop="collectParameterUnit">
           </el-table-column>
+          <el-table-column label="绮惧害" align="center" prop="accuracy">
+          </el-table-column>
+          <el-table-column label="鏁扮粍闀垮害" align="center" prop="arrayLength">
+          </el-table-column>
+
+
 <!--          <el-table-column label="鏁版嵁鎻忚堪" align="center" width="160" prop="Descriptives">
           </el-table-column>-->
           <el-table-column label="涓婇檺鍊�" align="center" prop="paramUpper">
@@ -157,16 +167,9 @@
           </el-table-column>
           <el-table-column label="涓績鍊�" align="center" prop="paramCentral">
           </el-table-column>
-          <el-table-column label="宸ュ簭鍚嶇О" width="150" align="center" prop="processesName">
-          </el-table-column>
-          <el-table-column label="璁惧" width="150" align="center" prop="device">
-          </el-table-column>
-          <el-table-column label="椤圭洰" align="center" prop="project">
-          </el-table-column>
-          <el-table-column label="绮惧害" align="center" prop="accuracy">
-          </el-table-column>
-          <el-table-column label="鏁扮粍闀垮害" align="center" prop="arrayLength">
-          </el-table-column>
+
+
+
           <el-table-column label="閲囬泦棰戠巼" width="107" align="center" prop="acquisitionFrequency">
           </el-table-column>
           <el-table-column label="涓氬姟闇�姹傞儴闂�" width="155" align="center" prop="demandDepartment">
@@ -217,29 +220,26 @@
     />
 
     <!-- 娣诲姞鎴栦慨鏀归噰闆嗗弬鏁伴厤缃璇濇 -->
-    <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="700px" append-to-body>
+    <el-dialog v-dialogpop-up  :title="title" :visible.sync="open" width="1100px" append-to-body>
       <span slot="title">
         <i class="el-icon-s-order"></i>
         {{titleName}}
       </span>
-      <el-form ref="form" inline :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" inline  :model="form" :rules="rules" label-width="120px">
         <el-form-item label="宸ュ簭缂栧彿" prop="processesCode">
           <el-input v-model="form.processesCode" placeholder="璇疯緭鍏ュ伐搴忕紪鍙�" />
         </el-form-item>
-        <el-form-item label="鍙傛暟闆嗙紪鐮�" prop="parameterSetCode">
-          <el-input v-model="form.parameterSetCode" placeholder="璇疯緭鍏ュ弬鏁伴泦缂栫爜" />
-        </el-form-item>
-        <el-form-item label="鍙傛暟闆嗗悕绉�" prop="parameterSetName">
-          <el-input v-model="form.parameterSetName" placeholder="璇疯緭鍏ュ弬鏁伴泦鍚嶇О" />
-        </el-form-item>
+<!--        <el-form-item label="鍙傛暟闆嗙紪鐮�" prop="parameterSetCode">-->
+<!--          <el-input v-model="form.parameterSetCode" placeholder="璇疯緭鍏ュ弬鏁伴泦缂栫爜" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="鍙傛暟闆嗗悕绉�" prop="parameterSetName">-->
+<!--          <el-input v-model="form.parameterSetName" placeholder="璇疯緭鍏ュ弬鏁伴泦鍚嶇О" />-->
+<!--        </el-form-item>-->
         <el-form-item label="閲囬泦鍙傛暟ID" prop="collectParameterId">
           <el-input v-model="form.collectParameterId" placeholder="璇疯緭鍏ラ噰闆嗗弬鏁癐D" />
         </el-form-item>
         <el-form-item label="閲囬泦鍙傛暟鍚嶇О" prop="collectParameterName">
           <el-input v-model="form.collectParameterName" placeholder="璇疯緭鍏ラ噰闆嗗弬鏁板悕绉�" />
-        </el-form-item>
-        <el-form-item label="鏄惁浣滀负瀵规瘮鍙傛暟" prop="contrastParameterFlag">
-          <el-input v-model="form.contrastParameterFlag" placeholder="璇疯緭鍏ユ槸鍚︿綔涓哄姣斿弬鏁�" />
         </el-form-item>
 <!--        <el-form-item label="閲囬泦鍙傛暟绫诲瀷" prop="collectParameterType">-->
 <!--          <el-select v-model="form.collectParameterType" placeholder="璇烽�夋嫨閲囬泦鍙傛暟绫诲瀷">-->

--
Gitblit v1.9.3