Merge remote-tracking branch 'origin/master'

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

@@ -108,8 +108,12 @@
                       }"
                       :customRequest="handleChangeBg"
                     >
-                      <a-button class="upload-btn">
-                        <a-icon type="upload" /> 点击上传
+                      <a-button
+                        type="primary"
+                        :class="{ 'upload-btn': v.fieldValue }"
+                      >
+                        <a-icon :type="v.fieldValue ? 'edit' : 'upload'" />
+                        {{ v.fieldValue ? "点击修改" : "点击上传" }}
                       </a-button>
                     </a-upload>
                   </a-form-model-item>
@@ -130,8 +134,11 @@
                     <span class="color-show">{{
                       v.fieldValue ? v.fieldValue : "--"
                     }}</span>
-                    <a-button class="select-color-btn">
-                      选择颜色
+                    <a-button
+                      type="primary"
+                      :class="{ 'select-color-btn': v.fieldValue }"
+                    >
+                      {{ v.fieldValue ? "修改颜色" : "选择颜色" }}
                       <input
                         type="color"
                         class="color-ipt"
@@ -307,6 +314,7 @@ export default {
       this.$refs.formData && this.$refs.formData.resetFields();
       this.isEdit = false;
       this.show = false;
+      this.loading = false;
       this.skinTemplate = [];
       this.curSkinTemplate = undefined;
     },
@@ -418,8 +426,7 @@ export default {
               if (code === 1) {
                 this.$message.success(msg);
                 this.$emit("addSkinSuccess");
-                this.$refs.formData.resetFields();
-                this.show = false;
+                this.backOne();
               }
             });
         }
@@ -504,8 +511,9 @@ export default {
     }
     .upload-btn,
     .select-color-btn {
-      background-color: #11a265;
+      background-color: #04cb8f;
       color: #fff;
+      border: 1px solid #04cb8f;
     }
     .color-ipt {
       width: 100%;

base-manager-ui/admin/src/pages/basicset/surface/queuingSkin/LandscapeMode.vue

@@ -69,6 +69,7 @@
     <!-- 排号机竖版 1080*1920 -->
     <div
       class="vertical-skin"
+      :id="conponentsId"
       v-else-if="imageResolution === '2'"
       :style="{
         background: filterItem('1', 0),