Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev
This commit is contained in:
commit
b57d9c5b11
|
|
@ -2,7 +2,7 @@
|
|||
* @Author: hisense.wuhongjian
|
||||
* @Date: 2022-08-25 14:37:49
|
||||
* @LastEditors: hisense.wuhongjian
|
||||
* @LastEditTime: 2022-10-12 13:40:14
|
||||
* @LastEditTime: 2022-10-12 15:25:01
|
||||
* @Description: 告诉大家这是什么
|
||||
*/
|
||||
var _global = {}
|
||||
|
|
@ -11,7 +11,7 @@ var CONFIGITEM = {
|
|||
// version: 'xihaian', // 西海岸
|
||||
// version: 'test', // 测试
|
||||
// version: 'frp', // 内网穿透
|
||||
version: 'dev', // 开发
|
||||
version: 'xihaian', // 开发
|
||||
vNum: 'v0.8.7.2',
|
||||
configData: {
|
||||
// 青岛市大数据局
|
||||
|
|
@ -25,7 +25,8 @@ var CONFIGITEM = {
|
|||
previewUrl: 'http://10.134.135.9:9796/',
|
||||
// apiURL: 'http://10.134.135.9:8888/renren-admin',
|
||||
// apiURL: 'http://10.16.5.35:8888/renren-admin', // 李志成-研发
|
||||
apiURL: 'http://192.168.124.254:8888/renren-admin', // 李志成-远雄
|
||||
apiURL: 'http://192.168.124.236:8888/renren-admin',
|
||||
// apiURL: 'http://192.168.124.254:8888/renren-admin', // 李志成-远雄
|
||||
websocketURL: 'ws://10.134.135.9:8888/renren-admin/websocket'
|
||||
},
|
||||
// 测试
|
||||
|
|
|
|||
|
|
@ -33,9 +33,13 @@
|
|||
<el-form-item prop="sort" :label="$t('menu.sort')">
|
||||
<el-input-number v-model="dataForm.sort" controls-position="right" :min="0" :label="$t('menu.sort')"></el-input-number>
|
||||
</el-form-item>
|
||||
<!-- 授权标识 -->
|
||||
<el-form-item prop="permissions" :label="$t('menu.permissions')">
|
||||
<el-input v-model="dataForm.permissions" :placeholder="$t('menu.permissionsTips')"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item prop="site" label="站点标识">
|
||||
<el-input v-model="dataForm.site" placeholder="请输入站点标识(1为共享门户,0为后台管理)"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="dataForm.type === 0" prop="icon" :label="$t('menu.icon')" class="icon-list">
|
||||
<el-popover v-model="iconListVisible" ref="iconListPopover" placement="bottom-start" trigger="click" popper-class="mod-sys__menu-icon-popover">
|
||||
<div class="mod-sys__menu-icon-inner">
|
||||
|
|
@ -77,6 +81,7 @@ export default {
|
|||
name: '',
|
||||
pid: '0',
|
||||
parentName: '',
|
||||
site: 0,
|
||||
url: '',
|
||||
permissions: '',
|
||||
sort: 0,
|
||||
|
|
@ -98,14 +103,14 @@ export default {
|
|||
},
|
||||
watch: {
|
||||
'dataForm.type' (val) {
|
||||
this.$refs['dataForm'].clearValidate()
|
||||
this.$refs.dataForm.clearValidate()
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
init () {
|
||||
this.visible = true
|
||||
this.$nextTick(() => {
|
||||
this.$refs['dataForm'].resetFields()
|
||||
this.$refs.dataForm.resetFields()
|
||||
this.iconList = getIconList()
|
||||
console.log('iconList', this.iconList)
|
||||
this.dataForm.parentName = this.$t('menu.parentNameDefault')
|
||||
|
|
@ -159,7 +164,7 @@ export default {
|
|||
},
|
||||
// 表单提交
|
||||
dataFormSubmitHandle: debounce(function () {
|
||||
this.$refs['dataForm'].validate((valid) => {
|
||||
this.$refs.dataForm.validate((valid) => {
|
||||
if (!valid) {
|
||||
return false
|
||||
}
|
||||
|
|
@ -178,7 +183,7 @@ export default {
|
|||
})
|
||||
}).catch(() => {})
|
||||
})
|
||||
}, 1000, { 'leading': true, 'trailing': false })
|
||||
}, 1000, { leading: true, trailing: false })
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
* @Author: hisense.wuhongjian
|
||||
* @Date: 2020-07-07 16:03:23
|
||||
* @LastEditors: hisense.wuhongjian
|
||||
* @LastEditTime: 2022-10-11 10:46:03
|
||||
* @LastEditTime: 2022-10-12 15:29:29
|
||||
* @Description: 系统静态参数配置
|
||||
*/
|
||||
var _global = {}
|
||||
var CONFIGITEM = {
|
||||
// version: 'qingdao', //青岛
|
||||
//version: 'xihaian', // 西海岸
|
||||
// version: 'xihaian', // 西海岸
|
||||
version: 'dev', // 开发
|
||||
// version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
|
||||
//version: 'test', // 测试
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ export function getHls(params) {
|
|||
}
|
||||
|
||||
// 西海岸--获取摄像头列表的后台地址 (测试环境地址：10.134.135.92:9537)
|
||||
let _cameraUrl = _global && _global.config && _global.config.camreaInfo.cameraUrl || '10.134.135.92:9537';
|
||||
let _cameraUrl = _global && _global.config && _global.config.camreaInfo && _global.config.camreaInfo.cameraUrl || '10.134.135.92:9537';
|
||||
//能力集市基础设施-左侧列表
|
||||
export function getCameraInfoByAreaId(params) {
|
||||
return axios.get(`http://${_cameraUrl}/data_service/getCamera/getCameraInfoByAreaId?areaId=${params.areaId}`,
|
||||
|
|
|
|||
|
|
@ -74,7 +74,15 @@ export function getHls(params) {
|
|||
// 加入申购车
|
||||
export function sgcInsert(data) {
|
||||
return request({
|
||||
// url: '/resourcecar/insert',
|
||||
url: '/resourcecar/insert',
|
||||
method: 'post',
|
||||
data,
|
||||
})
|
||||
}
|
||||
|
||||
// 西海岸--加入申购车
|
||||
export function xhaAddCart(data) {
|
||||
return request({
|
||||
url: '/resourcecar/batchInsert', // 西海岸-加入购物车相当于收藏功能
|
||||
method: 'post',
|
||||
data,
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -669,6 +669,7 @@
|
|||
:title="wrjName + '详情'"
|
||||
@ok="wrjVisible = false"
|
||||
>
|
||||
<template #footer></template>
|
||||
<div v-for="(db, key) in wrjData" :key="key">
|
||||
<template v-if="typeof db == 'object'">
|
||||
<div
|
||||
|
|
@ -721,6 +722,7 @@
|
|||
import { getCameraByCondition } from '@/api/file'
|
||||
import {
|
||||
sgcInsert,
|
||||
xhaAddCart,
|
||||
getRoomSearch,
|
||||
getDate,
|
||||
setSubmit,
|
||||
|
|
@ -1396,7 +1398,6 @@
|
|||
}
|
||||
selectType.value = '视频资源'
|
||||
console.log('444------------>', 444);
|
||||
|
||||
} else if (name == '政务云资源') {
|
||||
room.value = true
|
||||
tableHeight.value = 600
|
||||
|
|
@ -1578,6 +1579,8 @@
|
|||
clickList.value[1].content = []
|
||||
}
|
||||
clickList.value[indexFather].content[0] = name
|
||||
console.log('clickList.value[indexFather].content[0]------------>', clickList.value[indexFather].content[0]);
|
||||
|
||||
if (tabList.value[1]) {
|
||||
tabList.value[1].title = ''
|
||||
tabList.value[1].content = []
|
||||
|
|
@ -1888,7 +1891,7 @@
|
|||
note1: [v],
|
||||
})
|
||||
})
|
||||
sgcInsert(_arr).then((res) => {
|
||||
xhaAddCart(_arr).then((res) => {
|
||||
if(res.data.code !== 0) {
|
||||
return message.error(res.data.msg)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<div class="name">组件服务</div>
|
||||
<div class="sl">
|
||||
<span class="num">{{ zjNum || 0 }}</span>
|
||||
个
|
||||
项
|
||||
</div>
|
||||
</div>
|
||||
</a-tooltip>
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
<div class="name">应用资源</div>
|
||||
<div class="sl">
|
||||
<span class="num">{{ yyNum || 0 }}</span>
|
||||
个
|
||||
项
|
||||
</div>
|
||||
</div>
|
||||
</a-tooltip>
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
<div class="name">基础设施</div>
|
||||
<div class="sl">
|
||||
<span class="num">{{ jcNum || 0 }}</span>
|
||||
个
|
||||
项
|
||||
</div>
|
||||
</div>
|
||||
</a-tooltip>
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
<div class="name">知识库</div>
|
||||
<div class="sl">
|
||||
<span class="num">{{ zsNum || 0 }}</span>
|
||||
个
|
||||
条
|
||||
</div>
|
||||
</div>
|
||||
</a-tooltip>
|
||||
|
|
|
|||
|
|
@ -32,9 +32,9 @@
|
|||
<div class="img" :class="item.imgType"></div>
|
||||
</div>
|
||||
<div class="item-right">
|
||||
<div class="fw" v-if="select == '浏览量'">
|
||||
<!-- <div class="fw" v-if="select == '浏览量'">
|
||||
{{ select }}:{{ item.visits }}
|
||||
</div>
|
||||
</div> -->
|
||||
<div class="fw" v-if="select == '申请量'">
|
||||
{{ select }}:{{ item.applyCount }}
|
||||
</div>
|
||||
|
|
@ -139,7 +139,7 @@
|
|||
path: '/DetailsPageconetent',
|
||||
query: {
|
||||
// select: '组件服务',
|
||||
select: DETAIL_PAGE_CONTENT_DEFAULT_TAB
|
||||
select: DETAIL_PAGE_CONTENT_DEFAULT_TAB,
|
||||
},
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -643,7 +643,7 @@ const delList = () => {
|
|||
}
|
||||
//ceshiFunction
|
||||
const ceshiFunction = () => {
|
||||
debugger
|
||||
// debugger
|
||||
if (checkedListAbility.value.length == 0) {
|
||||
message.warning('请先选择需要操作的数据！')
|
||||
}
|
||||
|
|
@ -660,7 +660,7 @@ const handleDelete = (item, index) => {
|
|||
if (checkedListAbility.value.length == 0) {
|
||||
return message.warning('请先选择需要操作的数据！')
|
||||
} else {
|
||||
delArr = checkedListAbility.value
|
||||
delArr = checkedListAbility.value.map(v=>v.id)
|
||||
}
|
||||
}
|
||||
sgcDel({
|
||||
|
|
|
|||
Loading…
Reference in New Issue