wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

能力盘点系统修改

This commit is contained in:
unknown 2022-11-02 15:02:10 +08:00
parent 14cac6c190
commit 9a5b1732c5
6 changed files with 568 additions and 416 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
back/src/mixins/view-module.js
View File

@ -2,7 +2,7 @@ import Cookies from 'js-cookie'
import qs from 'qs' import qs from 'qs'
import { deepClone } from '@/utils/form-generator/index' import { deepClone } from '@/utils/form-generator/index'
export default { export default {
data () { data() {
/* eslint-disable */ /* eslint-disable */
return { return {
// 设置属性 // 设置属性
@ -20,13 +20,10 @@ export default {
flag: false, flag: false,
time: null, time: null,
// 默认属性 // 默认属性
dataForm: { dataForm: {}, // 查询条件
}, // 查询条件 dataList: [{
dataList: [
{
infoList: [] infoList: []
} }], // 数据列表
], // 数据列表
order: '', // 排序，asc／desc order: '', // 排序，asc／desc
orderField: '', // 排序，字段 orderField: '', // 排序，字段
page: 1, // 当前页码 page: 1, // 当前页码
@ -38,19 +35,19 @@ export default {
} }
/* eslint-enable */ /* eslint-enable */
}, },
created () { created() {
if (this.mixinViewModuleOptions.createdIsNeed) { if (this.mixinViewModuleOptions.createdIsNeed) {
this.query() this.query()
} }
}, },
activated () { activated() {
if (this.mixinViewModuleOptions.activatedIsNeed) { if (this.mixinViewModuleOptions.activatedIsNeed) {
this.query() this.query()
} }
}, },
methods: { methods: {
// 获取数据列表 // 获取数据列表
query () { query() {
this.dataListLoading = true this.dataListLoading = true
this.$http.get( this.$http.get(
this.mixinViewModuleOptions.getDataListURL + '?' + qs.stringify({ this.mixinViewModuleOptions.getDataListURL + '?' + qs.stringify({
@ -73,19 +70,35 @@ export default {
this.dataList.map((item, index) => { this.dataList.map((item, index) => {
if (this.dataList[index].type != null) { if (this.dataList[index].type != null) {
switch (item.type) { switch (item.type) {
case 1: this.dataList[index].type = '省'; break case 1:
case 2: this.dataList[index].type = '市'; break this.dataList[index].type = '省';
case 3: this.dataList[index].type = '区'; break break
case 4: this.dataList[index].type = '企业'; break case 2:
this.dataList[index].type = '市';
break
case 3:
this.dataList[index].type = '区';
break
case 4:
this.dataList[index].type = '企业';
break
} }
} }
if (item.children != null) { if (item.children != null) {
item.children.map((item2, index2) => { item.children.map((item2, index2) => {
switch (item2.type) { switch (item2.type) {
case 1: this.dataList[index].children[index2].type = '省'; break case 1:
case 2: this.dataList[index].children[index2].type = '市'; break this.dataList[index].children[index2].type = '省';
case 3: this.dataList[index].children[index2].type = '区'; break break
case 4: this.dataList[index].children[index2].type = '企业'; break case 2:
this.dataList[index].children[index2].type = '市';
break
case 3:
this.dataList[index].children[index2].type = '区';
break
case 4:
this.dataList[index].children[index2].type = '企业';
break
} }
}) })
} }
@ -116,6 +129,14 @@ export default {
this.dataList.map(val => { this.dataList.map(val => {
val.infoList2 = val.infoList.filter(item => item.attrType === '应用领域') val.infoList2 = val.infoList.filter(item => item.attrType === '应用领域')
}) })
} else if (this.dataList[0].type === '应用系统') {
this.dataList.forEach((item) => {
item.belongProject = "城市信息模型";
item.belongSystem = "信息模型技术平台";
});
this.dataList.map(val => {
val.infoList2 = val.infoList.filter(item => item.attrType === '应用领域')
})
} }
if (this.mixinViewModuleOptions.requestCallback) { if (this.mixinViewModuleOptions.requestCallback) {
this.mixinViewModuleOptions.requestCallback(res.data) this.mixinViewModuleOptions.requestCallback(res.data)
@ -126,11 +147,11 @@ export default {
}) })
}, },
// 多选 // 多选
dataListSelectionChangeHandle (val) { dataListSelectionChangeHandle(val) {
this.dataListSelections = val this.dataListSelections = val
}, },
// 排序 // 排序
dataListSortChangeHandle (data) { dataListSortChangeHandle(data) {
if (!data.order || !data.prop) { if (!data.order || !data.prop) {
this.order = '' this.order = ''
this.orderField = '' this.orderField = ''
@ -141,22 +162,22 @@ export default {
this.query() this.query()
}, },
// 分页, 每页条数 // 分页, 每页条数
pageSizeChangeHandle (val) { pageSizeChangeHandle(val) {
this.page = 1 this.page = 1
this.limit = val this.limit = val
this.query() this.query()
}, },
// 分页, 当前页 // 分页, 当前页
pageCurrentChangeHandle (val) { pageCurrentChangeHandle(val) {
this.page = val this.page = val
this.query() this.query()
}, },
getDataList: function () { getDataList: function() {
this.page = 1 this.page = 1
this.query() this.query()
}, },
// 新增 // 新增
addOrUpdateHandle (id) { addOrUpdateHandle(id) {
this.addOrUpdateVisible = true this.addOrUpdateVisible = true
this.disabled = false this.disabled = false
this.$nextTick(() => { this.$nextTick(() => {
@ -167,7 +188,7 @@ export default {
}, },
// 组件服务新增 // 组件服务新增
addOrUpdateHandleAI (id) { addOrUpdateHandleAI(id) {
// const infoList = [] // const infoList = []
let showList = [] let showList = []
this.$http.get('category/getCategoryTree').then(({ data: res }) => { this.$http.get('category/getCategoryTree').then(({ data: res }) => {
@ -182,7 +203,7 @@ export default {
options.push(val.dictLabel) options.push(val.dictLabel)
}) })
item2.options = options item2.options = options
}).catch(() => { }) }).catch(() => {})
} }
item2.note1 = '' item2.note1 = ''
// if (item.name !== '必填信息' && item.name !== '服务接口信息') { // if (item.name !== '必填信息' && item.name !== '服务接口信息') {
@ -198,7 +219,7 @@ export default {
}) })
console.log(res, showList) console.log(res, showList)
this.flag = true this.flag = true
}).catch(() => { }) }).catch(() => {})
// 定时器 // 定时器
this.time = setInterval(() => { this.time = setInterval(() => {
@ -225,7 +246,7 @@ export default {
}, 100) }, 100)
}, },
// 应用资源新增 // 应用资源新增
addOrUpdateHandleServe (id) { addOrUpdateHandleServe(id) {
// const infoList = [] // const infoList = []
let showList = [] let showList = []
this.$http.get('category/getCategoryTree').then(({ data: res }) => { this.$http.get('category/getCategoryTree').then(({ data: res }) => {
@ -240,7 +261,7 @@ export default {
options.push(val.dictLabel) options.push(val.dictLabel)
}) })
item2.options = options item2.options = options
}).catch(() => { }) }).catch(() => {})
} }
item2.note1 = '' item2.note1 = ''
// if (item.name !== '必填信息' && item.name !== '服务接口信息') { // if (item.name !== '必填信息' && item.name !== '服务接口信息') {
@ -256,7 +277,7 @@ export default {
}) })
console.log(res, showList) console.log(res, showList)
this.flag = true this.flag = true
}).catch(() => { }) }).catch(() => {})
// 定时器 // 定时器
this.time = setInterval(() => { this.time = setInterval(() => {
@ -283,7 +304,7 @@ export default {
}, 100) }, 100)
}, },
// 修改 // 修改
UpdateHandle (val) { UpdateHandle(val) {
this.addOrUpdateVisible = true this.addOrUpdateVisible = true
this.disabled = false this.disabled = false
const cloneVal = deepClone(val) const cloneVal = deepClone(val)
@ -308,7 +329,7 @@ export default {
}) })
}, },
// 关闭当前窗口 // 关闭当前窗口
closeCurrentTab (data) { closeCurrentTab(data) {
var tabName = this.$store.state.contentTabsActiveName var tabName = this.$store.state.contentTabsActiveName
this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => item.name !== tabName) this.$store.state.contentTabs = this.$store.state.contentTabs.filter(item => item.name !== tabName)
if (this.$store.state.contentTabs.length <= 0) { if (this.$store.state.contentTabs.length <= 0) {
@ -320,7 +341,7 @@ export default {
} }
}, },
// 删除 // 删除
deleteHandle (id) { deleteHandle(id) {
if (this.mixinViewModuleOptions.deleteIsBatch && !id && this.dataListSelections.length <= 0) { if (this.mixinViewModuleOptions.deleteIsBatch && !id && this.dataListSelections.length <= 0) {
return this.$message({ return this.$message({
message: this.$t('prompt.deleteBatch'), message: this.$t('prompt.deleteBatch'),
@ -350,11 +371,11 @@ export default {
this.query() this.query()
} }
}) })
}).catch(() => { }) }).catch(() => {})
}).catch(() => { }) }).catch(() => {})
}, },
deleteHandle2 (id) { deleteHandle2(id) {
console.log('删除========================》', id, this.dataListSelections) console.log('删除========================》', id, this.dataListSelections)
const ids = [] const ids = []
if (id) { if (id) {
@ -372,7 +393,7 @@ export default {
}) })
}, },
// 导出 // 导出
exportHandle () { exportHandle() {
var params = qs.stringify({ var params = qs.stringify({
token: Cookies.get('ucsToken'), token: Cookies.get('ucsToken'),
...this.dataForm ...this.dataForm

151
back/src/views/modules/ability/bsabilityai-relate-application.vue
View File

@ -2,7 +2,7 @@
<div> <div>
<el-dialog <el-dialog
:visible.sync="visible" :visible.sync="visible"
title="关联应用" title="关联标签"
@close="close" @close="close"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
@ -13,7 +13,7 @@
v-model="transferValue" v-model="transferValue"
filterable filterable
:filter-method="filterMethod" :filter-method="filterMethod"
filter-placeholder="请输入应用名称" filter-placeholder="请输入标签名称"
:titles="nameArray" :titles="nameArray"
:props="{ :props="{
key: 'id', key: 'id',
@ -24,7 +24,7 @@
</div> </div>
<template slot="footer"> <template slot="footer">
<el-button @click="visible = false">{{ $t("cancel") }}</el-button> <el-button @click="visible = false">{{ $t("cancel") }}</el-button>
<el-button type="primary" @click="confirmSubmitHandle()">{{ <el-button type="primary" @click="visible = false">{{
$t("confirm") $t("confirm")
}}</el-button> }}</el-button>
</template> </template>
@ -42,6 +42,140 @@ export default {
visible: true, visible: true,
transferData: [], //穿梭框所有数据 transferData: [], //穿梭框所有数据
transferValue: [], //已关联的数据id transferValue: [], //已关联的数据id
linkedData:[
{
id: "1534805370156834818",
dictTypeId: "1534805229031088130",
name: "视频类",
dictValue: "1",
remark: "",
sort: 0,
createDate: "2022-06-09 15:51:30",
updateDate: "2022-07-01 14:20:04",
status: 1
},
{
id: "1536670196898336769",
dictTypeId: "1534805229031088130",
name: "图片类",
dictValue: "2",
remark: "",
sort: 1,
createDate: "2022-06-14 19:21:40",
updateDate: "2022-07-01 14:20:27",
status: 1
},
{
id: "1534805309289095170",
dictTypeId: "1534805229031088130",
name: "文本类",
dictValue: "3",
remark: "",
sort: 2,
createDate: "2022-06-09 15:51:16",
updateDate: "2022-07-01 14:19:52",
status: 1
},
{
id: "1542753737822306305",
dictTypeId: "1534805229031088130",
name: "语音类",
dictValue: "4",
remark: "",
sort: 3,
createDate: "2022-07-01 14:15:29",
updateDate: "2022-07-01 14:15:29",
status: 1
},
{
id: "1536670305505644545",
dictTypeId: "1534805229031088130",
name: "其他",
dictValue: "5",
remark: "",
sort: 4,
createDate: "2022-06-14 19:22:05",
updateDate: "2022-07-01 14:15:11",
status: 1
}
],//已关联标签
labelData:[{
id: "1513714443263451137",
dictTypeId: "1513714403530809346",
name: "接口",
dictValue: "1",
remark: "",
sort: 1,
createDate: "2022-04-12 11:03:41",
updateDate: "2022-04-12 11:03:41",
status: 1
},
{
id: "1513714474334855170",
dictTypeId: "1513714403530809346",
name: "SDK",
dictValue: "2",
remark: "",
sort: 2,
createDate: "2022-04-12 11:03:49",
updateDate: "2022-04-12 11:03:49",
status: 1
},
{
id: "1513714504261214210",
dictTypeId: "1513714403530809346",
name: "Web页面",
dictValue: "3",
remark: "",
sort: 3,
createDate: "2022-04-12 11:03:56",
updateDate: "2022-04-12 11:03:56",
status: 1
},
{
id: "1513714541603102722",
dictTypeId: "1513714403530809346",
name: "其他",
dictValue: "99",
remark: "",
sort: 99,
createDate: "2022-04-12 11:04:05",
updateDate: "2022-04-12 11:04:05",
status: 1
}, {
id: "1539453444552638466",
dictTypeId: "1539453183746621441",
name: "视频资源",
dictValue: "1",
remark: "",
sort: 0,
createDate: "2022-06-22 11:41:18",
updateDate: "2022-06-22 11:41:18",
status: 1
},
{
id: "1539453481407987714",
dictTypeId: "1539453183746621441",
name: "感知资源",
dictValue: "2",
remark: "",
sort: 0,
createDate: "2022-06-22 11:41:26",
updateDate: "2022-06-22 11:41:26",
status: 1
},
{
id: "1539453516610781185",
dictTypeId: "1539453183746621441",
name: "云资源",
dictValue: "3",
remark: "",
sort: 0,
createDate: "2022-06-22 11:41:35",
updateDate: "2022-06-22 11:41:35",
status: 1
}
]
}; };
}, },
props: { props: {
@ -51,7 +185,7 @@ export default {
}, },
nameArray: { nameArray: {
type: Array, type: Array,
default: ["未关联应用名称", "已关联应用名称"], default: ["未关联标签名称", "已关联标签名称"],
}, },
}, },
computed: {}, computed: {},
@ -86,16 +220,15 @@ export default {
}, },
}, },
mounted() { mounted() {
if (this.relateInfo && this.relateInfo.responseData) { if (this.relateInfo) {
const alreadLinkedArr = this.relateInfo.responseData.alreadLinked || []; const alreadLinkedArr = this.linkedData;
this.transferData = alreadLinkedArr.concat( this.transferData = alreadLinkedArr.concat(
this.relateInfo.responseData.notLinked || [] this.labelData
); );
alreadLinkedArr.length && alreadLinkedArr.length &&
alreadLinkedArr.forEach((item) => { alreadLinkedArr.forEach((item) => {
this.transferValue.push(item.id); this.transferValue.push(item.id);
}); }); }
}
}, },
}; };
</script> </script>

