Merge remote-tracking branch 'origin/master'

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

@@ -238,8 +238,8 @@
               <span v-else>--</span>
             </template>
             <!-- 所属窗口 -->
-            <template slot="windowName" slot-scope="text">
-              {{ text.windowName ? text.windowName : "--" }}
+            <template slot="windowId" slot-scope="text">
+              {{ text.windowId ? filterWindow(text.windowId) : "--" }}
             </template>
             <!-- 创建时间 -->
             <template slot="time" slot-scope="text">
@@ -357,7 +357,7 @@ const columns = [
   {
     title: "所属窗口",
     scopedSlots: {
-      customRender: "windowName",
+      customRender: "windowId",
     },
   },
   {
@@ -637,6 +637,10 @@ export default {
       });
       return name;
     },
+    // 过滤窗口
+    filterWindow(id) {
+      return this.windowData.find((v) => v.id == id).fromnum;
+    },
   },
 };
 </script>

portal-manager-ui/admin/package.json

@@ -38,7 +38,6 @@
     "@vue/cli-service": "~5.0.0",
     "browserslist": "^4.21.4",
     "caniuse-lite": "^1.0.30001442",
-    "filemanager-webpack-plugin": "^8.0.0",
     "less": "^4.0.0",
     "less-loader": "^8.0.0",
     "postcss": "^8.4.12",

portal-manager-ui/admin/src/assets/css/common.less

