feat(情报板信息页面添加关联协议id):

ruoyi-ui/src/views/board/info/index.vue

@@ -79,12 +79,8 @@
       <el-table-column label="情报板方向" align="center" prop="boardDirection"/>
       <el-table-column label="情报板工桩号" align="center" prop="boardMileage"/>
       <el-table-column label="情报板类型" align="center" prop="boardSizeName" />
-      <el-table-column label="情报板品牌" align="center" prop="boardBrand"/>
+      <el-table-column label="情报板品牌" align="center" prop="boardBrandName"/>
-      <el-table-column label="情报板通讯协议" align="center" prop="boardCommunicationProtocol">
+      <el-table-column label="情报板通讯协议" align="center" prop="boardProtocolName" />
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.board_protocol" :value="scope.row.boardCommunicationProtocol"/>
-        </template>
-      </el-table-column>
       <el-table-column label="情报板IP" align="center" prop="boardIp"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -145,21 +141,12 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="品牌" prop="boardBrand">
+        <el-form-item label="品牌/协议" prop="boardBrandProtocol">
-          <el-input v-model="form.boardBrand" placeholder="请输入情报板品牌"/>
+          <el-cascader
-        </el-form-item>
+            v-model="form.boardBrandProtocol"
-        <el-form-item label="通讯协议" prop="boardCommunicationProtocol">
+            :options="boardProtocolOptions"
-          <el-select
+            :props="{lable: 'lable', value: 'id', expandTrigger:'hover', emitPath: false}"
-            v-model="form.boardCommunicationProtocol"
+          />
-            placeholder="全部"
-          >
-            <el-option
-              v-for="dict in dict.type.board_protocol"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
         </el-form-item>
         <el-form-item label="情报板IP" prop="boardIp">
           <el-input v-model="form.boardIp" placeholder="请输入情报板IP"/>
@@ -180,6 +167,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import TextPreview from "@/views/board/component/TextPreview.vue";
 import {roadGroupTreeSelect} from "@/api/board/roadgroup";
 import {listBoardType} from "@/api/board/boardtype";
+import {protocolTreeSelect} from "@/api/board/protocol";
 
 export default {
   name: "Info",
@@ -199,6 +187,9 @@ export default {
       roadGroupOptions: [],
       // 情报板类型列表
       boardTypeOptions: [],
+      boardTypeId: null,
+      // 情报板协议树
+      boardProtocolOptions: [],
       // 显示搜索条件
       showSearch: true,
       // 总条数
@@ -242,12 +233,9 @@ export default {
         boardSizeType: [
           {required: true, message: "情报板类型不能为空", trigger: "blur"}
         ],
-        boardBrand: [
+        boardBrandProtocol: [
           {required: true, message: "情报板品牌不能为空", trigger: "blur"}
         ],
-        boardCommunicationProtocol: [
-          {required: true, message: "情报板通讯协议不能为空", trigger: "blur"}
-        ],
         boardIp: [
           {required: true, message: "情报板IP不能为空", trigger: "blur"},
           {
@@ -263,6 +251,7 @@ export default {
     this.getList();
     this.getRoadTree();
     this.getBoardTypeList();
+    this.getProtocolTree();
   },
   methods: {
     /** 查询情报板信息列表 */
@@ -376,6 +365,12 @@ export default {
         this.boardTypeOptions = response.rows;
       });
     },
+    /** 查询情报板协议树 */
+    getProtocolTree() {
+      protocolTreeSelect().then(response => {
+        this.boardProtocolOptions = response.data;
+      });
+    },
   }
 };
 </script>