From b135c3dd79ef7701e0d8273813caf053a15680af Mon Sep 17 00:00:00 2001 From: hyt <958868763@qq.com> Date: Tue, 21 May 2024 11:02:29 +0800 Subject: [PATCH] =?UTF-8?q?5.21=E4=BF=AE=E6=94=B9=E6=89=80=E6=9C=89?= =?UTF-8?q?=E5=B7=B2=E5=87=BA=E7=8E=B0=E7=9A=84bug=E5=92=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/base/baseLayout/index.vue | 2 +- src/components/base/baseNewLayout/index.vue | 4 +- .../base/baseOrganization/index.vue | 2 +- src/components/base/basePage/index.vue | 89 +- src/components/base/basePerson/index.vue | 7 +- src/layout/components/Sidebar/index.vue | 842 +++++++++--------- src/store/modules/permission.js | 7 - src/store/modules/user.js | 5 + src/utils/request.js | 542 +++++------ .../IntegratedProductManagement/index.vue | 4 +- .../index.vue | 4 +- src/views/applicationList/applicationAdd.vue | 207 +++-- .../dataSourceManagement/index.vue | 4 +- .../esbCenter/messageManagement/index.vue | 4 +- .../esbCenter/messageManagementLog/index.vue | 12 +- src/views/index_v2.vue | 7 +- .../contrast/baseContrastSelect.vue | 2 +- .../contrast/baseContrastSelect.vue | 2 +- src/views/integrationOptionV2/index.vue | 1 + .../compoments/baseNewSelect.vue | 2 +- src/views/intergrationOptionScene/index.vue | 2 +- .../compoments/baseNewSelect.vue | 2 +- .../intergrationTask/detailData/index.vue | 2 +- src/views/intergrationTask/monRightDialog.vue | 2 +- src/views/intergrationTask/monitoring.vue | 2 +- src/views/intergrationTask/taskAdd.vue | 2 +- src/views/login.vue | 2 + .../compoments/baseNewSelect.vue | 2 +- .../plugInOptions/rightDialog.vue | 4 +- .../compoments/baseLeftRightSelect.vue | 2 +- .../receiptsPage/compoments/baseNewSelect.vue | 2 +- .../buttonManagement/index.vue | 2 +- .../systemMaintenance/operationLog/index.vue | 2 +- .../roleJurisdiction/index.vue | 2 +- .../userJurisdiction/index.vue | 12 +- .../systemSettings/userManagement/index.vue | 2 +- .../PersonnelSettings/configData.js | 488 +++++----- .../userSettings/PersonnelSettings/index.vue | 3 + .../userSettings/roleSettings/index.vue | 6 +- .../userInformation/configData.js | 1 + .../userSettings/userInformation/index.vue | 4 +- 41 files changed, 1195 insertions(+), 1100 deletions(-) diff --git a/src/components/base/baseLayout/index.vue b/src/components/base/baseLayout/index.vue index ff30de7..e84327f 100644 --- a/src/components/base/baseLayout/index.vue +++ b/src/components/base/baseLayout/index.vue @@ -324,7 +324,7 @@ export default { pageModel: { total: 0, pageIndex: 1, - pageSize: 10, + pageSize: 100, }, // 清除状态 clearState: 0, diff --git a/src/components/base/baseNewLayout/index.vue b/src/components/base/baseNewLayout/index.vue index ff7e2db..98fa22c 100644 --- a/src/components/base/baseNewLayout/index.vue +++ b/src/components/base/baseNewLayout/index.vue @@ -410,7 +410,7 @@ export default { pageModel: { total: 0, page: 1, - limit: 20, + pageSize: 100, }, // 清除状态 clearState: 0, @@ -600,7 +600,7 @@ export default { } let page = { page: this.pageModel.page, - limit: this.pageModel.limit, + limit: this.pageModel.pageSize, }; for (let i in this.model) { if (!this.model[i]) { diff --git a/src/components/base/baseOrganization/index.vue b/src/components/base/baseOrganization/index.vue index 95975e9..e07bacb 100644 --- a/src/components/base/baseOrganization/index.vue +++ b/src/components/base/baseOrganization/index.vue @@ -36,7 +36,7 @@ - diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index 0621828..0a1e907 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -29,7 +29,6 @@ const permission = { name: 'applicationEdit', hidden: true, meta: { - title: '应用编辑', hidden: true } }, @@ -39,7 +38,6 @@ const permission = { name: 'exploit', hidden: true, meta: { - title: '开发管理', hidden: true } }, @@ -49,7 +47,6 @@ const permission = { name: 'authority', hidden: true, meta: { - title: '权限管理', hidden: true } @@ -59,7 +56,6 @@ const permission = { name: 'appApiAdmin', component: () => import('@/views/applicationList/apiList/apiAdmin'), meta: { - title: 'API管理', hidden: true } }, @@ -68,7 +64,6 @@ const permission = { name: 'inserterAdmin', component: () => import('@/views/applicationList/inserterAdmin'), meta: { - title: '插件管理', hidden: true } }, @@ -79,7 +74,6 @@ const permission = { hidden: 'true', component: () => import('@/views/applicationList/apiList/apiAdd'), meta: { - title: 'API新增' } }, @@ -89,7 +83,6 @@ const permission = { hidden: 'true', component: () => import('@/views/applicationList/apiList/apiView'), meta: { - title: 'API查看' } } ] diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 4cce30a..7e773b3 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -64,7 +64,11 @@ const user = { resolve(); }) .catch((error) => { + console.log(123) + // + commit("LogOut") reject(error); + }); }); }, @@ -98,6 +102,7 @@ const user = { // 退出系统 LogOut({ commit, state }) { + console.log("触发推出") return new Promise((resolve, reject) => { commit("SET_TOKEN", ""); commit("SET_ROLES", []); diff --git a/src/utils/request.js b/src/utils/request.js index 67c7e5d..3fdbcf5 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,298 +1,314 @@ -import axios from "axios"; +import axios from 'axios' import { - Notification, - MessageBox, - Message, - Loading -} from "element-ui"; -import store from "@/store"; + Notification, + MessageBox, + Message, + Loading +} from 'element-ui' +import store from '@/store' import { - getToken, - setToken, - removeCompanyId, - removeToken, - removeInfo, -} from "@/utils/auth"; -import errorCode from "@/utils/errorCode"; + getToken, + setToken, + removeCompanyId, + removeToken, + removeInfo +} from '@/utils/auth' +import errorCode from '@/utils/errorCode' import { - tansParams, - blobValidate -} from "@/utils/ruoyi"; + tansParams, + blobValidate +} from '@/utils/ruoyi' import { closeLoading, openLoading } from '@/utils/loading' -import cache from "@/plugins/cache"; +import cache from '@/plugins/cache' import { - saveAs -} from "file-saver"; -import route from "../router/index"; + saveAs +} from 'file-saver' +import route from '../router/index' // import configKey from '@/assets/js/configKey.js' -let downloadLoadingInstance; -let downloadLoadingAxios; +let downloadLoadingInstance +let downloadLoadingAxios // 是否显示重新登录 export let isRelogin = { - show: false, -}; -let timer = null; + show: false +} +let timer = null // 是否正在刷新的标记 -let isRefreshing = false; +let isRefreshing = false //重试队列 -let requests = []; +let requests = [] -axios.defaults.headers["Content-Type"] = "application/json;charset=utf-8"; +axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' // 创建axios实例 const service = axios.create({ - // axios中请求配置有baseURL选项，表示请求URL公共部分 - // baseURL:configKey.urlType?configKey.baseURL:process.env.VUE_APP_BASE_API, - baseURL: process.env.VUE_APP_BASE_API, - // baseURL: "http://192.168.2.240:8066/", - // 超时 - timeout: 2 * 60 * 1000, -}); + // axios中请求配置有baseURL选项，表示请求URL公共部分 + // baseURL:configKey.urlType?configKey.baseURL:process.env.VUE_APP_BASE_API, + baseURL: process.env.VUE_APP_BASE_API, + // baseURL: "http://192.168.2.240:8066/", + // 超时 + timeout: 2 * 60 * 1000 +}) // request拦截器 service.interceptors.request.use( - (config) => { - // do something bedocument.getElementById("")fore request is sent - // config.headers['secretkey'] = 'aQ+b2wGj1LuhR8N2O0aOmKlkjgnOyHSlZ0QUtZMP3dHkVkAGhJe37KOdmpexsE6W' //本机密钥 + (config) => { + // do something bedocument.getElementById("")fore request is sent + // config.headers['secretkey'] = 'aQ+b2wGj1LuhR8N2O0aOmKlkjgnOyHSlZ0QUtZMP3dHkVkAGhJe37KOdmpexsE6W' //本机密钥 - // config.headers['secretkey'] = 'm/Ah8KQ6IfWEv85KEoaHKf4SfwtemYtGkiuBabkQCnOuJ/+nyvqBLOVheirHN1TO' //本机密钥 - config.headers["secretkey"] = configKey.secretkey; + // config.headers['secretkey'] = 'm/Ah8KQ6IfWEv85KEoaHKf4SfwtemYtGkiuBabkQCnOuJ/+nyvqBLOVheirHN1TO' //本机密钥 + config.headers['secretkey'] = configKey.secretkey - // if (store.getters.token) { - // if (window.localStorage.userToken) { - let token = getToken(); - if (token) { - config.headers["token"] = token; - } + // if (store.getters.token) { + // if (window.localStorage.userToken) { + let token = getToken() + if (token) { + config.headers['token'] = token + } - if (config.url.indexOf('updateDto') != -1 || config.url.indexOf('saveDto') != -1) { - openLoading('submit') - } else if (config.url.indexOf('getById') != -1) { - openLoading('detail') - } else if (config.url.indexOf('deleteById') != -1) { - openLoading('del') - } else if (config.url.indexOf('changerState') != -1) { - openLoading('submit') - } + if (config.url.indexOf('updateDto') != -1 || config.url.indexOf('saveDto') != -1) { + openLoading('submit') + } else if (config.url.indexOf('getById') != -1) { + openLoading('detail') + } else if (config.url.indexOf('deleteById') != -1) { + openLoading('del') + } else if (config.url.indexOf('changerState') != -1) { + openLoading('submit') + } - // 生成请求的唯一标识符 - const requestIdentifier = `${config.url}-${config.method}`; - // 判断是否已存在相同的请求 - const isDuplicateRequest = requests.includes(requestIdentifier); - // 如果存在相同请求，取消当前请求 - if (isDuplicateRequest) { - // return Promise.reject(new Error("Duplicate request")); - } - // 将请求的唯一标识符添加到请求队列中 - requests.push(requestIdentifier); - // 设置计时器，在秒后移除请求的唯一标识符 - clearTimeout(timer); - timer = setTimeout(() => { - const index = requests.indexOf(requestIdentifier); - if (index !== -1) { - requests.splice(index, 1); // 移除请求的唯一标识符 - } - }, 2000); - return config; - }, + // 生成请求的唯一标识符 + const requestIdentifier = `${config.url}-${config.method}` + // 判断是否已存在相同的请求 + const isDuplicateRequest = requests.includes(requestIdentifier) + // 如果存在相同请求，取消当前请求 + if (isDuplicateRequest) { + // return Promise.reject(new Error("Duplicate request")); + } + // 将请求的唯一标识符添加到请求队列中 + requests.push(requestIdentifier) + // 设置计时器，在秒后移除请求的唯一标识符 + clearTimeout(timer) + timer = setTimeout(() => { + const index = requests.indexOf(requestIdentifier) + if (index !== -1) { + requests.splice(index, 1) // 移除请求的唯一标识符 + } + }, 2000) + return config + }, - (error) => { - // do something with request error - // 请求发生错误时清除唯一标识符 - const requestIdentifier = `${error.config.url}-${error.config.method}`; - const index = requests.indexOf(requestIdentifier); - if (index !== -1) { - requests.splice(index, 1); // 清除唯一标识符 - } - return Promise.reject(error); - } -); + (error) => { + // do something with request error + // 请求发生错误时清除唯一标识符 + const requestIdentifier = `${error.config.url}-${error.config.method}` + const index = requests.indexOf(requestIdentifier) + if (index !== -1) { + requests.splice(index, 1) // 清除唯一标识符 + } + return Promise.reject(error) + } +) // 响应拦截器 service.interceptors.response.use( - (res) => { - // 请求完成时清除唯一标识符 - const requestIdentifier = `${res.config.url}-${res.config.method}`; - const index = requests.indexOf(requestIdentifier); - if (index !== -1) { - requests.splice(index, 1); // 清除唯一标识符 - } - // downloadLoadingAxios.close() - // 未设置状态码则默认成功状态 - const code = res.data.status || '200'; - // 获取错误信息 - const msg = res.data.msg; - closeLoading(); - // 二进制数据则直接返回 - if ( - res.request.responseType === "blob" || - res.request.responseType === "arraybuffer" - ) { - return res.data; - } + (res) => { + console.log(res, '相应拦截器拦截内容') + // 请求完成时清除唯一标识符 + const requestIdentifier = `${res.config.url}-${res.config.method}` + const index = requests.indexOf(requestIdentifier) + if (index !== -1) { + requests.splice(index, 1) // 清除唯一标识符 + } + // downloadLoadingAxios.close() + // 未设置状态码则默认成功状态 + const code = res.data.status || '200' + // 获取错误信息 + const msg = res.data.msg + closeLoading() + // 二进制数据则直接返回 + if ( + res.request.responseType === 'blob' || + res.request.responseType === 'arraybuffer' + ) { + return res.data + } - if (code === '500') { - MessageBox.confirm(msg, "系统提示", { - confirmButtonText: "确定", - showCancelButton: false, - showClose: false, - closeOnClickModal: false, - closeOnPressEscape: false, - type: "error", - }) - .then(() => { - if (msg === 'token无效') { - store.dispatch('LogOut').then(() => { - route.replace({ - path: "/login" - });; - }) - } + if (code === '500') { + MessageBox.confirm(msg, '系统提示', { + confirmButtonText: '确定', + showCancelButton: false, + showClose: false, + closeOnClickModal: false, + closeOnPressEscape: false, + type: 'error' + }) + .then(() => { + console.log(res, '相应拦截器拦截内容') + if (msg === 'token无效') { + store.dispatch('LogOut').then(() => { + route.replace({ + path: '/login' + }) - }) - .catch(() => { }); - return Promise.reject(new Error(msg)); - } else if (code == '1002') { + }) + } + if (res.config.headers.dj==='queryTreeById') { + store.dispatch('LogOut').then(() => { + route.replace({ + path: '/login' + }) - MessageBox.confirm(msg, "系统提示", { - confirmButtonText: "确定", - showCancelButton: false, - showClose: false, - closeOnClickModal: false, - closeOnPressEscape: false, - type: "error", - }) - .then(() => { - store.dispatch('LogOut').then(() => { - route.replace({ - path: "/login" - });; - }) - }) - .catch(() => { }); - } else if (code !== '200') { + }) + } - MessageBox.confirm(msg, "系统提示", { - confirmButtonText: "确定", - showCancelButton: false, - showClose: false, - closeOnClickModal: false, - closeOnPressEscape: false, - type: "error", - }) - .then(() => { }) - .catch(() => { }); - return Promise.reject("error"); - } else { - return res.data; - } - }, - (error) => { - let response = error.response; - closeLoading(); - // downloadLoadingAxios.close() - // if (response.status == 401) { - // if (response.data.code == 1002) { - // if (!isRefreshing) { - // isRefreshing = true; - // setToken(response.data.data[0]); - // response.headers.token = response.data.data[0]; - // // token 刷新后将数组的方法重新执行 - // requests.forEach((cb) => cb(token)); - // requests = []; // 重新请求完清空 - // return service(response.config); - // isRefreshing = false; - // } else { - // // 返回未执行 resolve 的 Promise - // return new Promise((resolve) => { - // // 用函数形式将 resolve 存入，等待刷新后再执行 - // requests.push((token) => { - // response.headers.token = `${token}`; - // resolve(service(response.config)); - // }); - // }); - // } - // return response && response.data; - // } else { - // Message({ - // message: response.data.message, - // type: "error", - // showClose: true, - // duration: 0, - // }); - // if (response.data.code == -1) {} else { - // store.dispatch("LogOut").then(() => { - // route.replace({ - // path: "/login", - // }); - // }); - // } - // } - // } else { - // let { - // message - // } = error; - // if (message == "Network Error") { - // message = "后端接口连接异常"; - // } else if (message.includes("timeout")) { - // message = "系统接口请求超时"; - // } else if (message.includes("Request failed with status code")) { - // message = "系统接口" + message.substr(message.length - 3) + "异常"; - // } - // MessageBox.confirm(message, "系统提示", { - // confirmButtonText: "确定", - // showCancelButton: false, - // showClose: false, - // closeOnClickModal: false, - // closeOnPressEscape: false, - // type: "error", - // }) - // .then(() => {}) - // .catch(() => {}); - // } + }) + .catch(() => { + }) + return Promise.reject(new Error(msg)) + } else if (code == '1002') { - return Promise.reject(error); - } -); + MessageBox.confirm(msg, '系统提示', { + confirmButtonText: '确定', + showCancelButton: false, + showClose: false, + closeOnClickModal: false, + closeOnPressEscape: false, + type: 'error' + }) + .then(() => { + store.dispatch('LogOut').then(() => { + route.replace({ + path: '/login' + }) + + }) + }) + .catch(() => { + }) + } else if (code !== '200') { + + MessageBox.confirm(msg, '系统提示', { + confirmButtonText: '确定', + showCancelButton: false, + showClose: false, + closeOnClickModal: false, + closeOnPressEscape: false, + type: 'error' + }) + .then(() => { + }) + .catch(() => { + }) + return Promise.reject('error') + } else { + return res.data + } + }, + (error) => { + let response = error.response + closeLoading() + // downloadLoadingAxios.close() + // if (response.status == 401) { + // if (response.data.code == 1002) { + // if (!isRefreshing) { + // isRefreshing = true; + // setToken(response.data.data[0]); + // response.headers.token = response.data.data[0]; + // // token 刷新后将数组的方法重新执行 + // requests.forEach((cb) => cb(token)); + // requests = []; // 重新请求完清空 + // return service(response.config); + // isRefreshing = false; + // } else { + // // 返回未执行 resolve 的 Promise + // return new Promise((resolve) => { + // // 用函数形式将 resolve 存入，等待刷新后再执行 + // requests.push((token) => { + // response.headers.token = `${token}`; + // resolve(service(response.config)); + // }); + // }); + // } + // return response && response.data; + // } else { + // Message({ + // message: response.data.message, + // type: "error", + // showClose: true, + // duration: 0, + // }); + // if (response.data.code == -1) {} else { + // store.dispatch("LogOut").then(() => { + // route.replace({ + // path: "/login", + // }); + // }); + // } + // } + // } else { + // let { + // message + // } = error; + // if (message == "Network Error") { + // message = "后端接口连接异常"; + // } else if (message.includes("timeout")) { + // message = "系统接口请求超时"; + // } else if (message.includes("Request failed with status code")) { + // message = "系统接口" + message.substr(message.length - 3) + "异常"; + // } + // MessageBox.confirm(message, "系统提示", { + // confirmButtonText: "确定", + // showCancelButton: false, + // showClose: false, + // closeOnClickModal: false, + // closeOnPressEscape: false, + // type: "error", + // }) + // .then(() => {}) + // .catch(() => {}); + // } + + return Promise.reject(error) + } +) // 通用下载方法 export function download(url, params, filename, config) { - downloadLoadingInstance = Loading.service({ - text: "正在下载数据，请稍候", - spinner: "el-icon-loading", - background: "rgba(0, 0, 0, 0.7)", - }); - return service - .post(url, params, { - transformRequest: [ - (params) => { - return tansParams(params); - }, - ], - headers: { - "Content-Type": "application/x-www-form-urlencoded", - }, - responseType: "blob", - ...config, - }) - .then(async (data) => { - const isLogin = await blobValidate(data); - if (isLogin) { - const blob = new Blob([data]); - saveAs(blob, filename); - } else { - const resText = await data.text(); - const rspObj = JSON.parse(resText); - const errMsg = - errorCode[rspObj.code] || rspObj.msg || errorCode["default"]; - Message.error(errMsg); - } - downloadLoadingInstance.close(); - }) - .catch((r) => { - Message.error("下载文件出现错误，请联系管理员！"); - downloadLoadingInstance.close(); - }); + downloadLoadingInstance = Loading.service({ + text: '正在下载数据，请稍候', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }) + return service + .post(url, params, { + transformRequest: [ + (params) => { + return tansParams(params) + } + ], + headers: { + 'Content-Type': 'application/x-www-form-urlencoded' + }, + responseType: 'blob', + ...config + }) + .then(async(data) => { + const isLogin = await blobValidate(data) + if (isLogin) { + const blob = new Blob([data]) + saveAs(blob, filename) + } else { + const resText = await data.text() + const rspObj = JSON.parse(resText) + const errMsg = + errorCode[rspObj.code] || rspObj.msg || errorCode['default'] + Message.error(errMsg) + } + downloadLoadingInstance.close() + }) + .catch((r) => { + Message.error('下载文件出现错误，请联系管理员！') + downloadLoadingInstance.close() + }) } -export default service; +export default service diff --git a/src/views/applicationIntegration/IntegratedProductManagement/index.vue b/src/views/applicationIntegration/IntegratedProductManagement/index.vue index aa4666e..f7b2eb4 100644 --- a/src/views/applicationIntegration/IntegratedProductManagement/index.vue +++ b/src/views/applicationIntegration/IntegratedProductManagement/index.vue @@ -99,7 +99,7 @@ export default { tableData: [], //表格数据 pageModel: { pageNum: 1, - pageSize: 10, + pageSize: 100, }, queryModel: { code: "", @@ -225,4 +225,4 @@ export default { color: #409eff; cursor: pointer; } - \ No newline at end of file + diff --git a/src/views/applicationIntegration/applicationConfigurationManagement/index.vue b/src/views/applicationIntegration/applicationConfigurationManagement/index.vue index 33916e8..fb40c02 100644 --- a/src/views/applicationIntegration/applicationConfigurationManagement/index.vue +++ b/src/views/applicationIntegration/applicationConfigurationManagement/index.vue @@ -107,7 +107,7 @@ export default { tableData: [], //表格数据 pageModel: { pageNum: 1, - pageSize: 10, + pageSize: 100, }, queryModel: { code: "", @@ -244,4 +244,4 @@ export default { color: #409eff; cursor: pointer; } - \ No newline at end of file + diff --git a/src/views/applicationList/applicationAdd.vue b/src/views/applicationList/applicationAdd.vue index 823abe7..c647311 100644 --- a/src/views/applicationList/applicationAdd.vue +++ b/src/views/applicationList/applicationAdd.vue @@ -5,19 +5,25 @@
返回 + " + >返回 +
保存
-
+
应用信息
应用logo
- +
@@ -40,40 +46,44 @@
- +
- +
\ No newline at end of file + diff --git a/src/views/esbCenter/messageManagement/index.vue b/src/views/esbCenter/messageManagement/index.vue index c5ee1d4..97b8011 100644 --- a/src/views/esbCenter/messageManagement/index.vue +++ b/src/views/esbCenter/messageManagement/index.vue @@ -102,7 +102,7 @@ export default { tableData: [], //表格数据 pageModel: { pageNum: 1, - pageSize: 10, + pageSize: 100, }, queryModel: { theme: "", //消息主题 @@ -246,4 +246,4 @@ export default { color: #409eff; cursor: pointer; } - \ No newline at end of file + diff --git a/src/views/esbCenter/messageManagementLog/index.vue b/src/views/esbCenter/messageManagementLog/index.vue index cf29efb..d935ea7 100644 --- a/src/views/esbCenter/messageManagementLog/index.vue +++ b/src/views/esbCenter/messageManagementLog/index.vue @@ -130,13 +130,13 @@ export default { tableData: [], //表格数据 pageModel: { pageNum: 1, - pageSize: 10, + pageSize: 100, }, queryModel: { - theme: "", - sendApp: "", - sendApi: "", - receiveApp: "", + theme: "", + sendApp: "", + sendApi: "", + receiveApp: "", receiveApi: "", status: "", }, @@ -285,4 +285,4 @@ export default { color: #409eff; cursor: pointer; } - \ No newline at end of file + diff --git a/src/views/index_v2.vue b/src/views/index_v2.vue index 7dd0b99..7156522 100644 --- a/src/views/index_v2.vue +++ b/src/views/index_v2.vue @@ -281,10 +281,11 @@ export default { margin-right: 20px; width: 5vw; height: 100%; - + box-shadow: 0 0 10px rgba(0, 0, 0, 0.2); img { width: 5vw; height: 7vh; + } } @@ -321,6 +322,7 @@ export default { overflow: hidden; display: flex; align-items: center; + box-shadow: 0 0 10px rgba(0, 0, 0, 0.2); img { width: 100%; } @@ -395,6 +397,7 @@ export default { align-items: center; justify-content: center; img { + box-shadow: 0 0 10px rgba(0, 0, 0, 0.2); width: 3vw; } } @@ -425,7 +428,7 @@ export default { font-weight: 700; flex-direction: column; align-items: center; - font-size: 34px; + font-size: 30px; color: #fff; .text{ margin-top: 5vh; diff --git a/src/views/integrationOption/compoments/contrast/baseContrastSelect.vue b/src/views/integrationOption/compoments/contrast/baseContrastSelect.vue index 0e7d1f5..42d1639 100644 --- a/src/views/integrationOption/compoments/contrast/baseContrastSelect.vue +++ b/src/views/integrationOption/compoments/contrast/baseContrastSelect.vue @@ -242,7 +242,7 @@ export default { journalingType: this.journalingType, names: val, pageNum: this.pageModel.pageIndex, - pageSize: 10, + pageSize: 100, ...obj, ...this.tempObj, }); diff --git a/src/views/integrationOptionV2/compoments/contrast/baseContrastSelect.vue b/src/views/integrationOptionV2/compoments/contrast/baseContrastSelect.vue index 0e7d1f5..42d1639 100644 --- a/src/views/integrationOptionV2/compoments/contrast/baseContrastSelect.vue +++ b/src/views/integrationOptionV2/compoments/contrast/baseContrastSelect.vue @@ -242,7 +242,7 @@ export default { journalingType: this.journalingType, names: val, pageNum: this.pageModel.pageIndex, - pageSize: 10, + pageSize: 100, ...obj, ...this.tempObj, }); diff --git a/src/views/integrationOptionV2/index.vue b/src/views/integrationOptionV2/index.vue index a1c2f0f..055952b 100644 --- a/src/views/integrationOptionV2/index.vue +++ b/src/views/integrationOptionV2/index.vue @@ -285,6 +285,7 @@ export default { // } // }) //主表处理 + console.log(res,'res') res.attribute.listList.forEach(item => { this.mainTableName = item.dbName item.ruleList.forEach(ele => { diff --git a/src/views/intergrationOptionScene/compoments/baseNewSelect.vue b/src/views/intergrationOptionScene/compoments/baseNewSelect.vue index 59e717a..ca091a9 100644 --- a/src/views/intergrationOptionScene/compoments/baseNewSelect.vue +++ b/src/views/intergrationOptionScene/compoments/baseNewSelect.vue @@ -252,7 +252,7 @@ export default { journalingType: this.journalingType, apiName: val, pageNum: this.pageModel.pageIndex, - pageSize: 10, + pageSize: 100, ...obj, ...this.tempObj, ...this.apiBody, diff --git a/src/views/intergrationOptionScene/index.vue b/src/views/intergrationOptionScene/index.vue index 1254fd1..68e0ade 100644 --- a/src/views/intergrationOptionScene/index.vue +++ b/src/views/intergrationOptionScene/index.vue @@ -245,7 +245,7 @@ export default { }, { pageNum: index, - pageSize: 10, + pageSize: 100, ...obj, } ); diff --git a/src/views/intergrationTask/compoments/baseNewSelect.vue b/src/views/intergrationTask/compoments/baseNewSelect.vue index fc789a8..d222cac 100644 --- a/src/views/intergrationTask/compoments/baseNewSelect.vue +++ b/src/views/intergrationTask/compoments/baseNewSelect.vue @@ -253,7 +253,7 @@ export default { journalingType: this.journalingType, names: val, pageNum: this.pageModel.pageIndex, - pageSize: 10, + pageSize: 100, ...obj, ...this.tempObj, ...this.apiBody, diff --git a/src/views/intergrationTask/detailData/index.vue b/src/views/intergrationTask/detailData/index.vue index 78be883..778f480 100644 --- a/src/views/intergrationTask/detailData/index.vue +++ b/src/views/intergrationTask/detailData/index.vue @@ -68,7 +68,7 @@ export default { label: '任务名称' }, { - prop: 'taskId', + prop: 'taskCode', label: '任务编码' }, { diff --git a/src/views/intergrationTask/monRightDialog.vue b/src/views/intergrationTask/monRightDialog.vue index 2754c2d..ac55955 100644 --- a/src/views/intergrationTask/monRightDialog.vue +++ b/src/views/intergrationTask/monRightDialog.vue @@ -280,7 +280,7 @@ export default { elCol: [ { label: "运行次数", - prop: "`runNum", + prop: "runNum", tag: "elInput", disabled:true, }, diff --git a/src/views/intergrationTask/monitoring.vue b/src/views/intergrationTask/monitoring.vue index e00a2b5..f1695dd 100644 --- a/src/views/intergrationTask/monitoring.vue +++ b/src/views/intergrationTask/monitoring.vue @@ -67,7 +67,7 @@ export default { label: '任务名称' }, { - prop: 'taskId', + prop: 'taskCode', label: '任务编码' }, { diff --git a/src/views/intergrationTask/taskAdd.vue b/src/views/intergrationTask/taskAdd.vue index 082b2e2..a931566 100644 --- a/src/views/intergrationTask/taskAdd.vue +++ b/src/views/intergrationTask/taskAdd.vue @@ -673,7 +673,7 @@ export default { if (res.status == 200) { this.ruleForm = res.attribute console.log(res) - this.formRow[0].elCol[1].disabled = true + this.formRow[0].elCol[1].disabled = false const res2 = await authApi('sysApplicationPluginService', '', 'queryEntity', '', { appId: res.attribute.taskApp }) diff --git a/src/views/login.vue b/src/views/login.vue index 4a273a4..75a99fa 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -255,6 +255,7 @@ export default { this.$store .dispatch("Login", this.loginForm) .then(() => { + this.loading = false; this.$router .push({ path: this.redirect || "/", @@ -263,6 +264,7 @@ export default { }) .catch(() => { this.loading = false; + console.log(123,'123') }); } }); diff --git a/src/views/masterDataOptions/compoments/baseNewSelect.vue b/src/views/masterDataOptions/compoments/baseNewSelect.vue index fc789a8..d222cac 100644 --- a/src/views/masterDataOptions/compoments/baseNewSelect.vue +++ b/src/views/masterDataOptions/compoments/baseNewSelect.vue @@ -253,7 +253,7 @@ export default { journalingType: this.journalingType, names: val, pageNum: this.pageModel.pageIndex, - pageSize: 10, + pageSize: 100, ...obj, ...this.tempObj, ...this.apiBody, diff --git a/src/views/newIntegrationTask/plugInOptions/rightDialog.vue b/src/views/newIntegrationTask/plugInOptions/rightDialog.vue index fbf2a47..0e1f743 100644 --- a/src/views/newIntegrationTask/plugInOptions/rightDialog.vue +++ b/src/views/newIntegrationTask/plugInOptions/rightDialog.vue @@ -168,6 +168,7 @@ export default { res.attribute.forEach(item=>{ this.$set(this.select_dist,item.pluginId,item) }) + console.log(res.attribute,'res.attribute插件返回') this.formRow[0].elCol[0].options = res.attribute } }, @@ -274,7 +275,7 @@ export default { return true } if(!item.argCode){ - this.$vmNews("参数编码") + this.$vmNews("请输入参数编码") return true } }) @@ -338,6 +339,7 @@ export default { params ); if (res.status == "200") { + console.log(res.attribute,'res.attribute123') this.formRow[1].elCol[0].options = res.attribute; } }, diff --git a/src/views/receiptsPage/compoments/baseLeftRightSelect.vue b/src/views/receiptsPage/compoments/baseLeftRightSelect.vue index 94ed525..06a96f0 100644 --- a/src/views/receiptsPage/compoments/baseLeftRightSelect.vue +++ b/src/views/receiptsPage/compoments/baseLeftRightSelect.vue @@ -279,7 +279,7 @@ export default { journalingType: this.journalingType, names: val, pageNum: this.pageModel.pageIndex, - pageSize: 10, + pageSize: 100, } ); this.selLoading = false; diff --git a/src/views/receiptsPage/compoments/baseNewSelect.vue b/src/views/receiptsPage/compoments/baseNewSelect.vue index b778c1e..17b21d6 100644 --- a/src/views/receiptsPage/compoments/baseNewSelect.vue +++ b/src/views/receiptsPage/compoments/baseNewSelect.vue @@ -216,7 +216,7 @@ export default { journalingType: this.journalingType, names: val, pageNum: this.pageModel.pageIndex, - pageSize: 10, + pageSize: 100, } ); this.selLoading = false; diff --git a/src/views/systemMaintenance/buttonManagement/index.vue b/src/views/systemMaintenance/buttonManagement/index.vue index 39df0d2..024105f 100644 --- a/src/views/systemMaintenance/buttonManagement/index.vue +++ b/src/views/systemMaintenance/buttonManagement/index.vue @@ -103,7 +103,7 @@ export default { menuData: [], formdata: {}, pageModel: { - pageSize: 20, + pageSize: 100, menuId: '', pageNum: 1 }, diff --git a/src/views/systemMaintenance/operationLog/index.vue b/src/views/systemMaintenance/operationLog/index.vue index a6ab398..d8f2897 100644 --- a/src/views/systemMaintenance/operationLog/index.vue +++ b/src/views/systemMaintenance/operationLog/index.vue @@ -37,7 +37,7 @@ export default { pageModel: { total: 10, pageNum: 1, - pageSize: 10, + pageSize: 100, }, } }, diff --git a/src/views/systemSettings/jurisdictionManage/roleJurisdiction/index.vue b/src/views/systemSettings/jurisdictionManage/roleJurisdiction/index.vue index 7740757..668aaff 100644 --- a/src/views/systemSettings/jurisdictionManage/roleJurisdiction/index.vue +++ b/src/views/systemSettings/jurisdictionManage/roleJurisdiction/index.vue @@ -97,7 +97,7 @@ export default { ], pageModel: { pageNum: 1, - pageSize: 20, + pageSize: 100, departmentID: "", Sequence: "", SequenceName: "", diff --git a/src/views/systemSettings/jurisdictionManage/userJurisdiction/index.vue b/src/views/systemSettings/jurisdictionManage/userJurisdiction/index.vue index 23231ce..a53acd6 100644 --- a/src/views/systemSettings/jurisdictionManage/userJurisdiction/index.vue +++ b/src/views/systemSettings/jurisdictionManage/userJurisdiction/index.vue @@ -18,6 +18,10 @@ @radioChange="userRadioChange" :slotrow="true" :tableHeight="tableHeight" :tableData="tableData" :tableColumn="tableColumn" > + +
@@ -49,7 +53,7 @@