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

This commit is contained in:
a0049873 2022-11-02 14:03:53 +08:00
commit 962740bde6
19 changed files with 528 additions and 245 deletions

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'
}
}
}

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 = '删除'

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 = '刪除'

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
})

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">

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
: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="联系人"
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"
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) => {

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>

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
: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="联系人"
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"
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,7 +310,6 @@ export default {
this.total = parseInt(res.data.data.total);
})
},
//
handleCurrentChange (val) {
console.log('val------------>', val)
this.currentPage = val;
@ -513,6 +520,7 @@ export default {
this.$message.error('查询信息不能为空')
}
},
// fullScreen () {
// if (window.outerHeight === screen.availHeight) {
// if (window.outerWidth === screen.availWidth) {
// this.qp = false

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) => {
@ -512,6 +510,7 @@ export default {
this.$message.error('查询信息不能为空')
}
},
// fullScreen () {
// if (window.outerHeight === screen.availHeight) {
// if (window.outerWidth === screen.availWidth) {
// this.qp = false

View File

@ -0,0 +1,144 @@
<template>
<div class="tag-directory-box">
<div class="left-tree-box">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.dictName" placeholder="标签名称" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
<div class="tree-box">
<el-tree class="filter-tree" :data="dataListCopy" :props="defaultProps" default-expand-all
@node-click="handleNodeClick" :filter-node-method="filterNode" ref="tree">
</el-tree>
</div>
</el-form>
</div>
<div class="right-detail">
<div class="title">标签详情</div>
<el-form :model="dataForm" label-width="120px">
<el-form-item prop="dictName" label="标签名称">
<el-input v-model="dataForm.dictName" :placeholder="$t('dict.dictName')"></el-input>
</el-form-item>
<el-form-item prop="dictType" label="标签编号">
<el-input v-model="dataForm.dictType" placeholder="标签编号"></el-input>
</el-form-item>
<el-form-item prop="dictType" label="标签分类" style="width:100%">
<el-input v-model="dataForm.dictType" placeholder="标签分类"></el-input>
</el-form-item>
<el-form-item prop="remark" :label="$t('dict.remark')" style="width:100%">
<el-input type="textarea" :rows="4" v-model="dataForm.remark" :placeholder="$t('dict.remark')">
</el-input>
</el-form-item>
</el-form>
</div>
</div>
</template>
<script>
import mixinViewModule from '@/mixins/view-module'
import AddOrUpdate from '../tag-type-add-or-update'
import TagSysBuildLife from './tag-sys-build-life'
import { addDynamicRoute } from '@/router'
export default {
mixins: [mixinViewModule],
data() {
return {
mixinViewModuleOptions: {
getDataListURL: '/sys/dict/type/page',
getDataListIsPage: true,
deleteURL: '/sys/dict/type',
deleteIsBatch: true
},
dataForm: {
id: '0',
dictName: '',
dictType: '',
dictLabel: '',
},
filterText: '',
dataList: [],
dataListCopy: [],
defaultProps: {
children: 'sysDictDataDTOList',
label: 'dictName'
}
}
},
watch: {
filterText(val) {
this.$refs.tree.filter(val);
},
dataList: {
handler(newVal) {
this.dataListCopy = []
newVal.map(v => {
if (v.sysDictDataDTOList && v.sysDictDataDTOList.length && v.sysDictDataDTOList.length > 0) {
v.sysDictDataDTOList.map(x => {
x.dictName = x.dictLabel;
return x
})
}
this.dataListCopy.push(v)
})
}
}
},
methods: {
filterNode(value, data) {
if (!value) return true;
return data.label.indexOf(value) !== -1;
},
handleNodeClick(data) {
console.log('data------------>', data);
this.dataForm = data
}
},
}
</script>
<style scoped lang="scss">
.tag-directory-box {
display: flex;
align-items: flex-start;
width: 100%;
}
.left-tree-box {
width: 350px;
background: #fff;
padding: 20px 0;
}
.right-detail {
flex: 1;
margin-left: 20px;
background: #fff;
padding: 20px;
}
.right-detail {
.el-form {
display: flex;
width: 100%;
align-items: center;
flex-wrap: wrap;
}
.el-form-item {
width: 50%;
}
}
.title {
line-height: 24px;
font-size: 20px;
color: #303133;
padding-bottom: 25px;
}
</style>

