调整情报板

ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/CustomMenu.vue

@@ -136,6 +136,7 @@ export default {
   &:hover {
     @include activeBtnBg;
     color: #fff !important;
+    border: none !important;
     ::v-deep .el-submenu__title{
       color: #fff;
     }
@@ -145,10 +146,12 @@ export default {
     @include activeBtnBg;
     ::v-deep .el-submenu__title{
       color: #fff !important;
+      border:none !important;
     }
   }
   ::v-deep &:focus .el-submenu__title{
     color: #fff !important;
+    border:none !important;
   }
 
 }

ruoyi-ui/src/views/JiHeExpressway/pages/service/board/addinfo.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="container infoBoardDialog">
     <!-- 添加信息弹窗 -->
-    <el-dialog title="新增" :visible.sync="dialogVisible" width="43%" :before-close="handleClose" :close-on-click-modal="false">
+    <el-dialog title="新增" :visible.sync="dialogVisible" width="43%" :before-close="handleClose" :close-on-click-modal="false" append-to-body>
       <div class="dialogStyleBox">
         <div class="dialogLine"></div>
         <div class="dialogCloseButton"></div>

ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue

@@ -144,7 +144,7 @@
             </div>
             <div class="templateBox">
               <el-collapse v-model="activeNames">
-                <el-collapse-item v-for="(item, index) in iotTemplateCategoryList" :key="index" :title="item.dictLabel" :name="item.dictValue">
+                <el-collapse-item v-for="(item, index) in tempCategory" :key="index" :title="item.dictLabel" :name="item.dictValue">
                   <div v-for="(itm, indx) in item.list" :key="indx" class="con" :style="{
                   fontSize: getFontSize(
                     itm.tcontents[0].fontSize,
@@ -210,7 +210,7 @@
       <el-row>
         <el-col :span="18">
           <el-select v-model="toRightCategory" placeholder="请选择所属类别">
-            <el-option v-for="item in iotTemplateCategoryList" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue">
+            <el-option v-for="item in tempCategory" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue">
             </el-option>
           </el-select>
         </el-col>
@@ -304,7 +304,7 @@ export default {
       }, //情报板列表表单
       supplier: null, //报文类型
       activeNames: [], //模板 展开项
-      iotTemplateCategoryList: [], //模板
+      tempCategory: [], //模板
       checkAll: false,
       isIndeterminate: false,
       contentList: [], //待下发数据
@@ -321,7 +321,7 @@ export default {
       console.log(newVal, 'iotBoardActive')
       if (newVal.length == 0) {
         this.form.devicePixel = ''
-        this.allVmsTemplate('no')
+        // this.allVmsTemplate('no')
       }
     }
     // // 改变方向
@@ -331,7 +331,7 @@ export default {
     // }
   },
   created() {
-    this.getInfoMode()
+    this.getTemplateCategory()
     this.changeDirection()
     this.getBoardPixel()
   },
@@ -341,7 +341,7 @@ export default {
   },
 
   methods: {
-    // 获取信息模板字典表
+    // 获取尺寸系列
     getBoardPixel() {
       this.iotBoardList = []
       this.getDicts('iot_board_pixel').then(res => {
@@ -354,10 +354,10 @@ export default {
         })
       })
     },
-    // 获取信息模板字典表
-    getInfoMode() {
+    // 获取信息模板分类
+    getTemplateCategory() {
       this.getDicts('iot_template_category').then(res => {
-        this.iotTemplateCategoryList = res.data
+        this.tempCategory = res.data
       })
     },
 
@@ -396,7 +396,7 @@ export default {
       this.checkAll = false
 
       //TODO 测试数据 需删除走接口
-   /*   let testData = [
+      let testData = [
         {
           devicePixel: '768*64',
           label: '门架板768*64',
@@ -717,7 +717,7 @@ export default {
           devicePixel: '480*48',
           label: '雨棚480*48',
           list: [
-            /!*{
+            {
               searchValue: null,
               createBy: null,
               createTime: null,
@@ -778,14 +778,14 @@ export default {
               lAlarmHandleStr: null,
               eqDirection: null,
               iotDeviceType: null
-            }*!/
+            }
           ]
         },
         {
           devicePixel: '192*160',
           label: ' 悬臂192*160',
           list: [
-            /!*{
+            {
               searchValue: null,
               createBy: null,
               createTime: null,
@@ -846,7 +846,7 @@ export default {
               lAlarmHandleStr: null,
               eqDirection: null,
               iotDeviceType: null
-            }*!/
+            }
           ]
         },
         {
@@ -921,11 +921,12 @@ export default {
       this.iotBoardList = testData
       if (testData.length > 0) {
         this.iotBoardActive = testData[0].devicePixel
-        this.handleChange(testData[0].devicePixel)
+        // this.handleChange(testData[0].devicePixel)
       } else {
-        this.getInfoMode()
+        this.getTemplateCategory()
       }
-      this.$forceUpdate()*/
+      this.$forceUpdate()
+      return;
 
       // TODO 接口
       let param = {
@@ -945,7 +946,7 @@ export default {
             this.iotBoardActive = this.iotBoardList[0].devicePixel;
             this.handleChange(this.iotBoardList[0].devicePixel);
           } else {
-            this.getInfoMode();
+            this.getTemplateCategory();
           }
         })
 
@@ -1131,8 +1132,8 @@ export default {
         console.log(res, '情报板管理右侧查询接口')
         let jArr = []
 
-        for (let j = 0; j < this.iotTemplateCategoryList.length; j++) {
-          let arr = this.iotTemplateCategoryList[j]
+        for (let j = 0; j < this.tempCategory.length; j++) {
+          let arr = this.tempCategory[j]
           let brr = data[j]
           arr.list = brr
           jArr.push(j.toString())
@@ -1141,7 +1142,7 @@ export default {
           this.activeNames = jArr
         }
         this.$forceUpdate()
-        console.log(this.iotTemplateCategoryList, '新模板')
+        console.log(this.tempCategory, '新模板')
       })
     },