Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/pages/basicset/sms/configurat.vue

@@ -12,7 +12,12 @@
         {{ v }}
       </div>
     </div>
+    <a-tooltip>
+      <template slot="title">
+        当前状态：{{ setInfo.messageoff ? "开启" : "关闭" }}
+      </template>
       <YButton v-model="setInfo.messageoff" @change="changeClose"></YButton>
+    </a-tooltip>
   </div>
 </template>
 

base-manager-ui/admin/src/pages/basicset/surface/components/ShowBox.vue

@@ -55,6 +55,7 @@ import SelfService from "../selfservice/SelfService.vue";
 import DesSelfService from "../desSelfservice/DesSelfService.vue";
 import SignDevicekin from "../signdeviceskin/SignDeviceSkin.vue";
 import InfoDisSkin from "../infoDisSkin/InfoDisSkin.vue";
+import DefaultShow from "../defaultshow/DefaultShow.vue";
 import { mapState, mapMutations } from "vuex";
 import { filterItems } from "@/utils";
 export default {
@@ -71,6 +72,7 @@ export default {
     DesSelfService,
     SignDevicekin,
     InfoDisSkin,
+    DefaultShow,
   },
   props: {},
   data() {
@@ -121,6 +123,8 @@ export default {
         case "xxgk":
           str = "InfoDisSkin";
           break;
+        default:
+          str = "DefaultShow";
       }
       return str;
     },

base-manager-ui/admin/src/pages/basicset/surface/defaultshow/DefaultShow.vue

+<template>
+  <div class="skin-box">
+    <!--  1920*1080 -->
+    <div
+      :id="componentsId"
+      class="across-skin"
+      v-if="imageResolution === '1'"
+      :style="{
+        background: filterItem('1', 0),
+      }"
+    ></div>
+    <!-- 竖版 1080*1920 -->
+    <div
+      class="vertical-skin"
+      :id="componentsId"
+      v-else-if="imageResolution === '2'"
+      :style="{
+        background: filterItem('1', 0),
+      }"
+    ></div>
+    <!-- 空数据显示 -->
+    <div class="empty flex aic jcc" v-else>
+      <a-empty
+        :image="require('../../../../assets/img/original.png')"
+        :image-style="{
+          height: '80px',
+        }"
+      >
+        <span slot="description"> <a href="#API">暂无皮肤模板</a> </span>
+      </a-empty>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    // imgItem: {
+    //   type: Array,
+    //   required: true,
+    //   default: () => {
+    //     return [];
+    //   },
+    // },
+    skinFieldList: {
+      type: Array,
+      required: true,
+      default: () => {
+        return [];
+      },
+    },
+    imageResolution: {
+      required: true,
+      default: "1",
+    },
+    componentsId: {
+      required: true,
+      type: String,
+    },
+  },
+  data() {
+    return {
+      api: process.env.VUE_APP_API_IMG_URL,
+    };
+  },
+  methods: {
+    // 过滤属性类型
+    filterItem(type, index) {
+      let arr = this.skinFieldList.filter((v) => {
+        return v.remark == type;
+      });
+      if (arr.length) {
+        return this.filterValueType(arr[index]);
+      } else {
+        return "";
+      }
+    },
+    // 过滤属性值类型
+    filterValueType(info = {}) {
+      let value = "";
+      if (info.fieldType !== "" && info.fieldType === "1" && info.fieldValue) {
+        value = info.fieldValue;
+      } else if (
+        info.fieldType !== "" &&
+        info.fieldType === "2" &&
+        info.fieldValue
+      ) {
+        value = `url(${this.api + info.fieldValue})`;
+      }
+      return value;
+    },
+    // 过滤导航
+    filterNav(type) {
+      let arr = [];
+      arr = this.skinFieldList.filter((v) => {
+        return v.remark == type;
+      });
+      return arr;
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.across-skin {
+  width: 1000px;
+  height: 562.5px;
+  color: #fff;
+  background-image: linear-gradient(#26c5ff, #2c66ff);
+  background-repeat: no-repeat !important;
+  background-position: center !important;
+  background-size: 100% 100% !important;
+}
+.vertical-skin {
+  height: 1000px;
+  width: 562px;
+  padding: 10px;
+  background-image: linear-gradient(#26c5ff, #2c66ff);
+  background-repeat: no-repeat !important;
+  background-position: center !important;
+  background-size: 100% 100% !important;
+}
+</style>

base-manager-ui/admin/src/pages/basicset/surface/modal/AddSurface.vue

@@ -196,6 +196,7 @@ import SelfService from "../selfservice/SelfService.vue";
 import DesSelfService from "../desSelfservice/DesSelfService.vue";
 import SignDevicekin from "../signdeviceskin/SignDeviceSkin.vue";
 import InfoDisSkin from "../infoDisSkin/InfoDisSkin.vue";
+import DefaultShow from "../defaultshow/DefaultShow.vue";
 import { uploadFile, skinSave, getTemplateList } from "@/services/surface";
 import html2canvas from "html2canvas";
 import { Empty } from "ant-design-vue";
@@ -215,6 +216,7 @@ export default {
     DesSelfService,
     SignDevicekin,
     InfoDisSkin,
+    DefaultShow,
   },
   props: {
     isShow: {
@@ -312,6 +314,8 @@ export default {
         case "xxgk":
           str = "InfoDisSkin";
           break;
+        default:
+          str = "DefaultShow";
       }
       return str;
     },

portal-manager-ui/admin/src/views/thePlatformIsSet/components/permissionsModel/userManagement.vue

@@ -182,7 +182,7 @@ export default {
       sourceInfoForm: {},
       userDict: {}, // 角色数据
       userform: {
-        type: 1,
+        type: 2,
         roleId: undefined,
         searchVal: undefined,
       },