系统名称修改
This commit is contained in:
commit
af4ba480cb
|
@ -1,8 +1,8 @@
|
||||||
/*
|
/*
|
||||||
* @Author: hisense.wuhongjian
|
* @Author: hisense.wuhongjian
|
||||||
* @Date: 2022-08-25 14:37:49
|
* @Date: 2022-08-25 14:37:49
|
||||||
* @LastEditors: Light
|
* @LastEditors: hisense.wuhongjian
|
||||||
* @LastEditTime: 2022-10-31 09:16:10
|
* @LastEditTime: 2022-11-01 15:37:21
|
||||||
* @Description: 告诉大家这是什么
|
* @Description: 告诉大家这是什么
|
||||||
*/
|
*/
|
||||||
var _global = {}
|
var _global = {}
|
||||||
|
@ -17,34 +17,34 @@ var CONFIGITEM = {
|
||||||
// 青岛市大数据局
|
// 青岛市大数据局
|
||||||
qingdao: {
|
qingdao: {
|
||||||
previewUrl: 'http://15.72.183.90:7008/',
|
previewUrl: 'http://15.72.183.90:7008/',
|
||||||
apiURL: 'http://15.72.183.90:8000/renren-admin',
|
apiURL: 'http://15.72.183.90:8000/ucs-admin',
|
||||||
websocketURL: 'ws://15.72.183.90:8000/renren-admin/websocket'
|
websocketURL: 'ws://15.72.183.90:8000/ucs-admin/websocket'
|
||||||
},
|
},
|
||||||
// 西海岸大数据局
|
// 西海岸大数据局
|
||||||
xihaian: {
|
xihaian: {
|
||||||
previewUrl: 'http://10.134.135.9:9796/',
|
previewUrl: 'http://10.134.135.9:9796/',
|
||||||
// apiURL: 'http://10.134.135.9:8888/renren-admin',
|
// apiURL: 'http://10.134.135.9:8888/ucs-admin',
|
||||||
// apiURL: 'http://10.16.5.35:8888/renren-admin', // 李志成-研发
|
// apiURL: 'http://10.16.5.35:8888/ucs-admin', // 李志成-研发
|
||||||
apiURL: 'http://192.168.124.236:8888/renren-admin',
|
apiURL: 'http://192.168.124.236:8888/ucs-admin',
|
||||||
// apiURL: 'http://192.168.124.254:8888/renren-admin', // 李志成-远雄
|
// apiURL: 'http://192.168.124.254:8888/ucs-admin', // 李志成-远雄
|
||||||
websocketURL: 'ws://10.134.135.9:8888/renren-admin/websocket'
|
websocketURL: 'ws://10.134.135.9:8888/ucs-admin/websocket'
|
||||||
},
|
},
|
||||||
// 测试
|
// 测试
|
||||||
test: {
|
test: {
|
||||||
previewUrl: 'http://192.168.124.243:9796/',
|
previewUrl: 'http://192.168.124.243:9796/',
|
||||||
apiURL: 'http://192.168.124.243:8888/renren-admin',
|
apiURL: 'http://192.168.124.243:8888/ucs-admin',
|
||||||
websocketURL: 'ws://192.168.124.243:8888/renren-admin/websocket'
|
websocketURL: 'ws://192.168.124.243:8888/ucs-admin/websocket'
|
||||||
},
|
},
|
||||||
// 内网穿透
|
// 内网穿透
|
||||||
frp: {
|
frp: {
|
||||||
previewUrl: 'http://124.222.94.39:9796/',
|
previewUrl: 'http://124.222.94.39:9796/',
|
||||||
apiURL: 'http://124.222.94.39:8888/renren-admin',
|
apiURL: 'http://124.222.94.39:8888/ucs-admin',
|
||||||
websocketURL: 'ws://124.222.94.39:8888/renren-admin/websocket'
|
websocketURL: 'ws://124.222.94.39:8888/ucs-admin/websocket'
|
||||||
},
|
},
|
||||||
dev: {
|
dev: {
|
||||||
previewUrl: 'http://localhost:8080/',
|
previewUrl: 'http://localhost:8080/',
|
||||||
apiURL: 'http://192.168.124.243:8888/renren-admin',
|
apiURL: 'http://192.168.124.236:8888/ucs-admin',
|
||||||
websocketURL: 'ws://192.168.243.243:8888/renren-admin/websocket'
|
websocketURL: 'ws://192.168.243.236:8888/ucs-admin/websocket'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -105,7 +105,6 @@ router.beforeEach((to, from, next) => {
|
||||||
return next({ name: 'login' })
|
return next({ name: 'login' })
|
||||||
}
|
}
|
||||||
window.SITE_CONFIG.menuList = res.data.filter(item => item.site === 0)
|
window.SITE_CONFIG.menuList = res.data.filter(item => item.site === 0)
|
||||||
debugger
|
|
||||||
fnAddDynamicMenuRoutes(window.SITE_CONFIG.menuList)
|
fnAddDynamicMenuRoutes(window.SITE_CONFIG.menuList)
|
||||||
next({ ...to, replace: true })
|
next({ ...to, replace: true })
|
||||||
}).catch(() => {
|
}).catch(() => {
|
||||||
|
@ -138,7 +137,6 @@ function fnCurrentRouteIsPageRoute (route, pageRoutes = []) {
|
||||||
*/
|
*/
|
||||||
function fnAddDynamicMenuRoutes (menuList = [], routes = []) {
|
function fnAddDynamicMenuRoutes (menuList = [], routes = []) {
|
||||||
var temp = []
|
var temp = []
|
||||||
debugger
|
|
||||||
for (var i = 0; i < menuList.length; i++) {
|
for (var i = 0; i < menuList.length; i++) {
|
||||||
if (menuList[i].children && menuList[i].children.length >= 1) {
|
if (menuList[i].children && menuList[i].children.length >= 1) {
|
||||||
temp = temp.concat(menuList[i].children)
|
temp = temp.concat(menuList[i].children)
|
||||||
|
|
|
@ -14,7 +14,7 @@ import isPlainObject from 'lodash/isPlainObject'
|
||||||
|
|
||||||
const http = axios.create({
|
const http = axios.create({
|
||||||
baseURL: window.SITE_CONFIG.apiURL,
|
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,
|
timeout: 1000 * 180,
|
||||||
withCredentials: true
|
withCredentials: true
|
||||||
})
|
})
|
||||||
|
|
|
@ -222,7 +222,7 @@ export default {
|
||||||
.aui-navbar__header {
|
.aui-navbar__header {
|
||||||
width: 25%;
|
width: 25%;
|
||||||
.aui-navbar__brand {
|
.aui-navbar__brand {
|
||||||
margin-left: 20px;
|
margin-left: -30px;
|
||||||
a {
|
a {
|
||||||
font-size: 22px;
|
font-size: 22px;
|
||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
|
|
|
@ -77,12 +77,6 @@
|
||||||
width="150"
|
width="150"
|
||||||
>
|
>
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button
|
|
||||||
type="text"
|
|
||||||
size="small"
|
|
||||||
@click="yunadd('detail',scope.row)"
|
|
||||||
>详情</el-button
|
|
||||||
>
|
|
||||||
<el-button
|
<el-button
|
||||||
type="text"
|
type="text"
|
||||||
size="small"
|
size="small"
|
||||||
|
@ -90,16 +84,23 @@
|
||||||
>修改</el-button
|
>修改</el-button
|
||||||
>
|
>
|
||||||
<el-button
|
<el-button
|
||||||
|
type="text"
|
||||||
|
size="small"
|
||||||
|
@click="yunadd('detail',scope.row)"
|
||||||
|
>详情</el-button
|
||||||
|
>
|
||||||
|
|
||||||
|
<!-- <el-button
|
||||||
type="text"
|
type="text"
|
||||||
size="small"
|
size="small"
|
||||||
@click="reset"
|
@click="reset"
|
||||||
>删除</el-button
|
>删除</el-button
|
||||||
>
|
> -->
|
||||||
<el-button
|
<el-button
|
||||||
type="text"
|
type="text"
|
||||||
size="small"
|
size="small"
|
||||||
@click="reset"
|
@click="reset"
|
||||||
>设置标签</el-button
|
>标签化</el-button
|
||||||
>
|
>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
@ -211,9 +212,9 @@ export default {
|
||||||
"e": "市南区"
|
"e": "市南区"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"a": "青岛一建青岛公共卫生中心大门",
|
"a": "一建公共卫生中心大门",
|
||||||
"b": "101_37020201581314000519",
|
"b": "101_37020201581314000519",
|
||||||
"c": "青岛一建青岛公共卫生中心",
|
"c": "一建公共卫生中心",
|
||||||
"d": "市住房城乡建设局",
|
"d": "市住房城乡建设局",
|
||||||
"e": "市南区"
|
"e": "市南区"
|
||||||
},
|
},
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" @click="yunadd('add',null)"
|
<el-button type="primary" @click="yunadd('add',null)"
|
||||||
>上架</el-button
|
>盘点入库</el-button
|
||||||
>
|
>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
|
@ -52,19 +52,19 @@
|
||||||
></el-table-column>
|
></el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="c"
|
prop="c"
|
||||||
label="数据描述"
|
label="能力描述"
|
||||||
header-align="center"
|
header-align="center"
|
||||||
align="center"
|
align="center"
|
||||||
></el-table-column>
|
></el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="d"
|
prop="d"
|
||||||
label="提供部门"
|
label="归属部门"
|
||||||
header-align="center"
|
header-align="center"
|
||||||
align="center"
|
align="center"
|
||||||
></el-table-column>
|
></el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="e"
|
prop="e"
|
||||||
label="创建时间"
|
label="注册者"
|
||||||
header-align="center"
|
header-align="center"
|
||||||
align="center"
|
align="center"
|
||||||
></el-table-column>
|
></el-table-column>
|
||||||
|
@ -76,13 +76,8 @@
|
||||||
align="center"
|
align="center"
|
||||||
width="150"
|
width="150"
|
||||||
>
|
>
|
||||||
|
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button
|
|
||||||
type="text"
|
|
||||||
size="small"
|
|
||||||
@click="yunadd('detail',scope.row)"
|
|
||||||
>详情</el-button
|
|
||||||
>
|
|
||||||
<el-button
|
<el-button
|
||||||
type="text"
|
type="text"
|
||||||
size="small"
|
size="small"
|
||||||
|
@ -90,16 +85,23 @@
|
||||||
>修改</el-button
|
>修改</el-button
|
||||||
>
|
>
|
||||||
<el-button
|
<el-button
|
||||||
|
type="text"
|
||||||
|
size="small"
|
||||||
|
@click="yunadd('detail',scope.row)"
|
||||||
|
>详情</el-button
|
||||||
|
>
|
||||||
|
|
||||||
|
<!-- <el-button
|
||||||
type="text"
|
type="text"
|
||||||
size="small"
|
size="small"
|
||||||
@click="reset"
|
@click="reset"
|
||||||
>删除</el-button
|
>删除</el-button
|
||||||
>
|
> -->
|
||||||
<el-button
|
<el-button
|
||||||
type="text"
|
type="text"
|
||||||
size="small"
|
size="small"
|
||||||
@click="reset"
|
@click="reset"
|
||||||
>设置标签</el-button
|
>标签化</el-button
|
||||||
>
|
>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
@ -220,71 +222,71 @@ export default {
|
||||||
"a": "供水营业网点信息",
|
"a": "供水营业网点信息",
|
||||||
"b": "307013109015000204",
|
"b": "307013109015000204",
|
||||||
"c": "供水营业网点信息",
|
"c": "供水营业网点信息",
|
||||||
"d": "青岛西海岸新区城市管理局(区水务局)",
|
"d": "西海岸新区城市管理局(区水务局)",
|
||||||
"e ": "2022-10-28"
|
"e": "张虎"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"a": "新建体育公园、笼式场地",
|
"a": "新建体育公园、笼式场地",
|
||||||
"b": "307013100673000036",
|
"b": "307013100673000036",
|
||||||
"c": "新建体育公园、笼式场地",
|
"c": "新建体育公园、笼式场地",
|
||||||
"d": "青岛市体育局",
|
"d": "体育局",
|
||||||
"e ": "2022-10-28"
|
"e": "张虎"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"a": "西海岸新区供水领域自然人欠费信息",
|
"a": "西海岸新区供水领域自然人欠费信息",
|
||||||
"b": "307013109015000211",
|
"b": "307013109015000211",
|
||||||
"c": "西海岸新区供水领域自然人欠费信息",
|
"c": "西海岸新区供水领域自然人欠费信息",
|
||||||
"d": "青岛西海岸新区城市管理局(区水务局)",
|
"d": "西海岸新区城市管理局(区水务局)",
|
||||||
"e ": "2022-10-28"
|
"e": "李阳"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"a": "青岛西海岸新区交通运输局",
|
"a": "西海岸新区交通运输局",
|
||||||
"b": "307013109071000108",
|
"b": "307013109071000108",
|
||||||
"c": "公交站点查询",
|
"c": "公交站点查询",
|
||||||
"d": "青岛西海岸新区交通运输局",
|
"d": "西海岸新区交通运输局",
|
||||||
"e ": "2022-10-27"
|
"e": "李阳"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"a": "全市主要经济指标",
|
"a": "全市主要经济指标",
|
||||||
"b": "307013107004000062",
|
"b": "307013107004000062",
|
||||||
"c": "胶州市国民经济分行业数据",
|
"c": "胶州市国民经济分行业数据",
|
||||||
"d": "胶州市统计局",
|
"d": "胶州市统计局",
|
||||||
"e ": "2022-10-13"
|
"e": "李阳"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"a": "乡村之星信息",
|
"a": "乡村之星信息",
|
||||||
"b": "307013100000000187",
|
"b": "307013100000000187",
|
||||||
"c": "乡村之星信息",
|
"c": "乡村之星信息",
|
||||||
"d": "青岛市农业农村局",
|
"d": "农业农村局",
|
||||||
"e ": "2022-10-13"
|
"e": "李阳"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"a": "建设项目环境影响评价审批信息",
|
"a": "建设项目环境影响评价审批信息",
|
||||||
"b": "307013107777000033",
|
"b": "307013107777000033",
|
||||||
"c": "建设单位、建设项目、审批文号",
|
"c": "建设单位、建设项目、审批文号",
|
||||||
"d": "青岛市生态环境局胶州分局",
|
"d": "生态环境局胶州分局",
|
||||||
"e ": "2022-10-13"
|
"e": "王二生"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"a": "新时代文明实践阵地信息表",
|
"a": "新时代文明实践阵地信息表",
|
||||||
"b": "307013108760000022",
|
"b": "307013108760000022",
|
||||||
"c": "镇街、阵地名称、专管员、联系电话",
|
"c": "镇街、阵地名称、专管员、联系电话",
|
||||||
"d": "莱西市夏格庄镇人民政府",
|
"d": "莱西市夏格庄镇人民政府",
|
||||||
"e ": "2022-09-29"
|
"e": "王二生"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"a": "泊里镇非物质文化遗产信息",
|
"a": "泊里镇非物质文化遗产信息",
|
||||||
"b": "307013109000000067",
|
"b": "307013109000000067",
|
||||||
"c": "泊里镇非物质文化遗产的名称、简介等信息",
|
"c": "泊里镇非物质文化遗产的名称、简介等信息",
|
||||||
"d": "青岛市黄岛区泊里镇人民政府",
|
"d": "黄岛区泊里镇人民政府",
|
||||||
"e ": "2022-10-11"
|
"e": "王二生"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"a": "人才住房建设情况",
|
"a": "人才住房建设情况",
|
||||||
"b": "307013100482000025",
|
"b": "307013100482000025",
|
||||||
"c": "人才住房项目数量、人才住房房屋套数、人才住房面积、人才住房目标任务房屋套数、人才住房房屋总面积",
|
"c": "人才住房项目数量、人才住房房屋套数、人才住房面积、人才住房目标任务房屋套数、人才住房房屋总面积",
|
||||||
"d": "青岛市住房和城乡建设局",
|
"d": "住房和城乡建设局",
|
||||||
"e ": "2022-09-18"
|
"e": "王二生"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
<!--起始日期 @keyup.enter.native="getDataList()"-->
|
<!--起始日期 @keyup.enter.native="getDataList()"-->
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<span>日期:</span>
|
<span>日期:</span>
|
||||||
<el-date-picker v-model="value1" type="datetimerange" range-separator="至" start-placeholder="开始日期"
|
<el-date-picker v-model="value1" type="daterange" range-separator="至" start-placeholder="开始日期"
|
||||||
end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
|
end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
@ -161,7 +161,7 @@
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="yyzy" label="应用资源" min-width="100%">
|
<el-table-column prop="yyzy" label="应用资源" min-width="100%">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="hys" label="会议室" min-width="100%" v-show='departmentId == 2 || departmentId == 4'>
|
<el-table-column prop="hys" label="会客厅" min-width="100%" v-show='departmentId == 2 || departmentId == 4'>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="zj" label="总计" min-width="100%">
|
<el-table-column prop="zj" label="总计" min-width="100%">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
@ -321,7 +321,7 @@ export default {
|
||||||
{ name: '基础设施', key: 3 },
|
{ name: '基础设施', key: 3 },
|
||||||
{ name: '数据资源', key: 4 },
|
{ name: '数据资源', key: 4 },
|
||||||
{ name: '知识库', key: 5 },
|
{ name: '知识库', key: 5 },
|
||||||
{ name: '会议室', value: 6 }
|
{ name: '会客厅', value: 6 }
|
||||||
],
|
],
|
||||||
tableData: [],
|
tableData: [],
|
||||||
tableDataClone: [],
|
tableDataClone: [],
|
||||||
|
@ -347,9 +347,9 @@ export default {
|
||||||
{ name: '开发组件', value: 3 },
|
{ name: '开发组件', value: 3 },
|
||||||
{ name: '业务组件', value: 4 },
|
{ name: '业务组件', value: 4 },
|
||||||
{ name: '应用资源', value: 5 },
|
{ name: '应用资源', value: 5 },
|
||||||
{ name: '会议室', value: 6 }
|
{ name: '会客厅', value: 6 }
|
||||||
], // 类型备选列表
|
], // 类型备选列表
|
||||||
typeOptions1: [// 能力上架隐藏会议室
|
typeOptions1: [// 能力上架隐藏会客厅
|
||||||
{ name: '智能算法', value: 1 },
|
{ name: '智能算法', value: 1 },
|
||||||
{ name: '图层服务', value: 2 },
|
{ name: '图层服务', value: 2 },
|
||||||
{ name: '开发组件', value: 3 },
|
{ name: '开发组件', value: 3 },
|
||||||
|
@ -909,8 +909,10 @@ export default {
|
||||||
// 点击查询按钮查询数据
|
// 点击查询按钮查询数据
|
||||||
getDataList() {
|
getDataList() {
|
||||||
if (this.value1 && this.value1.length > 0) {
|
if (this.value1 && this.value1.length > 0) {
|
||||||
this.startDate = this.handleTime(this.value1[0], 'yyyy-MM-dd')
|
// this.startDate = this.handleTime(this.value1[0], 'yyyy-MM-dd')
|
||||||
this.endDate = this.handleTime(this.value1[1], 'yyyy-MM-dd')
|
// this.endDate = this.handleTime(this.value1[1], 'yyyy-MM-dd')
|
||||||
|
this.startDate = this.value1[0]
|
||||||
|
this.endDate = this.value1[1]
|
||||||
} else {
|
} else {
|
||||||
this.startDate = ''
|
this.startDate = ''
|
||||||
this.endDate = ''
|
this.endDate = ''
|
||||||
|
|
|
@ -3,22 +3,36 @@
|
||||||
<div class="mod-sys__dept">
|
<div class="mod-sys__dept">
|
||||||
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
|
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button v-if="$hasPermission('sys:dept:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
|
<el-button v-if="$hasPermission('sys:dept:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}
|
||||||
|
</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<el-table v-loading="dataListLoading" :data="dataList" row-key="id" border style="width: 100%;">
|
<el-table v-loading="dataListLoading" :data="dataList" row-key="id" border style="width: 100%;">
|
||||||
<el-table-column prop="name" :label="$t('dept.name')" header-align="center" min-width="150"></el-table-column>
|
<el-table-column prop="name" :label="$t('dept.name')" header-align="center" min-width="150"></el-table-column>
|
||||||
<el-table-column prop="parentName" :label="$t('dept.parentName')" header-align="center" align="center"></el-table-column>
|
<el-table-column prop="parentName" :label="$t('dept.parentName')" header-align="center" align="center">
|
||||||
<el-table-column prop="sort" :label="$t('dept.sort')" header-align="center" align="center" width="80"></el-table-column>
|
</el-table-column>
|
||||||
|
<el-table-column prop="sort" :label="$t('dept.sort')" header-align="center" align="center" width="80">
|
||||||
|
</el-table-column>
|
||||||
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
|
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button v-if="$hasPermission('sys:dept:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
|
<el-button v-if="$hasPermission('sys:dept:update')" type="text" size="small"
|
||||||
<el-button v-if="$hasPermission('sys:dept:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
|
@click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
|
||||||
|
<el-button v-if="$hasPermission('sys:dept:delete')" type="text" size="small"
|
||||||
|
@click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="type" label="类型" header-align="center" align="center" width="80"></el-table-column>
|
<el-table-column prop="type" label="类型" header-align="center" align="center" width="80"></el-table-column>
|
||||||
<el-table-column prop="district" label="区划" header-align="center" align="center" width="80"></el-table-column>
|
<el-table-column prop="district" label="区划" header-align="center" align="center" width="80"></el-table-column>
|
||||||
</el-table>
|
</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>
|
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
|
||||||
</div>
|
</div>
|
||||||
|
@ -31,12 +45,16 @@ import AddOrUpdate from './dept-add-or-update'
|
||||||
import qs from 'qs'
|
import qs from 'qs'
|
||||||
export default {
|
export default {
|
||||||
mixins: [mixinViewModule],
|
mixins: [mixinViewModule],
|
||||||
data () {
|
data() {
|
||||||
return {
|
return {
|
||||||
mixinViewModuleOptions: {
|
mixinViewModuleOptions: {
|
||||||
getDataListURL: '/sys/dept/list',
|
getDataListURL: '/sys/dept/list',
|
||||||
deleteURL: '/sys/dept'
|
deleteURL: '/sys/dept'
|
||||||
}
|
},
|
||||||
|
total: 0,
|
||||||
|
limit: 10,
|
||||||
|
page: 1,
|
||||||
|
dataList: []
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
components: {
|
components: {
|
||||||
|
@ -45,16 +63,35 @@ export default {
|
||||||
watch: {
|
watch: {
|
||||||
dataList: {
|
dataList: {
|
||||||
handler: function () {
|
handler: function () {
|
||||||
this.init()
|
this.getData()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
init () {
|
// 分页, 每页条数
|
||||||
debugger
|
pageSizeChangeHandle (val) {
|
||||||
this.$http.get('/sys/dept/list').then((res) => {
|
this.page = 1
|
||||||
res.data.data.map((item, index) => {
|
this.limit = val
|
||||||
if (item.district != null || item.children.length > 0) {
|
this.getData()
|
||||||
|
},
|
||||||
|
// 分页, 当前页
|
||||||
|
pageCurrentChangeHandle (val) {
|
||||||
|
this.page = val
|
||||||
|
this.getData()
|
||||||
|
},
|
||||||
|
getData() {
|
||||||
|
// debugger
|
||||||
|
let _data = {
|
||||||
|
limt: this.limit,
|
||||||
|
page: this.page,
|
||||||
|
}
|
||||||
|
this.$http.get('sys/dept/page', {
|
||||||
|
params: _data
|
||||||
|
}).then((res) => {
|
||||||
|
this.total = res.data.data.total;
|
||||||
|
res.data.data.list.map((item, index) => {
|
||||||
|
console.log('item, index------------>', item, index);
|
||||||
|
if (item.district != null || item.children.length >= 0) {
|
||||||
this.$http.get('/sys/region/' + item.district).then((data) => {
|
this.$http.get('/sys/region/' + item.district).then((data) => {
|
||||||
this.dataList[index].district = data.data.data.name
|
this.dataList[index].district = data.data.data.name
|
||||||
console.log('datafrom', this.dataList)
|
console.log('datafrom', this.dataList)
|
||||||
|
@ -72,10 +109,10 @@ export default {
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
}
|
|
||||||
},
|
},
|
||||||
created () {
|
},
|
||||||
this.init()
|
created() {
|
||||||
|
this.getData()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
|
@ -52,15 +52,15 @@
|
||||||
>
|
>
|
||||||
<el-option
|
<el-option
|
||||||
label="增加"
|
label="增加"
|
||||||
value="/renren-admin/resource%/insert"
|
value="/ucs-admin/resource%/insert"
|
||||||
></el-option>
|
></el-option>
|
||||||
<el-option
|
<el-option
|
||||||
label="更新"
|
label="更新"
|
||||||
value="/renren-admin/resource%/update"
|
value="/ucs-admin/resource%/update"
|
||||||
></el-option>
|
></el-option>
|
||||||
<el-option
|
<el-option
|
||||||
label="删除"
|
label="删除"
|
||||||
value="/renren-admin/resource%/delete"
|
value="/ucs-admin/resource%/delete"
|
||||||
></el-option>
|
></el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|
|
@ -45,21 +45,21 @@
|
||||||
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle"
|
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle"
|
||||||
@sort-change="dataListSortChangeHandle" style="width: 100%">
|
@sort-change="dataListSortChangeHandle" style="width: 100%">
|
||||||
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
|
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
|
||||||
<el-table-column prop="username" :label="$t('user.username')" sortable="custom" header-align="center"
|
<el-table-column prop="username" :label="$t('user.username')" header-align="center"
|
||||||
align="center"></el-table-column>
|
align="center"></el-table-column>
|
||||||
<el-table-column prop="realName" label="真实姓名" header-align="center" align="center"></el-table-column>
|
<el-table-column prop="realName" label="真实姓名" header-align="center" align="center"></el-table-column>
|
||||||
<el-table-column prop="deptName" :label="$t('user.deptName')" header-align="center" align="center">
|
<el-table-column prop="deptName" :label="$t('user.deptName')" header-align="center" align="center">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="email" :label="$t('user.email')" header-align="center" align="center"></el-table-column>
|
<el-table-column prop="email" :label="$t('user.email')" header-align="center" align="center"></el-table-column>
|
||||||
<el-table-column prop="mobile" :label="$t('user.mobile')" sortable="custom" header-align="center"
|
<el-table-column prop="mobile" :label="$t('user.mobile')" header-align="center"
|
||||||
align="center"></el-table-column>
|
align="center"></el-table-column>
|
||||||
<el-table-column prop="gender" :label="$t('user.gender')" sortable="custom" header-align="center"
|
<el-table-column prop="gender" :label="$t('user.gender')" header-align="center"
|
||||||
align="center">
|
align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
{{ $getDictLabel('gender', scope.row.gender) }}
|
{{ $getDictLabel('gender', scope.row.gender) }}
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="status" :label="$t('user.status')" sortable="custom" header-align="center"
|
<el-table-column prop="status" :label="$t('user.status')" header-align="center"
|
||||||
align="center">
|
align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-tag v-if="scope.row.status === 0" size="small" type="danger">{{
|
<el-tag v-if="scope.row.status === 0" size="small" type="danger">{{
|
||||||
|
@ -70,7 +70,7 @@
|
||||||
}}</el-tag>
|
}}</el-tag>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="createDate" :label="$t('user.createDate')" sortable="custom" header-align="center"
|
<el-table-column prop="createDate" :label="$t('user.createDate')" header-align="center"
|
||||||
align="center" width="180"></el-table-column>
|
align="center" width="180"></el-table-column>
|
||||||
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
|
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
|
|
|
@ -27,9 +27,9 @@ var CONFIGITEM = {
|
||||||
backUrl: 'http://15.72.183.90:8001',
|
backUrl: 'http://15.72.183.90:8001',
|
||||||
previewUrl: 'http://15.72.183.90:7008/',
|
previewUrl: 'http://15.72.183.90:7008/',
|
||||||
//frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/',
|
//frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/',
|
||||||
apiURL: 'http://15.72.183.90:8000/renren-admin',
|
apiURL: 'http://15.72.183.90:8000/ucs-admin',
|
||||||
websocketURL: '15.72.183.90:8000/renren-admin',
|
websocketURL: '15.72.183.90:8000/ucs-admin',
|
||||||
// websocketURL: '192.168.124.233:8888/renren-admin',
|
// websocketURL: '192.168.124.233:8888/ucs-admin',
|
||||||
POI_URL:
|
POI_URL:
|
||||||
'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
|
'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
|
||||||
},
|
},
|
||||||
|
@ -45,10 +45,10 @@ var CONFIGITEM = {
|
||||||
backUrl: 'http://15.72.183.90:8001',
|
backUrl: 'http://15.72.183.90:8001',
|
||||||
previewUrl: 'http://15.72.183.90:7008/',
|
previewUrl: 'http://15.72.183.90:7008/',
|
||||||
//frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/',
|
//frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/',
|
||||||
//apiURL: 'http://15.72.183.90:8000/renren-admin',
|
//apiURL: 'http://15.72.183.90:8000/ucs-admin',
|
||||||
// websocketURL: '10.16.5.146:8888/renren-admin', // 姜永超
|
// websocketURL: '10.16.5.146:8888/ucs-admin', // 姜永超
|
||||||
websocketURL: '10.18.1.99:8889/renren-admin',
|
websocketURL: '10.18.1.99:8889/ucs-admin',
|
||||||
// websocketURL: '10.16.5.35:8888/renren-admin',
|
// websocketURL: '10.16.5.35:8888/ucs-admin',
|
||||||
POI_URL:
|
POI_URL:
|
||||||
'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
|
'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
|
||||||
},
|
},
|
||||||
|
@ -69,10 +69,10 @@ var CONFIGITEM = {
|
||||||
},
|
},
|
||||||
backUrl: 'http://10.134.135.9:9797',
|
backUrl: 'http://10.134.135.9:9797',
|
||||||
previewUrl: 'http://10.134.135.9:9796/',
|
previewUrl: 'http://10.134.135.9:9796/',
|
||||||
// websocketURL: '10.134.135.9:8888/renren-admin', // 正式环境
|
// websocketURL: '10.134.135.9:8888/ucs-admin', // 正式环境
|
||||||
// websocketURL: '10.134.135.92:8888/renren-admin', // 测试环境
|
// websocketURL: '10.134.135.92:8888/ucs-admin', // 测试环境
|
||||||
websocketURL: '192.168.124.254:8888/renren-admin', // 李志成-远雄
|
websocketURL: '192.168.124.254:8888/ucs-admin', // 李志成-远雄
|
||||||
// websocketURL: '10.18.1.99:8889/renren-admin', // 研发
|
// websocketURL: '10.18.1.99:8889/ucs-admin', // 研发
|
||||||
POI_URL:
|
POI_URL:
|
||||||
'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
|
'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
|
||||||
},
|
},
|
||||||
|
@ -87,8 +87,8 @@ var CONFIGITEM = {
|
||||||
},
|
},
|
||||||
backUrl: 'http://localhost:8001',
|
backUrl: 'http://localhost:8001',
|
||||||
previewUrl: 'http://192.168.124.243:9796/',
|
previewUrl: 'http://192.168.124.243:9796/',
|
||||||
websocketURL: '192.168.124.243:8888/renren-admin',
|
websocketURL: '192.168.124.243:8888/ucs-admin',
|
||||||
// websocketURL: '10.18.1.99:8889/renren-admin',
|
// websocketURL: '10.18.1.99:8889/ucs-admin',
|
||||||
POI_URL:
|
POI_URL:
|
||||||
'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
|
'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
|
||||||
},
|
},
|
||||||
|
@ -103,7 +103,7 @@ var CONFIGITEM = {
|
||||||
},
|
},
|
||||||
backUrl: 'http://192.168.124.243:9797',
|
backUrl: 'http://192.168.124.243:9797',
|
||||||
previewUrl: 'http://192.168.124.243:9796/',
|
previewUrl: 'http://192.168.124.243:9796/',
|
||||||
websocketURL: '192.168.124.243:8888/renren-admin',
|
websocketURL: '192.168.124.243:8888/ucs-admin',
|
||||||
POI_URL:
|
POI_URL:
|
||||||
'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
|
'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
|
||||||
},
|
},
|
||||||
|
@ -118,7 +118,7 @@ var CONFIGITEM = {
|
||||||
},
|
},
|
||||||
backUrl: 'http://124.222.94.39:9797',
|
backUrl: 'http://124.222.94.39:9797',
|
||||||
previewUrl: 'http://124.222.94.39:9796/',
|
previewUrl: 'http://124.222.94.39:9796/',
|
||||||
websocketURL: '124.222.94.39:8888/renren-admin',
|
websocketURL: '124.222.94.39:8888/ucs-admin',
|
||||||
POI_URL:
|
POI_URL:
|
||||||
'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
|
'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
|
||||||
},
|
},
|
||||||
|
|
|
@ -128,7 +128,7 @@ export function initiateMeet(data) {
|
||||||
// data: data,
|
// data: data,
|
||||||
// })
|
// })
|
||||||
return axios.post(
|
return axios.post(
|
||||||
'http://10.134.135.92:8888/renren-admin/enke/initiateMeet',
|
'http://10.134.135.92:8888/ucs-admin/enke/initiateMeet',
|
||||||
data,
|
data,
|
||||||
config2
|
config2
|
||||||
)
|
)
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* @Author: hisense.wuhongjian
|
* @Author: hisense.wuhongjian
|
||||||
* @Date: 2022-04-01 19:19:40
|
* @Date: 2022-04-01 19:19:40
|
||||||
* @LastEditors: Light
|
* @LastEditors: Light
|
||||||
* @LastEditTime: 2022-10-26 10:35:36
|
* @LastEditTime: 2022-10-31 15:52:57
|
||||||
* @Description: 告诉大家这是什么
|
* @Description: 告诉大家这是什么
|
||||||
*/
|
*/
|
||||||
import request from '@/utils/request'
|
import request from '@/utils/request'
|
||||||
|
@ -63,6 +63,13 @@ export function pageWithAttrs(data) {
|
||||||
data,
|
data,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
// 筛选
|
||||||
|
export function getAppListByDept() {
|
||||||
|
return request({
|
||||||
|
url: '/resource/getAppListByDept',
|
||||||
|
method: 'get',
|
||||||
|
})
|
||||||
|
}
|
||||||
// 获取hls视频流
|
// 获取hls视频流
|
||||||
export function getHls(params) {
|
export function getHls(params) {
|
||||||
return request({
|
return request({
|
||||||
|
|
|
@ -23,9 +23,9 @@ const setting = {
|
||||||
// baseURL: 'mock-server',
|
// baseURL: 'mock-server',
|
||||||
// 请求接口
|
// 请求接口
|
||||||
// 丁港
|
// 丁港
|
||||||
baseURL: 'http://15.72.183.90:8000/renren-admin',
|
baseURL: 'http://15.72.183.90:8000/ucs-admin',
|
||||||
// : 'http://15.2.21.238:8888/renren-admin/',
|
// : 'http://15.2.21.238:8888/ucs-admin/',
|
||||||
// 'http://15.72.183.90:8000/renren-admin',
|
// 'http://15.72.183.90:8000/ucs-admin',
|
||||||
// 黄工
|
// 黄工
|
||||||
// baseURL:
|
// baseURL:
|
||||||
// process.env.NODE_ENV === 'development'
|
// process.env.NODE_ENV === 'development'
|
||||||
|
|
|
@ -461,6 +461,7 @@
|
||||||
},
|
},
|
||||||
yAxis: {
|
yAxis: {
|
||||||
name: '部门数量(个)',
|
name: '部门数量(个)',
|
||||||
|
minInterval: 1,
|
||||||
},
|
},
|
||||||
grid: {
|
grid: {
|
||||||
height: '65%',
|
height: '65%',
|
||||||
|
|
|
@ -1190,6 +1190,16 @@
|
||||||
const re = /^[0-9\u4E00-\u9FA5]*$/
|
const re = /^[0-9\u4E00-\u9FA5]*$/
|
||||||
const getAppResources2 = () => {
|
const getAppResources2 = () => {
|
||||||
globalFlag.value = false
|
globalFlag.value = false
|
||||||
|
let newQuery = JSON.parse(
|
||||||
|
JSON.stringify(router.currentRoute.value.query)
|
||||||
|
)
|
||||||
|
newQuery.str = searchValue.value
|
||||||
|
router
|
||||||
|
.replace({
|
||||||
|
query: newQuery,
|
||||||
|
})
|
||||||
|
.then(() => {})
|
||||||
|
mybus.emit('changeRoomInput', searchValue.value)
|
||||||
if (
|
if (
|
||||||
whoShow1.value.itShowQingDao &&
|
whoShow1.value.itShowQingDao &&
|
||||||
paramsGetResources.type == '基础设施'
|
paramsGetResources.type == '基础设施'
|
||||||
|
@ -1543,6 +1553,9 @@
|
||||||
paramsGetResources2.value.regionId = ids
|
paramsGetResources2.value.regionId = ids
|
||||||
getAppResources()
|
getAppResources()
|
||||||
})
|
})
|
||||||
|
mybus.on('changeSearchValue', (val) => {
|
||||||
|
searchValue.value = val
|
||||||
|
})
|
||||||
mybus.on('paramsGetResources', (ids) => {
|
mybus.on('paramsGetResources', (ids) => {
|
||||||
if (ids && ids.length > 0) {
|
if (ids && ids.length > 0) {
|
||||||
paramsGetResources.deptIds = ids
|
paramsGetResources.deptIds = ids
|
||||||
|
@ -1845,6 +1858,7 @@
|
||||||
},
|
},
|
||||||
beforeUnmount() {
|
beforeUnmount() {
|
||||||
mybus.off('getCameraByParentId')
|
mybus.off('getCameraByParentId')
|
||||||
|
mybus.off('changeSearchValue')
|
||||||
mybus.off('selectCardsitem')
|
mybus.off('selectCardsitem')
|
||||||
mybus.off('paramsGetResources')
|
mybus.off('paramsGetResources')
|
||||||
mybus.off('changeCondition')
|
mybus.off('changeCondition')
|
||||||
|
|
|
@ -260,7 +260,11 @@
|
||||||
import { getCategoryTreePage, endProcess } from '@/api/personalCenter'
|
import { getCategoryTreePage, endProcess } from '@/api/personalCenter'
|
||||||
import mybus from '@/myplugins/mybus'
|
import mybus from '@/myplugins/mybus'
|
||||||
import { sgcDel, getApplyForm } from '@/api/personalCenter'
|
import { sgcDel, getApplyForm } from '@/api/personalCenter'
|
||||||
import { pageWithAttrs, updateIntegrationServices } from '@/api/home'
|
import {
|
||||||
|
pageWithAttrs,
|
||||||
|
updateIntegrationServices,
|
||||||
|
getAppListByDept,
|
||||||
|
} from '@/api/home'
|
||||||
import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
|
import { DETAIL_PAGE_CONTENT_DEFAULT_TAB } from '@/global/GlobalConfig.js'
|
||||||
import { getIntegrationDetail, soldierApply } from '@/api/home'
|
import { getIntegrationDetail, soldierApply } from '@/api/home'
|
||||||
import { useStore } from 'vuex'
|
import { useStore } from 'vuex'
|
||||||
|
@ -783,25 +787,18 @@
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
pageWithAttrs({
|
getAppListByDept().then((res) => {
|
||||||
pageNum: 1,
|
console.log('res=====>', res.data.data)
|
||||||
pageSize: 99999,
|
|
||||||
type: '应用资源',
|
|
||||||
name: '',
|
|
||||||
infoList: [],
|
|
||||||
}).then((res) => {
|
|
||||||
if (res.data.code == 0) {
|
if (res.data.code == 0) {
|
||||||
if (res.data.data.records.length == 0) {
|
if (res.data.data.length == 0) {
|
||||||
message.warning('该关键词,暂无应用资源!')
|
message.warning('该关键词,暂无应用资源!')
|
||||||
} else {
|
} else {
|
||||||
// 过滤本单位的应用系统
|
// 过滤本单位的应用系统
|
||||||
res.data.data.records.map((val) => {
|
res.data.data.map((val) => {
|
||||||
if (val.deptName === deptName) {
|
|
||||||
systemOptions2.value.push({
|
systemOptions2.value.push({
|
||||||
value: val.name,
|
value: val.NAME,
|
||||||
label: val.name,
|
label: val.NAME,
|
||||||
})
|
})
|
||||||
}
|
|
||||||
})
|
})
|
||||||
// console.log('第一次获取===================>', systemOptions2.value)
|
// console.log('第一次获取===================>', systemOptions2.value)
|
||||||
}
|
}
|
||||||
|
@ -959,7 +956,7 @@
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<style scoped lang="less">
|
<style scoped lang="less">
|
||||||
#apply-container {
|
#apply-container {
|
||||||
// background-color: #f5f8fc;
|
// background-color: #f5f8fc;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
@ -1038,9 +1035,9 @@
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
color: #000;
|
color: #000;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.applicationScene {
|
.applicationScene {
|
||||||
:deep(.ant-select-selector) {
|
:deep(.ant-select-selector) {
|
||||||
overflow-x: scroll;
|
overflow-x: scroll;
|
||||||
}
|
}
|
||||||
|
@ -1048,20 +1045,20 @@
|
||||||
:deep(.ant-select-selection-overflow) {
|
:deep(.ant-select-selection-overflow) {
|
||||||
flex-wrap: nowrap;
|
flex-wrap: nowrap;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
textarea {
|
textarea {
|
||||||
resize: none;
|
resize: none;
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.bottom-btn {
|
.bottom-btn {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
// position: fixed;
|
// position: fixed;
|
||||||
}
|
}
|
||||||
|
|
||||||
.cancel-apply {
|
.cancel-apply {
|
||||||
width: 80px;
|
width: 80px;
|
||||||
height: 38px;
|
height: 38px;
|
||||||
margin-right: 20px;
|
margin-right: 20px;
|
||||||
|
@ -1072,9 +1069,9 @@
|
||||||
border: none;
|
border: none;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.confirm-apply {
|
.confirm-apply {
|
||||||
width: 80px;
|
width: 80px;
|
||||||
height: 38px;
|
height: 38px;
|
||||||
background: #0087ff;
|
background: #0087ff;
|
||||||
|
@ -1084,5 +1081,5 @@
|
||||||
border: none;
|
border: none;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="box">
|
<div class="box">
|
||||||
|
<!-- <IntegrationServiceOrder ref="integrationServiceOrderDom" :orderArray="orderArray" :style="styleObj">
|
||||||
|
</IntegrationServiceOrder> -->
|
||||||
<div class="CanCase">
|
<div class="CanCase">
|
||||||
<div class="caseBox" v-for="(item, index) in caseList" :key="index" @click="toView(item)">
|
<div class="caseBox" v-for="(item, index) in caseList" :key="index" @click="toView(item)">
|
||||||
<a-image :preview="false" style="width:300px;height:200px" :src="
|
<a-image :preview="false" style="width:300px;height:200px" :src="
|
||||||
|
@ -7,13 +9,14 @@
|
||||||
.attrValue
|
.attrValue
|
||||||
" />
|
" />
|
||||||
<h3>{{ item.name }}</h3>
|
<h3>{{ item.name }}</h3>
|
||||||
<p>发布时间 {{ item.updateDate }}</p>
|
<p>发布时间 {{ item.createDate }}</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script setup>
|
<script setup>
|
||||||
import { ref, onMounted, onBeforeUnmount, watch, defineProps, defineEmits } from 'vue'
|
import { ref, onMounted, onBeforeUnmount, watch, defineProps, defineEmits } from 'vue'
|
||||||
|
import IntegrationServiceOrder from './integrationServiceOrder.vue'
|
||||||
|
|
||||||
import { useRouter } from 'vue-router'
|
import { useRouter } from 'vue-router'
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
|
@ -27,6 +30,19 @@ const props = defineProps({
|
||||||
default: '组件服务',
|
default: '组件服务',
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
const orderArray = ref([
|
||||||
|
{
|
||||||
|
value: 'create_date',
|
||||||
|
name: '发布时间',
|
||||||
|
orderType: 'DESC',
|
||||||
|
},
|
||||||
|
])
|
||||||
|
|
||||||
|
const styleObj = ref({
|
||||||
|
'justify-content': 'flex-end',
|
||||||
|
"padding": "0 20px"
|
||||||
|
})
|
||||||
const emits = defineEmits(['saveSearchCodition'])
|
const emits = defineEmits(['saveSearchCodition'])
|
||||||
|
|
||||||
const caseList = ref([])
|
const caseList = ref([])
|
||||||
|
|
|
@ -587,6 +587,7 @@
|
||||||
:deep(.ant-list-item) {
|
:deep(.ant-list-item) {
|
||||||
border-bottom: 0.01rem solid #ccc;
|
border-bottom: 0.01rem solid #ccc;
|
||||||
padding: 0.1rem;
|
padding: 0.1rem;
|
||||||
|
cursor: default;
|
||||||
}
|
}
|
||||||
|
|
||||||
:deep(.ant-list-item-meta-title) {
|
:deep(.ant-list-item-meta-title) {
|
||||||
|
@ -602,6 +603,7 @@
|
||||||
-webkit-line-clamp: 2;
|
-webkit-line-clamp: 2;
|
||||||
word-break: break-all;
|
word-break: break-all;
|
||||||
-webkit-box-orient: vertical;
|
-webkit-box-orient: vertical;
|
||||||
|
cursor: default;
|
||||||
}
|
}
|
||||||
|
|
||||||
button {
|
button {
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<template>
|
<template>
|
||||||
<ul class="integrationServiceOrder">
|
<ul class="integrationServiceOrder" :style="styleObj">
|
||||||
<li v-for="(item, i) in integrationOrderList" :key="i" @click="
|
<li v-for="(item, i) in integrationOrderList" :key="i" @click="
|
||||||
changeOrder(i, item.value, item.orderType == 'DESC' ? 'ASC' : 'DESC')
|
changeOrder(i, item.value, item.orderType == 'DESC' ? 'ASC' : 'DESC')
|
||||||
">
|
">
|
||||||
|
@ -14,7 +14,7 @@
|
||||||
</ul>
|
</ul>
|
||||||
</template>
|
</template>
|
||||||
<script setup>
|
<script setup>
|
||||||
import { ref, reactive, nextTick, defineExpose } from 'vue'
|
import { ref, reactive, nextTick, defineExpose, defineProps } from 'vue'
|
||||||
import mybus from '@/myplugins/mybus'
|
import mybus from '@/myplugins/mybus'
|
||||||
|
|
||||||
const orderList = [
|
const orderList = [
|
||||||
|
@ -39,7 +39,18 @@ const orderList = [
|
||||||
// orderType: 'DESC',
|
// orderType: 'DESC',
|
||||||
// },
|
// },
|
||||||
]
|
]
|
||||||
|
|
||||||
|
const props = defineProps({
|
||||||
|
orderArray: { type: Array, default: null },
|
||||||
|
styleObj: { type: Object, default: null },
|
||||||
|
})
|
||||||
|
|
||||||
|
console.log('props.orderArray------------>', props.orderArray);
|
||||||
|
|
||||||
const integrationOrderList = ref(JSON.parse(JSON.stringify(orderList)))
|
const integrationOrderList = ref(JSON.parse(JSON.stringify(orderList)))
|
||||||
|
if(props.orderArray) {
|
||||||
|
integrationOrderList.value = props.orderArray
|
||||||
|
}
|
||||||
const integrationOrder = reactive({
|
const integrationOrder = reactive({
|
||||||
orderField: '',
|
orderField: '',
|
||||||
orderType: '',
|
orderType: '',
|
||||||
|
@ -47,12 +58,10 @@ const integrationOrder = reactive({
|
||||||
|
|
||||||
// 融合服务--排序
|
// 融合服务--排序
|
||||||
const changeOrder = (i, val, type) => {
|
const changeOrder = (i, val, type) => {
|
||||||
|
|
||||||
console.log('i, val, type------------>', i, val, type);
|
|
||||||
integrationOrder.orderField = val
|
integrationOrder.orderField = val
|
||||||
integrationOrder.orderType = type;
|
integrationOrder.orderType = type;
|
||||||
// 0 apply_count ASC
|
// 0 apply_count ASC
|
||||||
let _index = integrationOrderList.value.findIndex(x => x.value = val)
|
let _index = integrationOrderList.value.findIndex(x => x.value == val)
|
||||||
if (_index > -1) {
|
if (_index > -1) {
|
||||||
integrationOrderList.value[_index].orderType = type
|
integrationOrderList.value[_index].orderType = type
|
||||||
}
|
}
|
||||||
|
|
|
@ -185,31 +185,32 @@
|
||||||
treeData.value.sort((a, b) => {
|
treeData.value.sort((a, b) => {
|
||||||
return sortArr.indexOf(a.key) - sortArr.indexOf(b.key)
|
return sortArr.indexOf(a.key) - sortArr.indexOf(b.key)
|
||||||
})
|
})
|
||||||
let deptId=user.value.deptId
|
//根据不同的权限展示不同的能力超市左侧树
|
||||||
treeData.value.forEach((child) => {
|
// let deptId=user.value.deptId
|
||||||
let childern=child.children
|
// treeData.value.forEach((child) => {
|
||||||
childern.forEach((childs) => {//第一层:市级
|
// let childern=child.children
|
||||||
if(childs.key==deptId ){
|
// childern.forEach((childs) => {//第一层:市级
|
||||||
childs.show=true
|
// if(childs.key==deptId ){
|
||||||
child.show=true
|
// childs.show=true
|
||||||
mybus.emit('paramsGetResources', [childs.key])
|
// child.show=true
|
||||||
selectId.value =childs.key
|
// mybus.emit('paramsGetResources', [childs.key])
|
||||||
}
|
// selectId.value =childs.key
|
||||||
if(childs.children && childs.children.length>0){//第二层 区级
|
// }
|
||||||
let qu=childs.children
|
// if(childs.children && childs.children.length>0){//第二层 区级
|
||||||
qu.forEach((qu) => {
|
// let qu=childs.children
|
||||||
if(qu.key==deptId ){
|
// qu.forEach((qu) => {
|
||||||
qu.show=true
|
// if(qu.key==deptId ){
|
||||||
childs.show=true
|
// qu.show=true
|
||||||
child.show=true
|
// childs.show=true
|
||||||
mybus.emit('paramsGetResources', [qu.key])
|
// child.show=true
|
||||||
selectId.value = qu.key
|
// mybus.emit('paramsGetResources', [qu.key])
|
||||||
}
|
// selectId.value = qu.key
|
||||||
})
|
// }
|
||||||
}
|
// })
|
||||||
})
|
// }
|
||||||
|
// })
|
||||||
|
|
||||||
})
|
// })
|
||||||
console.log('左侧树结构数据======================>', treeData.value)
|
console.log('左侧树结构数据======================>', treeData.value)
|
||||||
|
|
||||||
showKey.value++
|
showKey.value++
|
||||||
|
|
|
@ -105,7 +105,13 @@
|
||||||
<span>面积:{{ item.area }}m²</span>
|
<span>面积:{{ item.area }}m²</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="bottonmContent">
|
<div class="bottonmContent">
|
||||||
|
<a-tooltip>
|
||||||
|
<template #title>{{ item.description }}</template>
|
||||||
|
<span>{{ item.description }}</span>
|
||||||
|
</a-tooltip>
|
||||||
|
<!-- <a-tooltip>
|
||||||
{{ item.description }}
|
{{ item.description }}
|
||||||
|
</a-tooltip> -->
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<a-button
|
<a-button
|
||||||
|
@ -937,6 +943,10 @@
|
||||||
const fileList = ref([])
|
const fileList = ref([])
|
||||||
const useForm = Form.useForm
|
const useForm = Form.useForm
|
||||||
const roomInput = ref('')
|
const roomInput = ref('')
|
||||||
|
let roomStr = router.currentRoute.value.query.str
|
||||||
|
if (roomStr) {
|
||||||
|
roomInput.value = roomStr
|
||||||
|
}
|
||||||
const rulesRef = reactive({
|
const rulesRef = reactive({
|
||||||
bookDate: [
|
bookDate: [
|
||||||
{
|
{
|
||||||
|
@ -1052,6 +1062,12 @@
|
||||||
mapSearchParam.value.parentId = parentId
|
mapSearchParam.value.parentId = parentId
|
||||||
getCamera()
|
getCamera()
|
||||||
})
|
})
|
||||||
|
mybus.off('changeRoomInput')
|
||||||
|
mybus.on('changeRoomInput', (val) => {
|
||||||
|
console.log('更改=======》')
|
||||||
|
roomInput.value = val
|
||||||
|
onSearch()
|
||||||
|
})
|
||||||
mybus.off('getListByMap')
|
mybus.off('getListByMap')
|
||||||
mybus.on('getListByMap', (param) => {
|
mybus.on('getListByMap', (param) => {
|
||||||
mapSearchParam.value.gpsX = param.gpsX
|
mapSearchParam.value.gpsX = param.gpsX
|
||||||
|
@ -1226,7 +1242,14 @@
|
||||||
}
|
}
|
||||||
// 搜索
|
// 搜索
|
||||||
const onSearch = (searchValue) => {
|
const onSearch = (searchValue) => {
|
||||||
debugger
|
let newQuery = JSON.parse(JSON.stringify(router.currentRoute.value.query))
|
||||||
|
newQuery.str = roomInput.value
|
||||||
|
router
|
||||||
|
.replace({
|
||||||
|
query: newQuery,
|
||||||
|
})
|
||||||
|
.then(() => {})
|
||||||
|
mybus.emit('changeSearchValue', roomInput.value)
|
||||||
searchData()
|
searchData()
|
||||||
chengguoSearch()
|
chengguoSearch()
|
||||||
}
|
}
|
||||||
|
@ -2610,6 +2633,14 @@
|
||||||
font-size: 0.14rem;
|
font-size: 0.14rem;
|
||||||
margin: 0.15rem 0 0.2rem 0;
|
margin: 0.15rem 0 0.2rem 0;
|
||||||
}
|
}
|
||||||
|
.bottonmContent {
|
||||||
|
width: 100%;
|
||||||
|
overflow: hidden; //超出隐藏
|
||||||
|
text-overflow: ellipsis; //超出文本设置为...
|
||||||
|
display: -webkit-box; //将div1转换为盒子模型
|
||||||
|
-webkit-line-clamp: 3; //设置div1的文本为2行
|
||||||
|
-webkit-box-orient: vertical; //从顶部向底部垂直布置子元素
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -267,12 +267,10 @@
|
||||||
})
|
})
|
||||||
window.open(newpage.href, '_blank')
|
window.open(newpage.href, '_blank')
|
||||||
} else if (data === '资源下架') {
|
} else if (data === '资源下架') {
|
||||||
window.sessionStorage.setItem('type', JSON.stringify('apply'))
|
// 跳转到个人中心--我的发布
|
||||||
|
window.sessionStorage.setItem('type', JSON.stringify('push'))
|
||||||
const newpage = router.resolve({
|
const newpage = router.resolve({
|
||||||
path: '/personalCenter',
|
path: '/personalCenter',
|
||||||
query: {
|
|
||||||
tabTypeName: '能力上架'
|
|
||||||
}
|
|
||||||
})
|
})
|
||||||
window.location.href = newpage.href
|
window.location.href = newpage.href
|
||||||
}
|
}
|
||||||
|
|
|
@ -44,12 +44,12 @@
|
||||||
</div>
|
</div>
|
||||||
<a-tooltip>
|
<a-tooltip>
|
||||||
<template #title>
|
<template #title>
|
||||||
{{ item.cameraList ? item.system : item.title }}
|
{{ item.cameraList ? item.system : (item.title|| item.name) }}
|
||||||
</template>
|
</template>
|
||||||
<div class="content-body-title">
|
<div class="content-body-title">
|
||||||
<span>
|
<span>
|
||||||
名称:{{
|
名称:{{
|
||||||
item.cameraList ? item.system : item.title || item.name
|
item.cameraList ? item.system : (item.title || item.name)
|
||||||
}}
|
}}
|
||||||
</span>
|
</span>
|
||||||
<div></div>
|
<div></div>
|
||||||
|
|
|
@ -74,12 +74,12 @@ module.exports = {
|
||||||
// // },
|
// // },
|
||||||
// // 注释掉的地方是前端配置代理访问后端的示例
|
// // 注释掉的地方是前端配置代理访问后端的示例
|
||||||
// proxy: {
|
// proxy: {
|
||||||
// '/renren-admin': {
|
// '/ucs-admin': {
|
||||||
// target: `http://15.2.21.238:8888`,
|
// target: `http://15.2.21.238:8888`,
|
||||||
// // ws: true,
|
// // ws: true,
|
||||||
// changeOrigin: true,
|
// changeOrigin: true,
|
||||||
// // pathRewrite: {
|
// // pathRewrite: {
|
||||||
// // '^/': '/renren-admin/',
|
// // '^/': '/ucs-admin/',
|
||||||
// // },
|
// // },
|
||||||
// },
|
// },
|
||||||
// },
|
// },
|
||||||
|
|
Loading…
Reference in New Issue