From 6a869fcad9a722ce72ed60e58d3c91a7dbfb8ccc Mon Sep 17 00:00:00 2001 From: liujun Date: Thu, 25 Apr 2024 09:17:41 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=AE=9A=E4=BD=8D?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oneCompany/reflection/components/info.vue | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/views/oneCompany/reflection/components/info.vue b/src/views/oneCompany/reflection/components/info.vue index 219d312..0560385 100644 --- a/src/views/oneCompany/reflection/components/info.vue +++ b/src/views/oneCompany/reflection/components/info.vue @@ -273,19 +273,21 @@ export default { getPeopleList(e) { return new Promise(resolve => { this.material.departmentName = e.name - requestFN( - '/user/listAll', - { - DEPARTMENT_ID: e.id - } - ).then((data) => { - this.dic.userList = data.userList - this.material.userInfo = '' - resolve(true) - }).catch((e) => { - console.log(e) - resolve(true) - }) + if (e && e.id && e.id !== '') { + requestFN( + '/user/listAll', + { + DEPARTMENT_ID: e.id + } + ).then((data) => { + this.dic.userList = data.userList + this.material.userInfo = '' + resolve(true) + }).catch((e) => { + console.log(e) + resolve(true) + }) + } }) }, chooseUser(e) { From 123fca5edae81027bb85925fade15cc83e722f20 Mon Sep 17 00:00:00 2001 From: liujun Date: Thu, 25 Apr 2024 09:55:35 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=B7=B2=E5=AE=A1=E6=A0=B8=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E4=BF=A1=E6=81=AF=E6=9F=A5=E7=9C=8B=E5=8F=98=E6=88=90?= =?UTF-8?q?=E7=BB=BF=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/map/index.vue | 2 +- src/views/xgf/audit/components/list.vue | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/map/index.vue b/src/views/map/index.vue index 0c4809b..677bc6b 100644 --- a/src/views/map/index.vue +++ b/src/views/map/index.vue @@ -1234,7 +1234,7 @@ export default { } const entity = new Cesium.Entity({ id: 'trajectory', - polyline: { positions, width: 5.0, material: Cesium.Color.RED , clampToGround:true } + polyline: { positions, width: 5.0, material: Cesium.Color.RED, clampToGround: true } }) const collection = new Cesium.CustomDataSource('trajectoryEntityCollection') collection.entities.add(entity) diff --git a/src/views/xgf/audit/components/list.vue b/src/views/xgf/audit/components/list.vue index 7dd804d..25ed354 100644 --- a/src/views/xgf/audit/components/list.vue +++ b/src/views/xgf/audit/components/list.vue @@ -107,7 +107,8 @@ From bacfc976a6d7d71b3db4526bfb97b9c154bef217 Mon Sep 17 00:00:00 2001 From: liujun Date: Thu, 25 Apr 2024 14:50:40 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=BF=9E=E7=BB=AD=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E5=90=8E=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BAbug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xgf/flowApply/components/userInfo.vue | 66 +++++++++++-------- 1 file changed, 39 insertions(+), 27 deletions(-) diff --git a/src/views/xgf/flowApply/components/userInfo.vue b/src/views/xgf/flowApply/components/userInfo.vue index 007b258..8d585d8 100644 --- a/src/views/xgf/flowApply/components/userInfo.vue +++ b/src/views/xgf/flowApply/components/userInfo.vue @@ -19,7 +19,7 @@
- +
@@ -47,13 +47,13 @@
- + :preview-src-list="[config.fileUrl + item.FILEPATH]" + z-index="8000" + style="object-fit: cover; width: 40px; height: 40px"/>
@@ -137,13 +137,13 @@ - + :preview-src-list="[config.fileUrl + item.FILEPATH]" + z-index="8000" + style="object-fit: cover; width: 40px; height: 40px"/> @@ -159,13 +159,13 @@ - + :preview-src-list="[config.fileUrl + item.FILEPATH]" + z-index="8000" + style="object-fit: cover; width: 40px; height: 40px"/> @@ -178,13 +178,13 @@
- + :preview-src-list="[config.fileUrl + item.FILEPATH]" + z-index="8000" + style="object-fit: cover; width: 40px; height: 40px"/>
@@ -268,17 +268,16 @@
- - + + :preview-src-list="[config.fileUrl + item.FILEPATH_BACK]" + z-index="8000" + style="object-fit: cover; width: 40px; height: 40px"/>
@@ -413,7 +412,7 @@ - 取 消 + 取 消 @@ -511,6 +510,19 @@ export default { }, download(item) { useDownloadFile(item) + }, + close() { + this.visible = false + this.userDetailForm = {} + this.userCardIDPhotoFile = [] // 身份证照片 + this.trainRecordList = [] + this.photosOfLevel = [] // 三级教育照片 + this.specialUsersList = {} + this.insuranceFileList = [] // 保险文件 + this.contractFileList = [] + this.socialPhotoFile = [] + this.gongshangbaoxianFile = [] + this.applyList = [] } } } From 6a26a21f09178189c5eed2fbf2e0d78a025ed570 Mon Sep 17 00:00:00 2001 From: liujun Date: Fri, 26 Apr 2024 18:08:31 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=B8=89=E9=A1=B9=E5=88=B6=E5=BA=A6?= =?UTF-8?q?=E5=BA=93=E6=96=B0=E5=A2=9E=E5=B9=B3=E5=8F=B0=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../soLibrary/components/condition.vue | 188 +++++++ .../soLibrary/components/dashboard.vue | 38 ++ .../soLibrary/components/editTextLibrary.vue | 392 +++++++++++++ .../soLibrary/components/list.vue | 527 ++++++++++++++++++ .../soLibrary/components/listEm.vue | 504 +++++++++++++++++ .../soLibrary/components/textLibraryInfo.vue | 146 +++++ .../soLibrary/components/updateFile.vue | 77 +++ .../soLibrary/components/updateLog.vue | 55 ++ src/views/threeSystems/soLibrary/index.vue | 19 + .../spmLibrary/components/condition.vue | 188 +++++++ .../spmLibrary/components/dashboard.vue | 38 ++ .../spmLibrary/components/editTextLibrary.vue | 390 +++++++++++++ .../spmLibrary/components/list.vue | 526 +++++++++++++++++ .../spmLibrary/components/listEm.vue | 503 +++++++++++++++++ .../spmLibrary/components/textLibraryInfo.vue | 146 +++++ .../spmLibrary/components/updateFile.vue | 77 +++ .../spmLibrary/components/updateLog.vue | 55 ++ src/views/threeSystems/spmLibrary/index.vue | 19 + .../sprLibrary/components/condition.vue | 188 +++++++ .../sprLibrary/components/dashboard.vue | 38 ++ .../sprLibrary/components/editTextLibrary.vue | 390 +++++++++++++ .../sprLibrary/components/list.vue | 526 +++++++++++++++++ .../sprLibrary/components/listEm.vue | 503 +++++++++++++++++ .../sprLibrary/components/textLibraryInfo.vue | 146 +++++ .../sprLibrary/components/updateFile.vue | 77 +++ .../sprLibrary/components/updateLog.vue | 55 ++ src/views/threeSystems/sprLibrary/index.vue | 19 + 27 files changed, 5830 insertions(+) create mode 100644 src/views/threeSystems/soLibrary/components/condition.vue create mode 100644 src/views/threeSystems/soLibrary/components/dashboard.vue create mode 100644 src/views/threeSystems/soLibrary/components/editTextLibrary.vue create mode 100644 src/views/threeSystems/soLibrary/components/list.vue create mode 100644 src/views/threeSystems/soLibrary/components/listEm.vue create mode 100644 src/views/threeSystems/soLibrary/components/textLibraryInfo.vue create mode 100644 src/views/threeSystems/soLibrary/components/updateFile.vue create mode 100644 src/views/threeSystems/soLibrary/components/updateLog.vue create mode 100644 src/views/threeSystems/soLibrary/index.vue create mode 100644 src/views/threeSystems/spmLibrary/components/condition.vue create mode 100644 src/views/threeSystems/spmLibrary/components/dashboard.vue create mode 100644 src/views/threeSystems/spmLibrary/components/editTextLibrary.vue create mode 100644 src/views/threeSystems/spmLibrary/components/list.vue create mode 100644 src/views/threeSystems/spmLibrary/components/listEm.vue create mode 100644 src/views/threeSystems/spmLibrary/components/textLibraryInfo.vue create mode 100644 src/views/threeSystems/spmLibrary/components/updateFile.vue create mode 100644 src/views/threeSystems/spmLibrary/components/updateLog.vue create mode 100644 src/views/threeSystems/spmLibrary/index.vue create mode 100644 src/views/threeSystems/sprLibrary/components/condition.vue create mode 100644 src/views/threeSystems/sprLibrary/components/dashboard.vue create mode 100644 src/views/threeSystems/sprLibrary/components/editTextLibrary.vue create mode 100644 src/views/threeSystems/sprLibrary/components/list.vue create mode 100644 src/views/threeSystems/sprLibrary/components/listEm.vue create mode 100644 src/views/threeSystems/sprLibrary/components/textLibraryInfo.vue create mode 100644 src/views/threeSystems/sprLibrary/components/updateFile.vue create mode 100644 src/views/threeSystems/sprLibrary/components/updateLog.vue create mode 100644 src/views/threeSystems/sprLibrary/index.vue diff --git a/src/views/threeSystems/soLibrary/components/condition.vue b/src/views/threeSystems/soLibrary/components/condition.vue new file mode 100644 index 0000000..c9af125 --- /dev/null +++ b/src/views/threeSystems/soLibrary/components/condition.vue @@ -0,0 +1,188 @@ + + + + diff --git a/src/views/threeSystems/soLibrary/components/dashboard.vue b/src/views/threeSystems/soLibrary/components/dashboard.vue new file mode 100644 index 0000000..56486f2 --- /dev/null +++ b/src/views/threeSystems/soLibrary/components/dashboard.vue @@ -0,0 +1,38 @@ + + + diff --git a/src/views/threeSystems/soLibrary/components/editTextLibrary.vue b/src/views/threeSystems/soLibrary/components/editTextLibrary.vue new file mode 100644 index 0000000..22a3dec --- /dev/null +++ b/src/views/threeSystems/soLibrary/components/editTextLibrary.vue @@ -0,0 +1,392 @@ + + diff --git a/src/views/threeSystems/soLibrary/components/list.vue b/src/views/threeSystems/soLibrary/components/list.vue new file mode 100644 index 0000000..0ad9957 --- /dev/null +++ b/src/views/threeSystems/soLibrary/components/list.vue @@ -0,0 +1,527 @@ + + + diff --git a/src/views/threeSystems/soLibrary/components/listEm.vue b/src/views/threeSystems/soLibrary/components/listEm.vue new file mode 100644 index 0000000..b349535 --- /dev/null +++ b/src/views/threeSystems/soLibrary/components/listEm.vue @@ -0,0 +1,504 @@ + + + diff --git a/src/views/threeSystems/soLibrary/components/textLibraryInfo.vue b/src/views/threeSystems/soLibrary/components/textLibraryInfo.vue new file mode 100644 index 0000000..b104a8f --- /dev/null +++ b/src/views/threeSystems/soLibrary/components/textLibraryInfo.vue @@ -0,0 +1,146 @@ + + diff --git a/src/views/threeSystems/soLibrary/components/updateFile.vue b/src/views/threeSystems/soLibrary/components/updateFile.vue new file mode 100644 index 0000000..edcaa19 --- /dev/null +++ b/src/views/threeSystems/soLibrary/components/updateFile.vue @@ -0,0 +1,77 @@ + + diff --git a/src/views/threeSystems/soLibrary/components/updateLog.vue b/src/views/threeSystems/soLibrary/components/updateLog.vue new file mode 100644 index 0000000..ee30bd2 --- /dev/null +++ b/src/views/threeSystems/soLibrary/components/updateLog.vue @@ -0,0 +1,55 @@ + + diff --git a/src/views/threeSystems/soLibrary/index.vue b/src/views/threeSystems/soLibrary/index.vue new file mode 100644 index 0000000..8d78561 --- /dev/null +++ b/src/views/threeSystems/soLibrary/index.vue @@ -0,0 +1,19 @@ + + diff --git a/src/views/threeSystems/spmLibrary/components/condition.vue b/src/views/threeSystems/spmLibrary/components/condition.vue new file mode 100644 index 0000000..051c13e --- /dev/null +++ b/src/views/threeSystems/spmLibrary/components/condition.vue @@ -0,0 +1,188 @@ + + + + diff --git a/src/views/threeSystems/spmLibrary/components/dashboard.vue b/src/views/threeSystems/spmLibrary/components/dashboard.vue new file mode 100644 index 0000000..f9b3596 --- /dev/null +++ b/src/views/threeSystems/spmLibrary/components/dashboard.vue @@ -0,0 +1,38 @@ + + + diff --git a/src/views/threeSystems/spmLibrary/components/editTextLibrary.vue b/src/views/threeSystems/spmLibrary/components/editTextLibrary.vue new file mode 100644 index 0000000..723dffc --- /dev/null +++ b/src/views/threeSystems/spmLibrary/components/editTextLibrary.vue @@ -0,0 +1,390 @@ + + diff --git a/src/views/threeSystems/spmLibrary/components/list.vue b/src/views/threeSystems/spmLibrary/components/list.vue new file mode 100644 index 0000000..11e7164 --- /dev/null +++ b/src/views/threeSystems/spmLibrary/components/list.vue @@ -0,0 +1,526 @@ + + + diff --git a/src/views/threeSystems/spmLibrary/components/listEm.vue b/src/views/threeSystems/spmLibrary/components/listEm.vue new file mode 100644 index 0000000..436e2ab --- /dev/null +++ b/src/views/threeSystems/spmLibrary/components/listEm.vue @@ -0,0 +1,503 @@ + + + diff --git a/src/views/threeSystems/spmLibrary/components/textLibraryInfo.vue b/src/views/threeSystems/spmLibrary/components/textLibraryInfo.vue new file mode 100644 index 0000000..e9f9aac --- /dev/null +++ b/src/views/threeSystems/spmLibrary/components/textLibraryInfo.vue @@ -0,0 +1,146 @@ + + diff --git a/src/views/threeSystems/spmLibrary/components/updateFile.vue b/src/views/threeSystems/spmLibrary/components/updateFile.vue new file mode 100644 index 0000000..edcaa19 --- /dev/null +++ b/src/views/threeSystems/spmLibrary/components/updateFile.vue @@ -0,0 +1,77 @@ + + diff --git a/src/views/threeSystems/spmLibrary/components/updateLog.vue b/src/views/threeSystems/spmLibrary/components/updateLog.vue new file mode 100644 index 0000000..ee30bd2 --- /dev/null +++ b/src/views/threeSystems/spmLibrary/components/updateLog.vue @@ -0,0 +1,55 @@ + + diff --git a/src/views/threeSystems/spmLibrary/index.vue b/src/views/threeSystems/spmLibrary/index.vue new file mode 100644 index 0000000..8d78561 --- /dev/null +++ b/src/views/threeSystems/spmLibrary/index.vue @@ -0,0 +1,19 @@ + + diff --git a/src/views/threeSystems/sprLibrary/components/condition.vue b/src/views/threeSystems/sprLibrary/components/condition.vue new file mode 100644 index 0000000..fbb3b86 --- /dev/null +++ b/src/views/threeSystems/sprLibrary/components/condition.vue @@ -0,0 +1,188 @@ + + + + diff --git a/src/views/threeSystems/sprLibrary/components/dashboard.vue b/src/views/threeSystems/sprLibrary/components/dashboard.vue new file mode 100644 index 0000000..e7c8301 --- /dev/null +++ b/src/views/threeSystems/sprLibrary/components/dashboard.vue @@ -0,0 +1,38 @@ + + + diff --git a/src/views/threeSystems/sprLibrary/components/editTextLibrary.vue b/src/views/threeSystems/sprLibrary/components/editTextLibrary.vue new file mode 100644 index 0000000..2cbf55b --- /dev/null +++ b/src/views/threeSystems/sprLibrary/components/editTextLibrary.vue @@ -0,0 +1,390 @@ + + diff --git a/src/views/threeSystems/sprLibrary/components/list.vue b/src/views/threeSystems/sprLibrary/components/list.vue new file mode 100644 index 0000000..f804ccb --- /dev/null +++ b/src/views/threeSystems/sprLibrary/components/list.vue @@ -0,0 +1,526 @@ + + + diff --git a/src/views/threeSystems/sprLibrary/components/listEm.vue b/src/views/threeSystems/sprLibrary/components/listEm.vue new file mode 100644 index 0000000..234e626 --- /dev/null +++ b/src/views/threeSystems/sprLibrary/components/listEm.vue @@ -0,0 +1,503 @@ + + + diff --git a/src/views/threeSystems/sprLibrary/components/textLibraryInfo.vue b/src/views/threeSystems/sprLibrary/components/textLibraryInfo.vue new file mode 100644 index 0000000..5ce9a08 --- /dev/null +++ b/src/views/threeSystems/sprLibrary/components/textLibraryInfo.vue @@ -0,0 +1,146 @@ + + diff --git a/src/views/threeSystems/sprLibrary/components/updateFile.vue b/src/views/threeSystems/sprLibrary/components/updateFile.vue new file mode 100644 index 0000000..edcaa19 --- /dev/null +++ b/src/views/threeSystems/sprLibrary/components/updateFile.vue @@ -0,0 +1,77 @@ + + diff --git a/src/views/threeSystems/sprLibrary/components/updateLog.vue b/src/views/threeSystems/sprLibrary/components/updateLog.vue new file mode 100644 index 0000000..ee30bd2 --- /dev/null +++ b/src/views/threeSystems/sprLibrary/components/updateLog.vue @@ -0,0 +1,55 @@ + + diff --git a/src/views/threeSystems/sprLibrary/index.vue b/src/views/threeSystems/sprLibrary/index.vue new file mode 100644 index 0000000..8d78561 --- /dev/null +++ b/src/views/threeSystems/sprLibrary/index.vue @@ -0,0 +1,19 @@ + + From 3265c8356c040708df41e97fb3c29c1860a4f91e Mon Sep 17 00:00:00 2001 From: liujun Date: Sun, 28 Apr 2024 11:48:32 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=B8=89=E9=A1=B9=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E5=BA=93=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../soLibrary/components/list.vue | 36 ++++++++++++++- .../spmLibrary/components/list.vue | 45 ++++++++++++++++--- .../sprLibrary/components/list.vue | 45 ++++++++++++++++--- 3 files changed, 115 insertions(+), 11 deletions(-) diff --git a/src/views/threeSystems/soLibrary/components/list.vue b/src/views/threeSystems/soLibrary/components/list.vue index 0ad9957..ca5e22e 100644 --- a/src/views/threeSystems/soLibrary/components/list.vue +++ b/src/views/threeSystems/soLibrary/components/list.vue @@ -40,7 +40,41 @@ highlight-current-row @cell-mouse-enter="enterSelectionRows" @cell-mouse-leave="leaveSelectionRows"> + + + + + + @@ -60,7 +94,7 @@ - + - + - + - + + - + - + - + + - + - + - + - +