View File

@ -0,0 +1,62 @@
<template>
<el-dialog :visible.sync="visible" title="生命周期管理" :close-on-click-modal="false" :close-on-press-escape="false">
<div class="title">{{ rowData.dictName }}</div>
<el-table v-loading="dataListLoading" :data="dataList" border style="width: 100%;">
<el-table-column prop="status" label="状态" header-align="center" align="center"></el-table-column>
<el-table-column prop="time" label="时间" header-align="center" align="center"></el-table-column>
<el-table-column prop="remark" label="备注" header-align="center" align="center"></el-table-column>
<el-table-column prop="operator" label="操作者" header-align="center" align="center"></el-table-column>
</el-table>
<template slot="footer">
<el-button @click="visible = false">{{ $t('cancel') }}</el-button>
</template>
</el-dialog>
</template>
<script>
export default {
data() {
return {
visible: false,
dataList: [
{
status: '创建',
time: '2022-10-11',
remark: '创建',
operator: '管理员'
},
{
status: '修改',
time: '2022-09-24',
remark: '修改标签描述',
operator: '管理员'
},
{
status: '修改',
time: '2022-09-19',
remark: '补充城市管理标签页',
operator: '城管账号'
},
{
status: '删除',
time: '2022-08-11',
remark: '停止使用',
operator: '管理员'
},
],
rowData: {}
}
},
methods: {
}
}
</script>
<style scoped>
.title {
line-height: 24px;
font-size: 20px;
color: #303133;
padding-bottom: 25px;
}
</style>

View File

@ -0,0 +1,103 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mod-sys__dict">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.dictName" placeholder="标签名称" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="addOrUpdateHandle()">新增分类</el-button>
</el-form-item>
</el-form>
<el-table v-loading="dataListLoading" :data="dataList" border
@selection-change="dataListSelectionChangeHandle" @sort-change="dataListSortChangeHandle"
style="width: 100%;">
<el-table-column prop="dictName" label="分类名称" header-align="center" align="center"></el-table-column>
<el-table-column prop="remark" label="描述" header-align="center" align="center"></el-table-column>
<el-table-column prop="dictType" label="编号" header-align="center" align="center"></el-table-column>
<el-table-column label="状态" header-align="center" align="center">
<template slot-scope="scope">
<span>{{ scope.row.status == 1 ? '启用' : '禁用' }}</span>
</template>
</el-table-column>
<el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
<el-table-column label="操作" fixed="right" header-align="center" align="center" width="280">
<template slot-scope="scope">
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
<el-button type="text" size="small" @click="handleClick()">{{ scope.row.status
== 1 ? '禁用' : '启用'
}}</el-button>
<el-button type="text" @click="childHandle(scope.row)">新建标签</el-button>
<el-button type="text" size="small" @click="showLife(scope.row)">生命周期管理</el-button>
</template>
</el-table-column>
</el-table>
<el-pagination :current-page="page" :page-sizes="[10, 20, 50, 100]" :page-size="limit" :total="total"
layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle">
</el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
<!-- 生命周期管理 -->
<TagSysBuildLife ref="lifeModal" @refreshDataList="getDataList"></TagSysBuildLife>
</div>
</el-card>
</template>
<script>
import mixinViewModule from '@/mixins/view-module'
import AddOrUpdate from '../tag-type-add-or-update'
import TagSysBuildLife from './tag-sys-build-life'
import { addDynamicRoute } from '@/router'
export default {
mixins: [mixinViewModule],
data() {
return {
mixinViewModuleOptions: {
getDataListURL: '/sys/dict/type/page',
getDataListIsPage: true,
deleteURL: '/sys/dict/type',
deleteIsBatch: true
},
dataForm: {
id: '0',
dictName: '',
dictType: '',
dictLabel: '',
},
rowClickData: {},
}
},
components: {
AddOrUpdate, TagSysBuildLife
},
methods: {
//
childHandle(row) {
//
const routeParams = {
routeName: `${this.$route.name}__${row.id}`,
title: `${this.$route.meta.title} - ${row.dictType}`,
path: 'ability/tag-data',
params: {
dictTypeId: row.id
}
}
//
addDynamicRoute(routeParams, this.$router)
},
//
showLife(row) {
this.$refs.lifeModal.visible = true;
this.$refs.lifeModal.rowData = row;
},
handleClick() {
}
}
}
</script>

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": "市南区"
},

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": "王二生"
}
],

