diff --git a/base-manager-ui/admin/src/pages/basicset/appmarket/components/DataUpdate.vue b/base-manager-ui/admin/src/pages/basicset/appmarket/components/DataUpdate.vue
index 85b71981faa578f97600ff18848abecac9a079c7..e18ec140742328475a82d4f785044b938430759a 100644
--- a/base-manager-ui/admin/src/pages/basicset/appmarket/components/DataUpdate.vue
+++ b/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;
diff --git a/base-manager-ui/admin/src/pages/basicset/system/parameter/Parameter.vue b/base-manager-ui/admin/src/pages/basicset/system/parameter/Parameter.vue
index f9e1829705e9bf6319308a06bde6a619e1c0a8a2..cb38de4471873f23a69cd94b2cd5b37cd9526287 100644
--- a/base-manager-ui/admin/src/pages/basicset/system/parameter/Parameter.vue
+++ b/base-manager-ui/admin/src/pages/basicset/system/parameter/Parameter.vue
@@ -14,11 +14,6 @@
v-model="searchForm.name"
allowClear
/>
-
搜索
重置
@@ -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) {
diff --git a/portal-manager-ui/admin/src/main.js b/portal-manager-ui/admin/src/main.js
index defbf055c5fd4be8770e696989d0a9b2bb593f10..5aa31adaf2954ed5cb1a966d2dabffe81759d48c 100644
--- a/portal-manager-ui/admin/src/main.js
+++ b/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";
diff --git a/portal-manager-ui/admin/src/request/request.js b/portal-manager-ui/admin/src/request/request.js
index eb3ec08b1c2472d6cbae05261f15f8eacd3afaea..fce8ae2d818a075234d9a11adab1aa2a138bdec8 100644
--- a/portal-manager-ui/admin/src/request/request.js
+++ b/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;
diff --git a/portal-manager-ui/admin/src/utils/commin.js b/portal-manager-ui/admin/src/utils/commin.js
index 2865b948cc874ae780c2ee3c4e80c252754ec788..8f321b7af84dccff3e7526d4f57fb5a3d92d7d94 100644
--- a/portal-manager-ui/admin/src/utils/commin.js
+++ b/portal-manager-ui/admin/src/utils/commin.js
@@ -1,41 +1,37 @@
-
-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
+// 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
diff --git a/portal-manager-ui/admin/src/utils/js/cookie.js b/portal-manager-ui/admin/src/utils/js/cookie.js
new file mode 100644
index 0000000000000000000000000000000000000000..7ec13567257d6b295da9d640840a7c667dc42bca
--- /dev/null
+++ b/portal-manager-ui/admin/src/utils/js/cookie.js
@@ -0,0 +1,74 @@
+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;
+ },
+};
diff --git a/portal-manager-ui/admin/src/utils/js/exportExcel.js b/portal-manager-ui/admin/src/utils/js/exportExcel.js
index 544bced5ac06c7169c9dced1c839e9ac52bef4e7..0b4ec1114e307375d5891ce79f907e8dce2e93d8 100644
--- a/portal-manager-ui/admin/src/utils/js/exportExcel.js
+++ b/portal-manager-ui/admin/src/utils/js/exportExcel.js
@@ -1,5 +1,7 @@
// 导出表格数据
-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(); //保存
};
diff --git a/portal-manager-ui/admin/src/views/home/home.vue b/portal-manager-ui/admin/src/views/home/home.vue
index 6a594fe3512b11d067aa1fbe8118e2d391f0132e..6a86304dc1f94e5789d8564df492ca2d378cdb84 100644
--- a/portal-manager-ui/admin/src/views/home/home.vue
+++ b/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;
diff --git a/portal-manager-ui/admin/src/views/signIn/signIn.vue b/portal-manager-ui/admin/src/views/signIn/signIn.vue
index d25e5a70399521045418b39d259481ce434977db..821ed0536a34a27fd66b55647dbdd509fb88b657 100644
--- a/portal-manager-ui/admin/src/views/signIn/signIn.vue
+++ b/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) => {
diff --git a/portal-manager-ui/admin/src/views/siteArrange/siteArrange.vue b/portal-manager-ui/admin/src/views/siteArrange/siteArrange.vue
index 2869b6dcfdfd7d6e36ea4fb57b3175831a87b40a..4c379ff479dfd8b6321b22cca035fd3f76d471ea 100644
--- a/portal-manager-ui/admin/src/views/siteArrange/siteArrange.vue
+++ b/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;
diff --git a/portal-manager-ui/admin/vue.config.js b/portal-manager-ui/admin/vue.config.js
index d9b78dafdb459817b085248521163c93857571db..5c2c18a9344476c0c70a6cc2dc8710cf7f27ec7b 100644
--- a/portal-manager-ui/admin/vue.config.js
+++ b/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,