From 4580df0182fc5b81fa458b4471f6cfdbdf58b95a Mon Sep 17 00:00:00 2001 From: guoyue Date: Fri, 14 Oct 2022 11:39:06 +0800 Subject: [PATCH 01/31] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=EF=BC=9A?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=88=91=E7=9A=84=E7=94=B3=E8=AF=B7-?= =?UTF-8?q?=E8=83=BD=E5=8A=9B=E4=B8=8A=E6=9E=B6=E5=90=8D=E7=A7=B0=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/personalCenter/components/MyApply.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue index 4e1b1353..2b593d2f 100644 --- a/front/src/views/personalCenter/components/MyApply.vue +++ b/front/src/views/personalCenter/components/MyApply.vue @@ -33,7 +33,7 @@
- 名称：{{ item.cameraList ? item.system : item.title }} + 名称：{{ item.cameraList ? item.system : (item.title || item.name) }}
From 9bba3077ca9ef3e75c1ddeb1ae35ee6b29ed5255 Mon Sep 17 00:00:00 2001 From: guoyue Date: Fri, 14 Oct 2022 11:39:41 +0800 Subject: [PATCH 02/31] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=EF=BC=9A?= =?UTF-8?q?=E6=88=91=E7=9A=84=E7=94=B3=E8=AF=B7--=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=9C=9F=E6=9C=9B=E6=95=88=E6=9E=9C=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/personalCenter/components/AbilityApplication.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/src/views/personalCenter/components/AbilityApplication.vue b/front/src/views/personalCenter/components/AbilityApplication.vue index fd66c448..fa565915 100644 --- a/front/src/views/personalCenter/components/AbilityApplication.vue +++ b/front/src/views/personalCenter/components/AbilityApplication.vue @@ -29,7 +29,7 @@

应用背景：{{ props.refObj.applicationBackground }}

-

+

期望效果：{{ props.refObj.effectWish }}

