diff --git a/back/public/index.html b/back/public/index.html index eb19bbb6..f975e31c 100644 --- a/back/public/index.html +++ b/back/public/index.html @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2022-04-11 10:11:40 * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-06-23 18:30:45 + * @LastEditTime: 2022-06-29 16:59:38 * @Description: 告诉大家这是什么 --> @@ -42,8 +42,9 @@ <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %> diff --git a/back/src/views/modules/activiti/demo/correction-process2.vue b/back/src/views/modules/activiti/demo/correction-process2.vue index 04b1db78..f242b753 100644 --- a/back/src/views/modules/activiti/demo/correction-process2.vue +++ b/back/src/views/modules/activiti/demo/correction-process2.vue @@ -241,180 +241,177 @@ export default { } diff --git a/back/src/views/modules/activiti/my-work-dynamics.vue b/back/src/views/modules/activiti/my-work-dynamics.vue index 2c49710e..7e0d92d5 100644 --- a/back/src/views/modules/activiti/my-work-dynamics.vue +++ b/back/src/views/modules/activiti/my-work-dynamics.vue @@ -132,7 +132,7 @@ show-word-limit > - + - + // @ is an alias to /src export default { - data() { + data () { return { - fileUploadUrl: window.SITE_CONFIG.apiURL + "/upload", + fileUploadUrl: window.SITE_CONFIG.apiURL + '/upload', // 表格筛选条件对象 queryData: { - keyworld: "", + keyworld: '', pageIndex: 1, pageSize: 10, - total: 0, + total: 0 }, // 表格数据数组对象 tableData: [], @@ -359,307 +359,307 @@ export default { // imageUrl: '', // 新增数据表单对象 addDataFrom: { - title: "", - note1: "", - content: "", - imageUrl: "", - delFlag: 0, + title: '', + note1: '', + content: '', + imageUrl: '', + delFlag: 0 }, // 新增数据表单验证对象 addDataFromRules: { - title: [{ required: true, message: "请输入标题", trigger: "blur" }], - note1: [{ required: true, message: "请输入摘要", trigger: "blur" }], - content: [{ required: true, message: "请输入内容", trigger: "blur" }], + title: [{ required: true, message: '请输入标题', trigger: 'blur' }], + note1: [{ required: true, message: '请输入摘要', trigger: 'blur' }], + content: [{ required: true, message: '请输入内容', trigger: 'blur' }], imageUrl: [ - { required: true, message: "请输入图片地址", trigger: "blur" }, - ], + { required: true, message: '请输入图片地址', trigger: 'blur' } + ] }, editDataDialogVisabled: false, eidtDataForm: { - title: "", - note1: "", - content: "", - imageUrl: "", + title: '', + note1: '', + content: '', + imageUrl: '' }, eidtDataFromRules: { - title: [{ required: true, message: "请输入标题", trigger: "blur" }], - note1: [{ required: true, message: "请输入摘要", trigger: "blur" }], - content: [{ required: true, message: "请输入内容", trigger: "blur" }], + title: [{ required: true, message: '请输入标题', trigger: 'blur' }], + note1: [{ required: true, message: '请输入摘要', trigger: 'blur' }], + content: [{ required: true, message: '请输入内容', trigger: 'blur' }], imageUrl: [ - { required: true, message: "请输入图片地址", trigger: "blur" }, - ], + { required: true, message: '请输入图片地址', trigger: 'blur' } + ] }, perviewDataDialogVisabled: false, previewData: { - title: "", - note1: "", - content: "", - imageUrl: "", - delFlag: 0, + title: '', + note1: '', + content: '', + imageUrl: '', + delFlag: 0 }, - previewImg: "", // 预览图片 + previewImg: '', // 预览图片 deleteDataArr: [], - dialogVisibleImg: false, - }; + dialogVisibleImg: false + } }, - created() { - this.getTableData(); + created () { + this.getTableData() }, methods: { - tableChange(val) { - this.deleteDataArr = val.map((item) => item.id); - console.log(this.deleteDataArr); + tableChange (val) { + this.deleteDataArr = val.map((item) => item.id) + console.log(this.deleteDataArr) }, - restTableData() { - this.queryData.keyworld = ""; - this.getTableData(); + restTableData () { + this.queryData.keyworld = '' + this.getTableData() }, - showView(file) { - this.previewImg = file.url; - this.dialogVisibleImg = true; + showView (file) { + this.previewImg = file.url + this.dialogVisibleImg = true }, - getTableData() { + getTableData () { this.$http - .get("/workdynamics/page", { + .get('/workdynamics/page', { params: { limit: this.queryData.pageSize, page: this.queryData.pageIndex, - name: this.queryData.keyworld, - }, + name: this.queryData.keyworld + } }) .then(({ data: res }) => { if (res.code !== 0) { - return this.$message.error(res.msg); + return this.$message.error(res.msg) } - this.tableData = res.data.list; - this.queryData.total = res.data.total; + this.tableData = res.data.list + this.queryData.total = res.data.total }) - .catch(() => {}); + .catch(() => {}) }, - flashTableData() { - this.queryData.pageIndex = 1; - this.getTableData(); + flashTableData () { + this.queryData.pageIndex = 1 + this.getTableData() }, // 分页大小更改 - handleSizeChange(value) { - this.queryData.pageSize = value; - this.getTableData(); + handleSizeChange (value) { + this.queryData.pageSize = value + this.getTableData() }, // 当前索引更改 - handleCurrentChange(val) { - this.queryData.pageIndex = val; - this.getTableData(); + handleCurrentChange (val) { + this.queryData.pageIndex = val + this.getTableData() }, // 新增数据窗口关闭事件 - addDataDialogClose() { - this.$refs.addDataFormRef.resetFields(); - this.addDataFrom.imageUrl = ""; - this.$refs.addUpload.clearFiles(); + addDataDialogClose () { + this.$refs.addDataFormRef.resetFields() + this.addDataFrom.imageUrl = '' + this.$refs.addUpload.clearFiles() // this.addDataFrom.imagesFiles = [] // this.$refs.addDataFromUploadRef.clearFiles() }, - editDataDialogClose() { - this.$refs.editDataFormRef.resetFields(); - this.eidtDataForm.imageUrl = ""; - this.$refs.editUpload.clearFiles(); + editDataDialogClose () { + this.$refs.editDataFormRef.resetFields() + this.eidtDataForm.imageUrl = '' + this.$refs.editUpload.clearFiles() }, // 追加数据 - addDataDialogConfirm() { + addDataDialogConfirm () { this.$refs.addDataFormRef.validate(async (valid) => { if (valid) { - //console.log("新增新增", this.addDataFrom); + // console.log("新增新增", this.addDataFrom); this.$http - .post("/workdynamics/insert", this.addDataFrom) + .post('/workdynamics/insert', this.addDataFrom) .then(({ data: res }) => { if (res.code !== 0) { - return this.$message.error(res.msg); + return this.$message.error(res.msg) } - this.$message.success("新增成功"); - this.addDataDialogVisabled = false; - this.getTableData(); + this.$message.success('新增成功') + this.addDataDialogVisabled = false + this.getTableData() }) - .catch(() => {}); + .catch(() => {}) } else { - this.$message.success("表单数据填写不完整"); + this.$message.success('表单数据填写不完整') } - }); + }) }, // 限定图片 - handleExceed() { - this.$message({ type: "error", message: "最多支持一张图片上传" }); + handleExceed () { + this.$message({ type: 'error', message: '最多支持一张图片上传' }) }, // 限制标题 - titleExceed(str) { + titleExceed (str) { if (str.length >= 200) { - this.$message.error("标题文字不能超过200字"); + this.$message.error('标题文字不能超过200字') } }, // 限制内容 - contentExceed(str) { + contentExceed (str) { if (str.length >= 2000) { - this.$message.error("内容文字不能超过2000字"); + this.$message.error('内容文字不能超过2000字') } }, - //限制摘要 - noteExceed(str) { + // 限制摘要 + noteExceed (str) { if (str.length >= 1000) { - this.$message.error("摘要文字不能超过1000字"); + this.$message.error('摘要文字不能超过1000字') } }, // 删除数据 - deleteData(row) { - console.log(row); - this.$confirm("此操作将删除当前数据, 是否继续?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", + deleteData (row) { + console.log(row) + this.$confirm('此操作将删除当前数据, 是否继续?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' }) .then(async () => { - let ids = []; + let ids = [] if (this.deleteDataArr.length > 1) { - ids = this.deleteDataArr; + ids = this.deleteDataArr } else { - ids = [row.id]; + ids = [row.id] } - console.log(ids); + console.log(ids) this.$http - .delete("/workdynamics/delete", { - data: ids, + .delete('/workdynamics/delete', { + data: ids }) .then(({ data: res }) => { if (res.code !== 0) { - return this.$message.error(res.msg); + return this.$message.error(res.msg) } this.$message({ - type: "success", - message: "删除成功!", - }); - this.getTableData(); - }); + type: 'success', + message: '删除成功!' + }) + this.getTableData() + }) }) .catch(() => { this.$message({ - type: "info", - message: "已取消删除", - }); - }); + type: 'info', + message: '已取消删除' + }) + }) }, - //预览工作动态信息 - async openPreviewData(row) { - console.log("预览预览", row); + // 预览工作动态信息 + async openPreviewData (row) { + console.log('预览预览', row) const { data: res } = await this.$http.get( `workdynamics/select/${row.id}` - ); + ) if (res.code !== 0) { - return this.$message.error(res.msg); + return this.$message.error(res.msg) } - this.previewData = res.data; + this.previewData = res.data - this.perviewDataDialogVisabled = true; + this.perviewDataDialogVisabled = true }, - perviewDataDialogClose() { - this.perviewDataDialogVisabled = false; + perviewDataDialogClose () { + this.perviewDataDialogVisabled = false }, - handleAvatarSuccess(res, file) { + handleAvatarSuccess (res, file) { if (res.code !== 0) { - return this.$message.error(res.msg); + return this.$message.error(res.msg) } - this.addDataFrom.imageUrl = res.data; + this.addDataFrom.imageUrl = res.data // this.imageUrl = URL.createObjectURL(file.raw); }, - beforeAvatarUpload(file) { + beforeAvatarUpload (file) { const isImage = - file.type === "image/jpeg" || - file.type === "image/jpg" || - file.type === "image/png"; - const isLt2M = file.size / 1024 / 1024 < 2; + file.type === 'image/jpeg' || + file.type === 'image/jpg' || + file.type === 'image/png' + const isLt2M = file.size / 1024 / 1024 < 2 if (!isImage) { - this.$message.error("上传头像图片只能是 JPG 格式!"); + this.$message.error('上传头像图片只能是 JPG 格式!') } if (!isLt2M) { - this.$message.error("上传头像图片大小不能超过 2MB!"); + this.$message.error('上传头像图片大小不能超过 2MB!') } - return isImage && isLt2M; + return isImage && isLt2M }, - eidtHandleAvatarSuccess(res, file) { + eidtHandleAvatarSuccess (res, file) { if (res.code !== 0) { - return this.$message.error(res.msg); + return this.$message.error(res.msg) } - this.eidtDataForm.imageUrl = res.data; + this.eidtDataForm.imageUrl = res.data // this.imageUrl = URL.createObjectURL(file.raw); }, - editBeforeAvatarUpload(file) { + editBeforeAvatarUpload (file) { const isImage = - file.type === "image/jpeg" || - file.type === "image/jpg" || - file.type === "image/png"; - const isLt2M = file.size / 1024 / 1024 < 2; + file.type === 'image/jpeg' || + file.type === 'image/jpg' || + file.type === 'image/png' + const isLt2M = file.size / 1024 / 1024 < 2 if (!isImage) { - this.$message.error("上传头像图片只能是 JPG 格式!"); + this.$message.error('上传头像图片只能是 JPG 格式!') } if (!isLt2M) { - this.$message.error("上传头像图片大小不能超过 2MB!"); + this.$message.error('上传头像图片大小不能超过 2MB!') } - return isImage && isLt2M; + return isImage && isLt2M }, - async openEditDialog(row) { + async openEditDialog (row) { const { data: res } = await this.$http.get( `workdynamics/select/${row.id}` - ); + ) if (res.code !== 0) { - return this.$message.error(res.msg); + return this.$message.error(res.msg) } - this.eidtDataForm = res.data; + this.eidtDataForm = res.data - this.editDataDialogVisabled = true; + this.editDataDialogVisabled = true }, - eidtDataDialogConfirm() { + eidtDataDialogConfirm () { this.$refs.editDataFormRef.validate(async (valid) => { if (valid) { - console.log(this.eidtDataForm); + console.log(this.eidtDataForm) this.$http - .put("/workdynamics/update", this.eidtDataForm) + .put('/workdynamics/update', this.eidtDataForm) .then(({ data: res }) => { if (res.code !== 0) { - return this.$message.error(res.msg); + return this.$message.error(res.msg) } - this.$message.success("编辑成功"); - this.editDataDialogVisabled = false; - this.getTableData(); + this.$message.success('编辑成功') + this.editDataDialogVisabled = false + this.getTableData() }) - .catch(() => {}); + .catch(() => {}) } else { - this.$message.success("表单数据填写不完整"); + this.$message.success('表单数据填写不完整') } - }); + }) }, - addUploadRemoveFile(file, fileList) { - this.$refs.addUpload.clearFiles(); - this.addDataFrom.imageUrl = ""; - }, - editUploadRemoveFile(file, fileList) { - this.$refs.editUpload.clearFiles(); - this.eidtDataForm.imageUrl = ""; + addUploadRemoveFile (file, fileList) { + this.$refs.addUpload.clearFiles() + this.addDataFrom.imageUrl = '' }, + editUploadRemoveFile (file, fileList) { + this.$refs.editUpload.clearFiles() + this.eidtDataForm.imageUrl = '' + } }, computed: { - editDialogShowFileList() { + editDialogShowFileList () { if (this.eidtDataForm.imageUrl) { return [ - { name: this.eidtDataForm.imageUrl, url: this.eidtDataForm.imageUrl }, - ]; + { name: this.eidtDataForm.imageUrl, url: this.eidtDataForm.imageUrl } + ] } - }, - }, -}; + } + } +} diff --git a/back/src/views/modules/workBench/api.js b/back/src/views/modules/workBench/api.js new file mode 100644 index 00000000..52da4412 --- /dev/null +++ b/back/src/views/modules/workBench/api.js @@ -0,0 +1,46 @@ +// /resource/getByDept +import http from '@/utils/request'; + +function Request({ + methods, url, data, success, fali +}) { + let _key = methods == 'get' ? 'params' : 'data'; + return new Promise((resolve, reject) => { + http[methods](url, { + [_key]: data + }).then(res => { + resolve(res) + }, err => { + reject(err) + }) + }) + +} + +// /resource/getByDept:获取当前登录用户所在部门发布的资源 + +// 部门待办列表 +export const getToDoTask = (data, success, fail) => { + Request({ + methods: 'get', + url: '/act/task/deptToDoTaskPage', + data + }).then(res => { + success && success(res) + }).catch(err => { + fail && fail(err) + }) +} + +// 部门已办列表 +export const getHasToDoTask = (data, success, fail) => { + Request({ + methods: 'get', + url: '/act/his/getDeptHandledInstancePage', + data + }).then(res => { + success && success(res) + }).catch(err => { + fail && fail(err) + }) +} \ No newline at end of file diff --git a/back/src/views/modules/workBench/components/bottom-view.vue b/back/src/views/modules/workBench/components/bottom-view.vue new file mode 100644 index 00000000..93c9b0ca --- /dev/null +++ b/back/src/views/modules/workBench/components/bottom-view.vue @@ -0,0 +1,18 @@ + + + \ No newline at end of file diff --git a/back/src/views/modules/workBench/components/center-view.vue b/back/src/views/modules/workBench/components/center-view.vue new file mode 100644 index 00000000..a435f270 --- /dev/null +++ b/back/src/views/modules/workBench/components/center-view.vue @@ -0,0 +1,19 @@ + + + \ No newline at end of file diff --git a/back/src/views/modules/workBench/components/dept-chart-view.vue b/back/src/views/modules/workBench/components/dept-chart-view.vue new file mode 100644 index 00000000..126c5706 --- /dev/null +++ b/back/src/views/modules/workBench/components/dept-chart-view.vue @@ -0,0 +1,22 @@ + + + \ No newline at end of file diff --git a/back/src/views/modules/workBench/components/dept-todo-view.vue b/back/src/views/modules/workBench/components/dept-todo-view.vue new file mode 100644 index 00000000..a500f1b8 --- /dev/null +++ b/back/src/views/modules/workBench/components/dept-todo-view.vue @@ -0,0 +1,140 @@ + + + \ No newline at end of file diff --git a/back/src/views/modules/workBench/workBench.vue b/back/src/views/modules/workBench/workBench.vue new file mode 100644 index 00000000..a8033a0e --- /dev/null +++ b/back/src/views/modules/workBench/workBench.vue @@ -0,0 +1,130 @@ + + + + + \ No newline at end of file diff --git a/front/public/index.html b/front/public/index.html index 2f1af54c..a68491c4 100644 --- a/front/public/index.html +++ b/front/public/index.html @@ -2,7 +2,7 @@ * @Author: hisense.wuhongjian * @Date: 2022-03-29 16:45:25 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-06-29 16:00:06 + * @LastEditTime: 2022-06-29 18:37:11 * @Description: 告诉大家这是什么 --> @@ -45,9 +45,9 @@ // window.SITE_CONFIG['apiURL'] = 'http://10.134.135.9:8888/renren-admin'; // 开发 window.SITE_CONFIG['backUrl'] = 'http://15.2.21.238:9797'; - window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796'; + window.SITE_CONFIG['previewUrl'] = 'http://15.2.21.238:9796/'; window.SITE_CONFIG['frontUrl'] = 'http://15.2.21.238:9796/document/#/devModelFile/'; - window.SITE_CONFIG['apiURL'] = 'http://15.2.21.239:8888/renren-admin'; + window.SITE_CONFIG['apiURL'] = 'http://15.2.21.238:8888/renren-admin'; window.SITE_CONFIG['POI_URL'] = 'http://15.2.21.238:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address'; // 穿透版本 // window.SITE_CONFIG['backUrl'] = 'http://124.222.94.39:9797'; diff --git a/front/src/api/home.js b/front/src/api/home.js index 6f560eb9..3ba5a76a 100644 --- a/front/src/api/home.js +++ b/front/src/api/home.js @@ -1,8 +1,8 @@ /* * @Author: hisense.wuhongjian * @Date: 2022-04-01 19:19:40 - * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-06-22 18:59:03 + * @LastEditors: hisense.liangjunhua + * @LastEditTime: 2022-06-29 14:34:24 * @Description: 告诉大家这是什么 */ import request from '@/utils/request' @@ -114,7 +114,7 @@ export function lastestPage(params) { // 提交申请 export function submitApply(data) { return request({ - url: '/ability/center/apply', + url: '/ability/center/v2/apply', method: 'post', data, }) @@ -297,3 +297,11 @@ export function getDataResource(data) { data, }) } +//应用详情列表 +export function queryPartAppByKeyId(params) { + return request({ + url: 'dataResourceRel/queryPart4AppByKeyId', + method: 'get', + params, + }) +} diff --git a/front/src/api/personalCenter.js b/front/src/api/personalCenter.js index 83566908..faed5074 100644 --- a/front/src/api/personalCenter.js +++ b/front/src/api/personalCenter.js @@ -150,6 +150,16 @@ export function nengliziyuanshangjiaapply(params) { params, }) } +export function getTaskVariables(params) { + return request({ + url: + '/act/task/getTaskVariables?taskId=' + + params.taskId + + '&variableName=tAbilityApplicationDTOList', + method: 'get', + params, + }) +} // 能力下架申请 export function undercarriage(data) { return request({ diff --git a/front/src/views/demandCenter/demandDetails.vue b/front/src/views/demandCenter/demandDetails.vue index cbf6ca70..40b0669f 100644 --- a/front/src/views/demandCenter/demandDetails.vue +++ b/front/src/views/demandCenter/demandDetails.vue @@ -231,6 +231,7 @@ size="small" pageSize="8" :total="total" + v-model:current="page" @change="handleCurrentChange" /> @@ -248,7 +249,7 @@ import { demandComment, demandCommentPage, - demandCommentDelete, + // demandCommentDelete, demandCommentApply, } from '@/api/demandCenter' import { getUser, getUserInfo } from '@/api/home' @@ -264,15 +265,15 @@ }) }) //删除提示框 - const confirm = (item) => { - console.log(item) - evaluateDelete(item) - } + // const confirm = (item) => { + // console.log(item) + // evaluateDelete(item) + // } - const cancel = (e) => { - console.log(e) - message.error('已取消删除') - } + // const cancel = (e) => { + // console.log(e) + // message.error('已取消删除') + // } // const store = useStore() const router = useRouter() @@ -322,14 +323,14 @@ // }) // } - const evaluateDelete = (item) => { - demandCommentDelete([item.id]).then((res) => { - if (res.data.code == 0) { - message.success('删除评论成功！') - } - evaluateList() - }) - } + // const evaluateDelete = (item) => { + // demandCommentDelete([item.id]).then((res) => { + // if (res.data.code == 0) { + // message.success('删除评论成功！') + // } + // evaluateList() + // }) + // } const evaluateList = () => { const params = { page: page.value, @@ -339,6 +340,7 @@ demandCommentPage(params).then((res) => { evaluateData.value = res.data.data.list total.value = res.data.data.total + console.log(evaluateData, 'evaluateData') }) } @@ -382,6 +384,7 @@ // formName.value = formData.value const id = router.currentRoute.value.query.id getDemandForm(id).then((res) => { + console.log(res, 'res') const { data } = res.data formName.value.applyUserName = data.applyUserName formName.value.applyUserPhone = data.applyUserPhone diff --git a/front/src/views/detailsAll/AlgorithmDetails.vue b/front/src/views/detailsAll/AlgorithmDetails.vue index 911b4974..1bac95d9 100644 --- a/front/src/views/detailsAll/AlgorithmDetails.vue +++ b/front/src/views/detailsAll/AlgorithmDetails.vue @@ -21,6 +21,12 @@ id="algorithm-display" class="scrollBox" > + + + + diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmNavigation.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmNavigation.vue index 96b831ab..bb2ac893 100644 --- a/front/src/views/detailsAll/components/Algorithm/AlgorithmNavigation.vue +++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmNavigation.vue @@ -32,6 +32,10 @@ name: '算法优势', key: 'algorithm-advantage', }, + { + name: '关联能力', + key: 'algorithm-associated-ability', + }, { name: '应用场景', key: 'application-scenarios', @@ -87,6 +91,7 @@ list.value.push('使用方式') } }) + list.value.push('关联能力') navList.value.forEach((item) => { console.log(item) if (list.value.indexOf(item.name) > -1) { @@ -131,6 +136,7 @@ list.value.push('使用方式') } }) + list.value.push('关联能力') navList.value.forEach((item) => { console.log(item) if (list.value.indexOf(item.name) > -1) { diff --git a/front/src/views/detailsAll/components/Application/ApplicationAssociatedAbility.vue b/front/src/views/detailsAll/components/Application/ApplicationAssociatedAbility.vue new file mode 100644 index 00000000..4740f254 --- /dev/null +++ b/front/src/views/detailsAll/components/Application/ApplicationAssociatedAbility.vue @@ -0,0 +1,127 @@ + + + + + diff --git a/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue b/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue index a53358b2..3fc42394 100644 --- a/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue +++ b/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue @@ -36,6 +36,10 @@ name: '关联组件', key: 'application-associated-components', }, + { + name: '关联能力', + key: 'application-associated-ability', + }, { name: '使用能力', key: 'ability-to-use', @@ -77,6 +81,7 @@ list.value.push('应用展示') } }) + list.value.push('关联能力') navList.value.forEach((item) => { console.log(item) if (list.value.indexOf(item.name) > -1) { @@ -111,6 +116,7 @@ list.value.push('应用展示') } }) + list.value.push('关联能力') list.value.push('部署与安全') list.value.push('归属部门与服务商') navList.value.forEach((item) => { diff --git a/front/src/views/detailsAll/components/Business/BusinessAssociatedAbility.vue b/front/src/views/detailsAll/components/Business/BusinessAssociatedAbility.vue new file mode 100644 index 00000000..4740f254 --- /dev/null +++ b/front/src/views/detailsAll/components/Business/BusinessAssociatedAbility.vue @@ -0,0 +1,127 @@ + + + + + diff --git a/front/src/views/detailsAll/components/Business/BusinessNavigation.vue b/front/src/views/detailsAll/components/Business/BusinessNavigation.vue index e285dc53..fa9f6e76 100644 --- a/front/src/views/detailsAll/components/Business/BusinessNavigation.vue +++ b/front/src/views/detailsAll/components/Business/BusinessNavigation.vue @@ -36,6 +36,10 @@ name: '应用场景', key: 'application-scenarios', }, + { + name: '关联能力', + key: 'business-associated-ability', + }, { name: '应用案例', key: 'application-case', @@ -87,6 +91,7 @@ list.value.push('组件展示') } }) + list.value.push('关联能力') list.value.push('使用方式') navList.value.forEach((item) => { console.log(item) @@ -136,6 +141,7 @@ list.value.push('组件展示') } }) + list.value.push('关联能力') list.value.push('使用方式') navList.value.forEach((item) => { console.log(item) diff --git a/front/src/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue b/front/src/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue new file mode 100644 index 00000000..4740f254 --- /dev/null +++ b/front/src/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue @@ -0,0 +1,127 @@ + + + + + diff --git a/front/src/views/detailsAll/components/Developer/DeveloperNavigation.vue b/front/src/views/detailsAll/components/Developer/DeveloperNavigation.vue index 05b817f9..dc751b18 100644 --- a/front/src/views/detailsAll/components/Developer/DeveloperNavigation.vue +++ b/front/src/views/detailsAll/components/Developer/DeveloperNavigation.vue @@ -28,6 +28,10 @@ name: '组件展示', key: 'eveloper-presentation', }, + { + name: '关联能力', + key: 'developer-associated-ability', + }, { name: '功能介绍', key: 'function-introduction', @@ -66,7 +70,6 @@ if (props.dataList.infoList) { list.value = [] props.dataList.infoList.map((item) => { - debugger if ( item.attrType === '常见问题' || item.attrType === '应用案例' || @@ -77,6 +80,7 @@ list.value.push('组件展示') } }) + list.value.push('关联能力') navList.value.forEach((item) => { console.log(item) if (list.value.indexOf(item.name) > -1) { @@ -111,6 +115,7 @@ list.value.push('组件展示') } }) + list.value.push('关联能力') list.value.push('组件试用') list.value.push('使用方式') navList.value.forEach((item) => { diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceAssociatedAbility.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceAssociatedAbility.vue new file mode 100644 index 00000000..4740f254 --- /dev/null +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceAssociatedAbility.vue @@ -0,0 +1,127 @@ + + + + + diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue index fcbc0846..cdaa2258 100644 --- a/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue +++ b/front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue @@ -32,6 +32,10 @@ name: '图层信息', key: 'service-information', }, + { + name: '关联能力', + key: 'layer-service-associated-ability', + }, { name: '应用场景', key: 'service-application-scenarios', @@ -93,10 +97,31 @@ if (item.attrValue === '是') { list.value.push('图层预览') } + } else if ( + item.attrType === '服务类型' || + item.attrType === '覆盖区域' || + item.attrType === '切片策略' || + item.attrType === '坐标系' || + item.attrType === '切片尺寸' || + item.attrType === '最小级别' || + item.attrType === '数据范围' || + item.attrType === '图层类型' || + item.attrType === '最大级别' + ) { + list.value.push('图层信息') + } else if ( + item.attrType === '技术文档' || + item.attrType === '服务商' || + item.attrType === '服务商联系人' || + item.attrType === '使用手册' || + item.attrType === '服务地址' || + item.attrType === '样式服务地址' || + item.attrType === '服务商联系电话' + ) { + list.value.push('使用方式') } }) - list.value.push('图层信息') - list.value.push('使用方式') + list.value.push('关联能力') navList.value.forEach((item) => { console.log(item) if (list.value.indexOf(item.name) > -1) { @@ -147,8 +172,31 @@ if (item.attrValue === '是') { list.value.push('图层预览') } + } else if ( + item.attrType === '服务类型' || + item.attrType === '覆盖区域' || + item.attrType === '切片策略' || + item.attrType === '坐标系' || + item.attrType === '切片尺寸' || + item.attrType === '最小级别' || + item.attrType === '数据范围' || + item.attrType === '图层类型' || + item.attrType === '最大级别' + ) { + list.value.push('图层信息') + } else if ( + item.attrType === '技术文档' || + item.attrType === '服务商' || + item.attrType === '服务商联系人' || + item.attrType === '使用手册' || + item.attrType === '服务地址' || + item.attrType === '样式服务地址' || + item.attrType === '服务商联系电话' + ) { + list.value.push('使用方式') } }) + list.value.push('关联能力') list.value.push('图层信息') list.value.push('使用方式') navList.value.forEach((item) => { diff --git a/front/src/views/detailsAll/components/LayerService/LayerServicePreview.vue b/front/src/views/detailsAll/components/LayerService/LayerServicePreview.vue index c0f50a4d..8611e43d 100644 --- a/front/src/views/detailsAll/components/LayerService/LayerServicePreview.vue +++ b/front/src/views/detailsAll/components/LayerService/LayerServicePreview.vue @@ -8,7 +8,7 @@