From 6e316c9fd2dc6e8af66154c42216349cfff96428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com> Date: Thu, 14 Jul 2022 07:47:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?perms=E5=AD=98=E6=9D=83=E9=99=90=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/components/passwordForm.vue | 2 +- src/views/wf/state.vue | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/login/components/passwordForm.vue b/src/views/login/components/passwordForm.vue index bc1a8279..48af8fc5 100644 --- a/src/views/login/components/passwordForm.vue +++ b/src/views/login/components/passwordForm.vue @@ -159,7 +159,7 @@ export default { try { var res1 = await this.$API.auth.info.get(); this.$TOOL.data.set("USER_INFO", res1); - this.$TOOL.data.set("PERMISSIONS", res1.perms); + this.$TOOL.data.set("PERMISSIONS", res1.perms.keys()); this.$router.replace({ path: "/", }); diff --git a/src/views/wf/state.vue b/src/views/wf/state.vue index 04f5ceaf..8928028c 100644 --- a/src/views/wf/state.vue +++ b/src/views/wf/state.vue @@ -336,6 +336,9 @@ > + + +
From 490c0e489d58725d7de89b650649024acbe70af7 Mon Sep 17 00:00:00 2001 From: shijing Date: Thu, 14 Jul 2022 09:02:15 +0800 Subject: [PATCH 2/2] ticket&component --- public/img/nodata.png | Bin 0 -> 8037 bytes src/api/model/ecm.js | 8 + src/api/model/wf.js | 6 +- src/components/scSelect/userselect.vue | 274 +++++++++++++ src/scui.js | 10 +- src/views/am/area_form.vue | 533 +++++++++++++------------ src/views/bigScreen/index.vue | 203 ++++------ src/views/wf/allwork.vue | 197 ++++----- src/views/wf/ccwork.vue | 24 +- src/views/wf/details.vue | 143 +++---- src/views/wf/dutywork.vue | 224 +++++++---- src/views/wf/ownerwork.vue | 236 +++++++---- src/views/wf/steps.vue | 119 +++--- src/views/wf/visitdetail.vue | 339 +++++++++++----- src/views/wf/worked.vue | 160 ++++---- 15 files changed, 1540 insertions(+), 936 deletions(-) create mode 100644 public/img/nodata.png create mode 100644 src/components/scSelect/userselect.vue diff --git a/public/img/nodata.png b/public/img/nodata.png new file mode 100644 index 0000000000000000000000000000000000000000..ebe9842f8e11984b99652b8e39f6c3c8128aeb32 GIT binary patch literal 8037 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 nF9xV>wA~NWs!U>1FVp`6 + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+
+ + + + + + + + + + + + + +
+ 取 消 + + 确定 + +
+
+
+
+ + diff --git a/src/scui.js b/src/scui.js index c450f853..f8690c52 100644 --- a/src/scui.js +++ b/src/scui.js @@ -14,6 +14,7 @@ import scFormTable from './components/scFormTable' import scTableSelect from './components/scTableSelect' import scPageHeader from './components/scPageHeader' import scSelect from './components/scSelect' +import scUserSelect from './components/scSelect/userselect' import scDialog from './components/scDialog' import scForm from './components/scForm' import scTitle from './components/scTitle' @@ -59,13 +60,14 @@ export default { app.component('scWaterMark', scWaterMark); app.component('scQrCode', scQrCode); app.component('scStatusIndicator', scStatusIndicator); + app.component('scUserSelect', scUserSelect); app.component('scTrend', scTrend); //注册全局指令 - app.directive('auth', auth) - app.directive('role', role) - app.directive('time', time) - app.directive('copy', copy) + app.directive('auth', auth); + app.directive('role', role); + app.directive('time', time); + app.directive('copy', copy); //统一注册el-icon图标 for(let icon in elIcons){ diff --git a/src/views/am/area_form.vue b/src/views/am/area_form.vue index 4696a889..94dbea96 100644 --- a/src/views/am/area_form.vue +++ b/src/views/am/area_form.vue @@ -1,266 +1,281 @@ diff --git a/src/views/wf/visitdetail.vue b/src/views/wf/visitdetail.vue index 43bf5933..8355ed7d 100644 --- a/src/views/wf/visitdetail.vue +++ b/src/views/wf/visitdetail.vue @@ -1,112 +1,245 @@