diff --git a/back/src/App.vue b/back/src/App.vue index 67fb81e4..90b247b5 100644 --- a/back/src/App.vue +++ b/back/src/App.vue @@ -13,7 +13,28 @@ - diff --git a/back/src/views/modules/activiti/demo/abilitydemandapply.vue b/back/src/views/modules/activiti/demo/abilitydemandapply.vue index f1b96feb..f9f2fad5 100644 --- a/back/src/views/modules/activiti/demo/abilitydemandapply.vue +++ b/back/src/views/modules/activiti/demo/abilitydemandapply.vue @@ -60,7 +60,25 @@ - 附件下载 + + @@ -73,11 +91,16 @@ > -->
-
- 同意 +
+ +
+ + 同意 + 驳回 +
@@ -221,46 +244,46 @@ export default { }, // 同意与退回 agreeOrNot: debounce( - function (data) { + function (data, type) { this.dataForm.taskId = this.$route.params.taskId - if (this.dialogType === '同意') { - if (this.input !== '') { - console.log('this.dataForm', this.dataForm) - const params = qs.stringify({ - taskId: this.dataForm.taskId, - comment: this.input - }) - console.log(params) - this.$http - .post('/act/task/complete?' + params) - .then(({ data: res }) => { - if (res.code !== 0) { - this.$message.error(res.msg) - if (this.callbacks.taskHandleErrorCallback) { - this.callbacks.taskHandleErrorCallback(res) - } - return + if (type === '同意') { + // if (this.input !== '') { + console.log('this.dataForm', this.dataForm) + const params = qs.stringify({ + taskId: this.dataForm.taskId, + comment: this.input || '同意' + }) + console.log(params) + this.$http + .post('/act/task/complete?' + params) + .then(({ data: res }) => { + if (res.code !== 0) { + this.$message.error(res.msg) + if (this.callbacks.taskHandleErrorCallback) { + this.callbacks.taskHandleErrorCallback(res) } - bus.$emit('AbilityResourcesRemovedInit') - this.$message({ - message: this.$t('prompt.success'), - type: 'success', - duration: 500, - onClose: () => { - this.visible = false - this.dialogVisible = false - if (this.callbacks.taskHandleSuccessCallback) { - this.callbacks.taskHandleSuccessCallback(res) - } + return + } + bus.$emit('AbilityResourcesRemovedInit') + this.$message({ + message: this.$t('prompt.success'), + type: 'success', + duration: 500, + onClose: () => { + this.visible = false + this.dialogVisible = false + if (this.callbacks.taskHandleSuccessCallback) { + this.callbacks.taskHandleSuccessCallback(res) } - }) + } }) - .catch(() => {}) - this.tabRemoveHandle(data) - } else { - this.$message.error('请输入审批意见！') - } - } else if (this.dialogType === '拒绝') { + }) + .catch(() => {}) + this.tabRemoveHandle(data) + // } else { + // this.$message.error('请输入审批意见！') + // } + } else if (type === '驳回') { if (this.input !== '') { const params = qs.stringify({ taskId: this.dataForm.taskId, @@ -334,6 +357,11 @@ export default { } diff --git a/back/src/views/modules/activiti/demo/comments.vue b/back/src/views/modules/activiti/demo/comments.vue index 4f2a6d5c..6c539f0e 100644 --- a/back/src/views/modules/activiti/demo/comments.vue +++ b/back/src/views/modules/activiti/demo/comments.vue @@ -32,11 +32,16 @@ > -->
-
- 同意 +
+ +
+ + 同意 + 驳回 +
@@ -149,46 +154,46 @@ export default { }, // 同意与退回 agreeOrNot: debounce( - function (data) { + function (data, type) { this.dataForm.taskId = this.$route.params.taskId - if (this.dialogType === '同意') { - if (this.input !== '') { - console.log('this.dataForm', this.dataForm) - const params = qs.stringify({ - taskId: this.dataForm.taskId, - comment: this.input - }) - console.log(params) - this.$http - .post('/act/task/complete?' + params) - .then(({ data: res }) => { - if (res.code !== 0) { - this.$message.error(res.msg) - if (this.callbacks.taskHandleErrorCallback) { - this.callbacks.taskHandleErrorCallback(res) - } - return + if (type === '同意') { + // if (this.input !== '') { + console.log('this.dataForm', this.dataForm) + const params = qs.stringify({ + taskId: this.dataForm.taskId, + comment: this.input || '同意' + }) + console.log(params) + this.$http + .post('/act/task/complete?' + params) + .then(({ data: res }) => { + if (res.code !== 0) { + this.$message.error(res.msg) + if (this.callbacks.taskHandleErrorCallback) { + this.callbacks.taskHandleErrorCallback(res) } - bus.$emit('AbilityResourcesRemovedInit') - this.$message({ - message: this.$t('prompt.success'), - type: 'success', - duration: 500, - onClose: () => { - this.visible = false - this.dialogVisible = false - if (this.callbacks.taskHandleSuccessCallback) { - this.callbacks.taskHandleSuccessCallback(res) - } + return + } + bus.$emit('AbilityResourcesRemovedInit') + this.$message({ + message: this.$t('prompt.success'), + type: 'success', + duration: 500, + onClose: () => { + this.visible = false + this.dialogVisible = false + if (this.callbacks.taskHandleSuccessCallback) { + this.callbacks.taskHandleSuccessCallback(res) } - }) + } }) - .catch(() => {}) - this.tabRemoveHandle(data) - } else { - this.$message.error('请输入审批意见！') - } - } else if (this.dialogType === '拒绝') { + }) + .catch(() => {}) + this.tabRemoveHandle(data) + // } else { + // this.$message.error('请输入审批意见！') + // } + } else if (type === '拒绝') { if (this.input !== '') { const params = qs.stringify({ taskId: this.dataForm.taskId, @@ -291,4 +296,102 @@ export default { height: 100px; resize: none; } +.approvalOperation{ + display: flex; + flex-direction: column; + .contentOperation{ + display: flex; + flex-direction: row; + margin-bottom: 10px; + .el-input{ + margin-left: 0px; + width: 500px; + height: 32px; + line-height: 32px; + .el-input__inner{ + height: 32px; + width: 500px; + line-height: 32px; + } + } + .agreeButton{ + display: inline-block; + line-height: 8px; + width:80px; + height: 32px; + white-space: nowrap; + cursor: pointer; + color: #ffffff; + -webkit-appearance: none; + text-align: center; + -webkit-box-sizing: border-box; + box-sizing: border-box; + outline: 0; + margin-left: 10px; + -webkit-transition: .1s; + transition: .1s; + font-weight: 500; + //padding: 12px 20px; + font-size: 14px; + border-radius: 4px; + background-color: #0058e1; + } + .agreeButton:hover{ + background: #65a5f9; + border-color: #65a5f9; + color: #FFF; + } + .rejectButton{ + display: inline-block; + line-height: 8px; + width:80px; + height: 32px; + white-space: nowrap; + cursor: pointer; + color: #F56C6C; + -webkit-appearance: none; + text-align: center; + -webkit-box-sizing: border-box; + box-sizing: border-box; + outline: 0; + margin: 0; + -webkit-transition: .1s; + transition: .1s; + font-weight: 500; + //padding: 12px 20px; + font-size: 14px; + border-radius: 4px; + border-color: #F56C6C; + margin-left: 12px; + } + .rejectButton:hover{ + background-color: #F56C6C; + border-color: #F56C6C; + color: #ffffff; + } + .transferButton{ + display: inline-block; + line-height: 8px; + width:80px; + height: 32px; + white-space: nowrap; + cursor: pointer; + color: #0058e1; + -webkit-appearance: none; + text-align: center; + -webkit-box-sizing: border-box; + box-sizing: border-box; + outline: 0; + margin: 0; + -webkit-transition: .1s; + transition: .1s; + font-weight: 500; + //padding: 12px 20px; + font-size: 14px; + border-radius: 4px; + border-color: #0058e1; + margin-left: 12px; + } + } +} diff --git a/back/src/views/modules/activiti/demo/correction.vue b/back/src/views/modules/activiti/demo/correction.vue index de970618..004efccf 100644 --- a/back/src/views/modules/activiti/demo/correction.vue +++ b/back/src/views/modules/activiti/demo/correction.vue @@ -6,7 +6,7 @@ {{ $t('add') }} - {{ $t('deleteBatch') }} + {{ $t('deleteBatch') }} diff --git a/back/src/views/modules/activiti/demo/putaway-process3.vue b/back/src/views/modules/activiti/demo/putaway-process3.vue index f15c90d4..97829af5 100644 --- a/back/src/views/modules/activiti/demo/putaway-process3.vue +++ b/back/src/views/modules/activiti/demo/putaway-process3.vue @@ -234,42 +234,42 @@ export default { function (data) { this.dataForm.taskId = this.$route.params.taskId if (this.dialogType === '同意') { - if (this.input !== '') { - console.log('this.dataForm', this.dataForm) - const params = qs.stringify({ - taskId: this.dataForm.taskId, - comment: this.input - }) - console.log(params) - this.$http - .post('/act/task/complete?' + params) - .then(({ data: res }) => { - if (res.code !== 0) { - this.$message.error(res.msg) - if (this.callbacks.taskHandleErrorCallback) { - this.callbacks.taskHandleErrorCallback(res) - } - return + // if (this.input !== '') { + console.log('this.dataForm', this.dataForm) + const params = qs.stringify({ + taskId: this.dataForm.taskId, + comment: this.input || '同意' + }) + console.log(params) + this.$http + .post('/act/task/complete?' + params) + .then(({ data: res }) => { + if (res.code !== 0) { + this.$message.error(res.msg) + if (this.callbacks.taskHandleErrorCallback) { + this.callbacks.taskHandleErrorCallback(res) } - bus.$emit('AbilityResourcesRemovedInit') - this.$message({ - message: this.$t('prompt.success'), - type: 'success', - duration: 500, - onClose: () => { - this.visible = false - this.dialogVisible = false - if (this.callbacks.taskHandleSuccessCallback) { - this.callbacks.taskHandleSuccessCallback(res) - } + return + } + bus.$emit('AbilityResourcesRemovedInit') + this.$message({ + message: this.$t('prompt.success'), + type: 'success', + duration: 500, + onClose: () => { + this.visible = false + this.dialogVisible = false + if (this.callbacks.taskHandleSuccessCallback) { + this.callbacks.taskHandleSuccessCallback(res) } - }) + } }) - .catch(() => {}) - this.tabRemoveHandle(data) - } else { - this.$message.error('请输入审批意见！') - } + }) + .catch(() => {}) + this.tabRemoveHandle(data) + // } else { + // this.$message.error('请输入审批意见！') + // } } else if (this.dialogType === '拒绝') { if (this.input !== '') { const params = qs.stringify({ diff --git a/back/src/views/modules/activiti/model.vue b/back/src/views/modules/activiti/model.vue index 7194b76e..3c92cc51 100644 --- a/back/src/views/modules/activiti/model.vue +++ b/back/src/views/modules/activiti/model.vue @@ -31,7 +31,7 @@ }} - {{ + {{ $t("deleteBatch") }} diff --git a/back/src/views/modules/activiti/my-work-dynamics.vue b/back/src/views/modules/activiti/my-work-dynamics.vue index 7e1bbb0a..6dfd5410 100644 --- a/back/src/views/modules/activiti/my-work-dynamics.vue +++ b/back/src/views/modules/activiti/my-work-dynamics.vue @@ -11,7 +11,7 @@ 查询 - 重置 + 重置
{ let ids = [] - if (this.deleteDataArr.length > 1) { + if(row.id && this.deleteDataArr.length==0){ + ids = [row.id] + }else{ ids = this.deleteDataArr - } else { - ids = [row.id] } - console.log(ids) this.$http .delete('/workdynamics/delete', { data: ids diff --git a/back/src/views/modules/activiti/process-initiation.vue b/back/src/views/modules/activiti/process-initiation.vue index baf72e70..29377574 100644 --- a/back/src/views/modules/activiti/process-initiation.vue +++ b/back/src/views/modules/activiti/process-initiation.vue @@ -9,7 +9,7 @@ - {{ $t('query') }} + {{ $t('query') }} - {{ $t('query') }} + {{ $t('query') }} {{ $t('process.deployFile') }} - {{ $t('deleteBatch') }} + {{ $t('deleteBatch') }} - {{ $t('query') }} + {{ $t('query') }} - 查询 - 重置 + 查询 + 重置
diff --git a/back/src/views/modules/algorithm/algorithm-management.vue b/back/src/views/modules/algorithm/algorithm-management.vue index 3dba3e36..39f477cc 100644 --- a/back/src/views/modules/algorithm/algorithm-management.vue +++ b/back/src/views/modules/algorithm/algorithm-management.vue @@ -13,12 +13,12 @@ > - {{ + {{ $t("query") }} - {{ + {{ $t("export") }} @@ -33,13 +33,13 @@ {{ $t("deleteBatch") }} - 重置 + 重置 - 查询 - 重置 + 查询 + 重置 任务新增 diff --git a/back/src/views/modules/canassigncase/index.vue b/back/src/views/modules/canassigncase/index.vue index f62ece4d..06efb4f1 100644 --- a/back/src/views/modules/canassigncase/index.vue +++ b/back/src/views/modules/canassigncase/index.vue @@ -10,12 +10,12 @@ > - {{ + {{ $t("query") }} - {{ + {{ $t("export") }} @@ -30,13 +30,13 @@ {{ $t("deleteBatch") }} - 重置 + 重置 - {{ $t('query') }} + {{ $t('query') }} {{ $t('add') }} - {{ $t('deleteBatch') }} + {{ $t('deleteBatch') }} - {{ $t('excel.import') }} + {{ $t('excel.import') }} - {{ $t('export') }} + {{ $t('export') }} diff --git a/back/src/views/modules/demo/news.vue b/back/src/views/modules/demo/news.vue index a3759159..fca811bf 100644 --- a/back/src/views/modules/demo/news.vue +++ b/back/src/views/modules/demo/news.vue @@ -16,13 +16,13 @@ - {{ $t('query') }} + {{ $t('query') }} {{ $t('add') }} - {{ $t('deleteBatch') }} + {{ $t('deleteBatch') }} - {{ $t('query') }} + {{ $t('query') }} {{ $t('add') }} - {{ $t('deleteBatch') }} + {{ $t('deleteBatch') }} diff --git a/back/src/views/modules/devtools/baseclass.vue b/back/src/views/modules/devtools/baseclass.vue index 213ff599..297e737f 100644 --- a/back/src/views/modules/devtools/baseclass.vue +++ b/back/src/views/modules/devtools/baseclass.vue @@ -6,13 +6,13 @@ - 查询 + 查询 新增 - 删除 + 删除 diff --git a/back/src/views/modules/devtools/datasource.vue b/back/src/views/modules/devtools/datasource.vue index af004b5a..f3ba1d18 100644 --- a/back/src/views/modules/devtools/datasource.vue +++ b/back/src/views/modules/devtools/datasource.vue @@ -14,13 +14,13 @@ - 查询 + 查询 新增 - 删除 + 删除 diff --git a/back/src/views/modules/devtools/fieldtype.vue b/back/src/views/modules/devtools/fieldtype.vue index 73aa706a..89a289d3 100644 --- a/back/src/views/modules/devtools/fieldtype.vue +++ b/back/src/views/modules/devtools/fieldtype.vue @@ -9,13 +9,13 @@ - 查询 + 查询 新增 - 删除 + 删除 diff --git a/back/src/views/modules/devtools/generator.vue b/back/src/views/modules/devtools/generator.vue index 4bb4aa33..e87af2a9 100644 --- a/back/src/views/modules/devtools/generator.vue +++ b/back/src/views/modules/devtools/generator.vue @@ -6,13 +6,13 @@ - 查询 + 查询 导入数据库表 - 删除 + 删除 diff --git a/back/src/views/modules/devtools/template.vue b/back/src/views/modules/devtools/template.vue index 40c6e3ec..4c8a7b2b 100644 --- a/back/src/views/modules/devtools/template.vue +++ b/back/src/views/modules/devtools/template.vue @@ -12,13 +12,13 @@ 新增 - 启用 + 启用 - 禁用 + 禁用 - 删除 + 删除 diff --git a/back/src/views/modules/job/schedule.vue b/back/src/views/modules/job/schedule.vue index d1af99b5..43731ce4 100644 --- a/back/src/views/modules/job/schedule.vue +++ b/back/src/views/modules/job/schedule.vue @@ -6,25 +6,24 @@ - {{ $t('query') }} + {{ $t('query') }} {{ $t('add') }} - {{ $t('deleteBatch') }} + {{ $t('deleteBatch') }} - {{ $t('schedule.pauseBatch') }} + {{ $t('schedule.pauseBatch') }} - {{ $t('schedule.resumeBatch') }} + {{ $t('schedule.resumeBatch') }} - {{ $t('schedule.runBatch') }} - {{ $t('schedule.log') }} + {{ $t('schedule.log') }} - {{ $t('query') }} + {{ $t('query') }} - {{ $t('deleteBatch') }} + {{ $t('deleteBatch') }} diff --git a/back/src/views/modules/message/mail-template.vue b/back/src/views/modules/message/mail-template.vue index 33628dc9..2379d0d8 100644 --- a/back/src/views/modules/message/mail-template.vue +++ b/back/src/views/modules/message/mail-template.vue @@ -6,7 +6,7 @@ - {{ $t('query') }} + {{ $t('query') }} {{ $t('add') }} @@ -15,7 +15,7 @@ {{ $t('mail.config') }} - {{ $t('deleteBatch') }} + {{ $t('deleteBatch') }} - {{ $t('query') }} + {{ $t('query') }} - {{ $t('deleteBatch') }} + {{ $t('deleteBatch') }} diff --git a/back/src/views/modules/message/sms-send.vue b/back/src/views/modules/message/sms-send.vue index 1dc90111..a3173844 100644 --- a/back/src/views/modules/message/sms-send.vue +++ b/back/src/views/modules/message/sms-send.vue @@ -9,7 +9,7 @@ diff --git a/back/src/views/modules/message/sms.vue b/back/src/views/modules/message/sms.vue index 7deee55a..84320617 100644 --- a/back/src/views/modules/message/sms.vue +++ b/back/src/views/modules/message/sms.vue @@ -10,13 +10,13 @@ - {{ $t('query') }} + {{ $t('query') }} {{ $t('add') }} - {{ $t('deleteBatch') }} + {{ $t('deleteBatch') }} item.name === this.dataForm.type + '一' + (item) => item.name === this.dataForm.type )[0] this.dataForm.infoList.map((item, index) => { this.dataView.children.map((itemView, indexView) => { @@ -253,7 +253,7 @@ export default { (item) => item.attrType === '组件类型' ) this.dataView = val.filter( - (item) => item.name === this.dataForm.type + '一' + (item) => item.name === this.dataForm.type )[0] this.dataView = this.dataView.children.filter( (item) => item.name === componentType[0].attrValue @@ -366,7 +366,7 @@ export default { }, computed: {}, methods: { - videoAndImg(link) { + videoAndImg (link) { if (link) { window.open(link) } else { @@ -376,7 +376,7 @@ export default { }) } }, - deptName() { + deptName () { console.log(this.dataForm.deptId) this.$http .get(`/sys/dept/${this.dataForm.deptId}`) @@ -385,7 +385,7 @@ export default { this.unit = res.data.name }) }, - queryPartAppByKeyIdFunction(index, indexSon, indexSonSon) { + queryPartAppByKeyIdFunction (index, indexSon, indexSonSon) { if (this.dataForm.type === '组件服务') { this.$http .get( @@ -424,8 +424,8 @@ export default { } } }, - created() { }, - mounted() { + created () { }, + mounted () { this.deptName() } } diff --git a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue index 663d940a..9ce39e7a 100644 --- a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue +++ b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue @@ -35,12 +35,18 @@

审批

-
- 转办 +
+
+ + 同意 + 驳回 + 转办 +
+ @@ -89,15 +89,18 @@

审批

-
+
- 转办 - 同意 - 驳回 +
+ + 同意 + 驳回 + 转办 +
@@ -107,14 +110,14 @@ - 取 消 确 定 - + --> @@ -169,6 +172,7 @@ export default { this.$http.get('/sys/user/info').then(({ data: res }) => { res.data.roleIdList.map(val => { this.$http.get('/sys/role/' + val).then(role => { + console.log('role', role) if (role.data.data.name === '流程管理员') { this.taskEntrustFlag = true } @@ -278,7 +282,7 @@ export default { .get( `/act/task/getTaskVariables?${params}&variableName=allowEntrust` ).then(entrust => { - if (entrust.data.data.allowEntrust === true) { + if (entrust.data.data && entrust.data.data.allowEntrust === true) { this.taskEntrustFlag2 = true if (this.taskEntrustFlag && this.taskEntrustFlag2) { this.$alert('当前审核部门为' + res.data.tAbilityApplicationDTOList[0].resourceOwnerDept.name + '，该部门未配置审核人，请联系运维工程师配置完成后进行流程转办！', '流程提醒', { @@ -410,45 +414,47 @@ export default { }, // 同意与退回 agreeOrNot: debounce( - function (data) { - if (this.dialogType === '同意') { - if (this.input !== '') { - console.log('this.dataForm', this.dataForm) - const params = qs.stringify({ - taskId: this.dataForm.taskId, - comment: this.input - }) - console.log(params) - this.$http - .post('/act/task/complete?' + params) - .then(({ data: res }) => { - if (res.code !== 0) { - this.$message.error(res.msg) - if (this.callbacks.taskHandleErrorCallback) { - this.callbacks.taskHandleErrorCallback(res) - } - return + function (data, type) { + // console.log('datadata',data); + // console.log('tttttt',type); + // if (type === '同意') { + if (this.input !== '') { + console.log('this.dataForm', this.dataForm) + const params = qs.stringify({ + taskId: this.dataForm.taskId, + comment: this.input || '同意' + }) + console.log(params) + this.$http + .post('/act/task/complete?' + params) + .then(({ data: res }) => { + if (res.code !== 0) { + this.$message.error(res.msg) + if (this.callbacks.taskHandleErrorCallback) { + this.callbacks.taskHandleErrorCallback(res) } - bus.$emit('competencyApplicationInit') - this.$message({ - message: this.$t('prompt.success'), - type: 'success', - duration: 500, - onClose: () => { - this.visible = false - this.dialogVisible = false - if (this.callbacks.taskHandleSuccessCallback) { - this.callbacks.taskHandleSuccessCallback(res) - } + return + } + bus.$emit('competencyApplicationInit') + this.$message({ + message: this.$t('prompt.success'), + type: 'success', + duration: 500, + onClose: () => { + this.visible = false + this.dialogVisible = false + if (this.callbacks.taskHandleSuccessCallback) { + this.callbacks.taskHandleSuccessCallback(res) } - }) + } }) - .catch(() => { }) - this.tabRemoveHandle(data) - } else { - this.$message.error('请输入审批意见！') - } - } else if (this.dialogType === '驳回') { + }) + .catch(() => { }) + this.tabRemoveHandle(data) + // } else { + // this.$message.error('请输入审批意见！') + // } + } else if (type === '驳回') { if (this.input !== '') { const params = qs.stringify({ taskId: this.dataForm.taskId, @@ -670,7 +676,7 @@ export default { ::v-deep .agreeOr > div { display: flex; - align-items: center; + //align-items: center; .el-input { margin-right: 10px; @@ -737,4 +743,99 @@ export default { .blueInput { width: 55px; } +.approvalOperation{ + display: flex; + flex-direction: column; + .contentOperation{ + display: flex; + flex-direction: row; + margin-bottom: 10px; + .el-input{ + margin-left: 0px; + width: 500px; + height: 32px; + ::v-deep.el-input__inner{ + height: 32px; + } + } + .agreeButton{ + display: inline-block; + line-height: 8px; + width:80px; + height: 32px; + white-space: nowrap; + cursor: pointer; + color: #ffffff; + -webkit-appearance: none; + text-align: center; + -webkit-box-sizing: border-box; + box-sizing: border-box; + outline: 0; + margin: 0; + -webkit-transition: .1s; + transition: .1s; + font-weight: 500; + //padding: 12px 20px; + font-size: 14px; + border-radius: 4px; + background-color: #0058e1; + } + .agreeButton:hover{ + background: #65a5f9; + border-color: #65a5f9; + color: #FFF; + } + .rejectButton{ + display: inline-block; + line-height: 8px; + width:80px; + height: 32px; + white-space: nowrap; + cursor: pointer; + color: #F56C6C; + -webkit-appearance: none; + text-align: center; + -webkit-box-sizing: border-box; + box-sizing: border-box; + outline: 0; + margin: 0; + -webkit-transition: .1s; + transition: .1s; + font-weight: 500; + //padding: 12px 20px; + font-size: 14px; + border-radius: 4px; + border-color: #F56C6C; + margin-left: 12px; + } + .rejectButton:hover{ + background-color: #F56C6C; + border-color: #F56C6C; + color: #ffffff; + } + .transferButton{ + display: inline-block; + line-height: 8px; + width:80px; + height: 32px; + white-space: nowrap; + cursor: pointer; + color: #0058e1; + -webkit-appearance: none; + text-align: center; + -webkit-box-sizing: border-box; + box-sizing: border-box; + outline: 0; + margin: 0; + -webkit-transition: .1s; + transition: .1s; + font-weight: 500; + //padding: 12px 20px; + font-size: 14px; + border-radius: 4px; + border-color: #0058e1; + margin-left: 12px; + } + } +} diff --git a/back/src/views/modules/notice/notice-user.vue b/back/src/views/modules/notice/notice-user.vue index 09aff9e0..765ee20e 100644 --- a/back/src/views/modules/notice/notice-user.vue +++ b/back/src/views/modules/notice/notice-user.vue @@ -6,7 +6,7 @@ - {{ $t('query') }} + {{ $t('query') }} diff --git a/back/src/views/modules/notice/notice.vue b/back/src/views/modules/notice/notice.vue index a89c69f8..4e6d10ed 100644 --- a/back/src/views/modules/notice/notice.vue +++ b/back/src/views/modules/notice/notice.vue @@ -6,13 +6,13 @@ - {{ $t('query') }} + {{ $t('query') }} {{ $t('add') }} - {{ $t('deleteBatch') }} + {{ $t('deleteBatch') }} {{ $t('oss.upload') }} - {{ $t('deleteBatch') }} + {{ $t('deleteBatch') }} - {{ $t('query') }} + {{ $t('query') }} diff --git a/back/src/views/modules/pay/order.vue b/back/src/views/modules/pay/order.vue index 6f110498..47f1f396 100644 --- a/back/src/views/modules/pay/order.vue +++ b/back/src/views/modules/pay/order.vue @@ -12,7 +12,7 @@ - {{ $t('query') }} + {{ $t('query') }} {{ $t('add') }} diff --git a/back/src/views/modules/project/contribute.vue b/back/src/views/modules/project/contribute.vue index 5afee272..644eaf59 100644 --- a/back/src/views/modules/project/contribute.vue +++ b/back/src/views/modules/project/contribute.vue @@ -9,7 +9,7 @@ - {{ $t('query') }} + {{ $t('query') }} 重置 diff --git a/back/src/views/modules/project/list.vue b/back/src/views/modules/project/list.vue index ee292abe..2f0d2b23 100644 --- a/back/src/views/modules/project/list.vue +++ b/back/src/views/modules/project/list.vue @@ -15,7 +15,7 @@ - {{ $t('query') }} + {{ $t('query') }} {{ $t('reset') }} diff --git a/back/src/views/modules/project/use.vue b/back/src/views/modules/project/use.vue index 916d3290..90032d47 100644 --- a/back/src/views/modules/project/use.vue +++ b/back/src/views/modules/project/use.vue @@ -22,7 +22,7 @@ 查询 - 重置 + 重置 diff --git a/back/src/views/modules/sys/dict-type.vue b/back/src/views/modules/sys/dict-type.vue index 82249b3b..ee19b187 100644 --- a/back/src/views/modules/sys/dict-type.vue +++ b/back/src/views/modules/sys/dict-type.vue @@ -9,13 +9,13 @@ - {{ $t('query') }} + {{ $t('query') }} - {{ $t('add') }} + {{ $t('add') }} - {{ $t('deleteBatch') }} + {{ $t('deleteBatch') }} - {{ $t('query') }} + {{ $t('query') }} - 重置 + 重置 diff --git a/front/src/api/home.js b/front/src/api/home.js index 93e088d1..4851a2f0 100644 --- a/front/src/api/home.js +++ b/front/src/api/home.js @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2022-04-01 19:19:40 * @LastEditors: Light - * @LastEditTime: 2022-10-31 15:52:57 + * @LastEditTime: 2022-11-18 14:09:20 * @Description: 告诉大家这是什么 */ import request from '@/utils/request' @@ -526,3 +526,10 @@ export function getGisByArea(data) { data, }) } +export function getPolicyCloudService(data) { + return request({ + url: '/resource/getPolicyCloudService', + method: 'post', + data, + }) +} diff --git a/front/src/assets/abilityStatistics/four.png b/front/src/assets/abilityStatistics/four.png index d42b1fd0..70c10009 100644 Binary files a/front/src/assets/abilityStatistics/four.png and b/front/src/assets/abilityStatistics/four.png differ diff --git a/front/src/assets/abilityStatistics/fours.png b/front/src/assets/abilityStatistics/fours.png index 227cb98a..8a7d0884 100644 Binary files a/front/src/assets/abilityStatistics/fours.png and b/front/src/assets/abilityStatistics/fours.png differ diff --git a/front/src/assets/abilityStatistics/three.png b/front/src/assets/abilityStatistics/three.png index 70c10009..d33192ec 100644 Binary files a/front/src/assets/abilityStatistics/three.png and b/front/src/assets/abilityStatistics/three.png differ diff --git a/front/src/assets/abilityStatistics/threes.png b/front/src/assets/abilityStatistics/threes.png index 8a7d0884..b892248f 100644 Binary files a/front/src/assets/abilityStatistics/threes.png and b/front/src/assets/abilityStatistics/threes.png differ diff --git a/front/src/assets/abilityStatistics/two.png b/front/src/assets/abilityStatistics/two.png index d33192ec..d42b1fd0 100644 Binary files a/front/src/assets/abilityStatistics/two.png and b/front/src/assets/abilityStatistics/two.png differ diff --git a/front/src/assets/abilityStatistics/twos.png b/front/src/assets/abilityStatistics/twos.png index b892248f..227cb98a 100644 Binary files a/front/src/assets/abilityStatistics/twos.png and b/front/src/assets/abilityStatistics/twos.png differ diff --git a/front/src/assets/home/searchInner.png b/front/src/assets/home/searchInner.png new file mode 100644 index 00000000..1ee46d37 Binary files /dev/null and b/front/src/assets/home/searchInner.png differ diff --git a/front/src/utils/waterMark.js b/front/src/utils/waterMark.js new file mode 100644 index 00000000..edc0c21e --- /dev/null +++ b/front/src/utils/waterMark.js @@ -0,0 +1,69 @@ +/* + * @Author: Light + * @Date: 2022-11-14 15:01:54 + * @LastEditors: Light + * @LastEditTime: 2022-11-16 09:57:28 + * @Description: 水印 + */ +const watermark = { + timer: null, + set: () => {}, +} +const setWatermark = (str, width, height, size, top, index) => { + console.log('生成水印') + const id = str.charCodeAt() + if (document.getElementById(id) !== null) { + document.body.removeChild(document.getElementById(id)) + } + const can = document.createElement('canvas') + can.width = width + can.height = height + + const cans = can.getContext('2d') + cans.rotate((-20 * Math.PI) / 180) + cans.font = size + 'px Microsoft YaHei' + cans.fillStyle = 'rgba(200, 200, 200, 0.4)' + cans.textAlign = 'left' + cans.textBaseline = 'middle' + cans.fillText(str, can.width / 3, can.height / 2) + + const WATER_MARK = document.createElement('div') + const ALL_WIDTH = document.documentElement.clientWidth + 'px' + const ALL_HEIGHT = document.documentElement.clientHeight + 'px' + + WATER_MARK.id = id + WATER_MARK.style.cssText = ` + position: fixed; + top: ${index * top}px; + left: 0; + zIndex: 99999999; + pointer-events: none; + width: ${ALL_WIDTH}; + height: ${ALL_HEIGHT}; + background: url(${can.toDataURL('image/png')}) left top repeat; + opacity: 0; + ` + document.body.appendChild(WATER_MARK) + return id +} + +// 该方法只允许调用一次 +watermark.set = (str, width, height, size, top, index) => { + let id = setWatermark(str, width, height, size, top, index) + watermark.timer && clearTimeout(watermark.timer) + watermark.timer = setTimeout(() => { + if (document.getElementById(id) === null) { + id = setWatermark(str, width, height, size, top, index) + } + }, 300) + window.onresize = () => { + setWatermark(str, width, height, size, top, index) + } +} + +const onWholeWaterMark = (arr, width, height, size, top) => { + arr.map((str, index) => { + watermark.set(str, width, height, size, top, index) + }) +} +export default onWholeWaterMark diff --git a/front/src/views/abilityStatistics/components/AbilityRanking.vue b/front/src/views/abilityStatistics/components/AbilityRanking.vue index 12197f78..33aaac78 100644 --- a/front/src/views/abilityStatistics/components/AbilityRanking.vue +++ b/front/src/views/abilityStatistics/components/AbilityRanking.vue @@ -259,7 +259,7 @@ padding-bottom: 0; .main { width: 100%; - margin-top: 10px; + margin-top: 60px; display: flex; flex-direction: column; align-items: center; @@ -273,7 +273,7 @@ flex-wrap: wrap; justify-content: center; align-items: center; - margin-bottom: 26px; + margin-bottom: -10px; .line { width: 34px; height: 3px; @@ -356,6 +356,8 @@ color: #734204; } .content-neirong { + font-size: 18px; + font-weight: 600; width: 215px; text-overflow: -o-ellipsis-lastline; overflow: hidden; diff --git a/front/src/views/abilityStatistics/components/CapabilityRequirements.vue b/front/src/views/abilityStatistics/components/CapabilityRequirements.vue index b2d4c45c..a87451ea 100644 --- a/front/src/views/abilityStatistics/components/CapabilityRequirements.vue +++ b/front/src/views/abilityStatistics/components/CapabilityRequirements.vue @@ -31,7 +31,11 @@ 查看更多
- +
@@ -92,6 +96,7 @@ dataList.value[index].photo = photo.value[4] break } + dataList.value = [] }) console.log('123123123qwee', dataList.value) diff --git a/front/src/views/abilityStatistics/components/ResourceAggregation.vue b/front/src/views/abilityStatistics/components/ResourceAggregation.vue index 3d9d4741..93158c84 100644 --- a/front/src/views/abilityStatistics/components/ResourceAggregation.vue +++ b/front/src/views/abilityStatistics/components/ResourceAggregation.vue @@ -240,8 +240,8 @@ }, legend: { icon: 'emptyCircle', - height: 3, - itemGap: 40, + itemGap: 20, + padding: 20, // orient: 'horizontal', bottom: 0, formatter: function (name) { @@ -261,8 +261,7 @@ { center: ['50%', '40%'], type: 'pie', - selectedMode: 'single', - silent: true, + // selectedMode: 'single', radius: ['50%', '30%'], color: ['#fe845e', '#6cc95a', '#02d1b0', '#1772ff', '#FAC858'], top: '0', @@ -290,7 +289,6 @@ type: 'pie', center: ['50%', '40%'], radius: ['58%', '50%'], - silent: true, itemStyle: { normal: { color: '#c2c7d6', @@ -477,7 +475,7 @@ barGap: '-100%', itemStyle: { normal: { - color: '#C1232B', + color: '#ECB53F', }, }, // data: [5, 20, 36, 10, 10, 20] @@ -490,7 +488,7 @@ barGap: '-100%', itemStyle: { normal: { - color: '#B5C334', + color: '#FE845E', }, }, // data: [5, 20, 36, 10, 10, 20] @@ -503,7 +501,7 @@ barGap: '-100%', itemStyle: { normal: { - color: '#FCCE10', + color: '#6CC95A', }, }, // data: [5, 20, 36, 10, 10, 20] @@ -516,7 +514,7 @@ barGap: '-100%', itemStyle: { normal: { - color: '#E87C25', + color: '#02D1B0', }, }, // data: [5, 20, 36, 10, 10, 20] @@ -529,20 +527,7 @@ barGap: '-100%', itemStyle: { normal: { - color: '#27727B', - }, - }, - // data: [5, 20, 36, 10, 10, 20] - data: [], - }, - { - name: '', - type: 'bar', - barWidth: 35, - barGap: '-100%', - itemStyle: { - normal: { - color: '#FE8463', + color: '#1772FF', }, }, // data: [5, 20, 36, 10, 10, 20] @@ -560,6 +545,7 @@ for (let i = 0; i < 5; i++) { if (i == index) { arr.push(val.value) + // arr.push(10) // 方便更改样式 } else { arr.push(0) } diff --git a/front/src/views/abilityStatistics/components/SharingSituation.vue b/front/src/views/abilityStatistics/components/SharingSituation.vue index 9bc27605..54fe719b 100644 --- a/front/src/views/abilityStatistics/components/SharingSituation.vue +++ b/front/src/views/abilityStatistics/components/SharingSituation.vue @@ -8,9 +8,17 @@
-
日平均浏览量 {{ browseAvg }}次
+
+ 日平均浏览量 + {{ browseAvg }} + 次 +
-
日最大浏览量{{ browseMax }}次
+
+ 日最大浏览量 + {{ browseMax }} + 次 +

申请量

+

+ 浏览量 +

@@ -61,12 +72,12 @@ backgroundImage: `url(${item.photo}) `, }" >
-
{{ item.type }}
-
{{ item.amount }}
+
{{ item.type }}
+
{{ item.amount }}
-
{{ item.amount }}
-
{{ item.type }}
+
{{ item.amount }}
+
{{ item.type }}
-
能力上架申请
- +
- - {{ index + 1 }} - - {{ nav.name }} +
+ + {{ index + 1 }} + + {{ nav.name }} +
@@ -80,37 +81,10 @@ :required="required" :notFilled="notFilled" > - - - +
- + - + @@ -149,7 +124,7 @@ @confirm="changeYycj('上一步')" @cancel="cancel" > - + - - + - - + @@ -221,7 +198,7 @@ @confirm="changeYycj('下一步')" @cancel="cancel" > - + - - + - +
diff --git a/front/src/views/capacityOnTheShelf/Application.vue b/front/src/views/capacityOnTheShelf/Application.vue index 168072fc..ac710a6c 100644 --- a/front/src/views/capacityOnTheShelf/Application.vue +++ b/front/src/views/capacityOnTheShelf/Application.vue @@ -7,17 +7,19 @@ --> @@ -374,7 +378,7 @@ // ) { // notFilled.value.push('共享条件') // } - + if (notFilled.value.length > 0) { message.warning('请填写必填字段') console.log(notFilled.value) @@ -476,7 +480,7 @@ getCategoryTree().then((res) => { // console.clear() res.data.data = res.data.data.filter( - (item) => item.name === '应用资源一' + (item) => item.name === '应用资源' )[0] navList.value = [] navList2.value = [] @@ -715,85 +719,120 @@ diff --git a/front/src/views/capacityOnTheShelf/BusinessComponent.vue b/front/src/views/capacityOnTheShelf/BusinessComponent.vue index 9434c895..ec6acddc 100644 --- a/front/src/views/capacityOnTheShelf/BusinessComponent.vue +++ b/front/src/views/capacityOnTheShelf/BusinessComponent.vue @@ -7,17 +7,19 @@ --> @@ -572,7 +579,7 @@ getCategoryTree().then((res) => { // console.clear() res.data.data = res.data.data - .filter((item) => item.name === '组件服务一')[0] + .filter((item) => item.name === '组件服务')[0] .children.filter((item) => item.name === '业务组件')[0] navList.value = [] navList2.value = [] @@ -802,86 +809,121 @@ }) diff --git a/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue b/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue index 88669d0a..20929efe 100644 --- a/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue +++ b/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue @@ -7,17 +7,19 @@ --> @@ -570,7 +577,7 @@ getCategoryTree().then((res) => { // console.clear() res.data.data = res.data.data - .filter((item) => item.name === '组件服务一')[0] + .filter((item) => item.name === '组件服务')[0] .children.filter((item) => item.name === '开发组件')[0] navList.value = [] navList2.value = [] @@ -800,85 +807,120 @@ diff --git a/front/src/views/capacityOnTheShelf/LayerServices.vue b/front/src/views/capacityOnTheShelf/LayerServices.vue index ea073a23..f0ba0d1c 100644 --- a/front/src/views/capacityOnTheShelf/LayerServices.vue +++ b/front/src/views/capacityOnTheShelf/LayerServices.vue @@ -7,17 +7,19 @@ --> @@ -467,7 +472,7 @@ getCategoryTree().then((res) => { // console.clear() res.data.data = res.data.data - .filter((item) => item.name === '组件服务一')[0] + .filter((item) => item.name === '组件服务')[0] .children.filter((item) => item.name === '图层服务')[0] navList.value = [] navList2.value = [] @@ -670,85 +675,120 @@ diff --git a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue index 4559593f..89c8972f 100644 --- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue +++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue @@ -10,44 +10,16 @@
-
{{ title.name }}
+
{{ title.name }}
+
{{ val[attr.field] + (attr.company || '') }} @@ -111,24 +112,13 @@ -
+
- -
+ +
- {{ val.name }} + {{ val.name }}: - + + + - + /> --> +
+
+ {{ itemSelect }} +
+
+
- 添加更多{{ title.name }} + + 添加多个{{ title.name }}
@@ -228,7 +255,7 @@ * - {{ item.name }} + {{ item.name }} :
- - --> + + +
+
+ {{ itemSelect }} +
+
+ + + {{ item.note1 }} + + + {{ item.note1 }} + + +
+ + + +
+
+ {{ itemSelect.dictLabel }} +
+
{{ itemson.dictLabel }} +
@@ -516,905 +601,1031 @@
diff --git a/front/src/views/demandCenter/demandDetails.vue b/front/src/views/demandCenter/demandDetails.vue index ca9e50fa..15125495 100644 --- a/front/src/views/demandCenter/demandDetails.vue +++ b/front/src/views/demandCenter/demandDetails.vue @@ -147,7 +147,7 @@ + +
@@ -168,13 +169,14 @@ @change="onSearch" class="resultListSearchInput" /> - + +
@@ -228,13 +230,14 @@ @change="onSearch" class="resultListSearchInput" /> - + +
@@ -301,8 +304,8 @@
-
- +
+
@@ -334,7 +337,14 @@ @change="onSearch" class="resultListSearchInput" /> - + +
@@ -425,7 +435,11 @@
-
+
- - + +
+
+ +
@@ -538,7 +562,14 @@ @change="onSearch" class="resultListSearchInput" /> - + +
@@ -703,7 +734,14 @@ @change="onSearch" class="resultListSearchInput" /> - + + { flag.value = value } - const titleName = ref(titleNameArray) + const titleName = ref([]) const openMonitor = () => { window.open('http://www.qingdao.gov.cn:8083/ghwd/znwdqd/index.html') } @@ -869,6 +910,15 @@ pageSize: currentPageSize.value, name: '', }) + //调整标题顺序 西海岸基础设施放在最前面 + const setTitle = () => { + let title = titleNameArray + let whoShow1 = ref(whoShow) + if (whoShow1 && whoShow1.value.itShowXiHaiAn) { + title[0] = title.splice(2, 1, title[0])[0] + } + titleName.value = title + } // 查询 const onSearch = () => { loading.value = true @@ -1706,6 +1756,8 @@ } onMounted(() => { // 从本地读取查询条件，赋值 + //西海岸基础设施放在最前面 + setTitle() handleSetSearchData() listKey2.value++ // 获取筛选条件 @@ -1843,6 +1895,7 @@ ) } return { + setTitle, listKey, ListContent, searchValue, @@ -1903,7 +1956,9 @@ KnowledgeBase, DetailsPageResource, infrastructurePage, + infrastructurePageXha, detailsPageInfrastructureTree, + detailsPageInfrastructureTreeXha, }, beforeUnmount() { mybus.off('getCameraByParentId') @@ -1930,13 +1985,21 @@ .resultListSearchInput-son { background: #fff; padding: 0.2rem 0.2rem 0rem 0.3rem; - + position: relative; .hengxian { width: 100%; height: 0.01rem; background: rgba(150, 144, 144, 0.3); margin-top: 0.2rem; } + .searchImg { + width: 17px; + height: 17px; + background: url('~@/assets/home/searchInner.png'); + position: absolute; + top: 29px; + left: 480px; + } } } @@ -1945,20 +2008,20 @@ :deep(.ant-input) { width: 4rem; - height: 0.36rem; + height: 0.32rem; background: #fff; - border-radius: 0.04rem; + border-radius: 0.02rem; } :deep(.ant-input-search-button) { width: 0.8rem; - height: 0.36rem; - background: #0087ff; - border-radius: 0.04rem !important; + height: 0.32rem; + background: #0558e1; + border-radius: 0.02rem !important; font-size: 0.14rem; font-weight: 400; color: #fff; - line-height: 0.34rem; + line-height: 0.32rem; margin-left: 0.1rem; } @@ -1971,13 +2034,15 @@ border: 0; outline: none; width: 0.8rem; - height: 0.36rem; - background: #e1edfa; - border-radius: 0.04rem; + height: 0.32rem; + color: #fff; + //background: #e1edfa; + background: #0558e1; + border-radius: 0.02rem; font-size: 0.14rem; font-weight: 400; - color: #0087ff; - line-height: 0.34rem; + //color: #0087ff; + line-height: 0.32rem; margin-left: 2.5rem; cursor: pointer; } diff --git a/front/src/views/home/algorithmCompare.vue b/front/src/views/home/algorithmCompare.vue index 6b155b17..5ab4b261 100644 --- a/front/src/views/home/algorithmCompare.vue +++ b/front/src/views/home/algorithmCompare.vue @@ -1,6 +1,6 @@ {{ user.realName }} 退出 @@ -135,6 +135,7 @@ const mynoticeFlag = ref(false) const mynoticeData = ref([]) const navList = ref(navListManagement.navList) + const targetRouter= ref('') const backFlag = ref(false) getUserInfo().then((res) => { if(res.data.data.superAdmin =='1'){ @@ -153,6 +154,7 @@ const props = defineProps({ showView: { type: String, default: '' }, + targetFlag: { type: Boolean, default: false }, }) // 退出登录 @@ -185,8 +187,9 @@ window.open('http://15.72.177.175:18460/analystrunner/tonglan', '_blank') } // 跳转页面 - const jumpPage = (item) => { - // 西海岸 + const jumpPage = (item,type) => { + if(type == 'headerClick'){ + // 西海岸 if (itShowXiHaiAn.value) { let _arr = ['共享门户', '能力云图', '能力统计', '需求中心', '赋能案例'] if ( @@ -271,6 +274,84 @@ router.push('/home') break } + }else if(type == 'innerClick'){ + //select.value = item.key + switch (item.name) { + case '个人中心': + window.sessionStorage.setItem('type', JSON.stringify('PurchaseVehicle')) + router.push({ + path: '/personalCenter', + }) + break + case '能力统计': + router.push({ + path: '/abilityStatistics', + }) + break + case '能力集市': + router.push({ + path: '/algorithmCompare', + query: { + id: targetRouter.value.id, + }, + }); + break + case '能力云图': + router.push({ + path: '/capabilityCloud', + }) + break + // case '技术文档': + // router.push({ + // path: '/developmentGuide', + // }) + // break + case '新手指南': + router.push({ + path: '/instructionManual', + }) + break + case '需求中心': + router.push({ + path: '/demandCenter', + }) + break + case '区市站点': + router.push({ + path: '/mapTest', + }) + break + case '后台管理': + Cookies.remove('JSESSIONID') + window.open(window.SITE_CONFIG.backUrl + '/#/workBench-workBench') + // window.reload('http://15.2.21.238:9797') + break + case '赋能案例': + router.push({ + path: '/assignCase', + }) + break + case '典型赋能案例': + router.push({ + path: '/assignCase', + }) + break + case '融合服务': + router.push({ + path: '/integrationServices', + }) + break + case 'CIM专区': + router.push({ + path: '/cimSpecialArea', + }) + break + default: + router.push('/home') + break + } + + } } const scrollTop = ref(0) window.onscroll = function () { @@ -348,6 +429,20 @@ mybus.on('getMynotice', () => { getMynotice() }) + + mybus.on('changeMenuStyle', (data) => { + if(data.path=='/algorithmCompare'){ + targetRouter.value = data; + jumpPage({ + "name": "能力集市", + "key": "DetailsPageconetent", + "innerKey":"algorithmCompare" + },'innerClick'); + } else if(data.path =='/DetailsPageconetent'){ + jumpPage({ name: '能力集市', key: 'DetailsPageconetent' },'headerClick') + } + }) + }) onBeforeUnmount(() => { mybus.off('getSgcNum') @@ -433,6 +528,10 @@ .select { background: #0058e1; color: #fff !important; + } + .select-inner { + background: #0058e1; + color: #fff !important; } .info1 { margin-left: 0.1rem; diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue index 1fc314bb..08ce0a0e 100644 --- a/front/src/views/home/components/searchResultList.vue +++ b/front/src/views/home/components/searchResultList.vue @@ -805,12 +805,18 @@ } // 算法对比跳转 const goComparePk = (item) => { - router.push({ + // router.push({ + // path: '/algorithmCompare', + // query: { + // id: item.id, + // }, + // }); + //修改顶部菜单的样式 + let pathData = { path: '/algorithmCompare', - query: { - id: item.id, - }, - }) + id: item.id, + }; + mybus.emit('changeMenuStyle',pathData); } return { onSearch, diff --git a/front/src/views/home/detailsPageInfrastructureTreeXha.vue b/front/src/views/home/detailsPageInfrastructureTreeXha.vue new file mode 100644 index 00000000..b30661cb --- /dev/null +++ b/front/src/views/home/detailsPageInfrastructureTreeXha.vue @@ -0,0 +1,336 @@ + + + diff --git a/front/src/views/home/infrastructureApplication.vue b/front/src/views/home/infrastructureApplication.vue new file mode 100644 index 00000000..d8688692 --- /dev/null +++ b/front/src/views/home/infrastructureApplication.vue @@ -0,0 +1,12 @@ + + + + diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue index 85d16d64..99fb0dbe 100644 --- a/front/src/views/home/infrastructurePage.vue +++ b/front/src/views/home/infrastructurePage.vue @@ -560,6 +560,16 @@ @change="handleMeeting" > +
+ +
+ + diff --git a/front/src/views/home/integrationServices.vue b/front/src/views/home/integrationServices.vue index 89313d69..32535ead 100644 --- a/front/src/views/home/integrationServices.vue +++ b/front/src/views/home/integrationServices.vue @@ -29,6 +29,7 @@ @change="onSearch" class="resultListSearchInput" /> +
@@ -342,6 +343,14 @@ background: rgba(150, 144, 144, 0.3); margin-top: 0.2rem; } + .searchImg{ + width: 17px; + height: 17px; + background: url('~@/assets/home/searchInner.png'); + position: absolute; + top: 139px; + left: 500px; + } } } @@ -350,20 +359,20 @@ :deep(.ant-input) { width: 4rem; - height: 0.36rem; + height: 0.32rem; background: #fff; - border-radius: 0.04rem; + border-radius: 0.02rem; } :deep(.ant-input-search-button) { width: 0.8rem; - height: 0.36rem; - background: #0087ff; - border-radius: 0.04rem !important; + height: 0.32rem; + background: #0558e1; + border-radius: 0.02rem !important; font-size: 0.14rem; font-weight: 400; color: #fff; - line-height: 0.34rem; + line-height: 0.32rem; margin-left: 0.1rem; } @@ -376,13 +385,15 @@ border: 0; outline: none; width: 0.8rem; - height: 0.36rem; - background: #e1edfa; - border-radius: 0.04rem; + height: 0.32rem; + //background: #e1edfa; + background: #0558e1; + border-radius: 0.02rem; font-size: 0.14rem; font-weight: 400; - color: #0087ff; - line-height: 0.34rem; + //color: #0087ff; + color: #fff; + line-height: 0.32rem; margin-left: 2.5rem; cursor: pointer; } diff --git a/front/src/views/instructionManual/components/menuBook.vue b/front/src/views/instructionManual/components/menuBook.vue index d27eb5fe..679e466b 100644 --- a/front/src/views/instructionManual/components/menuBook.vue +++ b/front/src/views/instructionManual/components/menuBook.vue @@ -47,8 +47,8 @@ -
- -
+ + --> { const params = { diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue index 26ab9c86..bde52726 100644 --- a/front/src/views/personalCenter/components/MyApply.vue +++ b/front/src/views/personalCenter/components/MyApply.vue @@ -306,20 +306,24 @@ getUserInfo().then((res) => { userName.value = res.data.data.username }) - let typeList = ref([ - '能力申请', - '能力上架', - '能力下架', - '能力需求', - '需求评论', - '数据资源申请', - '云资源申请', - '云视频申请', - // '能力评价', - ]) const formState = ref({ name: '' }) // 西海岸-设备申请 let isXiHaiAn = whoShow.itShowXiHaiAn + let typeList = ref( + isXiHaiAn + ? ['能力申请', '能力上架', '能力下架', '能力需求', '需求评论'] + : [ + '能力申请', + '能力上架', + '能力下架', + '能力需求', + '需求评论', + '数据资源申请', + '云资源申请', + '云视频申请', + // '能力评价', + ] + ) const itShowXiHaiAn = ref(isXiHaiAn) const phoneSate = ref([2, 3]) if (isXiHaiAn) { @@ -769,8 +773,9 @@ contentList.data = res.data.data.list total.value = res.data.data.total initNum() + console.log('typeIndex', typeIndex.value) switch (typeIndex.value) { - case 2: + case 1: contentList.data.map((val) => { nengliziyuanshangjiaapply(val.businessKey).then((res1) => { console.log('上架===========>', res1.data.data) @@ -780,7 +785,7 @@ }) }) break - case 3: + case 2: contentList.data.map((val) => { selectOneDel(val.businessKey).then((res1) => { console.log('下架===========>', res1.data.data) @@ -790,7 +795,7 @@ }) }) break - case 4: + case 3: contentList.data.map((val) => { getDemandForm(val.businessKey).then((res1) => { console.log('需求===========>', res1.data.data) @@ -801,7 +806,7 @@ }) }) break - case 5: + case 4: contentList.data.map((val) => { demandComment(val.businessKey).then((res1) => { console.log('评论===========>', res1.data.data)