Merge branch 'reg' of http://gitlab.scsmile.cn/zxf/smart_gov_platform into reg

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

@@ -255,32 +255,23 @@ export default {
     // 获取数据列表
     async getDatasetList() {
       this.loading = true;
-      let orConditionList = [
-        {
-          fieldCode: this.fieldCode,
-          fieldValue: `%${this.searchVal}%`,
-        },
-        ...this.sortSearch,
-      ];
-
-      let res = await getDatasetList({
+      let obj = {};
+      let orConditionList = [];
+      let form = {
         page: this.current,
         size: this.size,
         appId: this.appId,
-        orConditionList,
-        // fieldCode: this.fieldCode,
-        // fieldValue: `%${this.searchVal}%`,
-        // orConditionList: [
-        //   {
-        //     fieldCode: this.fieldCode,
-        //     fieldValue: `%${this.searchVal}%`,
-        //   },
-        //   {
-        //     fieldCode: "top",
-        //     fieldValue: `%%`,
-        //   },
-        // ],
-      });
+      };
+      if (this.fieldCode) {
+        obj.fieldCode = this.fieldCode;
+        obj.fieldValue = `%${this.searchVal}%`;
+        orConditionList.push(obj);
+      }
+      orConditionList = [...orConditionList, ...this.sortSearch];
+      if (orConditionList.length) {
+        form.orConditionList = orConditionList;
+      }
+      let res = await getDatasetList(form);
       this.loading = false;
       if (res.data.code === 1) {
         let { data, total } = res.data.data;

base-manager-ui/admin/src/pages/basicset/system/parameter/Parameter.vue

@@ -14,11 +14,6 @@
             v-model="searchForm.name"
             allowClear
           />
-          <a-input
-            placeholder="请输入二级组织搜索"
-            v-model="searchForm.secondOrganize"
-            allowClear
-          />
           <a-button type="primary" @click="onSearch">搜索</a-button>
           <a-button @click="resetSearch">重置</a-button>
         </a-space>
@@ -185,7 +180,6 @@ export default {
       searchValue: "", // 搜索
       searchForm: {
         name: "",
-        secondOrganize: "",
       },
       tableData: [],
       selectedRowKeys: [],
@@ -205,7 +199,6 @@ export default {
         page: this.current,
         size: this.size,
         name: `%${this.searchForm.name}%`,
-        secondOrganize: `%${this.searchForm.secondOrganize}%`,
       });
       this.loading = false;
       if (res.data.code == 1) {

portal-manager-ui/admin/src/main.js

@@ -16,8 +16,8 @@ Vue.use(Antd);
 import GlobalComponents from "./utils/js/globalComponents";
 Vue.use(GlobalComponents);
 
-import common from "./utils/commin";
-Vue.use(common);
+// import common from "./utils/commin";
+// Vue.use(common);
 
 // 公共样式
 import "@/assets/css/normalize.css";

portal-manager-ui/admin/src/request/request.js

@@ -11,6 +11,7 @@ import storage from "@/utils/js/Storage";
 
 // 请求超时时间
 axios.defaults.timeout = 60 * 1000;
+axios.defaults.withCredentials = true;
 
 // 设置统一服务器地址
 // axios.defaults.baseURL = process.env.VUE_APP_API_BASE_URL;

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

-
-import moment from 'moment';
-import 'moment/locale/zh-cn'; // 获取中国标准时间，避免出现utc时间
-moment.locale('zh-cn')
-
-
-import * as echarts from 'echarts'
-
-
-import ExportJsonExcel from "js-export-excel";
-
-import Storage from './js/Storage.js';
-
-import '@/utils/css/animate.min.css'
-import 'font-awesome/css/font-awesome.css'
-import './css/index.less' //css  公共库 
-
-
-function setLoading(props) {
-    if (typeof props === 'boolean') props = {
-        spinning: props
-    }
-    if (Object.prototype.toString.call(props) !== '[object Object]') props = {}
-    this.$app.loadingProps = {
-        tip: '加载中...',
-        ...props
-    }
-}
-
-const common = {
-    install: function (Vue) {
-        Vue.prototype.$echarts = echarts;
-        Vue.prototype.$moment = moment;
-        Vue.prototype.$Storage = Storage;
-        Vue.prototype.$setLoading = setLoading;
-        Vue.prototype.$ExportJsonExcel = ExportJsonExcel;
-
-    }
-}
-
-export default common
+// import moment from 'moment';
+// import 'moment/locale/zh-cn'; // 获取中国标准时间，避免出现utc时间
+// moment.locale('zh-cn')
+
+// import * as echarts from 'echarts'
+
+// import ExportJsonExcel from "js-export-excel";
+
+// import Storage from './js/Storage.js';
+
+// import '@/utils/css/animate.min.css'
+// import 'font-awesome/css/font-awesome.css'
+// import './css/index.less' //css  公共库
+
+// function setLoading(props) {
+//     if (typeof props === 'boolean') props = {
+//         spinning: props
+//     }
+//     if (Object.prototype.toString.call(props) !== '[object Object]') props = {}
+//     this.$app.loadingProps = {
+//         tip: '加载中...',
+//         ...props
+//     }
+// }
+
+// const common = {
+//     install: function (Vue) {
+//         Vue.prototype.$echarts = echarts;
+//         Vue.prototype.$moment = moment;
+//         Vue.prototype.$Storage = Storage;
+//         Vue.prototype.$setLoading = setLoading;
+//         Vue.prototype.$ExportJsonExcel = ExportJsonExcel;
+
+//     }
+// }
+
+// export default common
\ No newline at end of file

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

+export default {
+  getItem: function (sKey) {
+    return (
+      decodeURIComponent(
+        document.cookie.replace(
+          new RegExp(
+            "(?:(?:^|.*;)\\s*" +
+              encodeURIComponent(sKey).replace(/[\-\.\+\*]/g, "\\$&") +
+              "\\s*\\=\\s*([^;]*).*$)|^.*$"
+          ),
+          "$1"
+        )
+      ) || null
+    );
+  },
+  setItem: function (sKey, sValue, vEnd, sPath, sDomain, bSecure) {
+    if (!sKey || /^(?:expires|max\-age|path|domain|secure)$/i.test(sKey)) {
+      return false;
+    }
+    var sExpires = "";
+    if (vEnd) {
+      switch (vEnd.constructor) {
+        case Number:
+          sExpires =
+            vEnd === Infinity
+              ? "; expires=Fri, 31 Dec 9999 23:59:59 GMT"
+              : "; max-age=" + vEnd;
+          break;
+        case String:
+          sExpires = "; expires=" + vEnd;
+          break;
+        case Date:
+          sExpires = "; expires=" + vEnd.toUTCString();
+          break;
+      }
+    }
+    document.cookie =
+      encodeURIComponent(sKey) +
+      "=" +
+      encodeURIComponent(sValue) +
+      sExpires +
+      (sDomain ? "; domain=" + sDomain : "") +
+      (sPath ? "; path=" + sPath : "") +
+      (bSecure ? "; secure" : "");
+    return true;
+  },
+  removeItem: function (sKey, sPath, sDomain) {
+    if (!sKey || !this.hasItem(sKey)) {
+      return false;
+    }
+    document.cookie =
+      encodeURIComponent(sKey) +
+      "=; expires=Thu, 01 Jan 1970 00:00:00 GMT" +
+      (sDomain ? "; domain=" + sDomain : "") +
+      (sPath ? "; path=" + sPath : "");
+    return true;
+  },
+  hasItem: function (sKey) {
+    return new RegExp(
+      "(?:^|;\\s*)" +
+        encodeURIComponent(sKey).replace(/[\-\.\+\*]/g, "\\$&") +
+        "\\s*\\="
+    ).test(document.cookie);
+  },
+  keys: /* optional method: you can safely remove it! */ function () {
+    var aKeys = document.cookie
+      .replace(/((?:^|\s*;)[^\=]+)(?=;|$)|^\s*|\s*(?:\=[^;]*)?(?:\1|$)/g, "")
+      .split(/\s*(?:\=[^;]*)?;\s*/);
+    for (var nIdx = 0; nIdx < aKeys.length; nIdx++) {
+      aKeys[nIdx] = decodeURIComponent(aKeys[nIdx]);
+    }
+    return aKeys;
+  },
+};

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

 // 导出表格数据
-const ExportJsonExcel = require("js-export-excel");
+// const ExportJsonExcel = require("js-export-excel");
+import { message } from "ant-design-vue";
+import Vue from "vue";
 /**
  * 导出excel
  * @param {导出的表头名信息} tHeader
@@ -8,18 +10,25 @@ const ExportJsonExcel = require("js-export-excel");
  * @param {导出文件名称} fileName
  */
 export const export2Excel = (tHeader, filterVal, list, fileName) => {
-  let option = {
-    fileName,
-    datas: [
-      {
-        sheetData: list,
-        sheetName: "sheet",
-        sheetFilter: filterVal,
-        sheetHeader: tHeader,
-        // columnWidths: columnWidths, // 列宽
-      },
-    ],
-  };
-  let toExcel = new ExportJsonExcel(option);
-  toExcel.saveExcel(); //保存
+  message.warning({
+    content: "功能维护中",
+    maxCount: 1,
+    duration: 2,
+  });
+  Vue.prototype.$app.progressFile.show = false;
+  Vue.prototype.$app.progressFile.percent = 1;
+  // let option = {
+  //   fileName,
+  //   datas: [
+  //     {
+  //       sheetData: list,
+  //       sheetName: "sheet",
+  //       sheetFilter: filterVal,
+  //       sheetHeader: tHeader,
+  //       // columnWidths: columnWidths, // 列宽
+  //     },
+  //   ],
+  // };
+  // let toExcel = new ExportJsonExcel(option);
+  // toExcel.saveExcel(); //保存
 };

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

@@ -199,6 +199,7 @@ export default {
 .header {
   height: @headerHeight;
   padding: 0px 60px;
+  font-size: 16px;
   color: #fff;
   position: absolute;
   top: 0px;

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

@@ -394,8 +394,7 @@ export default {
       // 加时间戳印记用于刷新gif
       let mark = new Date().getTime();
       this.form.mark = mark;
-      this.imgCode =
-        this.api + "/zwfw/securitycode/createCode" + `?mark=${mark}`;
+      this.imgCode = this.api + "/zwfw/securitycode/createCode" + `?t=${mark}`;
     },
     handleSubmit() {
       this.$refs.form.validate(async (valid) => {

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

@@ -332,6 +332,7 @@ export default {
   background: url("@/assets/images/siteArrange/bg_4.jpg") no-repeat;
   background-size: 100% 100%;
   overflow: hidden;
+  font-size: 16px;
 
   .del-box {
     width: 100%;
@@ -457,12 +458,6 @@ export default {
         // }
       }
       &:nth-child(1) {
-        .type-list {
-          border-style: solid;
-          border-right-width: 2px;
-          border-image: linear-gradient(180deg, #0000 0%, #fff 30%, #0000 90%) 1;
-          // border-image-slice: 2;
-        }
         .item-logo {
           background: linear-gradient(180deg, #c7e1f6 0%, #ffffff 85%);
         }
@@ -470,6 +465,8 @@ export default {
       &:nth-child(2) {
         .type-list {
           border-style: solid;
+          border-width: 0px;
+          border-left-width: 2px;
           border-right-width: 2px;
           border-image: linear-gradient(180deg, #0000 0%, #fff 30%, #0000 90%) 1;
           // border-image-slice: 2;

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

@@ -9,12 +9,13 @@ module.exports = defineConfig({
   },
   devServer: {
     proxy: {
-      "/api": {
+      "/zwfw": {
         target: process.env.VUE_APP_API_BASE_URL,
         changeOrigin: true,
-        pathRewrite: {
-          "^/api": "",
-        },
+        // pathRewrite: {
+        //   "^/api": "",
+        // },
+        cookieDomainRewrite: "localhost",
       },
       "/file": {
         target: process.env.VUE_APP_API_BASE_URL,