From aaa116813c0bfb8339173835b95a20b532a6680c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=8A=B2=E9=BE=99?= <2860996570@qq.com> Date: Tue, 10 Dec 2024 14:32:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=99=BE=E5=88=86?= =?UTF-8?q?=E6=AF=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/auditPages/taskManagement/info.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/auditPages/taskManagement/info.vue b/src/views/auditPages/taskManagement/info.vue index b38ef37..1ec90c5 100644 --- a/src/views/auditPages/taskManagement/info.vue +++ b/src/views/auditPages/taskManagement/info.vue @@ -622,7 +622,7 @@ export default { }, tooltip: { trigger: 'item', - formatter: '{b}：{c}条({d}%)' + formatter: '{b}：{c}-({d}%)' }, series: [ { From bb5202bc7401fdbc0cc6f57b55efdbfed845cd46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=8A=B2=E9=BE=99?= <2860996570@qq.com> Date: Wed, 11 Dec 2024 11:15:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 4 ++-- src/views/auditPages/taskManagement/index.vue | 4 ++-- src/views/auditPages/taskManagement/info.vue | 2 +- src/views/unitPages/myTask/index.vue | 2 +- src/views/unitPages/myTask/info.vue | 1 + vue.config.js | 4 ++-- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.env.production b/.env.production index cd2ab4f..cb19d1b 100644 --- a/.env.production +++ b/.env.production @@ -5,5 +5,5 @@ VUE_APP_TITLE = 太仓资产管理系统 ENV = 'production' # 若依管理系统/生产环境 -# VUE_APP_BASE_API = 'http://39.101.188.84:9115' -VUE_APP_BASE_API = 'http://20.1.0.164/api' +VUE_APP_BASE_API = 'http://39.101.188.84:9115' +# VUE_APP_BASE_API = 'http://20.1.0.164/api' diff --git a/src/views/auditPages/taskManagement/index.vue b/src/views/auditPages/taskManagement/index.vue index 5e9a4ae..02d50c3 100644 --- a/src/views/auditPages/taskManagement/index.vue +++ b/src/views/auditPages/taskManagement/index.vue @@ -14,7 +14,7 @@ - + @@ -436,7 +436,7 @@ export default { type: 'warning' }).then(() => { - assetTaskclose({ taskId: row.id }).then(res => { + assetTaskclose({ taskId: row.id,taskName:row.taskName }).then(res => { if (res.code == 200) { this.$message({ type: 'success', diff --git a/src/views/auditPages/taskManagement/info.vue b/src/views/auditPages/taskManagement/info.vue index 1ec90c5..639c4d9 100644 --- a/src/views/auditPages/taskManagement/info.vue +++ b/src/views/auditPages/taskManagement/info.vue @@ -456,6 +456,7 @@ export default { taskstatus(id) { if (id) { let obj = { + 0:"已关闭", 1: "进行中", 2: "正常完成", 3: "超期完成", 4: "正常完成", 5: "审核驳回" } @@ -618,7 +619,6 @@ export default { }, toolbox: { show: true, - }, tooltip: { trigger: 'item', diff --git a/src/views/unitPages/myTask/index.vue b/src/views/unitPages/myTask/index.vue index 2d9ce93..b1584f2 100644 --- a/src/views/unitPages/myTask/index.vue +++ b/src/views/unitPages/myTask/index.vue @@ -18,7 +18,7 @@ - + diff --git a/src/views/unitPages/myTask/info.vue b/src/views/unitPages/myTask/info.vue index d56fce5..5970804 100644 --- a/src/views/unitPages/myTask/info.vue +++ b/src/views/unitPages/myTask/info.vue @@ -372,6 +372,7 @@ export default { taskstatus(id) { if (id) { let obj = { + 0:"已关闭", 1: "进行中", 2: "正常完成", 3: "超期完成", 4: "正常完成", 5: "审核驳回" } diff --git a/vue.config.js b/vue.config.js index b553e8e..45eac87 100644 --- a/vue.config.js +++ b/vue.config.js @@ -18,8 +18,8 @@ module.exports = { // 部署生产环境和开发环境下的URL。 // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上 // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。 - // publicPath: process.env.NODE_ENV === "production" ? "/demo/TcAssetVerificationPc" : "/", - publicPath: process.env.NODE_ENV === "production" ? "./" : "/", + publicPath: process.env.NODE_ENV === "production" ? "/demo/TcAssetVerificationPc" : "/", + // publicPath: process.env.NODE_ENV === "production" ? "./" : "/", // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist） outputDir: 'dist', // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）