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

Merge branch 'hi-ucs-pre' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-pre

This commit is contained in:
guoyue 2022-11-01 18:06:10 +08:00
parent 14813c1f4d af4ba480cb
commit 14cac6c190
15 changed files with 172 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
back/public/config/basicConfig.js
View File

@ -1,8 +1,8 @@
/*
* @Author: hisense.wuhongjian
* @Date: 2022-08-25 14:37:49
* @LastEditors: Light
* @LastEditTime: 2022-11-01 09:20:12
* @LastEditors: hisense.wuhongjian
* @LastEditTime: 2022-11-01 15:37:21
* @Description: 告诉大家这是什么
*/
var _global = {}
@ -43,8 +43,8 @@ var CONFIGITEM = {
},
dev: {
previewUrl: 'http://localhost:8080/',
apiURL: 'http://192.168.124.243:8888/ucs-admin',
websocketURL: 'ws://192.168.124.243:8888/ucs-admin/websocket'
apiURL: 'http://192.168.124.236:8888/ucs-admin',
websocketURL: 'ws://192.168.243.236:8888/ucs-admin/websocket'
}
}
}

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

@ -3,8 +3,8 @@ const t = {}
t.loading = '加载中...'
t.brand = {}
t.brand.lg = '能力管理中心'
t.brand.mini = '一体化综合指挥'
t.brand.lg = '生态运营平台'
t.brand.mini = '政务信息系统'
t.add = '新增'
t.delete = '删除'

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

@ -3,10 +3,8 @@ const t = {}
t.loading = '加載中...'
t.brand = {}
// t.brand.lg = '能力管理中心'
// t.brand.mini = '一体化综合指挥'
t.brand.lg = '通用服务平台'
t.brand.mini = '城市云脑'
t.brand.lg = '生态运营平台'
t.brand.mini = '政务信息系统'
t.add = '新增'
t.delete = '刪除'

2
back/src/utils/request.js
View File

@ -14,7 +14,7 @@ import isPlainObject from 'lodash/isPlainObject'
const http = axios.create({
baseURL: window.SITE_CONFIG.apiURL,
// baseURL: 'http://15.2.21.238:8888/renren-admin/',
// baseURL: 'http://15.2.21.238:8888/ucs-admin/',
timeout: 1000 * 180,
withCredentials: true
})

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

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

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

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

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

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

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

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

21
back/src/views/modules/ability/shipinziyuan.vue
View File

@ -77,12 +77,6 @@
width="150"
>
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click="yunadd('detail',scope.row)"
>详情</el-button
>
<el-button
type="text"
size="small"
@ -90,16 +84,23 @@
>修改</el-button
>
<el-button
type="text"
size="small"
@click="yunadd('detail',scope.row)"
>详情</el-button
>
<!-- <el-button
type="text"
size="small"
@click="reset"
>删除</el-button
>
> -->
<el-button
type="text"
size="small"
@click="reset"
>设置标签</el-button
>标签化</el-button
>
</template>
</el-table-column>
@ -211,9 +212,9 @@ export default {
"e": "市南区"
},
{
"a": "青岛一建青岛公共卫生中心大门",
"a": "一建公共卫生中心大门",
"b": "101_37020201581314000519",
"c": "青岛一建青岛公共卫生中心",
"c": "一建公共卫生中心",
"d": "市住房城乡建设局",
"e": "市南区"
},

64
back/src/views/modules/ability/shujuziyuan.vue
View File

