Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/layouts/Layouts.vue

@@ -21,7 +21,7 @@
             初始化区域数据
           </a>
           <a-tooltip class="header-item" title="返回门户" placement="bottom">
-            <a :href="portalUrl + path ? path : ''">
+            <a :href="portalUrl + (path ? path : '')">
               <a-icon type="home" /> 返回门户
             </a>
           </a-tooltip>

base-manager-ui/admin/src/layouts/header/AdminHeader.vue

@@ -46,7 +46,9 @@
           >初始化区域数据</a-button
         >
         <a-tooltip class="header-item" title="返回门户" placement="bottom">
-          <a :href="portalUrl + path"> <a-icon type="home" /> 返回门户 </a>
+          <a :href="portalUrl + (path ? path : '')">
+            <a-icon type="home" /> 返回门户
+          </a>
         </a-tooltip>
         <!-- <a-tooltip class="header-item" title="数据可视化" placement="bottom">
           <a href="" target="_blank"> <a-icon type="setting" /> 数据可视化 </a>
@@ -96,7 +98,7 @@ export default {
         { key: "US", name: "English", alias: "English" },
       ],
       searchActive: false,
-      portalUrl: process.env.VUE_APP_API_portal_URL,
+      portalUrl: process.env.VUE_APP_API_portal_URL + "/#",
     };
   },
   computed: {

base-manager-ui/admin/src/pages/basicset/addmatter/AddMatter.vue

@@ -16,49 +16,49 @@
 
       <a-tab-pane key="ApplyMaterial">
         <span slot="tab">
-          <a-icon type="container" />
+          <a-icon type="file" />
           申请材料
         </span>
       </a-tab-pane>
 
       <a-tab-pane key="AcceptMaterial">
         <span slot="tab">
-          <a-icon type="container" />
+          <a-icon type="interaction" />
           受理材料
         </span>
       </a-tab-pane>
 
       <a-tab-pane key="Flow">
         <span slot="tab">
-          <a-icon type="container" />
+          <a-icon type="cluster" />
           办理流程
         </span>
       </a-tab-pane>
 
       <a-tab-pane key="Rates">
         <span slot="tab">
-          <a-icon type="container" />
+          <a-icon type="audit" />
           收费标准
         </span>
       </a-tab-pane>
 
       <a-tab-pane key="Pursuant">
         <span slot="tab">
-          <a-icon type="container" />
+          <a-icon type="file-done" />
           设定依据
         </span>
       </a-tab-pane>
 
       <a-tab-pane key="Agency">
         <span slot="tab">
-          <a-icon type="container" />
+          <a-icon type="solution" />
           中介服务
         </span>
       </a-tab-pane>
 
       <a-tab-pane key="Question">
         <span slot="tab">
-          <a-icon type="container" />
+          <a-icon type="file-unknown" />
           常见问题
         </span>
       </a-tab-pane>
@@ -116,7 +116,7 @@ export default {
   },
 };
 </script>
