From ff7dc7d58bbd1277752d0221edbc17f76cdb1d69 Mon Sep 17 00:00:00 2001 From: lijianzhong Date: Fri, 26 Jan 2024 09:02:58 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E7=BB=93=E6=9E=84=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/json/config.json | 3 + src/components/CustomUpload/index.vue | 175 +++++----- src/components/ImageUpload/index.vue | 433 +++++++++++++----------- src/components/QuillEditor/index.vue | 1 - src/router/modules/emergency.js | 6 +- src/router/modules/statistic.js | 25 ++ src/router/modules/work-manage.js | 26 ++ src/router/modules/work-trends.js | 9 +- src/router/routes.js | 4 + src/views/statistic/components/gz.vue | 131 +++++++ src/views/statistic/components/hj.vue | 69 ++++ src/views/statistic/components/rylx.vue | 76 +++++ src/views/statistic/components/tj.vue | 67 ++++ src/views/statistic/components/yj.vue | 71 ++++ src/views/statistic/index.vue | 73 ++++ src/views/system/setting/file.vue | 75 +++- src/views/system/setting/info.vue | 66 +++- src/views/system/setting/protocol.vue | 102 +++++- src/views/system/setting/safe.vue | 64 +++- src/views/work-manage/components/cg.vue | 60 ++++ src/views/work-manage/components/db.vue | 10 + src/views/work-manage/components/tj.vue | 10 + src/views/work-manage/components/yj.vue | 10 + src/views/work-manage/index.vue | 71 ++++ src/views/work-trends/index.vue | 178 +++++++++- 25 files changed, 1494 insertions(+), 321 deletions(-) create mode 100644 public/json/config.json create mode 100644 src/router/modules/statistic.js create mode 100644 src/router/modules/work-manage.js create mode 100644 src/views/statistic/components/gz.vue create mode 100644 src/views/statistic/components/hj.vue create mode 100644 src/views/statistic/components/rylx.vue create mode 100644 src/views/statistic/components/tj.vue create mode 100644 src/views/statistic/components/yj.vue create mode 100644 src/views/statistic/index.vue create mode 100644 src/views/work-manage/components/cg.vue create mode 100644 src/views/work-manage/components/db.vue create mode 100644 src/views/work-manage/components/tj.vue create mode 100644 src/views/work-manage/components/yj.vue create mode 100644 src/views/work-manage/index.vue diff --git a/public/json/config.json b/public/json/config.json new file mode 100644 index 0000000..b9390cc --- /dev/null +++ b/public/json/config.json @@ -0,0 +1,3 @@ +{ + "fileurl": "" +} \ No newline at end of file diff --git a/src/components/CustomUpload/index.vue b/src/components/CustomUpload/index.vue index dd75d43..ea2e611 100644 --- a/src/components/CustomUpload/index.vue +++ b/src/components/CustomUpload/index.vue @@ -53,7 +53,7 @@ -
+
-
+
@@ -121,11 +121,6 @@ const props = defineProps({ default: "", required: true, }, - //图片服务器拼接地址 - baseUrl: { - type: String, - default: "", - }, //图片服务ID uuid: { type: String, @@ -230,12 +225,6 @@ const handleRemove = (val: any) => { emits("onUpdate", arr); } }); - // const index = - // arr.filter((item) => item.sysdocumentid === item.sysdocumentid) - // console.log(index); - - // arr.splice(index, 1); - // emits("onUpdate", arr); } }); }; @@ -322,88 +311,88 @@ onMounted(() => { diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue index e321483..7d50f25 100644 --- a/src/components/ImageUpload/index.vue +++ b/src/components/ImageUpload/index.vue @@ -1,242 +1,277 @@ diff --git a/src/components/QuillEditor/index.vue b/src/components/QuillEditor/index.vue index 01fdfe7..3bfdb0b 100644 --- a/src/components/QuillEditor/index.vue +++ b/src/components/QuillEditor/index.vue @@ -59,7 +59,6 @@ const setValue = () => { } const handleUpload = (e) => { const files = Array.prototype.slice.call(e.target.files) - // console.log(files, "files") if (!files) { return } diff --git a/src/router/modules/emergency.js b/src/router/modules/emergency.js index 7d1a249..b207d2e 100644 --- a/src/router/modules/emergency.js +++ b/src/router/modules/emergency.js @@ -1,9 +1,9 @@ const Layout = () => import('@/layout/index.vue') export default { - path: '/emergency', + path: '/emer', component: Layout, - redirect: '/emergency/procession', - name: 'emergency', + redirect: '/emer/procession', + name: 'emer', meta: { auth: "emer", title: '应急管理', diff --git a/src/router/modules/statistic.js b/src/router/modules/statistic.js new file mode 100644 index 0000000..6badfbe --- /dev/null +++ b/src/router/modules/statistic.js @@ -0,0 +1,25 @@ +const Layout = () => import('@/layout/index.vue') + +export default { + path: '/statistic', + component: Layout, + name: 'statistic', + redirect: '/statistic/s-index', + meta: { + auth: "statistic", + title: '统计分析', + icon: 'point', + }, + children: [ + { + path: 's-index', + name: 's-index', + component: () => import('@/views/statistic/index.vue'), + meta: { + auth: "statistic.index", + title: '统计分析', + sidebar: false + } + }, + ] +} \ No newline at end of file diff --git a/src/router/modules/work-manage.js b/src/router/modules/work-manage.js new file mode 100644 index 0000000..e60526d --- /dev/null +++ b/src/router/modules/work-manage.js @@ -0,0 +1,26 @@ +const Layout = () => import('@/layout/index.vue') + +export default { + path: '/work', + component: Layout, + name: 'work', + redirect: '/work/w-index', + meta: { + auth: "daily", + title: '工作管理', + icon: 'point', + }, + children: [ + { + path: 'w-index', + name: 'w-index', + component: () => import('@/views/work-manage/index.vue'), + meta: { + auth: "daily", + icon: 'point', + title: '工作管理', + sidebar: false + } + }, + ] +} \ No newline at end of file diff --git a/src/router/modules/work-trends.js b/src/router/modules/work-trends.js index d5906c2..bceac7c 100644 --- a/src/router/modules/work-trends.js +++ b/src/router/modules/work-trends.js @@ -4,20 +4,19 @@ export default { path: '/trends', component: Layout, name: 'trends', - redirect: '/trends/index', + redirect: '/trends/t-index', meta: { auth: "trends", title: '工作动态', icon: 'point', - activeMenu: '/work-trends/index' }, children: [ { - path: 'index', - name: 'index', + path: 't-index', + name: 't-index', component: () => import('@/views/work-trends/index.vue'), meta: { - auth: "home.home", + auth: "trends.index", title: '工作动态', sidebar: false } diff --git a/src/router/routes.js b/src/router/routes.js index 40863ff..b10a30f 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -106,6 +106,8 @@ import emergency from "./modules/emergency"; import system from "./modules/system"; import base from './modules/basemanage'; import trends from './modules/work-trends'; +import manage from './modules/work-manage'; +import statistic from './modules/statistic'; // 动态路由(异步路由、导航栏路由) let asyncRoutes = [ @@ -120,6 +122,8 @@ let asyncRoutes = [ base, emergency, trends, + manage, + statistic, system, ] } diff --git a/src/views/statistic/components/gz.vue b/src/views/statistic/components/gz.vue new file mode 100644 index 0000000..6e03952 --- /dev/null +++ b/src/views/statistic/components/gz.vue @@ -0,0 +1,131 @@ + + + + + + diff --git a/src/views/statistic/components/hj.vue b/src/views/statistic/components/hj.vue new file mode 100644 index 0000000..6aebd2a --- /dev/null +++ b/src/views/statistic/components/hj.vue @@ -0,0 +1,69 @@ + + + + + + diff --git a/src/views/statistic/components/rylx.vue b/src/views/statistic/components/rylx.vue new file mode 100644 index 0000000..61acdd6 --- /dev/null +++ b/src/views/statistic/components/rylx.vue @@ -0,0 +1,76 @@ + + + + + + diff --git a/src/views/statistic/components/tj.vue b/src/views/statistic/components/tj.vue new file mode 100644 index 0000000..4d3e3cc --- /dev/null +++ b/src/views/statistic/components/tj.vue @@ -0,0 +1,67 @@ + + + + + + diff --git a/src/views/statistic/components/yj.vue b/src/views/statistic/components/yj.vue new file mode 100644 index 0000000..edd2e6b --- /dev/null +++ b/src/views/statistic/components/yj.vue @@ -0,0 +1,71 @@ + + + + + + diff --git a/src/views/statistic/index.vue b/src/views/statistic/index.vue new file mode 100644 index 0000000..908bea7 --- /dev/null +++ b/src/views/statistic/index.vue @@ -0,0 +1,73 @@ + + + + + diff --git a/src/views/system/setting/file.vue b/src/views/system/setting/file.vue index 34c85a8..046e76d 100644 --- a/src/views/system/setting/file.vue +++ b/src/views/system/setting/file.vue @@ -1,13 +1,72 @@ - + - - - \ No newline at end of file diff --git a/src/views/system/setting/info.vue b/src/views/system/setting/info.vue index af0787e..d521bc4 100644 --- a/src/views/system/setting/info.vue +++ b/src/views/system/setting/info.vue @@ -1,9 +1,73 @@ diff --git a/src/views/system/setting/protocol.vue b/src/views/system/setting/protocol.vue index 9ce744b..81ff0ed 100644 --- a/src/views/system/setting/protocol.vue +++ b/src/views/system/setting/protocol.vue @@ -1,10 +1,94 @@ - - - - - \ No newline at end of file +
+ + + +
+
+ +
+
+ 保存 +
+
+
+ + + + + diff --git a/src/views/system/setting/safe.vue b/src/views/system/setting/safe.vue index af0787e..66fcbbd 100644 --- a/src/views/system/setting/safe.vue +++ b/src/views/system/setting/safe.vue @@ -1,9 +1,71 @@ diff --git a/src/views/work-manage/components/cg.vue b/src/views/work-manage/components/cg.vue new file mode 100644 index 0000000..36a0528 --- /dev/null +++ b/src/views/work-manage/components/cg.vue @@ -0,0 +1,60 @@ + + + + + + diff --git a/src/views/work-manage/components/db.vue b/src/views/work-manage/components/db.vue new file mode 100644 index 0000000..66dc937 --- /dev/null +++ b/src/views/work-manage/components/db.vue @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/src/views/work-manage/components/tj.vue b/src/views/work-manage/components/tj.vue new file mode 100644 index 0000000..ad20e5b --- /dev/null +++ b/src/views/work-manage/components/tj.vue @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/src/views/work-manage/components/yj.vue b/src/views/work-manage/components/yj.vue new file mode 100644 index 0000000..b254a29 --- /dev/null +++ b/src/views/work-manage/components/yj.vue @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/src/views/work-manage/index.vue b/src/views/work-manage/index.vue new file mode 100644 index 0000000..176f571 --- /dev/null +++ b/src/views/work-manage/index.vue @@ -0,0 +1,71 @@ + + + + + diff --git a/src/views/work-trends/index.vue b/src/views/work-trends/index.vue index 060515d..69a98dc 100644 --- a/src/views/work-trends/index.vue +++ b/src/views/work-trends/index.vue @@ -1,9 +1,185 @@