@ -19,7 +19,7 @@
</el-form-item>
<el-form-item>
<el-button type="primary" @click="yunadd('add',null)"
>上架</el-button
>盘点入库</el-button
>
</el-form-item>
<el-form-item>
@ -52,19 +52,19 @@
></el-table-column>
<el-table-column
prop="c"
label="数据描述"
label="能力描述"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="d"
label="提供部门"
label="归属部门"
header-align="center"
align="center"
></el-table-column>
<el-table-column
prop="e"
label="创建时间"
label="注册者"
header-align="center"
align="center"
></el-table-column>
@ -76,13 +76,8 @@
align="center"
width="150"
>
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click="yunadd('detail',scope.row)"
>详情</el-button
>
<el-button
type="text"
size="small"
@ -90,16 +85,23 @@
>修改</el-button
>
<el-button
type="text"
size="small"
@click="yunadd('detail',scope.row)"
>详情</el-button
>
<!-- <el-button
type="text"
size="small"
@click="reset"
>删除</el-button
>
> -->
<el-button
type="text"
size="small"
@click="reset"
>设置标签</el-button
>标签化</el-button
>
</template>
</el-table-column>
@ -220,71 +222,71 @@ export default {
"a": "供水营业网点信息",
"b": "307013109015000204",
"c": "供水营业网点信息",
"d": "青岛西海岸新区城市管理局（区水务局）",
"e ": "2022-10-28"
"d": "西海岸新区城市管理局（区水务局）",
"e": "张虎"
},
{
"a": "新建体育公园、笼式场地",
"b": "307013100673000036",
"c": "新建体育公园、笼式场地",
"d": "青岛市体育局",
"e ": "2022-10-28"
"d": "体育局",
"e": "张虎"
},
{
"a": "西海岸新区供水领域自然人欠费信息",
"b": "307013109015000211",
"c": "西海岸新区供水领域自然人欠费信息",
"d": "青岛西海岸新区城市管理局（区水务局）",
"e ": "2022-10-28"
"d": "西海岸新区城市管理局（区水务局）",
"e": "李阳"
},
{
"a": "青岛西海岸新区交通运输局",
"a": "西海岸新区交通运输局",
"b": "307013109071000108",
"c": "公交站点查询",
"d": "青岛西海岸新区交通运输局",
"e ": "2022-10-27"
"d": "西海岸新区交通运输局",
"e": "李阳"
},
{
"a": "全市主要经济指标",
"b": "307013107004000062",
"c": "胶州市国民经济分行业数据",
"d": "胶州市统计局",
"e ": "2022-10-13"
"e": "李阳"
},
{
"a": "乡村之星信息",
"b": "307013100000000187",
"c": "乡村之星信息",
"d": "青岛市农业农村局",
"e ": "2022-10-13"
"d": "农业农村局",
"e": "李阳"
},
{
"a": "建设项目环境影响评价审批信息",
"b": "307013107777000033",
"c": "建设单位、建设项目、审批文号",
"d": "青岛市生态环境局胶州分局",
"e ": "2022-10-13"
"d": "生态环境局胶州分局",
"e": "王二生"
},
{
"a": "新时代文明实践阵地信息表",
"b": "307013108760000022",
"c": "镇街、阵地名称、专管员、联系电话",
"d": "莱西市夏格庄镇人民政府",
"e ": "2022-09-29"
"e": "王二生"
},
{
"a": "泊里镇非物质文化遗产信息",
"b": "307013109000000067",
"c": "泊里镇非物质文化遗产的名称、简介等信息",
"d": "青岛市黄岛区泊里镇人民政府",
"e ": "2022-10-11"
"d": "黄岛区泊里镇人民政府",
"e": "王二生"
},
{
"a": "人才住房建设情况",
"b": "307013100482000025",
"c": "人才住房项目数量、人才住房房屋套数、人才住房面积、人才住房目标任务房屋套数、人才住房房屋总面积",
"d": "青岛市住房和城乡建设局",
"e ": "2022-09-18"
"d": "住房和城乡建设局",
"e": "王二生"
}
],

6
back/src/views/modules/sys/log-data-modification-log.vue
View File

@ -52,15 +52,15 @@
>
<el-option
label="增加"
value="/renren-admin/resource%/insert"
value="/ucs-admin/resource%/insert"
></el-option>
<el-option
label="更新"
value="/renren-admin/resource%/update"
value="/ucs-admin/resource%/update"
></el-option>
<el-option
label="删除"
value="/renren-admin/resource%/delete"
value="/ucs-admin/resource%/delete"
></el-option>
</el-select>
</el-form-item>

2
front/src/api/file.js
View File

@ -128,7 +128,7 @@ export function initiateMeet(data) {
// data: data,
// })
return axios.post(
'http://10.134.135.92:8888/renren-admin/enke/initiateMeet',
'http://10.134.135.92:8888/ucs-admin/enke/initiateMeet',
data,
config2
)

6
front/src/config/default/setting.config.js
View File

@ -23,9 +23,9 @@ const setting = {
// baseURL: 'mock-server',
// 请求接口
// 丁港
baseURL: 'http://15.72.183.90:8000/renren-admin',
// : 'http://15.2.21.238:8888/renren-admin/',
// 'http://15.72.183.90:8000/renren-admin',
baseURL: 'http://15.72.183.90:8000/ucs-admin',
// : 'http://15.2.21.238:8888/ucs-admin/',
// 'http://15.72.183.90:8000/ucs-admin',
// 黄工
// baseURL:
// process.env.NODE_ENV === 'development'

4
front/vue.config.js
View File

@ -74,12 +74,12 @@ module.exports = {
// // },
// // 注释掉的地方是前端配置代理访问后端的示例
// proxy: {
// '/renren-admin': {
// '/ucs-admin': {
// target: `http://15.2.21.238:8888`,
// // ws: true,
// changeOrigin: true,
// // pathRewrite: {
// // '^/': '/renren-admin/',
// // '^/': '/ucs-admin/',
// // },
// },
// },