Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/pages/basicset/business/components/businessTabs1.vue

@@ -241,7 +241,7 @@ export default {
     this.getBusinessListData();
   },
   methods: {
-    // 现在业务成功
+    // 新增业务成功
     AddSuccess() {
       this.getSiteBusinessData();
       this.getBusinessListData();

base-manager-ui/admin/src/pages/basicset/business/group/addprofession.vue

@@ -22,7 +22,15 @@
         </a-radio-group>
       </a-form-model-item>
 
-      <a-form-model-item label="选择父级业务：">
+      <a-form-model-item
+        label="父级业务："
+        :rules="{
+          required: form.isBusiness ? true : false,
+          message: `父级业务不能为空`,
+          trigger: 'change',
+        }"
+        prop="parentId"
+      >
         <a-select
           v-model="form.parentId"
           placeholder="请选择父级业务"
@@ -153,11 +161,13 @@ export default {
       this.form = { ...data };
     },
     // 切换业务级别
-    changeIsBusiness(e) {
-      if (e.target.value === 0) {
-        this.form.parentId = 0;
-      }
-    },
+    // changeIsBusiness(e) {
+    //   if (e.target.value == 0) {
+    //     this.form.parentId = 0;
+    //   } else {
+    //     this.form.parentId = undefined;
+    //   }
+    // },
     // 重置
     handleReset() {
       this.$refs.formData.resetFields();
@@ -165,10 +175,12 @@ export default {
     // 确定
     handleOk() {
       this.$refs.formData.validate(async (valid) => {
+        console.log(this.form.parentId);
         if (valid) {
           this.confirmLoading = true;
           let res = await saveBusiness({
             ...this.form,
+            parentId: this.form.parentId == undefined ? 0 : this.form.parentId,
           });
           let { code, msg, data } = res.data;
           if (code === 1) {
@@ -189,8 +201,6 @@ export default {
               this.$message.success(msg);
               this.getBusinessData();
               this.$refs.formData.resetFields();
-              this.$parent.getSiteBusinessData();
-              this.$parent.getBusinessListData();
               this.$emit("newBusiness");
             }
             this.confirmLoading = false;

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

@@ -3,7 +3,7 @@
     <!-- 排号机 1920*1080 -->
     <div
       :id="conponentsId"
-      class="surface-preview"
+      class="across-skin"
       v-if="imageResolution === '1'"
       :style="{
         background: filterItem('1', 0),
@@ -12,7 +12,7 @@
       <div class="surface-preview-main">
         <div class="skin-header">
           <h1 class="skin-header-title" :style="{ color: filterItem('2', 0) }">
-            自助排队取号系统
+            政务服务中心
           </h1>
           <div class="skin-header-time" :style="{ color: filterItem('3', 0) }">
             <p class="show-time">16:14:00</p>
@@ -66,6 +66,71 @@
         </div>
       </div>
     </div>
+    <!-- 排号机竖版 1080*1920 -->
+    <div
+      class="vertical-skin"
+      v-else-if="imageResolution === '2'"
+      :style="{
+        background: filterItem('1', 0),
+      }"
+    >
+      <div class="header flex flexc aic">
+        <div class="title" :style="{ color: filterItem('2', 0) }">
+          政务服务中心
+        </div>
+        <div class="date" :style="{ color: filterItem('3', 0) }">
+          2023/01/03 星期一 12:00:00
+        </div>
+      </div>
+      <div class="banner">
+        <img src="../../../../assets/img/Banner.png" alt="" />
+      </div>
+      <div class="meuns flex flexwrap jcb">
+        <div
+          class="meuns-item"
+          v-for="(v, i) in filterNav('4')"
+          :key="v.id"
+          :class="{ border: !filterItem('4', i) }"
+          :style="{
+            background: filterItem('4', i),
+          }"
+        ></div>
+      </div>
+      <div class="data-total flex aic jca">
+        <div class="flex flexc aic">
+          <div :style="{ color: filterItem('5', 0) }">今日取号</div>
+          <div :style="{ color: filterItem('6', 0) }">888次</div>
+        </div>
+        <div class="flex flexc aic">
+          <div :style="{ color: filterItem('5', 0) }">累计取号量</div>
+          <div :style="{ color: filterItem('6', 0) }">888次</div>
+        </div>
+        <div class="flex flexc aic">
+          <div :style="{ color: filterItem('5', 0) }">当前等待人数</div>
+          <div :style="{ color: filterItem('6', 0) }">888人</div>
+        </div>
+        <div class="flex flexc aic">
+          <div :style="{ color: filterItem('5', 0) }">平均等待时间</div>
+          <div :style="{ color: filterItem('6', 0) }">8.8分钟</div>
+        </div>
+      </div>
+      <div class="info" :style="{ color: filterItem('9', 0) }">
+        <div class="flex aic jca mb15">
+          <div>
+            <span>主办单位：</span>
+            <span>四川省政务服务中心</span>
+          </div>
+          <div>
+            <span>承办单位：</span>
+            <span>四川省大数据中心</span>
+          </div>
+        </div>
+        <div class="flex aic jca">
+          <span>技术支持：<span>四川省青霆科技有限公司</span></span>
+          <span>蜀ICP12837943234号@u8742984923</span>
+        </div>
+      </div>
+    </div>
     <!-- 空数据显示 -->
     <div class="empty flex aic jcc" v-else>
       <a-empty
@@ -150,7 +215,7 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.surface-preview {
+.across-skin {
   width: 1000px;
   height: 562.5px;
   color: #fff;
@@ -256,7 +321,54 @@ export default {
     }
   }
 }
-.ant-empty {
-  margin-top: 25%;
+.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;
+  .header {
+    color: #fff;
+    .title {
+      font-size: 30px;
+      font-weight: 600;
+    }
+    .date {
+      font-size: 16px;
+    }
+  }
+  .banner {
+    width: 100%;
+    height: 320px;
+    margin-top: 20px;
+    border-radius: 4px;
+    img {
+      width: 100%;
+      height: 100%;
+      border-radius: 4px;
+    }
+  }
+  .meuns {
+    width: 100%;
+  }
+  .meuns-item {
+    height: 120px;
+    width: 49%;
+    margin-bottom: 10px;
+    border: 1px dashed #ccc;
+    border-radius: 4px;
+    background-size: 100% 100% !important;
+    background-repeat: no-repeat;
+  }
+  .data-total {
+    margin-top: 20px;
+    color: #fff;
+  }
+  .info {
+    margin-top: 30px;
+    color: #fff;
+  }
 }
 </style>
\ No newline at end of file