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

能力融合系统修改

This commit is contained in:
unknown 2022-11-01 16:52:48 +08:00
parent 3c134e0949
commit d4d2b06e1d
7 changed files with 116 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
back/src/i18n/zh-CN.js
View File

@ -3,8 +3,8 @@ const t = {}
t.loading = '加载中...' t.loading = '加载中...'
t.brand = {} t.brand = {}
t.brand.lg = '能力管理中心' t.brand.lg = '生态运营平台'
t.brand.mini = '一体化综合指挥' t.brand.mini = '政务信息系统'
t.add = '新增' t.add = '新增'
t.delete = '删除' t.delete = '删除'
@ -576,4 +576,4 @@ t.infrastructure.street = '所在街道'
t.infrastructure.department = '所属部门' t.infrastructure.department = '所属部门'
t.infrastructure.associatedApplication = '关联应用' t.infrastructure.associatedApplication = '关联应用'
export default t export default t

8
back/src/i18n/zh-TW.js
View File

@ -3,8 +3,8 @@ const t = {}
t.loading = '加載中...' t.loading = '加載中...'
t.brand = {} t.brand = {}
t.brand.lg = '能力管理中心' t.brand.lg = '生态运营平台'
t.brand.mini = '一体化综合指挥' t.brand.mini = '政务信息系统'
t.add = '新增' t.add = '新增'
t.delete = '刪除' t.delete = '刪除'
@ -25,7 +25,7 @@ t.choose = '請選擇'
t.fileName = '文件名' t.fileName = '文件名'
t.design = '在線設計' t.design = '在線設計'
t.preview = '預覽' t.preview = '預覽'
t.reset='重置' t.reset = '重置'
t.prompt = {} t.prompt = {}
t.prompt.title = '提示' t.prompt.title = '提示'
@ -544,4 +544,4 @@ t.notice.new = '有新通知'
t.notice.disconnect = '連接斷開' t.notice.disconnect = '連接斷開'
t.notice.disconnectMessage = 'WebSocket連接已斷開，請檢查網絡' t.notice.disconnectMessage = 'WebSocket連接已斷開，請檢查網絡'
export default t export default t

2
back/src/views/main-navbar.vue
View File

@ -12,7 +12,7 @@
$t("brand.lg") $t("brand.lg")
}}</a> }}</a>
<span>——</span> <span>——</span>
<span class="back-title-text">后台管理系统</span> <span class="back-title-text">能力知识库</span>
</h1> </h1>
</div> </div>
<div class="aui-navbar__body"> <div class="aui-navbar__body">

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