12
back/src/views/modules/ability/bsabilityai.vue
View File

@ -73,14 +73,14 @@
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
prop="deptName" prop="belongProject"
label="归属项目" label="归属项目"
header-align="center" header-align="center"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
prop="deptName" prop="belongSystem"
label="归属系统" label="归属系统"
header-align="center" header-align="center"
align="center" align="center"
@ -303,10 +303,16 @@ export default {
orderType: 'DESC', orderType: 'DESC',
pageNum: this.currentPage, pageNum: this.currentPage,
pageSize: 10, pageSize: 10,
type: '组件服务', type: 'GIS图层',
}; };
this.$http.post(`/resource/pageWithAttrs`, params).then((res) => { this.$http.post(`/resource/pageWithAttrs`, params).then((res) => {
this.dataList = res.data.data.records; this.dataList = res.data.data.records;
if(this.dataList.length>0){
this.dataList.forEach((item)=>{
item.belongProject = "城市信息模型";
item.belongSystem = "信息模型技术平台";
});
}
this.total = parseInt(res.data.data.total); this.total = parseInt(res.data.data.total);
}) })
}, },

36
back/src/views/modules/ability/bsabilityservice.vue
View File

@ -75,14 +75,14 @@
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
prop="deptName" prop="belongProject"
label="归属项目" label="归属项目"
header-align="center" header-align="center"
align="center" align="center"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
prop="deptName" prop="belongSystem"
label="归属系统" label="归属系统"
header-align="center" header-align="center"
align="center" align="center"
@ -222,18 +222,18 @@ export default {
creator: '', creator: '',
selectType: 0, selectType: 0,
delFlag: 0, delFlag: 0,
type: '应用资源' type: '应用系统'
}, },
qp: false, qp: false,
relateApplicationResourceVisible: false, relateApplicationResourceVisible: false,
relationData: {}, // 打开穿梭框时传递的参数 relationData: {}, // 打开穿梭框时传递的参数
topNameArray: [], // topNameArray: [], //
radio: '应用资源', radio: '应用系统',
insertList: [], insertList: [],
putOnTheShelfList: [], putOnTheShelfList: [],
showPutOnTheShelfFlag2: false, showPutOnTheShelfFlag2: false,
submitFrom: { submitFrom: {
type: '应用资源', type: '应用系统',
deptId: '', deptId: '',
delFlag: 0, delFlag: 0,
infoList: [ infoList: [
@ -244,7 +244,7 @@ export default {
// } // }
] ]
}, },
typeInput: '应用资源' typeInput: '应用系统'
} }
}, },
watch: {}, watch: {},
@ -255,7 +255,7 @@ export default {
}, },
created () { created () {
this.dataForm.name = '' this.dataForm.name = ''
this.dataForm.type = '应用资源' this.dataForm.type = '应用系统'
}, },
mounted () { mounted () {
// window.addEventListener('resize', this.a) // window.addEventListener('resize', this.a)
@ -276,7 +276,7 @@ export default {
limit: 10, limit: 10,
delFlag: 0, delFlag: 0,
creator: '', creator: '',
type: '应用资源', type: '应用系统',
name: '' name: ''
}) })
) )
@ -292,7 +292,13 @@ export default {
: res.data : res.data
this.total = this.mixinViewModuleOptions.getDataListIsPage this.total = this.mixinViewModuleOptions.getDataListIsPage
? res.data.total ? res.data.total
: 0 : 0;
if(this.dataList.length>0){
this.dataList.forEach((item)=>{
item.belongProject = "城市信息模型";
item.belongSystem = "信息模型技术平台";
});
}
if (this.mixinViewModuleOptions.requestCallback) { if (this.mixinViewModuleOptions.requestCallback) {
this.mixinViewModuleOptions.requestCallback(res.data) this.mixinViewModuleOptions.requestCallback(res.data)
} }
@ -351,7 +357,7 @@ export default {
// type: '组件服务', // type: '组件服务',
pageNum: 1, pageNum: 1,
pageSize: this.limit, pageSize: this.limit,
type: '应用资源', type: '应用系统',
creator: '', creator: '',
selectType: 0, selectType: 0,
delFlag: 0, delFlag: 0,
@ -453,7 +459,7 @@ export default {
linkType: '1', linkType: '1',
responseData: res.data responseData: res.data
} }
this.topNameArray = ['未关联组件名称', '已关联组件名称'] this.topNameArray = ['未关联标签名称', '已关联标签名称']
console.log(' this.relationData', this.relationData) console.log(' this.relationData', this.relationData)
// 将数据传递给引入的组件 // 将数据传递给引入的组件
}) })
@ -526,9 +532,9 @@ export default {
this.showPutOnTheShelfFlag2 = false this.showPutOnTheShelfFlag2 = false
this.insertList = [] this.insertList = []
this.putOnTheShelfList = [] this.putOnTheShelfList = []
this.radio = '应用资源' this.radio = '应用系统'
this.submitFrom = { this.submitFrom = {
type: '应用资源', type: '应用系统',
deptId: '', deptId: '',
delFlag: 0, delFlag: 0,
infoList: [ infoList: [
@ -719,8 +725,8 @@ export default {
UpdateData (item) { UpdateData (item) {
this.$http.get('/category/getCategoryTree').then(res => { this.$http.get('/category/getCategoryTree').then(res => {
this.insertList = res.data.data.filter(item => item.name === '应用资源一')[0] this.insertList = res.data.data.filter(item => item.name === '应用资源一')[0]
this.radio = '应用资源' this.radio = '应用系统'
// this.radio = item.infoList.filter(val => val.attrType === '应用资源')[0].attrValue // this.radio = item.infoList.filter(val => val.attrType === '应用系统')[0].attrValue
this.putOnTheShelfList = this.insertList.children this.putOnTheShelfList = this.insertList.children
// this.putOnTheShelfList = this.insertList.children.filter(item => item.name === this.radio)[0].children // this.putOnTheShelfList = this.insertList.children.filter(item => item.name === this.radio)[0].children
this.putOnTheShelfList.map(parent => { this.putOnTheShelfList.map(parent => {

16
back/src/views/modules/ability/businessComponents.vue
View File

@ -70,20 +70,6 @@
label="能力描述" label="能力描述"
header-align="center" header-align="center"
align="center" align="center"
></el-table-column>
<el-table-column
:show-overflow-tooltip="true"
prop="deptName"
label="归属项目"
header-align="center"
align="center"
></el-table-column>
<el-table-column
:show-overflow-tooltip="true"
prop="deptName"
label="归属系统"
header-align="center"
align="center"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
@ -303,7 +289,7 @@ export default {
orderType: 'DESC', orderType: 'DESC',
pageNum: this.currentPage, pageNum: this.currentPage,
pageSize: 10, pageSize: 10,
type: '组件服务', type: 'GIS图层',
}; };
this.$http.post(`/resource/pageWithAttrs`, params).then((res) => { this.$http.post(`/resource/pageWithAttrs`, params).then((res) => {
this.dataList = res.data.data.records; this.dataList = res.data.data.records;

2
back/src/views/modules/ability/commonCapabilities.vue
View File

@ -293,7 +293,7 @@ export default {
orderType: 'DESC', orderType: 'DESC',
pageNum: this.currentPage, pageNum: this.currentPage,
pageSize: 10, pageSize: 10,
type: '组件服务', type: 'GIS图层',
}; };
this.$http.post(`/resource/pageWithAttrs`, params).then((res) => { this.$http.post(`/resource/pageWithAttrs`, params).then((res) => {
this.dataList = res.data.data.records; this.dataList = res.data.data.records;