@@ -553,4 +553,5 @@
 .addclass {
   background: linear-gradient(90deg, #5ab6ff 0%, #2e9aff 100%) !important;
   color: #fff !important;
+  border:none !important
 }

portal-manager-ui/admin/src/views/dataActuary/portrayal/portrayalAnalysis/index.vue

@@ -17,7 +17,7 @@
 							<a-form-item label="联系电话：">{{ formState.phone || '--' }}</a-form-item>
 							<a-form-item label="身份证号：">{{ formState.idcard_IDCardNo || '--' }}</a-form-item>
 							<a-form-item label="注册时间：">{{ formState.update_time || '--' }}</a-form-item>
-							<a-form-item label="注册来源：">{{ regType[formState.register_type] || '--' }}</a-form-item>
+							<a-form-item label="注册来源：">{{ regType[formState.register_type] || '现场注册' }}</a-form-item>
 							<a-form-item label="户籍地址：">{{ formState.idcard_Address || '--' }}</a-form-item>
 						</a-form>
 					</div>
@@ -57,7 +57,7 @@
 							{{ formState.idcard_Name }}<a-tag color="green" class="info_tag">实名认证</a-tag>
 						</div>
 						<a-row>
-							<a-col :span="8">年龄：{{ formState.idcard_Name }}</a-col>
+							<a-col :span="8">年龄：{{ formState.age }}岁</a-col>
 							<a-col :span="8">性别：{{ formState.idcard_Sex || '--' }}</a-col>
 							<a-col :span="8">民族：{{ formState.idcard_Nation }}</a-col>
 						</a-row>

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

@@ -45,6 +45,7 @@
             <div
               class="list flex aic jcb"
               v-for="(i, j) in listArr[active].curInfo"
+              :key="j"
             >
               <div class="app-name">{{ i.appName }}</div>
               <img

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

 <template>
   <div class="menuMgmt">
     <div class="header_box">
-      <a-button type="primary" class="addclass"  @click="showEditModal(1)">新增</a-button>
+      <a-button type="primary" class="addclass" @click="showEditModal(1)"
+        >新增</a-button
+      >
       <span>
         <a-input v-model="searchForm.name" placeholder="请输入菜单名称搜索">
           <a-icon slot="prefix" type="search" />
@@ -13,7 +15,9 @@
           </a-select-option>
         </a-select>
 
-        <a-button type="primary" class="addclass"  @click="searchData">搜索</a-button>
+        <a-button type="primary" class="addclass" @click="searchData"
+          >搜索</a-button
+        >
         <a-button @click="resetSearch">重置</a-button>
       </span>
     </div>
@@ -89,7 +93,7 @@ export default {
       api: process.env.VUE_APP_API_IMG_URL,
       EditModalVisible: false,
       searchForm: {
-        name: undefined,
+        name: "",
         parentId: "",
       },
       tableLoading: false,
@@ -218,8 +222,8 @@ export default {
     // 搜索
     async searchData() {
       if (this.searchForm.parentId || this.searchForm.name) {
-        let obj = {...this.searchForm}
-        obj.name = '%'+this.searchForm.name+'%'
+        let obj = { ...this.searchForm };
+        obj.name = "%" + this.searchForm.name + "%";
         let res = await menuList({
           page: this.tablePagination.current,
           size: -1,

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

@@ -51,7 +51,7 @@
         :columns="tableHeaders"
         :dataSource="tableSourceData"
       >
-        <template slot="network" slot-scope="text, record, index">
+        <template slot="network" slot-scope="text">
           <span
             v-for="(item, idx) of dict.network"
             v-show="text.indexOf(idx) != -1"
@@ -61,7 +61,7 @@
           </span>
         </template>
 
-        <template slot="operation" slot-scope="text, record, index">
+        <template slot="operation" slot-scope="text, record">
           <a-button type="link" @click="openDetails(record)">编辑</a-button>
           <a-popconfirm
             title="确定要删除此应用吗?"
@@ -163,7 +163,7 @@ export default {
         },
       ],
       query: {
-        interfaceName: undefined,
+        interfaceName: "",
         interfaceSource: "",
         interfaceTag: "",
         productId: this.$route.query.id,
@@ -188,6 +188,7 @@ export default {
         page: this.tablePagination.current,
         size: this.tablePagination.pageSize,
         ...this.query,
+        interfaceName: `%${this.query.interfaceName}%`,
       }).then((res) => {
         if (res.code == 1) {
           let { data, total, dict } = res.data;

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

@@ -2,11 +2,7 @@
   <div class="PoliticsShow-Container">
     <div class="header_box">
       <div>
-        <a-button
-          type="primary"
-          class="addclass"
-          @click="openDetails()"
-        >
+        <a-button type="primary" class="addclass" @click="openDetails()">
           <span>新增</span>
         </a-button>
       </div>
@@ -30,10 +26,7 @@
           </a-select-option>
         </a-select>
 
-        <a-button
-          type="primary"
-          class="addclass"
-          @click="getList()"
+        <a-button type="primary" class="addclass" @click="getList()"
           >搜索</a-button
         >
       </span>
@@ -50,11 +43,11 @@
         :columns="tableHeaders"
         :dataSource="tableSourceData"
       >
-        <template slot="operation" slot-scope="text, record, index">
+        <template slot="operation" slot-scope="text, record">
           <a-button
             type="link"
             v-if="record.appFileUrl"
-            @click="handleDowload(record.appFileUrl)"
+            @click="handleDowload(record.appFileUrl, record.appName)"
             >下载应用</a-button
           >
           <a-button type="link" @click="openDetails(record)">编辑</a-button>
@@ -83,6 +76,7 @@ export default {
   name: "PortalAdminVueAlerting",
   data() {
     return {
+      api: process.env.VUE_APP_API_IMG_URL,
       tableHeaders: [
         {
           title: "序号",
@@ -194,11 +188,12 @@ export default {
         }
       });
     },
-    handleDowload(url) {
-      let arr = url.split("/");
+    handleDowload(url, fileName) {
+      let index = url.lastIndexOf(".");
+      let suffix = url.slice(index);
       const a = document.createElement("a");
-      a.href = process.env.VUE_APP_API_BASE_URL + "/" + url;
-      a.download = arr[arr.length - 1];
+      a.href = this.api + url;
+      a.download = fileName + suffix;
       a.click();
     },
     openDetails(item) {

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

@@ -31,11 +31,11 @@
         :columns="tableHeaders"
         :dataSource="tableSourceData"
       >
-        <template slot="operation" slot-scope="text, record, index">
+        <template slot="operation" slot-scope="text, record">
           <a-button
             type="link"
             v-if="record.docFileUrl"
-            @click="handleDowload(record.docFileUrl)"
+            @click="handleDowload(record.docFileUrl, record.docName)"
             >下载</a-button
           >
           <a-button type="link" @click="openDetails(record)">编辑</a-button>
@@ -63,6 +63,7 @@ export default {
   name: "PortalAdminVueAlerting",
   data() {
     return {
+      api: process.env.VUE_APP_API_IMG_URL,
       tableHeaders: [
         {
           title: "序号",
@@ -159,11 +160,12 @@ export default {
         }
       });
     },
-    handleDowload(url) {
-      let arr = url.split("/");
+    handleDowload(url, fileName) {
+      let index = url.lastIndexOf(".");
+      let suffix = url.slice(index);
       const a = document.createElement("a");
-      a.href = process.env.VUE_APP_API_BASE_URL + "/" + url;
-      a.download = arr[arr.length - 1];
+      a.href = this.api + url;
+      a.download = fileName + suffix;
       a.click();
     },
     openDetails(item) {

portal-manager-ui/admin/vue.config.js

 const { defineConfig } = require("@vue/cli-service");
-const FileManagerPlugin = require("filemanager-webpack-plugin"); // 压缩文件夹
-const isDev = process.env.NODE_ENV === "development";
-let plugins = [];
-// 避免打本地启项目时自动打zip包
-if (!isDev) {
-  plugins.push(
-    new FileManagerPlugin({
-      events: {
-        onEnd: {
-          // mkdir: ["./dist"],
-          delete: ["./zip/"],
-          copy: [{ source: "./dist", destination: "./zip/dist" }],
-          archive: [{ source: "./zip", destination: "./zip/门户系统.zip" }],
-        },
-      },
-    })
-  );
-}
 module.exports = defineConfig({
   transpileDependencies: true,
   lintOnSave: false,
   // 打包目录
   outputDir: "dist",
   configureWebpack: {
-    plugins: [...plugins],
+    plugins: [],
   },
   devServer: {
     proxy: {