更新

ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardInfoEditor.vue

@@ -15,7 +15,7 @@
           <el-form :model="dataForm" :rules="dataRule" label-width="110px" ref="dataForm" size="mini">
             <el-row :gutter="24">
               <el-col :span="8">
-                <el-form-item label="所属类别" v-if="type == 'template'">
+                <el-form-item label="所属类别" v-if="type == 'template' && mode!='toDevice'">
                   <el-select v-model="dataForm.category" placeholder="请选择所属类别" size="mini">
                     <el-option v-for="item in templateCategoryList" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue">
                     </el-option>

ruoyi-ui/src/views/JiHeExpressway/components/infoBoard/BoardTplPreview.vue

@@ -74,6 +74,7 @@ export default {
                 let boxH = this.$refs["compBox"].offsetHeight;
                 let arr = this.boardWH.split("*");
                 let scale = 1;
+                console.log(boxW,boxH,arr[0],arr[1]);
                 if (arr[0] / arr[1] > boxW / boxH) {
                     scale = boxW / arr[0];
                 } else {

ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue

@@ -5,7 +5,7 @@
         <div v-if="visible" class="dialog_info">
           <div class="dialog_info_left">
             <div class="dialog_head">
-              <div class="tit">{{ dialogTit }}</div>
+              <div class="tit">{{ device.deviceName }}</div>
               <img class="btnCls" src="@/assets/jihe/images/dialog/ibCls.png" alt="" @click="onClose">
               <img class="deco" src="@/assets/jihe/images/dialog/ibHeadDeco.png" alt="">
             </div>
@@ -45,7 +45,7 @@
                       </div>
                       <div class="deviceInfo">
                         <div class="deviceInfo_l">屏幕像素</div>
-                        <!-- <div class="deviceInfo_r">{{ JSON.parse(device.otherConfig).screenSize }}</div> -->
+                        <div class="deviceInfo_r">{{ JSON.parse(device.otherConfig).screenSize }} px</div>
                       </div>
                       <!-- <div class="deviceInfo" v-for="item in tabDataInfoList" :key="item.id">
                       <div class="deviceInfo_l">{{ item.tit }}: </div>
@@ -347,7 +347,6 @@ export default {
     },
 
     ____getDeviceInfo() {
-      console.log(this.device , "this.devicethis.devicethis.devicethis.device")
       this.selectedSize = JSON.parse(this.device.otherConfig).screenSize;
       if(this.tplCategory.length && this.templateAll.length){
         this.____setAvailableTemplate();
@@ -929,7 +928,7 @@ export default {
     }
 
     .infoBtnBox {
-      width: 160px;
+      width: 110px;
       height: 80px;
       display: flex;
       margin-left: 10px;
@@ -942,8 +941,8 @@ export default {
       .btn {
         background-repeat: no-repeat;
         background-size: 100% 100%;
-        width: 40px;
-        height: 40px;
+        width: 30px;
+        height: 30px;
 
         &.btnApply {
           background-image: url(~@/assets/jihe/images/button/toLeft.png);

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

@@ -8,16 +8,16 @@
           <div>情报板列表</div>
           <img class="qbbBigDotBa" src="@/assets/screen/xtb/qbba.png" alt="">
         </div>
-        <el-form ref="form" :model="form" class="partCon">
+        <el-form ref="form" :model="form" class="partCon" style="display: flex; flex-direction: column;">
           <el-form-item style="margin-bottom: 12px;">
             <el-select v-model="form.selectedDirection" size="medium" placeholder="请选择方向" class="direction">
               <el-option v-for="item in boardDirectionList" :key="item.dictValue" :label="item.dictLabel"
                 :value="item.dictValue" @click.native="____changeDirection(item.dictValue)" />
             </el-select>
           </el-form-item>
-          <el-form-item>
+          <vuescroll :ops="scrollOptions" style="flex: 1; height: 0;">
             <!-- {{ boardSizeDic }} -->
-            <el-collapse v-model="selectedSize" accordion @change="____onChangeSize">
+            <el-collapse v-model="selectedSize" accordion @change="____onChangeSize" style="margin-right: 20px;">
               <el-collapse-item v-for="(item, key) in boardSizeDic" :key="key" :title="item.label" :name="key">
                 <div v-if="item.list.length > 0">
                   <!-- <el-checkbox style="width: 100%" :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选
@@ -37,7 +37,7 @@
                 <div v-else style="color: #fff; text-align: center; line-height: 60px;">暂无数据</div>
               </el-collapse-item>
             </el-collapse>
-          </el-form-item>
+          </vuescroll>
         </el-form>
       </div>
       <!-- ++++++++++中间部分：单个设备++++++++++ -->

ruoyi-ui/src/views/login.vue

@@ -102,7 +102,7 @@ export default {
       cookiePassword: "",
       loginForm: {
         username: "admin",
-        password: "admin123", 
+        password: "dxc123!@#", 
         rememberMe: false,
         code: "",
         uuid: "",