diff --git a/back/src/views/modules/ability/IntegratedServices-add.vue b/back/src/views/modules/ability/IntegratedServices-add.vue index 8144b0b9..d56937be 100644 --- a/back/src/views/modules/ability/IntegratedServices-add.vue +++ b/back/src/views/modules/ability/IntegratedServices-add.vue @@ -483,7 +483,6 @@ export default { -webkit-box-sizing: border-box; box-sizing: border-box; line-height: 32px; - background: pink; width: 120px; } diff --git a/back/src/views/modules/ability/assignedScene/add-update-scene.vue b/back/src/views/modules/ability/assignedScene/add-update-scene.vue index a1e69fad..4a8275af 100644 --- a/back/src/views/modules/ability/assignedScene/add-update-scene.vue +++ b/back/src/views/modules/ability/assignedScene/add-update-scene.vue @@ -31,7 +31,8 @@ 基本信息 - + + +
+ + +
+
v.attrType !== title)) { + this.dataForm.fuseAttrList.push({ + 'attrType': title, + 'attrValue': JSON.stringify(data.list) + }) + } else { this.dataForm.fuseAttrList.map(v => { - if (v.attrType === '使用步骤') { + if (v.attrType === title) { v.attrValue = JSON.stringify(data.list) } }) } - if (data.title == '关联能力') { - this.dataForm.fuseResourceList = data.list - } }, // 改变按钮状态 changeBtn(data) { @@ -281,28 +321,30 @@ export default { this.$nextTick(() => { this.$refs.combineAbility && this.$refs.combineAbility.getDataInfo(data) this.$refs.sceneUseUp && this.$refs.sceneUseUp.getDataInfo(data) + this.$refs.commonQuestion && this.$refs.commonQuestion.getDataInfo(data) console.log('this.dataForm----详情-------->', this.dataForm); }) }, // 重组数据 - getDisPlayData() { - this.$nextTick(() => { - const questionObj = this.dataForm.fuseAttrList.find(v => v.attrType == '使用步骤') || {}; - let fuseResourceList = this.dataForm.fuseResourceList || []; - let arr = [] - fuseResourceList.map(v => { - if (v.resource) { - arr.push({ - name: v.resource.name, - type: v.resource.type, - }) - } - }) - this.displayListInfo['使用步骤'] = JSON.parse(questionObj.attrValue || '[]') - this.displayListInfo['关联能力'] = arr - }) - - }, + // getDisPlayData() { + // this.$nextTick(() => { + // const stepObj = this.dataForm.fuseAttrList.find(v => v.attrType == '使用步骤') || {}; + // const moreObj = this.dataForm.fuseAttrList.find(v => v.attrType == '更多能力') || {}; + // let fuseResourceList = this.dataForm.fuseResourceList || []; + // let arr = [] + // fuseResourceList.map(v => { + // if (v.resource) { + // arr.push({ + // name: v.resource.name, + // type: v.resource.type, + // }) + // } + // }) + // this.displayListInfo['使用步骤'] = JSON.parse(stepObj.attrValue || '[]') + // this.displayListInfo['更多能力'] = JSON.parse(moreObj.attrValue || '[]') + // this.displayListInfo['关联能力'] = arr + // }) + // }, }, beforeDestroy() { this.clearForm() @@ -403,7 +445,6 @@ export default { -webkit-box-sizing: border-box; box-sizing: border-box; line-height: 32px; - background: pink; width: 120px; } diff --git a/back/src/views/modules/ability/components/common-question.vue b/back/src/views/modules/ability/components/common-question.vue index 1d729e1e..bc67d874 100644 --- a/back/src/views/modules/ability/components/common-question.vue +++ b/back/src/views/modules/ability/components/common-question.vue @@ -1,14 +1,17 @@ + diff --git a/back/src/views/modules/workBench/components/dept-chart-view.vue b/back/src/views/modules/workBench/components/dept-chart-view.vue index 79291918..e7a95a2e 100644 --- a/back/src/views/modules/workBench/components/dept-chart-view.vue +++ b/back/src/views/modules/workBench/components/dept-chart-view.vue @@ -42,12 +42,7 @@ export default { handler(newVal, oldVal) { if (newVal) { this.dataListCopy = newVal; - if (document.getElementById(this.id)) { - // 解决数据初始渲染不出来的问题 - setTimeout(() => { - this.initChart() - }, 2000) - } + this.initChart() } }, deep: true, @@ -55,9 +50,6 @@ export default { }, }, mounted() { - setTimeout(() => { - this.initChart() - }, 2000) }, methods: { initChart() { @@ -68,7 +60,6 @@ export default { this.myChart = chartDom && echarts.init(chartDom); let lengendArr = this.dataListCopy.filter(v => v.name); - let total = 0; this.dataListCopy.map(v => { if (v.value || v.value === 0) { diff --git a/back/src/views/modules/workBench/components/dept-todo-view.vue b/back/src/views/modules/workBench/components/dept-todo-view.vue index 3864a583..c7d872e0 100644 --- a/back/src/views/modules/workBench/components/dept-todo-view.vue +++ b/back/src/views/modules/workBench/components/dept-todo-view.vue @@ -12,16 +12,26 @@
-
- - + +
- {{ item[dataInfo.nameStr] || '--' }} + {{ `${(item.processDefinitionName || '--')}${item.taskName ? ('—' + item.taskName) : ''}` }} +
+
+ + +
+ {{ `${(item.processDefinitionName || '--')}${item.resourceName ? ('—' + item.resourceName) : + ''}` + }}
-
查看更多 >
diff --git a/back/src/views/modules/workBench/workBench.vue b/back/src/views/modules/workBench/workBench.vue index 95f5bca3..97a1a0b4 100644 --- a/back/src/views/modules/workBench/workBench.vue +++ b/back/src/views/modules/workBench/workBench.vue @@ -9,13 +9,13 @@
+ ref="resourceChart" :colorArray="resourceColor"> - + ref="requireChart" :colorArray="requireColor">
@@ -54,7 +54,7 @@ export default { textColor: '#f86f01', num: 0, list: [], - nameStr: 'taskName', + type: 'todo', url: 'activiti-my-todo-task' }, // 部门已办 @@ -67,7 +67,6 @@ export default { textColor: '#21b107', num: 0, list: [], - nameStr: 'processDefinitionName', url: 'activiti-my-join-task' }, // 部门申请 @@ -134,6 +133,7 @@ export default { console.log('res----已办-------->', res.data); this.hasToDodoData.list = res.data.data.records || [] this.hasToDodoData.num = res.data.data.total || 0 + }, err => { this.$message.error(err) this.loadingHasToDo = false; @@ -150,6 +150,9 @@ export default { } console.log('res----部门上架-------->', res.data); this.resourceData = this.formatList(res.data.data.total || []) + this.$nextTick(() => { + this.$refs.resourceChart.initChart(this.resourceData) + }) }, err => { this.$message.error(err) this.loadingResource = false; @@ -165,6 +168,10 @@ export default { } console.log('res----部门申请-------->', res.data); this.applyData = this.formatList(res.data.data.total || []) + this.$nextTick(() => { + console.log('this.applyData------------>', this.applyData); + this.$refs.applyChart.initChart(this.applyData) + }) }, err => { this.$message.error(err) this.loadingApply = false; @@ -190,6 +197,9 @@ export default { } console.log('res----部门需求-------->', res.data); this.requireData = this.formatList(res.data.data.total || [], 'flag') + this.$nextTick(() => { + this.$refs.requireChart.initChart(this.requireData) + }) }, err => { this.$message.error(err) diff --git a/front/public/static/config/location.js b/front/public/static/config/location.js index 685e6098..acba5bf8 100644 --- a/front/public/static/config/location.js +++ b/front/public/static/config/location.js @@ -2,12 +2,12 @@ * @Author: hisense.wuhongjian * @Date: 2020-07-07 16:03:23 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-07-14 10:01:08 + * @LastEditTime: 2022-07-18 11:34:38 * @Description: 数据资源参数配置 */ -const newLocation = 'qingdao' +//const newLocation = 'qingdao' // const newLocation = 'baotou' -// const newLocation = 'xihaian' +const newLocation = 'xihaian' // 数据资源数据 const whoShow = {} diff --git a/front/src/assets/newHome/newHome-title-bg-xihaian.png b/front/src/assets/newHome/newHome-title-bg-xihaian.png new file mode 100644 index 00000000..cfe3b105 Binary files /dev/null and b/front/src/assets/newHome/newHome-title-bg-xihaian.png differ diff --git a/front/src/vab/plugins/permissions.js b/front/src/vab/plugins/permissions.js index b0324521..38f98cdf 100644 --- a/front/src/vab/plugins/permissions.js +++ b/front/src/vab/plugins/permissions.js @@ -2,60 +2,59 @@ * @Author: hisense.wuhongjian * @Date: 2022-04-01 17:23:11 * @LastEditors: hisense.wuhongjian - * @LastEditTime: 2022-07-16 10:57:59 + * @LastEditTime: 2022-07-18 11:25:28 * @Description: 告诉大家这是什么 */ /** * @author chuzhixin 1204505056@qq.com * @description 路由守卫,目前两种模式:all模式与intelligence模式 */ - import router from '@/router' - import store from '@/store' - import getPageTitle from '@/utils/pageTitle' - import { getUserInfo } from '@/api/user' - import { - // authentication, - loginInterception, - // recordRoute, - routesWhiteList, - } from '@/config' - import { setAccessToken, getAccessToken } from '@/utils/accessToken' - router.beforeEach(async (to, from, next) => { - // debugger - // const SSOTOKEN = to.query.SSOToken - // if (SSOTOKEN) { - // setAccessToken(SSOTOKEN) - // } +import router from '@/router' +import store from '@/store' +import getPageTitle from '@/utils/pageTitle' +import { getUserInfo } from '@/api/user' +import { + // authentication, + loginInterception, + // recordRoute, + routesWhiteList, +} from '@/config' +import { setAccessToken, getAccessToken } from '@/utils/accessToken' +router.beforeEach(async (to, from, next) => { + // debugger + // const SSOTOKEN = to.query.SSOToken + // if (SSOTOKEN) { + // setAccessToken(SSOTOKEN) + // } - const token = getAccessToken() - console.log('token', token) - let hasToken = token - // debugger - if (!loginInterception) hasToken = true - console.log('hasToken存在巨大问题', hasToken) - if (hasToken) { + const token = getAccessToken() + console.log('token', token) + let hasToken = token + // debugger + if (!loginInterception) hasToken = true + console.log('hasToken存在巨大问题', hasToken) + if (hasToken) { // setAccessToken(hasToken) - await store.dispatch('user/getUserInfo') - // debugger - next() - } else { - let accessRoutes = [] - accessRoutes = await store.dispatch('routes/setRoutes') - accessRoutes.forEach((item) => { - router.addRoute(item) - }) - if (routesWhiteList.indexOf(to.path) !== -1) { - next() - } else { + await store.dispatch('user/getUserInfo') + // debugger + next() + } else { + let accessRoutes = [] + accessRoutes = await store.dispatch('routes/setRoutes') + accessRoutes.forEach((item) => { + router.addRoute(item) + }) + if (routesWhiteList.indexOf(to.path) !== -1) { + next() + } else { // 这里是一个单点登录的入口 - if (to.query.redict) - getUserInfo(to.query.redict) - else { - getUserInfo() - } - } - } - }) - router.afterEach((to) => { - document.title = getPageTitle(to.meta.title) - }) + if (to.query.redict) getUserInfo(to.query.redict) + else { + getUserInfo() + } + } + } +}) +router.afterEach((to) => { + document.title = getPageTitle(to.meta.title) +}) diff --git a/front/src/views/assignCase/components/AssignCaseDetailPage.vue b/front/src/views/assignCase/components/AssignCaseDetailPage.vue index fdde065e..2124c217 100644 --- a/front/src/views/assignCase/components/AssignCaseDetailPage.vue +++ b/front/src/views/assignCase/components/AssignCaseDetailPage.vue @@ -13,7 +13,7 @@
diff --git a/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue b/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue index 9d123dbd..9203d616 100644 --- a/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue +++ b/front/src/views/capacityOnTheShelf/DevelopmentComponents.vue @@ -27,6 +27,7 @@ :refData="refData" :dataFrom="dataFrom" :videoList="videoList" + :imgList="imgList" :externalField="[ '组件名称', '组件描述', @@ -54,7 +55,6 @@ :dataFrom="dataFrom" :fileList="fileList" :fileList2="fileList2" - :imgList="imgList" :configure="bs" >
diff --git a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue index 2c238e15..a106e878 100644 --- a/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue +++ b/front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue @@ -2,7 +2,7 @@ * @Author: hisense.liangjunhua * @Date: 2022-06-17 14:11:08 * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-07-18 14:41:45 + * @LastEditTime: 2022-07-18 14:43:47 * @Description: 上架 --> diff --git a/front/src/views/detailsAll/ApplicationDetails.vue b/front/src/views/detailsAll/ApplicationDetails.vue index 7eee09d3..e7b95446 100644 --- a/front/src/views/detailsAll/ApplicationDetails.vue +++ b/front/src/views/detailsAll/ApplicationDetails.vue @@ -1,179 +1,219 @@ diff --git a/front/src/views/detailsAll/BusinessDetails.vue b/front/src/views/detailsAll/BusinessDetails.vue index cb14bfd2..51e60e98 100644 --- a/front/src/views/detailsAll/BusinessDetails.vue +++ b/front/src/views/detailsAll/BusinessDetails.vue @@ -10,149 +10,178 @@ - + - + - - + - - + - - + - - + - + - +
diff --git a/front/src/views/detailsAll/DeveloperComponents.vue b/front/src/views/detailsAll/DeveloperComponents.vue index be9c7f40..6b0fef8e 100644 --- a/front/src/views/detailsAll/DeveloperComponents.vue +++ b/front/src/views/detailsAll/DeveloperComponents.vue @@ -10,157 +10,188 @@ - + - + - - + - - + - - + - - + - + - + - - +
diff --git a/front/src/views/detailsAll/LayerService.vue b/front/src/views/detailsAll/LayerService.vue index 6228798c..2a0f6708 100644 --- a/front/src/views/detailsAll/LayerService.vue +++ b/front/src/views/detailsAll/LayerService.vue @@ -8,156 +8,189 @@ diff --git a/front/src/views/detailsAll/components/Application/ApplicationAbilityTrial.vue b/front/src/views/detailsAll/components/Application/ApplicationAbilityTrial.vue new file mode 100644 index 00000000..808695b8 --- /dev/null +++ b/front/src/views/detailsAll/components/Application/ApplicationAbilityTrial.vue @@ -0,0 +1,179 @@ + + + + + diff --git a/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue b/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue index d6235ac1..51dee4f2 100644 --- a/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue +++ b/front/src/views/detailsAll/components/Application/ApplicationDeploymentAndSecurity.vue @@ -75,13 +75,14 @@ attrValue: '是', } dataFrom.value.content[1].childrenContent.push(isAndNo) - } else if (item.attrType === '访问地址') { - let obj = { - attrType: '访问地址', - attrValue: item.attrValue || '------', - } - dataFrom.value.content[0].childrenContent.push(obj) } + // } else if (item.attrType === '访问地址') { + // let obj = { + // attrType: '访问地址', + // attrValue: item.attrValue || '------', + // } + // dataFrom.value.content[0].childrenContent.push(obj) + // } }) if (dataFrom.value.content[1].childrenContent.length <= 0) { let data = [ @@ -99,12 +100,12 @@ }) } } - //访问地址跳转方法 - const addressFunction = (name, itemValue) => { - if (name == '访问地址') { - window.open(itemValue) - } - } + // //访问地址跳转方法 + // const addressFunction = (name, itemValue) => { + // if (name == '访问地址') { + // window.open(itemValue) + // } + // } watch( () => props.dataList, (val) => { @@ -125,13 +126,14 @@ attrValue: '是', } dataFrom.value.content[1].childrenContent.push(isAndNo) - } else if (item.attrType === '访问地址') { - let obj = { - attrType: '访问地址', - attrValue: item.attrValue || '------', - } - dataFrom.value.content[0].childrenContent.push(obj) } + // } else if (item.attrType === '访问地址') { + // let obj = { + // attrType: '访问地址', + // attrValue: item.attrValue || '------', + // } + // dataFrom.value.content[0].childrenContent.push(obj) + // } }) if (dataFrom.value.content[1].childrenContent.length <= 0) { debugger diff --git a/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue b/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue index feff2a35..612773a1 100644 --- a/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue +++ b/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue @@ -41,6 +41,10 @@ name: '使用能力', key: 'ability-to-use', }, + { + name: '应用详情', + key: 'application-ability-trial', + }, { name: '部署与安全', key: 'deployment-and-security', @@ -96,6 +100,11 @@ list.value.push(item.attrType) } else if (item.attrType === '应用展示视频') { list.value.push('应用展示') + } else if ( + item.attrType === '访问地址' && + props.dataList.applyState === '已申请' + ) { + list.value.push('应用详情') } }) list.value.unshift('关联组件') @@ -137,6 +146,11 @@ list.value.push(item.attrType) } else if (item.attrType === '应用展示视频') { list.value.push('应用展示') + } else if ( + item.attrType === '访问地址' && + props.dataList.applyState === '已申请' + ) { + list.value.push('应用详情') } }) list.value.unshift('关联组件') diff --git a/front/src/views/detailsAll/components/Developer/DeveloperNavigation.vue b/front/src/views/detailsAll/components/Developer/DeveloperNavigation.vue index 0f3ee737..cfa20a0b 100644 --- a/front/src/views/detailsAll/components/Developer/DeveloperNavigation.vue +++ b/front/src/views/detailsAll/components/Developer/DeveloperNavigation.vue @@ -89,6 +89,7 @@ list.value = [] props.dataList.infoList.map((item) => { if ( + item.attrType === '功能介绍' || item.attrType === '常见问题' || item.attrType === '应用案例' || item.attrType === '应用场景' @@ -101,6 +102,7 @@ } }) list.value.unshift('关联应用') + list.value.push('使用方式') navList.value.forEach((item) => { console.log(item) if (list.value.indexOf(item.name) > -1) { diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue index 670312fb..35924f62 100644 --- a/front/src/views/home/apply.vue +++ b/front/src/views/home/apply.vue @@ -95,9 +95,9 @@
-
+
+
城市云脑通用能力服务平台