驱动

src/api/infoApi.js

@@ -29,10 +29,6 @@ const infoApi = {
   //   getFree(params) {
   //     return getRequest('/com/free', params)
   //   },
-  // 获取支持的通讯驱动
-  getTxSupport() {
-    return postPBRequest('/driver', null, 53001)
-  },
 
   //   // 获取所有串口列表api/com
   //   getCom(params) {
@@ -42,9 +38,7 @@ const infoApi = {
   //   saveTx(params) {
   //     return postJsonRequest("/tx", params);
   //   },
-  //   editTx(params) {
+
-  //     return putRequest("/tx", params);
-  //   },
   //   // 透传服务启停
   //   stopTc(params) {
   //     return putRequest("/tc", params);
@@ -55,11 +49,11 @@ const infoApi = {
   //   },
   // 模板列表
   getMb(params) {
-    return postPBRequest('/template', params, 55000)
+    return postPBRequest('/template', params, 53000)
   },
   // 新增模板
   addMb(params) {
-    return postPBRequest('/template', params, 55100)
+    return postPBRequest('/template', params, 53100)
   },
   // 更新模板
   editMb(params) {
@@ -67,24 +61,24 @@ const infoApi = {
   },
   // 删除模板
   delMb(params) {
-    return postPBRequest('/template', params, 55300)
+    return postPBRequest('/template', params, 53300)
   },
   // 新增点位
   addP(params) {
-    return postPBRequest('/template', params, 56100)
+    return postPBRequest('/template', params, 53110, params.template_name)
   },
   // 获取模板支持类型
   getTemplateType(params) {
-    return postPBRequest('/template', params, 55001)
+    return postPBRequest('/template', params, 53001)
   },
 
   // 获取点位
   getP(params) {
-    return postPBRequest('/template', params, 56000)
+    return postPBRequest('/template', params, 53010, params.template_name)
   },
   // 删除点位
   detP(params) {
-    return postPBRequest('/template', params, 56300)
+    return postPBRequest('/template', params, 53310, params.template_name)
   },
   //   // 获取设备列表
   //   getSet(params) {
@@ -96,30 +90,39 @@ const infoApi = {
   //   },
   // 驱动列表查询
   getTx(params) {
-    return postPBRequest('/driver', params, 53000)
+    return postPBRequest('/driver', params, 54000)
   },
-  // 添加查询
+  // 添加驱动
   saveTx(params) {
-    return postPBRequest("/driver", params, 53100);
+    return postPBRequest("/driver", params, 54100);
   },
-  // 查询支持的驱动列表
+  // 更新驱动
-  getSupportTx(params) {
+  editTx(params) {
-    return postPBRequest("/driver", params, 53001);
+    return postPBRequest("/driver", params, 54200);
+  },
+  // 删除通讯
+  delTx(params) {
+    return postPBRequest(`/driver`, params, 54300);
+  },
+
+  // 获取支持的通讯驱动
+  getTxSupport() {
+    return postPBRequest('/driver', null, 54001)
   },
   // 查询驱动配置项
   getTxConfig(params) {
     return postPBRequest("/driver", params, 53002);
+  },
+
+    // 通讯服务启用,停用
+    startStatus(params) {
+      return postPBRequest("/driver", params,53201);
+    },
+    // 通讯服务停止
+    stopStatus(params) {
+      return postPBRequest("/driver", params,53202);
     }
 
-  //   // 通讯服务启用,停用
-  //   changeStatus(params) {
-  //     return postJsonRequest(`/tx/${params.url}/${params.name}`, params);
-  //   },
-
-  //   // 删除通讯
-  //   delTx(params) {
-  //     return deleteRequest(`/tx`, params);
-  //   },
   //   // 获取上报列表
   //   getSc(params) {
   //     return getRequest('/sb/list', params)

src/components/AddData.vue

@@ -7,45 +7,40 @@
   >
     <el-form
       label-position="top"
-      :model="formData"
+      :model="addForm"
       label-width="150px"
       :rules="rules"
       ref="ruleFormRef"
     >
-      <el-form-item label="通讯名称:" prop="index">
+      <el-form-item label="通讯名称:" prop="name">
         <el-input
-          v-model="formData.index"
+          v-model="addForm.name"
           placeholder="请输入驱动名称"
           clearable
           :disabled="type == '1'"
         />
       </el-form-item>
-      <el-form-item label="通讯驱动:" prop="drive" >
+      <el-form-item label="通讯驱动:" prop="type" >
         <el-select
-          v-model="formData.drive"
+          v-model="addForm.type"
           value-key="name"
           clearable
           placeholder="请选择通讯驱动"
           @change="driveChange"
           :disabled="type == '1'"
         >
-          <el-option
+        <el-option v-for="(item, index) of typeOptions" :key="index" :label="item.name" :value="item.key" />
-            v-for="(item, index) of qudongOptions"
-            :key="index"
-            :label="item.name"
-            :value="item"
-          />
         </el-select>
       </el-form-item>
-      <el-form-item label="驱动描述:" prop="Description">
+      <el-form-item label="驱动描述:" prop="description">
         <el-input
-          v-model="formData.Description"
+          v-model="addForm.description"
           placeholder="请输入描述"
           clearable
         ></el-input>
       </el-form-item>
       <!-- 驱动1 -->
-      <div v-if="serialConfig">
+      <!-- <div v-if="serialConfig">
         <el-form-item label="COM口:">
           <el-select
             v-model="configData.name"
@@ -132,9 +127,9 @@
             />
           </el-select>
         </el-form-item>
-      </div>
+      </div> -->
       <!-- 驱动2 -->
-      <div v-if="modbusTCPConfig">
+      <!-- <div v-if="modbusTCPConfig">
         <el-form-item label="主机地址:">
           <el-input
             v-model="configData1.port"
@@ -149,7 +144,7 @@
             clearable
           />
         </el-form-item>
-      </div>
+      </div> -->
     </el-form>
 
       
@@ -180,6 +175,8 @@ export default {
       }
     };
     const state = reactive({
+      addForm: {},
+      typeOptions: [],
       serialConfig: false,
       modbusTCPConfig: false,
       com_select: [],
@@ -206,12 +203,12 @@ export default {
       stop_bits_select: [1, 2],
       timeout_select: [0, 100, 200, 500, 1000, 2000],
       rules: {
-        index: [
+        name: [
           { required: true, message: "请输入通讯名称", trigger: "blur" },
           { required: true, validator: validName, trigger: "blur" },
         ],
         description: [{ required: true, message: "请输入驱动描述", trigger: "blur" }],
-        drive: [{ required: true, message: "请选择通讯驱动", trigger: "blur" }],
+        type: [{ required: true, message: "请选择通讯驱动", trigger: "blur" }],
         // com: [{ required: true, message: "请选择COM口", trigger: "blur" }],
         // baudRate: [{ required: true, message: "请选择波特率", trigger: "blur" }],
         // parity: [{ required: true, message: "请选择校验位", trigger: "blur" }],
@@ -227,69 +224,47 @@ export default {
     });
 
     onMounted(async () => {
-      if (props.type === '1') {
+      // if (props.type === '1') {
-        if (props.formData.serial) {
+      //   if (props.formData.serial) {
-          state.serialConfig = true;
+      //     state.serialConfig = true;
-          state.modbusTCPConfig = false;
+      //     state.modbusTCPConfig = false;
-          // 获取com,比对赋值
+      //     // 获取com,比对赋值
-          getCom();
+      //     getCom();
-        } else {
+      //   } else {
-          state.serialConfig = false;
+      //     state.serialConfig = false;
-          if (props.formData.drive == "modbusTCP") {
+      //     if (props.formData.drive == "modbusTCP") {
-            state.modbusTCPConfig = true;
+      //       state.modbusTCPConfig = true;
-            // 直接赋值
+      //       // 直接赋值
-            state.configData1 = {
+      //       state.configData1 = {
-              port: props.formData.host.split(":")[0],
+      //         port: props.formData.host.split(":")[0],
-              host: props.formData.host.split(":")[1]
+      //         host: props.formData.host.split(":")[1]
-            }
+      //       }
-          }
+      //     }
-        }
+      //   }
-      }
+      // }
+      state.addForm = props.formData;
+      getTypeOptions();
       
     });
+
+    const getTypeOptions = () => {
+      state.typeOptions = [];
+      for (let i in props.qudongOptions) {
+        let obj = {
+          key: Number(i),
+          name: props.qudongOptions[i]
+        }
+        state.typeOptions.push(obj);
+        console.log(33,state.typeOptions);
+      }
+    }
     const closeDialog = () => {
       ctx.emit("dialogClose");
     };
     const saveData = async () => {
       await ruleFormRef.value.validate(async (valid) => {
         if (valid) {
-          let req_configbuf;
+          const res = props.type === '0' ? await infoApi.saveTx(state.addForm) : await infoApi.editTx(state.addForm);
-          if (props.type==='0') { // 新增
-              if (props.formData.drive.serial) {
-                req_configbuf = state.configData
-              } else {
-                if (props.formData.drive.name == "modbusTCP") {
-                  req_configbuf = state.configData1;
-                }
-              }
-              var obj = {
-                  index: props.formData.index,
-                  drive: props.formData.drive.name,
-                  Description: props.formData.Description,
-                  serial: props.formData.drive.serial,
-                  config: req_configbuf,
-              };
-              console.log('编辑数据3', obj);
-          } else { // 编辑
-            console.log('编辑数据1', state.configData)
-            console.log('编辑数据2', state.configData1)
-            if (props.formData.serial) {
-              req_configbuf = state.configData
-            } else {
-              if (props.formData.drive == "modbusTCP") {
-                req_configbuf = state.configData1;
-              }
-            }
-            obj = {
-              name: props.formData.name,
-              drive: props.formData.drive,
-              description: props.formData.description,
-              serial: props.formData.serial,
-              config: req_configbuf,
-            };
-            console.log('编辑数据3', obj);
-          }
-          const res = props.type === '0' ? await infoApi.saveTx(obj) : await infoApi.editTx(obj);
           if (res.code == 0) {
             ElMessage.success(res.message || "请求成功");
             ctx.emit("dialogSuccess");

src/components/AddMb.vue

@@ -2,14 +2,14 @@
   <el-dialog v-model="visible" :title="type === 'I' ? '新增模板' : '编辑模板'" width="30%" :before-close="closeDialog">
     <el-form :model="addForm" label-width="100px" :rules="rules" ref="ruleFormRef">
       <el-form-item label="模板名称:" prop="name">
-        <el-input v-model="addForm.name" placeholder="请输入模板名称" clearable :disabled="type === 'I' ? false : true" />
+        <el-input v-model="addForm.name" placeholder="请输入模板名称" clearable :disabled="type !== 'I'" />
       </el-form-item>
       <el-form-item label="模板描述:" prop="description">
         <el-input v-model="addForm.description" placeholder="请输入模板描述" clearable />
       </el-form-item>
       <el-form-item label="模板类型:" prop="type">
 
-        <el-select v-model="addForm.type" clearable placeholder="请选择模板类型" @change="driveChange" :disabled="type !== 'I'">
+        <el-select v-model="addForm.type" placeholder="请选择模板类型" @change="driveChange" :disabled="type !== 'I'">
           <el-option v-for="(item, index) of typeOptions" :key="index" :label="item.name" :value="item.key" />
         </el-select>
       </el-form-item>

src/components/AddPoint.vue

@@ -147,13 +147,9 @@ export default {
       await ruleFormRef.value.validate(async (valid) => {
         if (valid) {
           const param = {
-            point_name: props.formData.name + '/' + state.addForm.name,
+            template_name: props.formData.name,
-            point: {
+            ...state.addForm,
-              description: state.addForm.description,
+            address: Number(state.addForm.address)
-              address: Number(state.addForm.address),
-              type: state.addForm.type,
-              byte_order: state.addForm.byte_order
-            }
           }
           const res = await infoApi.addP(param);
           if (res.code == 0) {

src/components/ViewPoint.vue

@@ -78,11 +78,15 @@ export default {
 
         const getPointList = async () => {
             const parm = {
-                name: props.formData.name
+                template_name: props.formData.name
             }
             const res = await infoApi.getP(parm);
             if (res.code == 0) {
-                state.propertiesData = res.data;
+                state.propertiesData = [];
+                const pointData = res.data;
+                for (let i in pointData) {
+                    state.propertiesData.push(pointData[i]);
+                }
             } else {
                 console.log(res);
             }
@@ -99,7 +103,8 @@ export default {
             })
                 .then(async () => {
                     let param = {
-                        point_name: item.name
+                        template_name: props.formData.name,
+                        name: item.name
                     }
                     const res = await infoApi.detP(param);
                     if (res.code == 0) {

src/utils/axios.js

@@ -56,13 +56,14 @@ axios.interceptors.response.use(
   }
 );
 // post请求
-export function postPBRequest(url, params, actionNum) {
+export function postPBRequest(url, params, actionNum,template_name) {
   return axios({
     method: "post",
     url: url,
     data: params,
     headers: {
       "action": actionNum,
+      "template_name": template_name
     },
   });
 }

src/views/Model.vue

@@ -32,7 +32,7 @@
         </el-table-column>
       </el-table>
     </div>
-    <AddMb :type="type" :formData="formData"  :dialogVisible="dialogVisible" v-if="dialogVisible"
+    <AddMb :type="type" :formData="formData" :templateData="templateData" :dialogVisible="dialogVisible" v-if="dialogVisible"
       @dialogClose="dialogClose" @dialogSuccess="dialogSuccess">
     </AddMb>
     <AddPoint :formData="formData1" :dialogVisible="dialogVisible1"  v-if="dialogVisible1" @dialogClose="dialogClose"

src/views/Page.vue

@@ -14,14 +14,14 @@
       >
         <el-table-column type="index" label="序号" width="80" align="center" />
         <el-table-column
-          prop="index"
+          prop="name"
           label="通讯名称"
           width="200"
           align="center"
           show-overflow-tooltip
         />
         <el-table-column
-          prop="Description"
+          prop="description"
           label="通讯描述"
           width="200"
           align="center"
@@ -38,13 +38,13 @@
           <span>{{ qudongOptions[scope.row.type]}}</span>
         </template>
         </el-table-column>
-        <el-table-column
+        <!-- <el-table-column
           prop="host"
           label="主机地址"
           width="200"
           align="center"
           show-overflow-tooltip
-        />
+        /> -->
         <el-table-column
           prop="status"
           label="通讯状态"
@@ -181,10 +181,8 @@ export default {
     const addData = () => {
       state.formData = {
         name: '',
-        drive: '',
+        type: 1,
         description: '',
-        serial: false,
-        config: '',
       };
       state.dialogVisible = true;
       state.type = '0';
@@ -229,9 +227,8 @@ export default {
       console.log(item.enable);
       const param = {
         name: item.name,
-        url: item.enable ? 'start': 'stop'
       }
-      const res = await infoApi.changeStatus(param);
+      const res = item.enable ? await infoApi.startStatus(param) : await infoApi.stopStatus(param);
       if (res.code == 0) {
         ElMessage.success(res.msg || "请求成功");
         getTableData();