From b227fadf9e929a6806bcdd491aed8d09b4d9bd5d Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Wed, 28 Aug 2024 17:08:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD=20?=
=?UTF-8?q?=E5=A4=A7=E7=BA=B2=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/common.js | 9 +++++++
src/utils/common.js | 7 ++++++
src/views/daily/components/viewInfo.vue | 4 ++--
src/views/daily/components/viewUpInfo.vue | 2 +-
.../dashboard/components/showArticle.vue | 2 +-
.../components/showDashboardArticle.vue | 4 ++--
.../lawsfile/index/components/viewInfo.vue | 4 ++--
.../task/list/components/addBackPlan.vue | 4 ++--
src/views/task/list/components/checkUnit.vue | 6 ++---
.../task/list/components/showBackPlan.vue | 8 +++----
src/views/task/list/outline.vue | 24 +++++++++++++++++--
vue.config.js | 2 +-
12 files changed, 56 insertions(+), 20 deletions(-)
diff --git a/src/api/common.js b/src/api/common.js
index cbeb700..f8a3e01 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -20,3 +20,12 @@ export function listCommonuser(params) {
params:params
})
}
+
+export function downLoadFile(params) {
+ return request({
+ url: 'api/admin/download-file',
+ method: 'get',
+ params:params
+ })
+}
+
diff --git a/src/utils/common.js b/src/utils/common.js
index 6a7e618..16a1e52 100644
--- a/src/utils/common.js
+++ b/src/utils/common.js
@@ -1,4 +1,11 @@
+import {
+ getToken
+} from '@/utils/auth'
let base = {
+ downLoadFileUrl(id){
+ window.open(process.env.VUE_APP_BASE_API + 'api/admin/download-file?id='+id+'&token='+getToken(),'_blank')
+ // return process.env.VUE_APP_BASE_API + 'api/admin/download-file?id='+id+'&token='+getToken()
+ },
isPhone (val) {
return /^[1][3,4,5,6,7,8,9][0-9]{9}$/.test(val)
},
diff --git a/src/views/daily/components/viewInfo.vue b/src/views/daily/components/viewInfo.vue
index 49f1e7c..56d4b5d 100644
--- a/src/views/daily/components/viewInfo.vue
+++ b/src/views/daily/components/viewInfo.vue
@@ -29,8 +29,8 @@
type="primary">
预览
-
- 下载
+
+ 下载
diff --git a/src/views/daily/components/viewUpInfo.vue b/src/views/daily/components/viewUpInfo.vue
index fbbbb18..2809caa 100644
--- a/src/views/daily/components/viewUpInfo.vue
+++ b/src/views/daily/components/viewUpInfo.vue
@@ -21,7 +21,7 @@
type="primary">
预览
-
+
下载
diff --git a/src/views/dashboard/components/showArticle.vue b/src/views/dashboard/components/showArticle.vue
index 6910d00..b47b3de 100644
--- a/src/views/dashboard/components/showArticle.vue
+++ b/src/views/dashboard/components/showArticle.vue
@@ -53,7 +53,7 @@
type="primary">
预览
-
+
下载
{{item.files.original_name}}
diff --git a/src/views/dashboard/components/showDashboardArticle.vue b/src/views/dashboard/components/showDashboardArticle.vue
index ec82a80..80f235d 100644
--- a/src/views/dashboard/components/showDashboardArticle.vue
+++ b/src/views/dashboard/components/showDashboardArticle.vue
@@ -18,8 +18,8 @@
type="primary">
预览
-
- 下载
+
+ 下载
{{item.original_name}}
diff --git a/src/views/lawsfile/index/components/viewInfo.vue b/src/views/lawsfile/index/components/viewInfo.vue
index cd03b99..a7fe675 100644
--- a/src/views/lawsfile/index/components/viewInfo.vue
+++ b/src/views/lawsfile/index/components/viewInfo.vue
@@ -28,8 +28,8 @@
type="primary">
预览
-
- 下载
+
+ 下载
diff --git a/src/views/task/list/components/addBackPlan.vue b/src/views/task/list/components/addBackPlan.vue
index da8ca22..6b99898 100644
--- a/src/views/task/list/components/addBackPlan.vue
+++ b/src/views/task/list/components/addBackPlan.vue
@@ -46,8 +46,8 @@
预览
-
- 下载
+
+ 下载
diff --git a/src/views/task/list/components/checkUnit.vue b/src/views/task/list/components/checkUnit.vue
index 5810e9f..cc492bf 100644
--- a/src/views/task/list/components/checkUnit.vue
+++ b/src/views/task/list/components/checkUnit.vue
@@ -44,7 +44,7 @@
预览
-
+
下载
@@ -173,7 +173,7 @@
预览
-
+
下载
@@ -238,7 +238,7 @@
预览
-
+
下载
diff --git a/src/views/task/list/components/showBackPlan.vue b/src/views/task/list/components/showBackPlan.vue
index 05c8234..4bfaaa8 100644
--- a/src/views/task/list/components/showBackPlan.vue
+++ b/src/views/task/list/components/showBackPlan.vue
@@ -42,7 +42,7 @@
预览
-
+
下载
@@ -118,7 +118,7 @@
预览
-
+
下载
@@ -132,14 +132,14 @@
预览
-
+
下载
- 内归档概述
+ 归档概述
{{backform.content?backform.content:''}}
diff --git a/src/views/task/list/outline.vue b/src/views/task/list/outline.vue
index 9264f4e..9d74ffa 100644
--- a/src/views/task/list/outline.vue
+++ b/src/views/task/list/outline.vue
@@ -16,7 +16,20 @@
+ :span-method="spanMethod">
+ has_mission
+
+
+
+
+ 已创建计划
+
+
+ 已创建专项任务
+
+
+
+
@@ -125,6 +138,11 @@
prop: 'resource',
width: 240,
align: 'left'
+ },{
+ label: "是否已创建计划或专项任务",
+ prop: 'has_mission',
+ width: 240,
+ align: 'left'
}],
}
},
@@ -150,7 +168,9 @@
async getList() {
const res = await index({
- ...this.select,
+ ...this.select,
+ 'with_relations[0]':"missionPlans",
+ 'with_relations[1]':"missions",
filter: [{
key: 'year',
op: 'eq',
diff --git a/vue.config.js b/vue.config.js
index 8b49cd5..7dc6f04 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -25,7 +25,7 @@ module.exports = {
* Detail: https://cli.vuejs.org/config/#publicpath
*/
publicPath: process.env.ENV === 'staging' ? '/admin_test' : '/admin',
- outputDir: '/Users/mac/Documents/朗业/2024/h-河道处项目/a-安全生产/safety-manage-service/public/admin_test',
+ outputDir: '/Users/mac/Documents/朗业/2024/h-河道处项目/a-安全生产/safety-manage-service/public/admin_stage',
assetsDir: 'static',
lintOnSave: process.env.NODE_ENV === 'development',
productionSourceMap: false,