@ -29,7 +29,7 @@
</el-form-item> --> </el-form-item> -->
<el-form-item> <el-form-item>
<el-button type="primary" @click="showPutOnTheShelf()" <el-button type="primary" @click="showPutOnTheShelf()"
>上架</el-button >盘点入库</el-button
> >
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@ -48,7 +48,6 @@
v-loading="dataListLoading" v-loading="dataListLoading"
:data="dataList" :data="dataList"
border border
style="width: 100%"
height="650px" height="650px"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
@ -60,7 +59,6 @@
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="280"
prop="name" prop="name"
label="图层名称" label="图层名称"
header-align="center" header-align="center"
@ -68,29 +66,40 @@
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="280"
prop="description" prop="description"
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"
width="280"
prop="deptName" prop="deptName"
label="上架部门" label="归属项目"
header-align="center"
align="center"
></el-table-column>
<el-table-column
:show-overflow-tooltip="true"
prop="deptName"
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"
width="280" prop="deptName"
prop="deptContacts" 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"
prop="deptContacts"
label="注册者"
header-align="center"
align="center"
></el-table-column>
<!-- <el-table-column
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="280" width="280"
prop="deptPhone" prop="deptPhone"
@ -105,13 +114,12 @@
label="上架时间" label="上架时间"
header-align="center" header-align="center"
align="center" align="center"
></el-table-column> ></el-table-column> -->
<el-table-column <el-table-column
label="操作" label="操作"
fixed="right" fixed="right"
header-align="center" header-align="center"
align="center" align="center"
width="150"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -120,17 +128,17 @@
@click="UpdateData(scope.row)" @click="UpdateData(scope.row)"
>{{ $t('update') }}</el-button >{{ $t('update') }}</el-button
> >
<el-button <!-- <el-button
type="text" type="text"
size="small" size="small"
@click="deleteHandle2(scope.row.id)" @click="deleteHandle2(scope.row.id)"
>{{ $t('delete') }}</el-button >{{ $t('delete') }}</el-button
> > -->
<el-button type="text" size="small" @click="showDetail(scope.row)" <el-button type="text" size="small" @click="showDetail(scope.row)"
>详情</el-button >详情</el-button
> >
<el-button type="text" size="small" @click="showDocument(scope.row)" <el-button type="text" size="small"
>设置</el-button >标签化</el-button
> >
</template> </template>
</el-table-column> </el-table-column>
@ -294,7 +302,7 @@ export default {
orderField: 'total', orderField: 'total',
orderType: 'DESC', orderType: 'DESC',
pageNum: this.currentPage, pageNum: this.currentPage,
pageSize: 15, pageSize: 10,
type: '组件服务', type: '组件服务',
}; };
this.$http.post(`/resource/pageWithAttrs`, params).then((res) => { this.$http.post(`/resource/pageWithAttrs`, params).then((res) => {

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

@ -31,7 +31,7 @@
<el-button <el-button
type="primary" type="primary"
@click="showPutOnTheShelf()" @click="showPutOnTheShelf()"
>上架</el-button >盘点入库</el-button
> >
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@ -51,7 +51,6 @@
:data="dataList" :data="dataList"
border border
@selection-change="dataListSelectionChangeHandle" @selection-change="dataListSelectionChangeHandle"
style="width: 100%"
height="650px" height="650px"
> >
<el-table-column <el-table-column
@ -62,56 +61,58 @@
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="280"
prop="name" prop="name"
label="应用名称" label="系统名称"
header-align="center" header-align="center"
align="center" align="center"
></el-table-column> ></el-table-column>
<af-table-column <el-table-column
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="280"
prop="description" prop="description"
label="应用描述" label="能力描述"
header-align="center" header-align="center"
align="center" align="center"
></af-table-column> ></el-table-column>
<af-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
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="280"
prop="deptName" prop="deptName"
label="归属部门" label="归属部门"
header-align="center" header-align="center"
align="center" align="center"
></af-table-column> ></el-table-column>
<af-table-column <el-table-column
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="280"
prop="deptContacts" prop="deptContacts"
label="部门联系人" label="注册者"
header-align="center" header-align="center"
align="center" align="center"
></af-table-column> ></el-table-column>
<af-table-column <!-- <el-table-column
:show-overflow-tooltip="true"
width="280"
prop="deptPhone"
label="部门联系人电话"
header-align="center"
align="center"
></af-table-column>
<af-table-column
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="280" width="280"
prop="shareCondition" prop="shareCondition"
label="共享条件" label="共享条件"
header-align="center" header-align="center"
align="center" align="center"
></af-table-column> ></el-table-column>
<template v-if="dataList[0] && dataList[0].infoList2"> <template v-if="dataList[0] && dataList[0].infoList2">
<el-table-column <el-table-column
v-for="(item, index) in dataList[0].infoList2" v-for="(item, index) in dataList[0].infoList2"
:key="index" :key="Math.random()"
:label="item.attrType" :label="item.attrType"
header-align="center" header-align="center"
align="center" align="center"
@ -122,29 +123,20 @@
{{ findValue(scope.row.infoList2, item.attrType) }} {{ findValue(scope.row.infoList2, item.attrType) }}
</template> </template>
</el-table-column> </el-table-column>
</template> </template>-->
<el-table-column <el-table-column
:label="$t('handle')" label="操作"
fixed="right" fixed="right"
header-align="center" header-align="center"
align="center" align="center"
width="300"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
v-if="$hasPermission('ability:bsabilityai:update')"
type="text" type="text"
size="small" size="small"
@click="UpdateData(scope.row)" @click="UpdateData(scope.row)"
>{{ $t("update") }}</el-button >{{ $t("update") }}</el-button
> >
<el-button
v-if="$hasPermission('ability:bsabilityai:delete')"
type="text"
size="small"
@click="deleteHandle2(scope.row.id)"
>{{ $t("delete") }}</el-button
>
<el-button type="text" size="small" @click="showDetail(scope.row)" <el-button type="text" size="small" @click="showDetail(scope.row)"
>详情</el-button >详情</el-button
> >
@ -152,30 +144,7 @@
type="text" type="text"
size="small" size="small"
@click="applyAndAssembly(scope.row)" @click="applyAndAssembly(scope.row)"
>应用与GIS图层</el-button >标签化</el-button
>
<el-button
type="text"
size="small"
@click="applyAndDataResource(scope.row)"
>应用与数据</el-button
>
<el-button
type="text"
size="small"
@click="applyAndProject(scope.row)"
>应用与项目</el-button
>
<el-button
type="text"
size="small"
@click="applyAndInfrastructure(scope.row)"
>应用与视频资源</el-button
>
<el-button
type="text"
size="small"
>设置</el-button
> >
</template> </template>
</el-table-column> </el-table-column>

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

@ -29,7 +29,7 @@
</el-form-item> --> </el-form-item> -->
<el-form-item> <el-form-item>
<el-button type="primary" @click="showPutOnTheShelf()" <el-button type="primary" @click="showPutOnTheShelf()"
>上架</el-button >盘点入库</el-button
> >
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@ -48,7 +48,6 @@
v-loading="dataListLoading" v-loading="dataListLoading"
:data="dataList" :data="dataList"
border border
style="width: 100%"
height="650px" height="650px"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
@ -60,37 +59,47 @@
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="280"
prop="name" prop="name"
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"
width="280"
prop="description" prop="description"
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"
width="280"
prop="deptName" prop="deptName"
label="上架部门" label="归属项目"
header-align="center"
align="center"
></el-table-column>
<el-table-column
:show-overflow-tooltip="true"
prop="deptName"
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"
width="280" prop="deptName"
prop="deptContacts" 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"
prop="deptContacts"
label="注册者"
header-align="center"
align="center"
></el-table-column>
<!-- <el-table-column
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="280" width="280"
prop="deptPhone" prop="deptPhone"
@ -105,13 +114,12 @@
label="上架时间" label="上架时间"
header-align="center" header-align="center"
align="center" align="center"
></el-table-column> ></el-table-column> -->
<el-table-column <el-table-column
label="操作" label="操作"
fixed="right" fixed="right"
header-align="center" header-align="center"
align="center" align="center"
width="150"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -120,17 +128,17 @@
@click="UpdateData(scope.row)" @click="UpdateData(scope.row)"
>{{ $t('update') }}</el-button >{{ $t('update') }}</el-button
> >
<el-button <!-- <el-button
type="text" type="text"
size="small" size="small"
@click="deleteHandle2(scope.row.id)" @click="deleteHandle2(scope.row.id)"
>{{ $t('delete') }}</el-button >{{ $t('delete') }}</el-button
> > -->
<el-button type="text" size="small" @click="showDetail(scope.row)" <el-button type="text" size="small" @click="showDetail(scope.row)"
>详情</el-button >详情</el-button
> >
<el-button type="text" size="small" @click="showDocument(scope.row)" <el-button type="text" size="small"
>设置</el-button >标签化</el-button
> >
</template> </template>
</el-table-column> </el-table-column>
@ -294,7 +302,7 @@ export default {
orderField: 'total', orderField: 'total',
orderType: 'DESC', orderType: 'DESC',
pageNum: this.currentPage, pageNum: this.currentPage,
pageSize: 15, pageSize: 10,
type: '组件服务', type: '组件服务',
}; };
this.$http.post(`/resource/pageWithAttrs`, params).then((res) => { this.$http.post(`/resource/pageWithAttrs`, params).then((res) => {
@ -302,13 +310,12 @@ export default {
this.total = parseInt(res.data.data.total); this.total = parseInt(res.data.data.total);
}) })
}, },
//翻页
handleCurrentChange (val) { handleCurrentChange (val) {
console.log('val------------>', val) console.log('val------------>', val)
this.currentPage = val; this.currentPage = val;
this.getDataList(); this.getDataList();
}, },
//删除，可以批量删除 //删除，可以批量删除
deleteHandle2 (id) { deleteHandle2 (id) {
console.log('删除========================》', id, this.dataListSelections) console.log('删除========================》', id, this.dataListSelections)
const ids = [] const ids = []
@ -326,7 +333,7 @@ export default {
this.getDataList() this.getDataList()
}) })
}, },
//多选多选 //多选多选
handleSelectionChange(val){ handleSelectionChange(val){
this.dataListSelections = val; this.dataListSelections = val;
}, },
@ -348,7 +355,7 @@ export default {
}) })
}, },
reset () { reset () {
this.getDataList(); this.getDataList();
}, },
findValue (list, type) { findValue (list, type) {
const found = list.find((item) => item.attrType === type) const found = list.find((item) => item.attrType === type)
@ -513,6 +520,7 @@ export default {
this.$message.error('查询信息不能为空') this.$message.error('查询信息不能为空')
} }
}, },
// fullScreen () {
// if (window.outerHeight === screen.availHeight) { // if (window.outerHeight === screen.availHeight) {
// if (window.outerWidth === screen.availWidth) { // if (window.outerWidth === screen.availWidth) {
// this.qp = false // this.qp = false

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

