diff --git a/back/public/index.html b/back/public/index.html index 17d1b9da..4869501d 100644 --- a/back/public/index.html +++ b/back/public/index.html @@ -1,8 +1,8 @@ @@ -43,8 +43,8 @@ diff --git a/back/src/views/modules/ability/bsdataresources.vue b/back/src/views/modules/ability/bsdataresources.vue index dcb29158..77d9b1b0 100644 --- a/back/src/views/modules/ability/bsdataresources.vue +++ b/back/src/views/modules/ability/bsdataresources.vue @@ -84,7 +84,11 @@ export default { methods: { // 重置 resetDataList () { - this.dataForm = this.noDataForm + this.dataForm = { + orderId: '', + status: '', + userId: '' + }, this.page = 1 // 当前页码 this.query() }, diff --git a/back/src/views/modules/abilityStatistics/applicationResources.vue b/back/src/views/modules/abilityStatistics/applicationResources.vue index aea5855f..cc2acede 100644 --- a/back/src/views/modules/abilityStatistics/applicationResources.vue +++ b/back/src/views/modules/abilityStatistics/applicationResources.vue @@ -48,7 +48,7 @@
应用领域分布情况 -
+
应用状态分布情况 @@ -114,8 +114,9 @@ export default { getDistributedList () { this.$http.get('/census/center/v3/assemblerUseProjectInfo/' ,{ params : { - keyId:'1522550195034857476' - // this.tableId + id: + // '1522550195034857476' + this.tableId } }).then(res => { let arry=[] @@ -147,8 +148,8 @@ export default { arry=res.data.data arry.forEach((item)=>{ const single={ - value:item.useNum, - name:item.name + value:item.appNum, + name:item.attr_value } this.data3.push(single.name) this.data4.push(single.value) @@ -377,7 +378,7 @@ export default { var total = 0; var tarValue; for (var i = 0; i < data.length; i++) { - total += data[i].value; + total += Number(data[i].value); if (data[i].name == name) { tarValue = data[i].value; } @@ -599,7 +600,7 @@ export default { }, series: [ { - data: [5, 5, 5, 5, 5, 5], + data: [1, 1, 1, 1, 1, 1], type: 'bar', barWidth: 14, stack: '1', @@ -654,7 +655,7 @@ export default { var total = 0; var tarValue; for (var i = 0; i < data.length; i++) { - total += data[i].value; + total += Number(data[i].value); if (data[i].name == name) { tarValue = data[i].value; } @@ -725,7 +726,7 @@ export default { var total = 0; var tarValue; for (var i = 0; i < data.length; i++) { - total += data[i].value; + total += Number(data[i].value); if (data[i].name == name) { tarValue = data[i].value; } @@ -804,7 +805,7 @@ export default { var total = 0; var tarValue; for (var i = 0; i < data.length; i++) { - total += data[i].value; + total += Number(data[i].value); if (data[i].name == name) { tarValue = data[i].value; } @@ -822,9 +823,9 @@ export default { a: { // 设置文字、数学、英语这一列的样式 width: 80, - color: "#000000", + color: "#666666", fontSize: 12, - fontWeight: "bolder", + // fontWeight: "bolder", }, b: { // 设置10分、20分、30分这一列的样式 @@ -899,7 +900,7 @@ export default { var total = 0; var tarValue; for (var i = 0; i < data.length; i++) { - total += data[i].value; + total += Number(data[i].value); if (data[i].name == name) { tarValue = data[i].value; } diff --git a/back/src/views/modules/abilityStatistics/componentServices.vue b/back/src/views/modules/abilityStatistics/componentServices.vue index 01c866bb..e39f577c 100644 --- a/back/src/views/modules/abilityStatistics/componentServices.vue +++ b/back/src/views/modules/abilityStatistics/componentServices.vue @@ -200,7 +200,7 @@ export default { this.$http.get('/census/center/v3/assemblerCaredTopInfo' ,{ params : { id:this.tableId, - resourceType:"应用资源" + resourceType:"组件服务" // pageNo: pageNo || 1, // pageSize: 20 } @@ -231,7 +231,7 @@ export default { var total = 0; var tarValue; for (var i = 0; i < data.length; i++) { - total += data[i].value; + total += Number(data[i].value); if (data[i].name == name) { tarValue = data[i].value; } @@ -295,7 +295,7 @@ export default { var total = 0; var tarValue; for (var i = 0; i < data.length; i++) { - total += data[i].value; + total += Number(data[i].value); if (data[i].name == name) { tarValue = data[i].value; } @@ -361,7 +361,7 @@ export default { var total = 0; var tarValue; for (var i = 0; i < data.length; i++) { - total += data[i].value; + total += Number(data[i].value); if (data[i].name == name) { tarValue = data[i].value; } @@ -377,9 +377,9 @@ export default { a: { // 设置文字、数学、英语这一列的样式 width: 100, - color: "#000000", + color: "#666666", fontSize: 12, - fontWeight: "bolder", + // fontWeight: "bolder", }, b: { // 设置10分、20分、30分这一列的样式 diff --git a/back/src/views/modules/abilityStatistics/componentUsed.vue b/back/src/views/modules/abilityStatistics/componentUsed.vue index 3c44cb1e..de68a125 100644 --- a/back/src/views/modules/abilityStatistics/componentUsed.vue +++ b/back/src/views/modules/abilityStatistics/componentUsed.vue @@ -17,11 +17,11 @@
使用组件应用领域分布情况 -
+
- 被调用组件及数量 + Top5使用组件
@@ -30,13 +30,13 @@ {{index+1}}
{{item.name}} - {{item.resourceCarNum}} + {{item.useNum}}
- 被申请组件及数量 + 使用组件评分
@@ -45,7 +45,7 @@ {{index+1}}
{{item.name}} - {{item.resourceCarNum}} + {{item.score}}
@@ -86,8 +86,8 @@ export default { colorList:['linear-gradient(to right, rgba(251, 59, 5,0.6),transparent)', 'linear-gradient(to right,rgba(251, 123, 5),transparent)','linear-gradient(to right,rgba(250, 179, 2,.6),transparent)','linear-gradient(to right,rgba(82, 106, 255,.6),transparent','linear-gradient(to right,rgba(82, 106, 255,.6),transparent)',], widthList:['90px','80px','70px','60px','50px'], numColorList:['#fc5656','#ff8a00','#f9af0a','#808fff','#808fff'], - usedList:[{name:'组件名称一',resourceCarNum:111},{name:'组件名称一',resourceCarNum:111},{name:'组件名称一',resourceCarNum:111},{name:'组件名称四',resourceCarNum:111},{name:'组件名称五',resourceCarNum:111},], - applicationList:[{name:'组件名称一',resourceCarNum:111},{name:'组件名称一',resourceCarNum:111},{name:'组件名称一',resourceCarNum:111},{name:'组件名称四',resourceCarNum:111},{name:'组件名称五',resourceCarNum:111},] + usedList:[{name:'组件名称一',useNum:111},{name:'组件名称一',useNum:111},{name:'组件名称一',useNum:111},{name:'组件名称四',useNum:111},{name:'组件名称五',useNum:111},], + applicationList:[{name:'组件名称一',score:111},{name:'组件名称一',score:111},{name:'组件名称一',score:111},{name:'组件名称四',score:111},{name:'组件名称五',score:111},] } }, created(){ @@ -161,10 +161,10 @@ export default { }, // 应用领域分布 getDistributed () { - this.$http.get('/census/center/v3/applicationAreaCapabilityList' ,{ + this.$http.get('/census/center/v3/applicationUsedAreaCapabilityList' ,{ params : { id:this.tableId, - resourceType:"应用资源" + resourceType:"组件服务" } }).then(res => { let arry=[] @@ -174,30 +174,28 @@ export default { value:item.total, name:item.type } - const newList=[] this.data3.push(single) - // this.data2=newList this.myEcharts3() }) }) }, - // 被调用组件及数量 + // top5使用组件 getBeCalled () { - this.$http.get('/census/center/v3/assemblerCaredTopInfo' ,{ + this.$http.get('/census/center/v3/assemblerUseTopInfo' ,{ params : { id:this.tableId, - resourceType:"应用资源" + resourceType:"组件服务" // pageNo: pageNo || 1, // pageSize: 20 } }).then(res => { - this.applicationList =res.data.data + this.usedList =res.data.data }) }, - // 被申请组件及数量 + // 使用组件评分5 getBeApplied () { - this.$http.get('/census/center/v3/assemblerCaredTopInfo' ,{ + this.$http.get('/census/center/v3/assemblerUseScoreTopInfo' ,{ params : { id:this.tableId, resourceType:"应用资源" @@ -231,7 +229,7 @@ export default { var total = 0; var tarValue; for (var i = 0; i < data.length; i++) { - total += data[i].value; + total += Number(data[i].value); if (data[i].name == name) { tarValue = data[i].value; } @@ -295,7 +293,7 @@ export default { var total = 0; var tarValue; for (var i = 0; i < data.length; i++) { - total += data[i].value; + total += Number(data[i].value); if (data[i].name == name) { tarValue = data[i].value; } @@ -361,13 +359,14 @@ export default { var total = 0; var tarValue; for (var i = 0; i < data.length; i++) { - total += data[i].value; + total += Number(data[i].value); if (data[i].name == name) { tarValue = data[i].value; } } - var v = tarValue; + // var v = tarValue; var p = Math.round(((tarValue / total) * 100)); + console.log('@@@@', tarValue, total) return `{a|${name}} {b|${p}%}`; }, itemStyle:{}, @@ -428,7 +427,7 @@ export default { option && myChart.setOption(option); }, backBtn(){ - this.$emit('closeChild') + this.$emit('closeChild2') } } } @@ -541,9 +540,13 @@ export default { position:absolute; display: flex; margin-left:90px; + width:200px; margin-top:5px; color:#333333; - font-size: 16px; + font-size: 16px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; } .count-style{ position:absolute; diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue index ac0dd287..2ff30249 100644 --- a/back/src/views/modules/abilityStatistics/index.vue +++ b/back/src/views/modules/abilityStatistics/index.vue @@ -50,46 +50,56 @@ label="部门名称" min-width="100%"> - - - - - - - - + + + + @@ -111,14 +121,13 @@ - + - diff --git a/back/src/views/modules/components/upload/index.vue b/back/src/views/modules/components/upload/index.vue new file mode 100644 index 00000000..22561ec1 --- /dev/null +++ b/back/src/views/modules/components/upload/index.vue @@ -0,0 +1,96 @@ + + + + diff --git a/back/src/views/modules/hasToDoTasks/AbilityResourceShelf.vue b/back/src/views/modules/hasToDoTasks/AbilityResourceShelf.vue new file mode 100644 index 00000000..0da3a386 --- /dev/null +++ b/back/src/views/modules/hasToDoTasks/AbilityResourceShelf.vue @@ -0,0 +1,142 @@ + + + + diff --git a/back/src/views/modules/hasToDoTasks/AbilityResourcesRemoved.vue b/back/src/views/modules/hasToDoTasks/AbilityResourcesRemoved.vue new file mode 100644 index 00000000..3c0a1ed3 --- /dev/null +++ b/back/src/views/modules/hasToDoTasks/AbilityResourcesRemoved.vue @@ -0,0 +1,142 @@ + + + + diff --git a/back/src/views/modules/hasToDoTasks/ApplicationForCompetencyRequirements.vue b/back/src/views/modules/hasToDoTasks/ApplicationForCompetencyRequirements.vue new file mode 100644 index 00000000..6f936524 --- /dev/null +++ b/back/src/views/modules/hasToDoTasks/ApplicationForCompetencyRequirements.vue @@ -0,0 +1,142 @@ + + + + diff --git a/back/src/views/modules/hasToDoTasks/CommentModeration.vue b/back/src/views/modules/hasToDoTasks/CommentModeration.vue new file mode 100644 index 00000000..2de57bdc --- /dev/null +++ b/back/src/views/modules/hasToDoTasks/CommentModeration.vue @@ -0,0 +1,142 @@ + + + + diff --git a/back/src/views/modules/hasToDoTasks/CompetencyApplication.vue b/back/src/views/modules/hasToDoTasks/CompetencyApplication.vue new file mode 100644 index 00000000..1cf2d2b5 --- /dev/null +++ b/back/src/views/modules/hasToDoTasks/CompetencyApplication.vue @@ -0,0 +1,142 @@ + + + + diff --git a/back/src/views/modules/myAgent/AbilityResourceShelf.vue b/back/src/views/modules/myAgent/AbilityResourceShelf.vue new file mode 100644 index 00000000..39410b15 --- /dev/null +++ b/back/src/views/modules/myAgent/AbilityResourceShelf.vue @@ -0,0 +1,170 @@ + + + + diff --git a/back/src/views/modules/myAgent/AbilityResourcesRemoved.vue b/back/src/views/modules/myAgent/AbilityResourcesRemoved.vue new file mode 100644 index 00000000..1a1154ed --- /dev/null +++ b/back/src/views/modules/myAgent/AbilityResourcesRemoved.vue @@ -0,0 +1,170 @@ + + + + diff --git a/back/src/views/modules/myAgent/ApplicationforCompetencyRequirements.vue b/back/src/views/modules/myAgent/ApplicationforCompetencyRequirements.vue new file mode 100644 index 00000000..245903a5 --- /dev/null +++ b/back/src/views/modules/myAgent/ApplicationforCompetencyRequirements.vue @@ -0,0 +1,170 @@ + + + + diff --git a/back/src/views/modules/myAgent/CommentModeration.vue b/back/src/views/modules/myAgent/CommentModeration.vue new file mode 100644 index 00000000..d592773a --- /dev/null +++ b/back/src/views/modules/myAgent/CommentModeration.vue @@ -0,0 +1,170 @@ + + + + diff --git a/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue new file mode 100644 index 00000000..5681064c --- /dev/null +++ b/back/src/views/modules/myAgent/demo/ability-resource-shelf.vue @@ -0,0 +1,273 @@ + + + + diff --git a/back/src/views/modules/myAgent/demo/competency-application.vue b/back/src/views/modules/myAgent/demo/competency-application.vue index 709f0fcc..0c29bfbd 100644 --- a/back/src/views/modules/myAgent/demo/competency-application.vue +++ b/back/src/views/modules/myAgent/demo/competency-application.vue @@ -2,7 +2,7 @@ * @Author: hisense.liangjunhua * @Date: 2022-06-29 15:59:51 * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-07-01 09:29:57 + * @LastEditTime: 2022-07-04 16:17:22 * @Description: 告诉大家这是什么 --> @@ -157,6 +157,7 @@ export default { }) }, downloadFile2 (url) { + console.log(window.SITE_CONFIG.previewUrl) window.open( window.SITE_CONFIG.previewUrl + 'hisense_office/onlinePreview?url=' + diff --git a/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue b/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue new file mode 100644 index 00000000..9c8395e7 --- /dev/null +++ b/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue @@ -0,0 +1,179 @@ + + + + diff --git a/back/src/views/modules/putOnTheShelf/components/special.vue b/back/src/views/modules/putOnTheShelf/components/special.vue new file mode 100644 index 00000000..77fa3e34 --- /dev/null +++ b/back/src/views/modules/putOnTheShelf/components/special.vue @@ -0,0 +1,311 @@ + + + + diff --git a/back/src/views/modules/putOnTheShelf/index.vue b/back/src/views/modules/putOnTheShelf/index.vue new file mode 100644 index 00000000..5a0e8322 --- /dev/null +++ b/back/src/views/modules/putOnTheShelf/index.vue @@ -0,0 +1,213 @@ + + + + diff --git a/back/src/views/modules/workBench/components/bottom-view.vue b/back/src/views/modules/workBench/components/bottom-view.vue index 98acdc7a..75368b2d 100644 --- a/back/src/views/modules/workBench/components/bottom-view.vue +++ b/back/src/views/modules/workBench/components/bottom-view.vue @@ -28,108 +28,108 @@ \ No newline at end of file + diff --git a/front/package.json b/front/package.json index 60073475..a3efb530 100644 --- a/front/package.json +++ b/front/package.json @@ -1,5 +1,5 @@ { - "name": "HiIRS", + "name": "HiUCS", "version": "0.8.0", "private": true, "scripts": { @@ -38,6 +38,7 @@ "pinyin-pro": "^3.8.3", "postprocessing": "^5.3.2", "remixicon": "^2.5.0", + "swiper": "^8.2.6", "three": "^0.98.0", "three.meshline": "^1.1.0", "vue": "^3.1.4", @@ -70,6 +71,7 @@ "stylus": "^0.54.5", "stylus-loader": "^3.0.2", "svg-sprite-loader": "^6.0.9", + "swiper": "^8.0.0", "vab-config": "0.0.8", "webpackbar": "^5.0.0-3" }, diff --git a/front/public/index.html b/front/public/index.html index 43013a4e..cacc03dd 100644 --- a/front/public/index.html +++ b/front/public/index.html @@ -2,36 +2,38 @@ * @Author: hisense.wuhongjian * @Date: 2022-03-29 16:45:25 * @LastEditors: hisense.liangjunhua - * @LastEditTime: 2022-07-01 17:06:39 + * @LastEditTime: 2022-07-09 15:05:57 * @Description: 告诉大家这是什么 --> - - - - - - <%= htmlWebpackPlugin.options.title %> - - - - - - + + + + + + + + <%= htmlWebpackPlugin.options.title %> + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - -