Merge remote-tracking branch 'origin/master'

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

@@ -262,35 +262,35 @@ export default {
     },
     component() {
       let str = "";
-      switch (this.facilityInfo.productId) {
-        case 1:
+      switch (this.facilityInfo.productName) {
+        case "排号机":
           str = "LandscapeMode";
           break;
-        case 2:
+        case "窗口屏":
           str = "WindowSkin";
           break;
-        case 3:
+        case "呼叫器":
           str = "CallOutSkin";
           break;
-        case 4:
+        case "集中显示屏":
           str = "CentralizeSkin";
           break;
-        case 5:
+        case "导视机":
           // str = "CentralizeSkin";
           break;
-        case 6:
+        case "评价器":
           str = "AppraiseSkin";
           break;
-        case 7:
+        case "自助服务终端":
           // str = "AppraiseSkin";
           break;
-        case 8:
+        case "填单机":
           str = "WriteFormSkin";
           break;
-        case 9:
+        case "样表机":
           str = "SampleFormSkin";
           break;
-        case 10:
+        case "信息发布终端":
           str = "InformationSkin";
           break;
       }

portal-manager-ui/admin/src/utils/js/validate.js

 // 只能为数字验证
-export function isNumber (rule, value, callback) {
-  var number = /^\d+$/
+export function isNumber(rule, value, callback) {
+  var number = /^\d+$/;
   if (!number.test(value)) {
-    callback(new Error("格式有误,只能为数字"))
+    callback(new Error("格式有误,只能为数字"));
   } else {
-    callback()
+    callback();
   }
 }
 
 // 验证流水编号
-export const checkFlowNum = (rule,value,callback)=>{
-  let reg = /^[A-Z][a-zA-Z0-9]{3,32}$/
-  if(!value){
-    callback(new Error('请输入流水编号'))
-  }else if(!reg.test(value)){
-    callback(new Error('格式为大写字母开头,4~32位'))
-  }else{
-    callback()
+export const checkFlowNum = (rule, value, callback) => {
+  let reg = /^[A-Z][a-zA-Z0-9]{3,32}$/;
+  if (!value) {
+    callback(new Error("请输入流水编号"));
+  } else if (!reg.test(value)) {
+    callback(new Error("格式为大写字母开头,4~32位"));
+  } else {
+    callback();
   }
-}
+};
 // 验证英文
-export const checkEn = (rule,value,callback)=>{
-  let reg = /^[a-zA-Z]{2,15}$/
-  if(!value){
-    callback(new Error('请输入英文名称'))
-  }else if(!reg.test(value)){
-    callback(new Error('格式为字母a-z,A-Z,2~15位'))
-  }else{
-    callback()
+export const checkEn = (rule, value, callback) => {
+  let reg = /^[a-zA-Z]{2,15}$/;
+  if (!value) {
+    callback(new Error("请输入英文名称"));
+  } else if (!reg.test(value)) {
+    callback(new Error("格式为字母a-z,A-Z,2~15位"));
+  } else {
+    callback();
   }
-}
+};
 // 验证账号
 export const changeAccount = (rule, value, callback) => {
   if (!value) {
-      callback(new Error("请输入用户名"));
+    callback(new Error("请输入用户名"));
   } else if (!/^[a-zA-Z0-9_-]{4,16}$/.test(value)) {
-      callback(new Error("4到16位(字母,数字,下划线,中横线)"));
+    callback(new Error("4到16位(字母,数字,下划线,中横线)"));
   } else {
-      callback();
+    callback();
   }
 };
 
 // 验证密码
 export const changePassWord = (rule, value, callback) => {
   if (!value) {
-      callback(new Error("请输入密码"));
-  } else if (!/^[a-zA-Z0-9_-]{5,18}$/.test(value)) {
-      callback(new Error("5到18位(字母,数字,下划线,中横线)"));
+    callback(new Error("请输入密码"));
+  } else if (!/^[a-zA-Z0-9_!@#$%^&*`~()-+=]{5,18}$/.test(value)) {
+    callback(new Error("5到18位(字母、数字、特殊字符)"));
   } else {
-      callback();
+    callback();
   }
 };
 // 验证手机号码
 export const changePhone = (rule, value, callback) => {
   if (!value) {
-      // callback(new Error("请输入手机号"));
-      callback();
+    // callback(new Error("请输入手机号"));
+    callback();
   } else if (!/^1[3-9]\d{9}$/.test(value)) {
-      callback(new Error("手机号码格式不正确"));
+    callback(new Error("手机号码格式不正确"));
   } else {
-      callback();
+    callback();
   }
 };
 
 // 验证座机号码
 export const changeLandline = (rule, value, callback) => {
   if (!value) {
-      // callback(new Error("请输入座机号"));
-      callback();
+    // callback(new Error("请输入座机号"));
+    callback();
   } else if (!/^[0][1-9]{2,3}-[0-9]{5,10}$/.test(value)) {
-      callback(new Error("区号-电话号码"));
+    callback(new Error("区号-电话号码"));
   } else {
-      callback();
+    callback();
   }
 };
 
 // 窗口编号验证（字母加数字 数字不能大于1000）
 export const changeWindowNumber = (rule, value, callback) => {
   if (!value) {
-      callback(new Error("请输入窗口编号"));
-      callback();
+    callback(new Error("请输入窗口编号"));
+    callback();
   } else if (!/^[a-zA-Z]+\d{1,3}$/.test(value)) {
-      callback(new Error("字母+数字，数字不能大于999"));
+    callback(new Error("字母+数字，数字不能大于999"));
   } else {
-      callback();
+    callback();
   }
-};
\ No newline at end of file
+};

portal-manager-ui/admin/src/views/dataAdmin/dataAdmin.vue

@@ -46,7 +46,7 @@
         <li class="skip_list">
           <p class="top">聚焦协同<span>FOCUS ON TEAMWORK</span></p>
           <ul class="content">
-            <template v-for="itm of CensusType_2">
+            <!-- <template v-for="itm of CensusType_2">
               <li
                 class="content_list"
                 :key="itm.id"
@@ -74,11 +74,9 @@
             <li class="content_list" @click="pushRouter11">样表记录报表</li>
             <li class="content_list" @click="pushRouter12">填单记录样表</li>
             <li class="content_list" @click="pushRouter13">微官网注册报表</li>
-            <li class="content_list" @click="pushRouter14">网络理政报表</li>
+            <li class="content_list" @click="pushRouter14">网络理政报表</li> -->
           </ul>
-          <p class="bottom" @click="handleCkeck(11)">
-            协同类数据分析<a-icon type="swap-right" />
-          </p>
+          <p class="bottom">协同类数据分析<a-icon type="swap-right" /></p>
         </li>
       </ul>
       <ul class="list">
@@ -95,9 +93,7 @@
               </li>
             </template>
           </ul>
-          <p class="bottom" @click="handleCkeck(11)">
-            监管类数据分析<a-icon type="swap-right" />
-          </p>
+          <p class="bottom">监管类数据分析<a-icon type="swap-right" /></p>
         </li>
       </ul>
       <ul class="list">
@@ -114,9 +110,7 @@
               </li>
             </template>
           </ul>
-          <p class="bottom" @click="handleCkeck(11)">
-            数据驾驶一体化<a-icon type="swap-right" />
-          </p>
+          <p class="bottom">数据驾驶一体化<a-icon type="swap-right" /></p>
         </li>
       </ul>
       <ul class="list">
@@ -133,9 +127,7 @@
               </li>
             </template>
           </ul>
-          <p class="bottom" @click="handleCkeck(11)">
-            运营类数据分析<a-icon type="swap-right" />
-          </p>
+          <p class="bottom">运营类数据分析<a-icon type="swap-right" /></p>
         </li>
       </ul>
     </div>

portal-manager-ui/admin/src/views/thePlatformIsSet/components/productManage/components/InterfaceManage/alerting.vue

@@ -195,6 +195,9 @@ export default {
 </script>
 
 <style lang="less" scoped>
+/deep/.ant-spin-container {
+  display: block;
+}
 .PoliticsShow-Container {
   .header_box {
     padding-bottom: 1rem;
@@ -334,9 +337,6 @@ export default {
         margin-left: 1rem !important;
       }
     }
-    /deep/.ant-table-pagination {
-      float: left !important;
-    }
   }
 }
 </style>

portal-manager-ui/admin/src/views/thePlatformIsSet/components/productManage/components/InterfaceManage/module.vue

@@ -4,7 +4,7 @@
       <a-tabs v-model="tabsActive" @change="tabsChange" :forceRender="false">
         <a-tab-pane
           :key="item.path"
-          v-for="(item, index) of tabsList['children']"
+          v-for="item of tabsList['children']"
           :tab="item['meta']['title']"
         >
         </a-tab-pane>

portal-manager-ui/admin/src/views/thePlatformIsSet/components/productManage/components/appManage/application.vue

@@ -147,6 +147,9 @@ export default {
 </script>
 
 <style lang="less" scoped>
+/deep/.ant-spin-container {
+  display: block;
+}
 .PoliticsShow-Container {
   .header_box {
     padding-bottom: 1rem;
@@ -286,9 +289,6 @@ export default {
         margin-left: 1rem !important;
       }
     }
-    /deep/.ant-table-pagination {
-      float: left !important;
-    }
   }
 }
 </style>

portal-manager-ui/admin/src/views/thePlatformIsSet/components/productManage/components/docData/fileData.vue

@@ -137,6 +137,9 @@ export default {
 </script>
 
 <style lang="less" scoped>
+/deep/.ant-spin-container {
+  display: block;
+}
 .PoliticsShow-Container {
   .header_box {
     padding-bottom: 1rem;
@@ -276,9 +279,6 @@ export default {
         margin-left: 1rem !important;
       }
     }
-    /deep/.ant-table-pagination {
-      float: left !important;
-    }
   }
 }
 </style>

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

@@ -14,7 +14,7 @@
         新增产品
       </a-button>
       <ul class="content">
-        <li class="list" v-for="item of 5">
+        <li class="list" v-for="item of 5" :key="item">
           <a-popover placement="leftBottom">
             <template slot="content">
               <div class="popoverContent">