From 5b616a9363858ab3814a76e0a76622491396eb07 Mon Sep 17 00:00:00 2001 From: laozt <2721205210@qq.com> Date: Sat, 23 Dec 2023 09:45:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 4 ++-- src/views/components/AddDialog/tab1.vue | 5 +++-- src/views/components/AddDialog/tab2.vue | 3 ++- src/views/components/AddDialog/tab3.vue | 8 ++++++-- vue.config.js | 4 ++-- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.env.production b/.env.production index 84401d1..1dc3907 100644 --- a/.env.production +++ b/.env.production @@ -6,8 +6,8 @@ ENV = 'production' # 苏州市应急执法计划管理系统/生产环境 # VUE_APP_BASE_API = 'http://192.168.0.105:9033' -# VUE_APP_BASE_API = 'http://39.101.188.84:9033' -VUE_APP_BASE_API = 'http://180.108.205.123:13002' +VUE_APP_BASE_API = 'http://39.101.188.84:9033' +# VUE_APP_BASE_API = 'http://180.108.205.123:13002' # 统一登录-内网 VUE_APP_SSO_LOGIN_N = 'http://2.46.4.197:8090/sso-server/oauth2/sso?aid=17847210&cbu=http%3A%2F%2F180.108.205.123%3A13001%2F&response_type=code' diff --git a/src/views/components/AddDialog/tab1.vue b/src/views/components/AddDialog/tab1.vue index f5d8c6a..b18fb38 100644 --- a/src/views/components/AddDialog/tab1.vue +++ b/src/views/components/AddDialog/tab1.vue @@ -286,8 +286,9 @@ export default { if (userInfo.lawLevel == "县级" || userInfo.lawLevel == "镇级") { this.queryParams.district = userInfo.permissionCode; this.queryPlanEnterpriseParams.district = userInfo.permissionCode; + this.queryPlanEnterpriseParams.lawHierarchy = userInfo.userName; + } - this.getList(); this.getPlanEnterpriseList(); }, /** 查询计划企业列表 */ @@ -319,7 +320,7 @@ export default { this.formPlanEnterprise.lawSort = userInfo.lawSort; this.formPlanEnterprise.lawAreas = userInfo.lawAreas; this.formPlanEnterprise.lawLevel = userInfo.lawLevel; - this.formPlanEnterprise.lawHierarchy = userInfo.userName; + this.formPlanEnterprise.lawHierarchy = userInfo.nickName; this.formPlanEnterprise.plannedYear = this.$moment(new Date()).format( "yyyy" ); diff --git a/src/views/components/AddDialog/tab2.vue b/src/views/components/AddDialog/tab2.vue index 5bcb33a..9b412ec 100644 --- a/src/views/components/AddDialog/tab2.vue +++ b/src/views/components/AddDialog/tab2.vue @@ -286,6 +286,7 @@ export default { if (userInfo.lawLevel == "县级" || userInfo.lawLevel == "镇级") { this.queryParams.district = userInfo.permissionCode; this.queryPlanEnterpriseParams.district = userInfo.permissionCode; + this.queryPlanEnterpriseParams.lawHierarchy = userInfo.userName; } this.getList(); this.getPlanEnterpriseList(); @@ -319,7 +320,7 @@ export default { this.formPlanEnterprise.lawSort = userInfo.lawSort; this.formPlanEnterprise.lawAreas = userInfo.lawAreas; this.formPlanEnterprise.lawLevel = userInfo.lawLevel; - this.formPlanEnterprise.lawHierarchy = userInfo.userName; + this.formPlanEnterprise.lawHierarchy = userInfo.nickName; this.formPlanEnterprise.plannedYear = this.$moment(new Date()).format( "yyyy" ); diff --git a/src/views/components/AddDialog/tab3.vue b/src/views/components/AddDialog/tab3.vue index 72c9339..92087c3 100644 --- a/src/views/components/AddDialog/tab3.vue +++ b/src/views/components/AddDialog/tab3.vue @@ -148,8 +148,12 @@ export default { }, created() { this.$nextTick(() => { + // 查询条件 let userInfo = JSON.parse(sessionStorage.getItem("USER_INFO")); - this.queryParams.district = userInfo.permissionCode; + // if (userInfo.lawLevel == "县级" || userInfo.lawLevel == "镇级") { + this.queryParams.district = userInfo.permissionCode; + this.queryParams.lawHierarchy = userInfo.userName; + // } this.getList(); }); }, @@ -181,7 +185,7 @@ export default { this.$prompt("请输入月份", "编辑", { confirmButtonText: "确定", cancelButtonText: "取消", - inputValue: row.plannedMonth ? row.plannedMonth :plannedMonth, + inputValue: row.plannedMonth ? row.plannedMonth : plannedMonth, inputPlaceholder: "请输入1到12的数字", inputPattern: /^(1[0-2]|[1-9])$/, inputErrorMessage: "格式不正确", diff --git a/vue.config.js b/vue.config.js index ece6d59..d637a6e 100644 --- a/vue.config.js +++ b/vue.config.js @@ -25,8 +25,8 @@ module.exports = { // 部署生产环境和开发环境下的URL。 // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上 // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。 - // publicPath: process.env.NODE_ENV === "production" ? "/demo/suzhouyingjiPC/" : "/", - publicPath: process.env.NODE_ENV === "production" ? "/" : "/", + publicPath: process.env.NODE_ENV === "production" ? "/demo/suzhouyingjiPC/" : "/", + // publicPath: process.env.NODE_ENV === "production" ? "/" : "/", // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist） outputDir: "dist", // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）