- {{ val.channelName }}
+ {{ val.channelName }}
基础设施
@@ -156,6 +184,9 @@
From b1c04e5f31abdab0bb664e84cfd9916b9d4516dc Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 2 Aug 2022 17:59:47 +0800
Subject: [PATCH 05/38] =?UTF-8?q?=E8=B6=8B=E5=8A=BF=E7=AB=99=E7=82=B9=20?=
=?UTF-8?q?=20=E6=96=B0=E5=A2=9E=20=20=E5=B4=82=E5=B1=B1=E5=8C=BA=20=20?=
=?UTF-8?q?=E6=9D=8E=E6=B2=A7=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
front/src/views/home/mapTest/index.vue | 101 +++++++++++++++++++++++--
1 file changed, 95 insertions(+), 6 deletions(-)
diff --git a/front/src/views/home/mapTest/index.vue b/front/src/views/home/mapTest/index.vue
index 73300ce4..1d0ba2f0 100644
--- a/front/src/views/home/mapTest/index.vue
+++ b/front/src/views/home/mapTest/index.vue
@@ -93,7 +93,7 @@
// name: '市南区',
// code: 'shinan',
// className: 'classsn',
- // value: 0,
+ // value: 1,
// },
{
name: '市北区',
@@ -117,13 +117,13 @@
name: '李沧区',
code: 'licang',
className: 'classlc',
- value: 0,
+ value: 0.2,
},
{
name: '城阳区',
code: 'chengyang',
className: 'classcy',
- value: 0,
+ value: 0.2,
},
{
name: '即墨区',
@@ -322,7 +322,12 @@
let res = []
for (let i = 0; i < data.length; i++) {
let dataItem = data[i]
- if (dataItem.name === '西海岸' || dataItem.name === '崂山区') {
+ if (
+ dataItem.name === '西海岸' ||
+ dataItem.name === '崂山区' ||
+ dataItem.name === '李沧区' ||
+ dataItem.name === '城阳区'
+ ) {
let fromCoord = geoCoordMap[dataItem.name]
let toCoord = [120.364482, 36.065671]
if (fromCoord && toCoord) {
@@ -344,7 +349,12 @@
let res = []
for (let i = 0; i < data.length; i++) {
let dataItem = data[i]
- if (dataItem.name === '西海岸' || dataItem.name === '崂山区') {
+ if (
+ dataItem.name === '西海岸' ||
+ dataItem.name === '崂山区' ||
+ dataItem.name === '李沧区' ||
+ dataItem.name === '城阳区'
+ ) {
let fromCoord = [120.364482, 36.065671]
let toCoord = geoCoordMap[dataItem.name]
if (fromCoord && toCoord) {
@@ -366,7 +376,12 @@
let res = []
for (let i = 0; i < data.length; i++) {
let dataItem = data[i]
- if (dataItem.name !== '西海岸' && dataItem.name !== '崂山区') {
+ if (
+ dataItem.name !== '西海岸' &&
+ dataItem.name !== '崂山区' &&
+ dataItem.name !== '李沧区' &&
+ dataItem.name !== '城阳区'
+ ) {
let fromCoord = [120.364482, 36.065671]
let toCoord = geoCoordMap[dataItem.name]
if (fromCoord && toCoord) {
@@ -599,6 +614,80 @@
value: geoCoordMap['崂山区'].concat([10]),
},
],
+ },
+ {
+ type: 'scatter',
+ coordinateSystem: 'geo',
+ zlevel: 2,
+ rippleEffect: {
+ period: 4,
+ brushType: 'stroke',
+ scale: 4,
+ },
+ label: {
+ normal: {
+ show: true,
+ position: 'bottom',
+ //offset:[5, 0],
+ color: '#fbd500',
+ formatter: '{b}',
+ textStyle: {
+ color: '#fbd500',
+ fontSize: 18,
+ fontWeight: 600,
+ },
+ },
+ emphasis: {
+ show: true,
+ color: '#f60',
+ },
+ },
+ symbol: 'image://' + require('@/assets/home/yb.png'),
+ symbolSize: 40,
+ symbolOffset: [0, -20],
+ data: [
+ {
+ name: '城阳区',
+ value: geoCoordMap['城阳区'].concat([10]),
+ },
+ ],
+ },
+ {
+ type: 'scatter',
+ coordinateSystem: 'geo',
+ zlevel: 2,
+ rippleEffect: {
+ period: 4,
+ brushType: 'stroke',
+ scale: 4,
+ },
+ label: {
+ normal: {
+ show: true,
+ position: 'bottom',
+ //offset:[5, 0],
+ color: '#fbd500',
+ formatter: '{b}',
+ textStyle: {
+ color: '#fbd500',
+ fontSize: 18,
+ fontWeight: 600,
+ },
+ },
+ emphasis: {
+ show: true,
+ color: '#f60',
+ },
+ },
+ symbol: 'image://' + require('@/assets/home/yb.png'),
+ symbolSize: 40,
+ symbolOffset: [0, -20],
+ data: [
+ {
+ name: '李沧区',
+ value: geoCoordMap['李沧区'].concat([10]),
+ },
+ ],
}
)
})
From 3bb705ec3f3721557f9076ce5f7beb2253f66d76 Mon Sep 17 00:00:00 2001
From: a0049873 <79py69t9wb@privaterelay.appleid.com>
Date: Tue, 2 Aug 2022 18:37:51 +0800
Subject: [PATCH 06/38] =?UTF-8?q?=E5=8C=BA=E5=B8=82=E7=AB=99=E7=82=B9=20?=
=?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=20=E9=BC=A0=E6=A0=87=E7=A7=BB=E5=8A=A8?=
=?UTF-8?q?=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
front/src/views/home/mapTest/index.vue | 94 ++++++++++++++++++++++++--
1 file changed, 89 insertions(+), 5 deletions(-)
diff --git a/front/src/views/home/mapTest/index.vue b/front/src/views/home/mapTest/index.vue
index 1d0ba2f0..46ca48f9 100644
--- a/front/src/views/home/mapTest/index.vue
+++ b/front/src/views/home/mapTest/index.vue
@@ -175,6 +175,8 @@
]
} else if (val.name === '市北区') {
geoCoordMap[val.name] = [val.coord[0], val.coord[1]]
+ } else if (val.name === '城阳区') {
+ geoCoordMap[val.name] = [val.coord[0] - 0.057495, val.coord[1]]
} else if (val.name === '市南区') {
geoCoordMap[val.name] = [120.364482, 36.065671]
}
@@ -573,7 +575,7 @@
symbolOffset: [0, -20],
data: [
{
- name: '西海岸',
+ name: '',
value: geoCoordMap['西海岸'].concat([10]),
},
],
@@ -610,7 +612,7 @@
symbolOffset: [0, -20],
data: [
{
- name: '崂山区',
+ name: '',
value: geoCoordMap['崂山区'].concat([10]),
},
],
@@ -647,7 +649,7 @@
symbolOffset: [0, -20],
data: [
{
- name: '城阳区',
+ name: '',
value: geoCoordMap['城阳区'].concat([10]),
},
],
@@ -684,7 +686,7 @@
symbolOffset: [0, -20],
data: [
{
- name: '李沧区',
+ name: '',
value: geoCoordMap['李沧区'].concat([10]),
},
],
@@ -701,11 +703,93 @@
}
onMounted(() => {
initMap()
- myChart.on('mouseover', function () {
+ myChart.on('mouseover', function (params) {
+ console.log(params.value)
myChart.dispatchAction({
type: 'downplay',
})
+ let flag = true
+ if (
+ params.value[0] == '119.825774' &&
+ params.value[1] == '35.739174000000006'
+ ) {
+ if (option.series[8].data[0].name == '西海岸') {
+ flag = false
+ }
+ option.series[8].data[0].name = '西海岸'
+ option.series[9].data[0].name = ''
+ option.series[10].data[0].name = ''
+ option.series[11].data[0].name = ''
+ if (flag) {
+ myChart.clear()
+ myChart.setOption(option, true)
+ }
+ } else if (
+ params.value[0] == '120.579994' &&
+ params.value[1] == '36.189191'
+ ) {
+ if (option.series[9].data[0].name == '崂山区') {
+ flag = false
+ }
+ option.series[8].data[0].name = ''
+ option.series[9].data[0].name = '崂山区'
+ option.series[10].data[0].name = ''
+ option.series[11].data[0].name = ''
+ if (flag) {
+ myChart.clear()
+ myChart.setOption(option, true)
+ }
+ } else if (
+ params.value[0] == '120.421977' &&
+ params.value[1] == '36.18555'
+ ) {
+ if (option.series[11].data[0].name == '李沧区') {
+ flag = false
+ }
+ option.series[8].data[0].name = ''
+ option.series[9].data[0].name = ''
+ option.series[10].data[0].name = ''
+ option.series[11].data[0].name = '李沧区'
+ if (flag) {
+ myChart.clear()
+ myChart.setOption(option, true)
+ }
+ } else if (
+ params.value[0] == '120.272216' &&
+ params.value[1] == '36.27479'
+ ) {
+ if (option.series[10].data[0].name == '城阳区') {
+ flag = false
+ }
+ option.series[8].data[0].name = ''
+ option.series[9].data[0].name = ''
+ option.series[10].data[0].name = '城阳区'
+ option.series[11].data[0].name = ''
+ if (flag) {
+ myChart.clear()
+ myChart.setOption(option, true)
+ }
+ }
})
+ // myChart.on('mouseout', function (params) {
+ // console.log(params)
+ // switch (params.name) {
+ // case '西海岸':
+ // option.series[8].data[0].name = ''
+ // break
+ // case '崂山区':
+ // option.series[9].data[0].name = ''
+ // break
+ // case '城阳区':
+ // option.series[10].data[0].name = ''
+ // break
+ // case '李沧区':
+ // option.series[11].data[0].name = ''
+ // break
+ // }
+ // myChart.clear()
+ // myChart.setOption(option, true)
+ // })
myChart.on('click', function (params) {
console.log(params)
params.event.event.stopPropagation()
From 341119dcd2776034b320ab49f9a4636c217598dc Mon Sep 17 00:00:00 2001
From: gaoyuanwei <2826352639@qq.com>
Date: Wed, 3 Aug 2022 09:20:25 +0800
Subject: [PATCH 07/38] 782Bug
---
front/src/views/demandCenter/demandDetails.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/front/src/views/demandCenter/demandDetails.vue b/front/src/views/demandCenter/demandDetails.vue
index 40b0669f..67c8f99b 100644
--- a/front/src/views/demandCenter/demandDetails.vue
+++ b/front/src/views/demandCenter/demandDetails.vue
@@ -299,7 +299,7 @@
if (res.data.code == '0') {
demandCommentApply({ id: res.data.data.id }).then((res1) => {
if (res1.data.code == '0') {
- message.success('提交评价成功！')
+ message.success('提交评价成功，请注意查看消息通知！')
myComment.value = ''
evaluateList()
}
From ce6163621dcb1536179b2da540aba67d36924253 Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Wed, 3 Aug 2022 09:46:46 +0800
Subject: [PATCH 08/38] =?UTF-8?q?bug786=E8=83=BD=E5=8A=9B=E9=9C=80?=
=?UTF-8?q?=E6=B1=82=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/views/personalCenter/components/addApplication.vue | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/front/src/views/personalCenter/components/addApplication.vue b/front/src/views/personalCenter/components/addApplication.vue
index 4099d01d..64221936 100644
--- a/front/src/views/personalCenter/components/addApplication.vue
+++ b/front/src/views/personalCenter/components/addApplication.vue
@@ -101,6 +101,12 @@
:rules="[{ required: true, message: '请选择应用领域' }]"
>
Date: Wed, 3 Aug 2022 10:32:08 +0800
Subject: [PATCH 09/38] bug783
---
.../views/modules/activiti/demo/comments.vue | 29 +++++++++++--------
1 file changed, 17 insertions(+), 12 deletions(-)
diff --git a/back/src/views/modules/activiti/demo/comments.vue b/back/src/views/modules/activiti/demo/comments.vue
index fe6f3ddd..d09be790 100644
--- a/back/src/views/modules/activiti/demo/comments.vue
+++ b/back/src/views/modules/activiti/demo/comments.vue
@@ -7,13 +7,19 @@
@keyup.enter.native="dataFormSubmitHandle()"
:label-width="$i18n.locale === 'en-US' ? '120px' : 'auto'"
>
-
-
-
+
+
+ {{ dataForm.comment }}
+
+
+
+
+
@@ -106,10 +112,9 @@ export default {
mounted () {}
}
-
From a9e500490d8b5e39733030f693cd7b6b58a0d8f7 Mon Sep 17 00:00:00 2001
From: "851673013@qq.com" <851673013@qq.com>
Date: Wed, 3 Aug 2022 11:07:16 +0800
Subject: [PATCH 10/38] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E4=B8=8A=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../hasToDoTasks/AbilityResourceShelf.vue | 8 --
.../myAgent/demo/ResourcesAndServices.vue | 125 +++++++++---------
.../myAgent/demo/ability-resource-shelf.vue | 27 ++--
3 files changed, 75 insertions(+), 85 deletions(-)
diff --git a/back/src/views/modules/hasToDoTasks/AbilityResourceShelf.vue b/back/src/views/modules/hasToDoTasks/AbilityResourceShelf.vue
index dd77df1c..0da3a386 100644
--- a/back/src/views/modules/hasToDoTasks/AbilityResourceShelf.vue
+++ b/back/src/views/modules/hasToDoTasks/AbilityResourceShelf.vue
@@ -136,15 +136,7 @@ export default {
return this.$message.error(this.$t('task.detailError'))
}
this.getProcDefRouteSet(row, this.forwardDetail)
- },
- methodsThree () {
- this.$http.get('/category/getCategoryTree').then((res) => {
- localStorage.setItem('getCategoryTree', JSON.stringify(res.data.data))
- })
}
- },
- mounted () {
- this.methodsThree()
}
}
diff --git a/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue b/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue
index f7e74c61..92c363dd 100644
--- a/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue
+++ b/back/src/views/modules/myAgent/demo/ResourcesAndServices.vue
@@ -1,6 +1,6 @@