-<style lang='less' scoped>
+<style lang="less" scoped>
 .addmatter {
   width: 100%;
   height: 100%;

base-manager-ui/admin/src/pages/basicset/appmarket/components/AppTheme.vue

@@ -75,11 +75,6 @@
       :addVisile.sync="addVisile"
       @addSuccess="getCategoryList"
     ></AddTheme>
-    <!-- 预览 -->
-    <PrevieModal
-      :previewData="previewData"
-      :previewVisible.sync="previewVisible"
-    ></PrevieModal>
   </div>
 </template>
 
@@ -88,7 +83,6 @@ import { getCategoryList, deleteCategory } from "@/services/market";
 import AddTheme from "../modal/AddTheme";
 import local from "@/utils/local";
 import { pageSizeOptions } from "@/config/pageConfig.js";
-import PrevieModal from "@/components/PrevieModal.vue";
 const columns = [
   {
     title: "序号",
@@ -135,15 +129,12 @@ const columns = [
 export default {
   components: {
     AddTheme,
-    PrevieModal,
   },
   data() {
     return {
       api: process.env.VUE_APP_API_BASE_URL + "/",
       api2: process.env.VUE_APP_API_IMG_URL,
       columns,
-      previewData: {}, // 预览
-      previewVisible: false,
       siteId: local.getLocal("siteId"),
       tableData: [], // 表格数据
       loading: false,
@@ -254,11 +245,9 @@ export default {
     },
     // 预览封面
     handlePreview(url) {
-      this.previewData = {
-        type: "img",
-        url: url,
-      };
-      this.previewVisible = true;
+      this.$viewerApi({
+        images: [url],
+      });
     },
   },
 };

base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddData.vue

@@ -22,6 +22,7 @@
               :class="{
                 content: v.fieldType == 'text',
                 'upload-item': v.fieldType == 'upload',
+                'table-item': v.fieldType == 'table',
               }"
               :prop="`appInfoFieldList.${i}.fieldValue`"
               :rules="{
@@ -532,7 +533,7 @@ export default {
 <style lang="less" scoped>
 /deep/.ant-form-item {
   display: flex;
-  align-items: flex-start;
+  align-items: center;
 }
 /deep/.ant-drawer-body {
   height: calc(100vh - 55px);
@@ -554,8 +555,12 @@ export default {
   }
 }
 .upload-item {
+  align-items: flex-start !important;
   display: block !important;
 }
+.table-item {
+  align-items: flex-start !important;
+}
 .search-box {
   margin-bottom: 10px;
   text-align: right;

base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddField.vue

@@ -458,6 +458,12 @@ export default {
             value: "",
           },
         ];
+        this.apiParams = [
+          {
+            key: "",
+            value: "",
+          },
+        ];
       }
     },
   },

base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddTheme.vue

@@ -46,11 +46,6 @@
           <a-input-number v-model="form.sort" :min="1" />
         </a-form-model-item>
       </a-form-model>
-      <!-- 预览 -->
-      <PrevieModal
-        :previewData="previewData"
-        :previewVisible.sync="previewVisible"
-      ></PrevieModal>
     </a-modal>
   </div>
 </template>
@@ -58,7 +53,6 @@
 <script>
 import { saveCategory } from "@/services/market";
 import local from "@/utils/local";
-import PrevieModal from "@/components/PrevieModal.vue";
 export default {
   props: {
     addVisile: {
@@ -71,17 +65,13 @@ export default {
       default: "新增分类",
     },
   },
-  components: {
-    PrevieModal,
-  },
+  components: {},
   data() {
     return {
       accept: "image/jpeg,image/png",
       api: process.env.VUE_APP_API_BASE_URL + "/",
       api2: process.env.VUE_APP_API_IMG_URL,
       fileList: [],
-      previewData: {}, // 预览
-      previewVisible: false,
       form: {
         siteId: local.getLocal("siteId"), // 站点id
         siteName: local.getLocal("siteName"), // 站点名称
@@ -184,11 +174,9 @@ export default {
     },
     // 预览
     handlePreview(info) {
-      this.previewData = {
-        type: "img",
-        url: info.url,
-      };
-      this.previewVisible = true;
+      this.$viewerApi({
+        images: [info.url],
+      });
     },
     // 重置
     handleReset() {

base-manager-ui/admin/src/pages/basicset/site/components/addsite.vue

@@ -282,8 +282,9 @@
               </a-form-model-item>
             </a-col>
           </a-row>
-          <div class="color_title">部署板块</div>
+          <div v-permission="[1]" class="color_title">部署板块</div>
           <a-form-model-item
+            v-permission="[1]"
             :label-col="{ span: 2 }"
             :wrapper-col="{ span: 22 }"
             class="model-id"
@@ -566,7 +567,6 @@ export default {
   },
   created() {
     this.getModel();
-    console.log(process.env.NODE_ENV);
   },
   computed: {
     Visible: {
@@ -811,7 +811,7 @@ export default {
   }
   .ant-checkbox-group {
     display: grid;
-    grid-template-columns: 260px 260px 260px 260px;
+    grid-template-columns: repeat(3, 320px);
   }
   .ant-checkbox-wrapper {
     margin-left: 0px;

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

@@ -302,6 +302,7 @@ export default {
 <style lang="less" scoped>
 /deep/.ant-drawer-body {
   height: 90%;
+  padding: 0px;
 }
 .classify {
   height: 100%;
@@ -310,6 +311,7 @@ export default {
   .classify-list {
     flex: 1;
     margin-bottom: 10px;
+    padding: 20px;
     overflow-y: auto;
   }
   .footer-btn {
@@ -326,6 +328,7 @@ export default {
 }
 .skin-name {
   margin-bottom: 0px;
+  align-items: flex-start;
   /deep/ .ant-form-item-label {
     line-height: 20px !important;
   }

base-manager-ui/admin/src/pages/basicset/workman/personnel.vue

 <template>
   <a-spin tip="正在上传中..." :spinning="spinning">
-    <div class="website flex flexc">
+    <div class="personnel flex flexc">
       <TabHeader label="工作人员管理"></TabHeader>
       <div class="pd15 flex1 auto-scroll-y">
         <div class="person_chang flex aic mb10">
@@ -21,6 +21,7 @@
                 {{ curDept }}
               </div>
               <a-popover
+                overlayClassName="personnel-popover"
                 arrowPointAtCenter
                 placement="rightTop"
                 title="部门列表"
@@ -80,6 +81,7 @@
                 {{ curWindow }}
               </div>
               <a-popover
+                overlayClassName="personnel-popover"
                 arrowPointAtCenter
                 placement="rightTop"
                 title="窗口列表"
@@ -661,9 +663,15 @@ export default {
   },
 };
 </script>
-
+<style lang="less">
+.personnel-popover {
+  .ant-popover-inner-content {
+    padding: 0px !important;
+  }
+}
+</style>
 <style lang="less" scoped>
-.website {
+.personnel {
   width: 100%;
   height: 100%;
   .right {
@@ -783,10 +791,12 @@ export default {
     }
   }
 }
+
 .dept-list {
-  width: 500px;
+  width: 620px;
   min-height: 50px;
   max-height: 400px;
+  padding: 12px 16px;
   overflow-y: auto;
   .ant-radio-group {
     display: grid;

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

@@ -21,10 +21,10 @@
             style="width: 150px"
           >
             <a-select-option
-              v-for="v in userDict"
-              :key="v.key"
-              :value="v.key"
-              >{{ v.value }}</a-select-option
+              v-for="(v, key) in userDict"
+              :key="key"
+              :value="key"
+              >{{ v }}</a-select-option
             >
           </a-select>
           <a-button type="primary" class="addclass" @click="getUserList"
@@ -98,6 +98,7 @@
 
 <script>
 import { userList, userDelete } from "@/api/userManagement.js";
+import { mapGetters } from "vuex";
 import addUser from "./components/addUser.vue";
 import EditUser from "./components/EditUser.vue";
 import EditPwd from "./components/EditPwd.vue";
@@ -174,8 +175,13 @@ export default {
         roleId: undefined,
         searchVal: undefined,
       },
+
+      loginNames: ["admin", "administrator1", "Administrator"],
     };
   },
+  computed: {
+    ...mapGetters("user", ["userData"]),
+  },
   created() {
     this.getUserList();
   },
@@ -185,15 +191,6 @@ export default {
       this.tablePagination.pageSize = pag.pageSize;
       this.getUserList();
     },
-    // 对象转对象数组
-    transverter(obj) {
-      return Object.keys(obj).map((v) => {
-        return {
-          key: v,
-          value: obj[v],
-        };
-      });
-    },
 
     // 获取用户列表
     async getUserList() {
@@ -207,11 +204,6 @@ export default {
           realName = "%" + this.userform.searchVal + "%";
         }
       }
-      // if (/^[\u4e00-\u9fa5]+$/.test(this.userform.searchVal)) {
-      //   realName = "%" + this.userform.searchVal + "%";
-      // } else if (/^[\d]+$/.test(this.userform.searchVal)) {
-      //   mobile = "%" + this.userform.searchVal + "%";
-      // }
       let res = await userList({
         page: this.tablePagination.current,
         size: this.tablePagination.pageSize,
@@ -225,9 +217,18 @@ export default {
         this.tablePagination.current -= 1;
         this.getUserList();
       }
-      this.tablePagination.total = total;
-      this.userDict = this.transverter(roleId);
+      this.userDict = roleId;
+      let { loginName } = this.userData;
+      if (this.loginNames.includes(loginName)) {
         this.tableSourceData = data;
+        this.tablePagination.total = total;
+      } else {
+        this.tableSourceData = data.filter((v) => {
+          return !this.loginNames.includes(v.loginName);
+        });
+
+        this.tablePagination.total = total - 3;
+      }
       this.tableLoading = false;
     },