From db5a6079c0405f1e014ea2c502b10d8879b0c14d Mon Sep 17 00:00:00 2001 From: zhouzy062 Date: Wed, 27 Mar 2024 14:10:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-ui/src/layout/components/Navbar.vue | 2 +- sgzb-ui/src/permission.js | 2 +- sgzb-ui/src/router/index.js | 1 + sgzb-ui/src/utils/request.js | 2 +- .../constructionSite/constructionSite.vue | 14 ++++++------- .../receive/receiveApplyAdd.vue | 4 ++-- .../claimAndRefund/receive/receiveOut.vue | 21 +++++++++++-------- sgzb-ui/vue.config.js | 9 ++++---- 8 files changed, 30 insertions(+), 25 deletions(-) diff --git a/sgzb-ui/src/layout/components/Navbar.vue b/sgzb-ui/src/layout/components/Navbar.vue index 9b9d77d0..6ee018f6 100644 --- a/sgzb-ui/src/layout/components/Navbar.vue +++ b/sgzb-ui/src/layout/components/Navbar.vue @@ -104,7 +104,7 @@ export default { }).then(() => { this.$store.dispatch('LogOut').then(() => { location.href = '/login'; - // location.href = '/gl/'; + // location.href = '/gl/login'; }) }).catch(() => {}); } diff --git a/sgzb-ui/src/permission.js b/sgzb-ui/src/permission.js index 885299e3..cb27f303 100644 --- a/sgzb-ui/src/permission.js +++ b/sgzb-ui/src/permission.js @@ -33,7 +33,7 @@ router.beforeEach((to, from, next) => { store.dispatch('LogOut').then(() => { Message.error(err) next({ path: '/login' }) - // next({ path: '/gl/' }) + // next({ path: '/gl/login' }) }) }) } else { diff --git a/sgzb-ui/src/router/index.js b/sgzb-ui/src/router/index.js index 5a36ba99..7d0a4c78 100644 --- a/sgzb-ui/src/router/index.js +++ b/sgzb-ui/src/router/index.js @@ -197,6 +197,7 @@ Router.prototype.replace = function push(location) { } export default new Router({ + // base:'/gl/', mode: 'history', // 去掉url中的# scrollBehavior: () => ({ y: 0 }), routes: constantRoutes diff --git a/sgzb-ui/src/utils/request.js b/sgzb-ui/src/utils/request.js index d77410ec..f0a9eb65 100644 --- a/sgzb-ui/src/utils/request.js +++ b/sgzb-ui/src/utils/request.js @@ -88,7 +88,7 @@ service.interceptors.response.use(res => { isRelogin.show = false; store.dispatch('LogOut').then(() => { location.href = '/login'; - // location.href = '/gl/'; + // location.href = '/gl/login'; }) }).catch(() => { isRelogin.show = false; diff --git a/sgzb-ui/src/views/claimAndRefund/constructionSite/constructionSite.vue b/sgzb-ui/src/views/claimAndRefund/constructionSite/constructionSite.vue index d73893af..a5147a34 100644 --- a/sgzb-ui/src/views/claimAndRefund/constructionSite/constructionSite.vue +++ b/sgzb-ui/src/views/claimAndRefund/constructionSite/constructionSite.vue @@ -20,8 +20,8 @@ > - - + + - + - + - + - + - + @@ -352,6 +351,11 @@ }) }); }, + /** 搜索按钮操作 */ + handleQuery() { + this.queryParams.pageNum = 1; + this.getList(); + }, /** 查询列表 */ getList() { this.loading = true; @@ -361,6 +365,9 @@ this.loading = false; } ); + }, + handleView(){ + }, // 取消按钮 cancel() { @@ -379,11 +386,7 @@ }; this.resetForm("nform"); }, - /** 搜索按钮操作 */ - handleQuery() { - this.queryParams.pageNum = 1; - this.getList(); - }, + handleDialogQuery() { this.dialogQuery.pageNum = 1; this.getDialogList(); diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js index fc0309fa..2cecc9fa 100644 --- a/sgzb-ui/vue.config.js +++ b/sgzb-ui/vue.config.js @@ -40,9 +40,9 @@ module.exports = { // target: `http://192.168.0.14:21624`,//线上环境/ // target: `http://1.12.248.179:23028`,//线上环境-南网 // target: `https://test-cc.zhgkxt.com`,//线上环境-南网 - // target: `https://z.csgmall.com.cn`, + target: `https://z.csgmall.com.cn`, - target: `http://10.40.92.8:8080`,//超 + // target: `http://10.40.92.8:8080`,//超 // target: `http://10.40.92.253:8080`,//韩 // target: `http://10.40.92.209:8080`,//川/ @@ -51,8 +51,9 @@ module.exports = { //更改 utils/globalUrl.js 内qrUrl地址 //2.打开view文件夹根目录dashboard.vue 更换大屏项目发布的跳转地址，打开大屏项目config/index.js更改请求地址，大屏打包node<16.0.0; //3.只有南网项目产线gl发布打包时候需要注意： - // 将 assetsDir:'static' 改为 assetsDir:'gl/static',还有env.development和env.production中的VUE_APP_BASE_API改为'/gl/dev-api';登录跳转地址从/login换成/gl/; - //4. 重庆环境的时候需要将新增领料申请跳转地址改为claimAndRefund/receive/receiveApplyAddByCq + // 将 publicPath:'static' 改为 '/gl/',还有env.development和env.production中的VUE_APP_BASE_API改为'/gl/dev-api'; + // 登录跳转地址从/login换成/gl/login; + //4. 重庆环境的时候需要将领料管理线上菜单修改 //******** 注意事项 ********* */ changeOrigin: true,