From a71fc5326edb209012f74ef67dc3c29f76e37fbf Mon Sep 17 00:00:00 2001 From: guoyue Date: Fri, 14 Oct 2022 11:40:22 +0800 Subject: [PATCH 03/31] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=EF=BC=9A?= =?UTF-8?q?=E6=88=91=E7=9A=84=E7=94=B3=E8=AF=B7--=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=BB=BB=E5=8A=A1=E6=97=B6=E9=95=BF=E5=8F=96?= =?UTF-8?q?=E5=80=BC=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/personalCenter/components/ApplyDetails.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/front/src/views/personalCenter/components/ApplyDetails.vue b/front/src/views/personalCenter/components/ApplyDetails.vue index 825354ae..1b052ff4 100644 --- a/front/src/views/personalCenter/components/ApplyDetails.vue +++ b/front/src/views/personalCenter/components/ApplyDetails.vue @@ -130,9 +130,9 @@ const columns = [ key: 'comment', }, { - title: '任务时长/秒', - dataIndex: 'durationInSeconds', - key: 'durationInSeconds', + title: '任务时长', + dataIndex: 'duration', + key: 'duration', }, ] const getInfo = () => { From e34f47680b6e51c01a8ea2d5f2ecf146976d0f37 Mon Sep 17 00:00:00 2001 From: guoyue Date: Fri, 14 Oct 2022 14:20:23 +0800 Subject: [PATCH 04/31] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=EF=BC=9A?= =?UTF-8?q?=E5=8D=95=E5=85=B5=E5=92=8C=E6=97=A0=E4=BA=BA=E6=9C=BA=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=94=B3=E8=AF=B7=EF=BC=8C=E7=94=B3=E8=AF=B7=E6=88=90?= =?UTF-8?q?=E5=8A=9F=EF=BC=8C=E5=89=8D=E7=AB=AF=E6=8F=90=E7=A4=BA=E6=96=87?= =?UTF-8?q?=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/home/apply.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue index 0b7b7ebe..1209ae57 100644 --- a/front/src/views/home/apply.vue +++ b/front/src/views/home/apply.vue @@ -868,8 +868,8 @@ } soldierApply(_data) .then((res) => { - if (res.data.code == 0) { - message.success(res.data.msg) + if (res.data.msg === 'success') { + message.success('申请提交成功，请到消息中心查看！') jumpToDetailsPageconetent() } else { message.error('申请失败！') From 9c8785b8ce4026ae346451959a5ec663368fe8eb Mon Sep 17 00:00:00 2001 From: guoyue Date: Fri, 14 Oct 2022 14:20:45 +0800 Subject: [PATCH 05/31] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8-=E6=88=91?= =?UTF-8?q?=E7=9A=84=E7=94=B3=E8=AF=B7=EF=BC=9A=E6=9F=A5=E7=9C=8B=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E7=95=8C=E9=9D=A2=EF=BC=8C=E6=B5=81=E7=A8=8B=E7=BB=88?= =?UTF-8?q?=E6=AD=A2=E5=90=8E=EF=BC=8C=E6=8F=90=E7=A4=BA=E8=AF=A5=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E7=BB=88=E6=AD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/personalCenter/components/AbilityApplication.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/front/src/views/personalCenter/components/AbilityApplication.vue b/front/src/views/personalCenter/components/AbilityApplication.vue index fa565915..0f2a42d6 100644 --- a/front/src/views/personalCenter/components/AbilityApplication.vue +++ b/front/src/views/personalCenter/components/AbilityApplication.vue @@ -163,6 +163,7 @@ @click.stop="openVideo(val)"> 视频预览 + 该流程已终止

From 2484cda43d28c9334cd85b253b51bbb704c6dea5 Mon Sep 17 00:00:00 2001 From: gongjiale <942894820@qq.com> Date: Fri, 14 Oct 2022 15:39:18 +0800 Subject: [PATCH 06/31] =?UTF-8?q?1.=E5=AE=8C=E6=88=90=E8=83=BD=E5=8A=9B?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1-=E8=83=BD=E5=8A=9B=E4=B8=8A=E6=9E=B6?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=EF=BC=9A=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85?= =?UTF-8?q?=EF=BC=8C=E4=BB=BB=E5=8A=A1=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E3=80=81=E4=BB=BB=E5=8A=A1=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E4=B8=8D=E8=BD=AC=E8=A1=8C=EF=BC=9B=202.=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E8=83=BD=E5=8A=9B=E7=BB=9F=E8=AE=A1-=E8=83=BD=E5=8A=9B?= =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E7=BB=9F=E8=AE=A1=EF=BC=9A=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E4=B8=AD=E7=9A=84=E7=8A=B6=E6=80=81=E5=92=8C?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=AD=E7=9A=84=E7=8A=B6=E6=80=81=E8=AF=B7?= =?UTF-8?q?=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/abilityDetails.vue | 42 +++++++++++++++++-- .../views/modules/abilityStatistics/index.vue | 31 +++++++++----- 2 files changed, 59 insertions(+), 14 deletions(-) diff --git a/back/src/views/modules/abilityStatistics/components/abilityDetails.vue b/back/src/views/modules/abilityStatistics/components/abilityDetails.vue index 0783f165..9a72879f 100644 --- a/back/src/views/modules/abilityStatistics/components/abilityDetails.vue +++ b/back/src/views/modules/abilityStatistics/components/abilityDetails.vue @@ -88,16 +88,49 @@
审批详情
-
- + + + + + + + + + + + + + + + +
-
+ @@ -228,6 +261,7 @@ export default { } } } + console.log("this.dataSource.data[0]========",this.dataSource.data[0][1]) }, // init () { // this.visible = true diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue index e95ec4b3..75686078 100644 --- a/back/src/views/modules/abilityStatistics/index.vue +++ b/back/src/views/modules/abilityStatistics/index.vue @@ -38,7 +38,7 @@ - + 审核状态： - - + + + @@ -371,8 +372,9 @@ export default { { name: '组件服务', key: 1 }, { name: '应用资源', key: 2 }, { name: '基础设施', key: 3 }, - { name: '数据资源', key: 3 }, - { name: '知识库', key: 3 } + { name: '数据资源', key: 4 }, + { name: '知识库', key: 5 }, + { name: '会议室', value: 6} ], tableData: [], tableData2: [ @@ -396,7 +398,8 @@ export default { { name: '图层服务', value: 2 }, { name: '通用开发组件', value: 3 }, { name: '页面开发组件', value: 4 }, - { name: '应用资源', value: 5 } + { name: '应用资源', value: 5 }, + { name: '会议室', value: 6} ], // 类型备选列表 detailFlag: false, // 明细返回按钮显示标志位 startDate: '', // 开始时间 @@ -478,7 +481,9 @@ export default { } else if (this.examineStatus == '0') { this.status = '审核中' } else if (this.examineStatus == '1') { - this.status = '审核完成' + this.status = '通过' + }else if (this.examineStatus == '2') { + this.status = '不通过' } else { this.status = this.examineStatus } @@ -534,7 +539,9 @@ export default { } else if (this.examineStatus == '0') { this.status = '审核中' } else if (this.examineStatus == '1') { - this.status = '审核完成' + this.status = '通过' + } else if (this.examineStatus == '2') { + this.status = '不通过' } else { this.status = this.examineStatus } @@ -627,13 +634,15 @@ export default { }, // 能力上架明细 getOneDetail (page) { - var passAndReview = '' // 转变"审核完成"字段为通过 + var passAndReview = '' // 转变"通过"字段为通过 if (this.examineStatus == '-1') { this.status = '' } else if (this.examineStatus == '0') { this.status = '审核中' } else if (this.examineStatus == '1') { this.status = '通过' + } else if (this.examineStatus == '2') { + this.status = '不通过' } else { this.status = this.examineStatus } @@ -657,13 +666,15 @@ export default { }, // 能力使用明细 getTwoDetail (page) { - var passAndReview = '' // 转变"审核完成"字段为通过 + var passAndReview = '' // 转变"通过"字段为通过 if (this.examineStatus == '-1') { this.status = '' } else if (this.examineStatus == '0') { this.status = '审核中' } else if (this.examineStatus == '1') { this.status = '通过' + } else if (this.examineStatus == '2') { + this.status = '不通过' } else { this.status = this.examineStatus } From 4354abdf25d5708c22dec056756cf74650bf4355 Mon Sep 17 00:00:00 2001 From: guoyue Date: Fri, 14 Oct 2022 15:40:14 +0800 Subject: [PATCH 07/31] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8-=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E8=B5=84=E6=BA=90=E7=94=B3=E8=AF=B7-=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E5=8C=85=E5=90=AB=E8=A5=BF=E6=B5=B7=E5=B2=B8?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=88=86=E5=B1=80=E6=B7=BB=E5=8A=A0=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E9=99=84=E4=BB=B6=E4=B8=AA=E6=A8=A1=E6=9D=BF=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/download/感知资源申请表.doc | Bin 0 -> 35840 bytes front/src/views/home/apply.vue | 1645 ++++++++--------- 2 files changed, 780 insertions(+), 865 deletions(-) create mode 100644 front/public/static/download/感知资源申请表.doc diff --git a/front/public/static/download/感知资源申请表.doc b/front/public/static/download/感知资源申请表.doc new file mode 100644 index 0000000000000000000000000000000000000000..903585bf7b94f903fd3a0e4cb26d57b6acd2fab3 GIT binary patch literal 35840 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 literal 0 HcmV?d00001 diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue index 1209ae57..bff1b8e1 100644 --- a/front/src/views/home/apply.vue +++ b/front/src/views/home/apply.vue @@ -8,93 +8,36 @@
- +
- - + + - - + +
- - + + - - + + - - - - + + + + {{ item.name }} @@ -102,102 +45,61 @@
- - + + - + 如选项没有系统请新增
- - + + + +
+
+ +
-
- - - + +
+ + + + + + 选择上传附件 + + + 支持doc、docx、PDF等格式支撑材料上传，文件大小不超过100M + + + + + + + + 感知资源申请表模板下载 + +
+
- + 退出申请 - + 提交申请
@@ -215,309 +117,249 @@
From 34ac0b016bb7abc5bef68c6a521a3cec0479651c Mon Sep 17 00:00:00 2001 From: guoyue Date: Fri, 14 Oct 2022 17:08:54 +0800 Subject: [PATCH 08/31] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8=EF=BC=9A?= =?UTF-8?q?=E6=88=91=E7=9A=84=E7=94=B3=E8=AF=B7-=E8=83=BD=E5=8A=9B?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E8=BF=87?= =?UTF-8?q?=E6=9C=9F=E6=97=B6=E9=97=B4=E7=9A=84=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../personalCenter/components/MyApply.vue | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue index 2b593d2f..508e8bd2 100644 --- a/front/src/views/personalCenter/components/MyApply.vue +++ b/front/src/views/personalCenter/components/MyApply.vue @@ -48,7 +48,8 @@
申请日期：{{ item.createDate || item.startTime }}
-
+ +
过期时间：{{ item.expireDate || '' }}
- + + + @@ -237,9 +240,17 @@ function changeApplyState(item, index) { } } +const cilckRowData = ref({}) +let detailModalTitle = '申请详情'; const showDetail = (item) => { + cilckRowData.value = item; // 西海岸-申请时间过期，提示 if (isXiHaiAn) { + // 西海岸、单兵无人机设备 + if (item.tbDeviceDTO) { + detailModalTitle = item.tbDeviceDTO.name ? item.tbDeviceDTO.name + '申请详情' : '申请详情' + } + console.log('detailModalTitle------------>', detailModalTitle); if (item.expireDate) { let diff = moment().diff(moment(item.expireDate), 'seconds') if (diff > 0) { @@ -251,7 +262,6 @@ const showDetail = (item) => { getByApplyFlag(item.applyFlag).then((res) => { if (res.data.code == 0) { refObj.value = res.data.data - detailsVisible.value = true processDefinitionName.value = item.processDefinitionName businessKey.value = item.businessKey From 0d402302f721ba6d86548db233fec9f5858efc2d Mon Sep 17 00:00:00 2001 From: guoyue Date: Fri, 14 Oct 2022 17:34:35 +0800 Subject: [PATCH 09/31] =?UTF-8?q?=E8=A5=BF=E6=B5=B7=E5=B2=B8-=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E8=AE=BE=E6=96=BD=EF=BC=9A=E6=97=A0=E4=BA=BA=E6=9C=BA?= =?UTF-8?q?=E3=80=81=E5=8D=95=E5=85=B5=E7=94=B3=E8=AF=B7=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E9=A1=B5=E9=9D=A2=E5=BA=94=E8=AF=A5=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E6=97=A0=E4=BA=BA=E6=9C=BA=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/home/infrastructurePage.vue | 4080 +++++++++---------- 1 file changed, 1905 insertions(+), 2175 deletions(-) diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue index 96cf4576..7c45e006 100644 --- a/front/src/views/home/infrastructurePage.vue +++ b/front/src/views/home/infrastructurePage.vue @@ -5,24 +5,15 @@
{{ item.title }} - + 清空 - + {{ itemContent.labelName || itemContent }}
@@ -30,35 +21,19 @@
-
+
会议室预约
-
+
预约结果
会议室搜索
- - + + 重置
@@ -69,40 +44,23 @@
可用时间查询 - - - + + +
- +
{{ item.name }}
@@ -115,54 +73,39 @@ {{ item.description }}
- + " @click="appointment(item)"> 预约
- +
- + - +
- +
预约结果
-
-
+ ">
+
审核结果：{{ - lookData.state == 2 - ? '通过' - : lookData.state == 1 - ? '审核中' - : '不通过' + lookData.state == 2 + ? '通过' + : lookData.state == 1 + ? '审核中' + : '不通过' }} @@ -217,29 +142,24 @@
预约信息
-
+ ">
预约时段：{{ lookData.bookDate }} {{ lookData.startTime }}-{{ - lookData.endTime + lookData.endTime }}
-
+ "> 预约人：{{ lookData.name }} 联系方式：{{ lookData.phone }} 预约部门：{{ lookData.dept }} @@ -249,43 +169,18 @@ 使用事项：{{ lookData.matter }}
- - + + - - + + -
+
当日会议室可用时段：{{ roomDateList[0] }} @@ -293,40 +188,21 @@
- - + + - + - + @@ -336,42 +212,23 @@ - + - + - - + + 选择上传附件 @@ -382,18 +239,11 @@ - + 取消 - + 提交 @@ -423,47 +273,23 @@
- - + + 重置
- + 批量预览 - + 添加至申购车 - + 一键申请 @@ -473,39 +299,27 @@
- + }" :loading="loadingCamera">