View File

@ -1,75 +1,40 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mod-sys__dict">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item>
<el-input v-model="dataForm.dictName" placeholder="标签名称" clearable></el-input>
</el-form-item>
<!-- <el-form-item>
<el-input v-model="dataForm.dictLabel" placeholder="资源名称" clearable></el-input>
</el-form-item> -->
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="addOrUpdateHandle()">新增分类</el-button>
</el-form-item>
</el-form>
<el-table v-loading="dataListLoading" :data="dataList" border
@selection-change="dataListSelectionChangeHandle" @sort-change="dataListSortChangeHandle"
style="width: 100%;">
<el-table-column prop="dictName" label="标签名称" header-align="center" align="center"></el-table-column>
<el-table-column prop="dictType" label="英文名称" header-align="center" align="center">
<template slot-scope="scope">
<el-button type="text" @click="childHandle(scope.row)">{{ scope.row.dictType }}</el-button>
</template>
</el-table-column>
<el-table-column prop="remark" label="描述" header-align="center" align="center"></el-table-column>
<el-table-column prop="createDate" label="创建时间" header-align="center" align="center"></el-table-column>
<el-table-column label="操作" fixed="right" header-align="center" align="center" width="280">
<template slot-scope="scope">
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">新增</el-button>
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">删除</el-button>
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">详情</el-button>
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{scope.row.status == 1 ? '禁用' : '启用'}}</el-button>
</template>
</el-table-column>
</el-table>
<el-pagination :current-page="page" :page-sizes="[10, 20, 50, 100]" :page-size="limit" :total="total"
layout="total, sizes, prev, pager, next, jumper" @size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle">
</el-pagination>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
<div style="height:100%">
<div class="tab-box">
<div class="tab-item" v-for="(tab, i) in tabList" :key="i" @click="selectTab = tab.key"
:class="[selectTab == tab.key ? 'tab-active' : '', i == 0 ? 'no-border-right' : '']">
{{ tab.name }}
</div>
</div>
<TagSysBuild v-if="selectTab == 'build'"></TagSysBuild>
<TagDirectory v-if="selectTab == 'directory'"></TagDirectory>
</div>
</el-card>
</template>
<script>
import mixinViewModule from '@/mixins/view-module'
import AddOrUpdate from './tag-type-add-or-update'
import TagSysBuild from './components/tag-sys-build'
import TagDirectory from './components/tag-directory'
import { addDynamicRoute } from '@/router'
export default {
mixins: [mixinViewModule],
data() {
return {
mixinViewModuleOptions: {
getDataListURL: '/sys/dict/type/page',
getDataListIsPage: true,
deleteURL: '/sys/dict/type',
deleteIsBatch: true
tabList: [
{
name: '标签体系构建',
key: 'build'
}, {
name: '标签目录管理',
key: 'directory'
},
dataForm: {
id: '0',
dictName: '',
dictType: '',
dictLabel: '',
}
],
selectTab: 'build'
}
},
components: {
AddOrUpdate
TagSysBuild,
TagDirectory
},
methods: {
//
@ -89,4 +54,28 @@ export default {
}
}
</script>
<style scoped>
.tab-box {
display: flex;
align-items: center;
margin-bottom: 20px;
}
.tab-item {
display: inline-block;
padding: 10px 20px;
cursor: pointer;
border: 1px solid #e0e0e0;
box-sizing: border-box;
}
.no-border-right {
border-right: 0;
}
.tab-active {
background: #0058e1;
color: #fff;
}
</style>

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>

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
)

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'

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/',
// // },
// },
// },