@ -5,7 +5,7 @@
<el-form-item> <el-form-item>
<el-input <el-input
v-model="dataForm.name" v-model="dataForm.name"
placeholder="图层名称" placeholder="名称"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
@ -29,7 +29,7 @@
</el-form-item> --> </el-form-item> -->
<el-form-item> <el-form-item>
<el-button type="primary" @click="showPutOnTheShelf()" <el-button type="primary" @click="showPutOnTheShelf()"
>上架</el-button >盘点入库</el-button
> >
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@ -48,7 +48,6 @@
v-loading="dataListLoading" v-loading="dataListLoading"
:data="dataList" :data="dataList"
border border
style="width: 100%"
height="650px" height="650px"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
@ -60,37 +59,36 @@
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
width="280"
prop="name" prop="name"
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"
width="280"
prop="description" prop="description"
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"
width="280"
prop="deptName" prop="deptName"
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"
width="280"
prop="deptContacts" prop="deptContacts"
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"
width="280" width="280"
prop="deptPhone" prop="deptPhone"
@ -105,13 +103,13 @@
label="上架时间" label="上架时间"
header-align="center" header-align="center"
align="center" align="center"
></el-table-column> ></el-table-column> -->
<el-table-column <el-table-column
label="操作" label="操作"
fixed="right" fixed="right"
header-align="center" header-align="center"
align="center" align="center"
width="150"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -120,17 +118,17 @@
@click="UpdateData(scope.row)" @click="UpdateData(scope.row)"
>{{ $t('update') }}</el-button >{{ $t('update') }}</el-button
> >
<el-button <!-- <el-button
type="text" type="text"
size="small" size="small"
@click="deleteHandle2(scope.row.id)" @click="deleteHandle2(scope.row.id)"
>{{ $t('delete') }}</el-button >{{ $t('delete') }}</el-button
> > -->
<el-button type="text" size="small" @click="showDetail(scope.row)" <el-button type="text" size="small" @click="showDetail(scope.row)"
>详情</el-button >详情</el-button
> >
<el-button type="text" size="small" @click="showDocument(scope.row)" <el-button type="text" size="small"
>设置</el-button >标签化</el-button
> >
</template> </template>
</el-table-column> </el-table-column>
@ -294,7 +292,7 @@ export default {
orderField: 'total', orderField: 'total',
orderType: 'DESC', orderType: 'DESC',
pageNum: this.currentPage, pageNum: this.currentPage,
pageSize: 15, pageSize: 10,
type: '组件服务', type: '组件服务',
}; };
this.$http.post(`/resource/pageWithAttrs`, params).then((res) => { this.$http.post(`/resource/pageWithAttrs`, params).then((res) => {
@ -307,7 +305,7 @@ export default {
this.currentPage = val; this.currentPage = val;
this.getDataList(); this.getDataList();
}, },
//删除，可以批量删除 //删除，可以批量删除
deleteHandle2 (id) { deleteHandle2 (id) {
console.log('删除========================》', id, this.dataListSelections) console.log('删除========================》', id, this.dataListSelections)
const ids = [] const ids = []
@ -325,7 +323,7 @@ export default {
this.getDataList() this.getDataList()
}) })
}, },
//多选多选 //多选多选
handleSelectionChange(val){ handleSelectionChange(val){
this.dataListSelections = val; this.dataListSelections = val;
}, },
@ -347,7 +345,7 @@ export default {
}) })
}, },
reset () { reset () {
this.getDataList(); this.getDataList();
}, },
findValue (list, type) { findValue (list, type) {
const found = list.find((item) => item.attrType === type) const found = list.find((item) => item.attrType === type)
@ -512,6 +510,7 @@ export default {
this.$message.error('查询信息不能为空') this.$message.error('查询信息不能为空')
} }
}, },
// fullScreen () {
// if (window.outerHeight === screen.availHeight) { // if (window.outerHeight === screen.availHeight) {
// if (window.outerWidth === screen.availWidth) { // if (window.outerWidth === screen.availWidth) {
// this.qp = false // this.qp = false