学校壁纸

public/config.js

@@ -2,8 +2,8 @@ window.isTest = true; //测试环境true 正式环境false
 window._config = window.isTest
   ? {
       // 测试环境
-      baseUrl: "http://mcapitest.xhkjedu.com/",
-      baseImageUrl: "http://mcapitest.xhkjedu.com/",
+      baseUrl: "https://mcapitest.xhkjedu.com/",
+      baseImageUrl: "https://mcapitest.xhkjedu.com/",
       showImageUrl: "https://mcapitest.xhkjedu.com/",
       axiosApiTimeout: 60, // 接口超时时间 单位秒
       axiosFileTimeout: 120, // 上传文件超时时间 单位秒
@@ -16,9 +16,9 @@ window._config = window.isTest
     }
   : {
       // 正式环境
-      baseUrl: "http://49.4.26.249:8331/",
-      baseImageUrl: "http://49.4.26.249:8331/",
-      showImageUrl: "http://49.4.26.249:8331/",
+      baseUrl: "https://mcapi.xhkjedu.com/",
+      baseImageUrl: "https://mcapi.xhkjedu.com/",
+      showImageUrl: "https://mcapi.xhkjedu.com/",
       axiosApiTimeout: 20, // 接口超时时间 单位秒
       axiosFileTimeout: 30, // 上传文件超时时间 单位秒
       // 开发者

src/assets/less/common.less

@@ -326,6 +326,7 @@ fieldset[disabled] .ivu-input,
   }
 }
 // 多选框禁用时选中颜色修改
+.ivu-checkbox-indeterminate.ivu-checkbox-disabled,
 .ivu-checkbox-disabled {
   &.ivu-checkbox-checked .ivu-checkbox-inner,
   .ivu-checkbox-inner {

src/views/schoolSection/setting/wallpaper.vue

@@ -47,11 +47,11 @@
         <template slot-scope="{ row }" slot="actionSlot">
           <div class="action_list">
             <div @click="toView(row)">查看</div>
-            <div v-if="userInfo.adminid === row.createid" @click="toEdit(row)">
+            <div v-if="userInfo.adminid === row.updateid" @click="toEdit(row)">
               编辑
             </div>
             <div
-              v-if="userInfo.adminid === row.createid"
+              v-if="userInfo.adminid === row.updateid"
               class="action_del"
               @click="toDel(row)"
             >
@@ -182,12 +182,14 @@
               </div>
               <Checkbox
                 :disabled="brandItem.devices.length === 0"
-                :indeterminate="getIndeterminate(brandItem)"
-                :value="getCheckedAllValue(brandItem)"
+                :indeterminate="
+                  getIndeterminate(brandItem, wallpaperInfo.deviceids)
+                "
+                :value="getCheckedAllValue(brandItem, wallpaperInfo.deviceids)"
                 @click.prevent.native="
                   deviceBrandCheckedAll(
                     brandItem,
-                    getCheckedAllValue(brandItem)
+                    getCheckedAllValue(brandItem, wallpaperInfo.deviceids)
                   )
                 "
                 >{{ brandItem.dgname }}</Checkbox
@@ -249,24 +251,18 @@
                 />
               </div>
               <Checkbox
-                :disabled="brandItem.devices.length === 0"
-                :indeterminate="getIndeterminate(brandItem)"
-                :value="getCheckedAllValue(brandItem)"
-                @click.prevent.native="
-                  deviceBrandCheckedAll(
-                    brandItem,
-                    getCheckedAllValue(brandItem)
-                  )
-                "
+                :disabled="true"
+                :indeterminate="getIndeterminate(brandItem, viewInfo.deviceids)"
+                :value="getCheckedAllValue(brandItem, viewInfo.deviceids)"
                 >{{ brandItem.dgname }}</Checkbox
               >
             </div>
             <div class="device_brand_main" v-if="!brandItem.close">
               <Checkbox
+                :disabled="true"
                 v-for="deviceItem in brandItem.devices"
                 :key="deviceItem.deviceid"
                 :value="viewInfo.deviceids.includes(deviceItem.deviceid)"
-                @on-change="deviceModelCheck(deviceItem)"
                 >{{ deviceItem.deviceModel }}</Checkbox
               >
             </div>
@@ -547,10 +543,10 @@ export default {
       this.$set(brandItem, "close", !brandItem.close);
     },
     // 获取样式控制状态
-    getIndeterminate(brandItem) {
+    getIndeterminate(brandItem, deviceids) {
       let selectList = [];
       brandItem.devices.forEach((deviceItem) => {
-        if (this.wallpaperInfo.deviceids.includes(deviceItem.deviceid)) {
+        if (deviceids.includes(deviceItem.deviceid)) {
           selectList.push(deviceItem.deviceid);
         }
       });
@@ -559,10 +555,10 @@ export default {
       );
     },
     // 获取品牌全选状态
-    getCheckedAllValue(brandItem) {
+    getCheckedAllValue(brandItem, deviceids) {
       let selectAll = true;
       for (const deviceItem of brandItem.devices) {
-        if (!this.wallpaperInfo.deviceids.includes(deviceItem.deviceid)) {
+        if (!deviceids.includes(deviceItem.deviceid)) {
           return false;
         }
       }
@@ -646,11 +642,11 @@ export default {
               _deviceids.push(deviceItem.deviceid);
             });
           });
-          this.wallpaperInfo.deviceids = _deviceids;
+          this.viewInfo.deviceids = _deviceids;
         }
       });
       this.getDeviceList().then((list) => {
-        this.wallpaperInfo.deviceList = list;
+        this.viewInfo.deviceList = list;
       });
     },
     // 编辑