Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
This commit is contained in:
unknown
commit
1a23d64064
|
|
@ -107,7 +107,6 @@ export default {
|
|||
} else {
|
||||
this.total = this.mixinViewModuleOptions.getDataListIsPage ? res.data.total : 0
|
||||
}
|
||||
|
||||
console.log('数据列表', this.dataList, this.mixinViewModuleOptions.getDataListURL)
|
||||
if (this.dataList[0].type === '组件服务') {
|
||||
this.dataList.map(val => {
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ router.beforeEach((to, from, next) => {
|
|||
Vue.prototype.$message.error(res.msg)
|
||||
return next({ name: 'login' })
|
||||
}
|
||||
window.SITE_CONFIG.menuList = res.data
|
||||
window.SITE_CONFIG.menuList = res.data.filter(item => item.site === 0)
|
||||
fnAddDynamicMenuRoutes(window.SITE_CONFIG.menuList)
|
||||
next({ ...to, replace: true })
|
||||
}).catch(() => {
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
/*
|
||||
* @Author: hisense.guoyue
|
||||
* @Date: 2022-08-23 10:30:11
|
||||
* @LastEditors: hisense.guoyue
|
||||
* @LastEditTime: 2022-10-02 14:47:05
|
||||
* @LastEditors: hisense.wuhongjian
|
||||
* @LastEditTime: 2022-10-18 17:44:33
|
||||
* @Description: 判断当前环境是西海岸还是青岛市局
|
||||
*/
|
||||
const returnLocationStr = () => {
|
||||
return CONFIGITEM.version
|
||||
return CONFIGITEM.version === 'xihaian' ? 'xihaian' : 'qingdao'
|
||||
}
|
||||
|
||||
export default returnLocationStr
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<!--
|
||||
* @Author: kongjun qdkongjun@gmail.com
|
||||
* @Date: 2022-06-20 09:29:59
|
||||
* @LastEditors: kongjun qdkongjun@gmail.com
|
||||
* @LastEditTime: 2022-06-22 10:04:56
|
||||
* @LastEditors: hisense.wuhongjian
|
||||
* @LastEditTime: 2022-10-18 15:46:51
|
||||
* @FilePath: \back\src\views\main-sidebar.vue
|
||||
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
||||
-->
|
||||
|
|
@ -35,71 +35,72 @@
|
|||
|
||||
<script>
|
||||
import http from '@/utils/request'
|
||||
import SubMenu from "./main-sidebar-sub-menu";
|
||||
import returnLocationStr from '@/utils/location';
|
||||
import SubMenu from './main-sidebar-sub-menu'
|
||||
import returnLocationStr from '@/utils/location'
|
||||
import bus from '@/views/bus.js'
|
||||
export default {
|
||||
data() {
|
||||
data () {
|
||||
return {
|
||||
numObject:{}
|
||||
};
|
||||
numObject: {}
|
||||
}
|
||||
},
|
||||
components: {
|
||||
SubMenu,
|
||||
SubMenu
|
||||
},
|
||||
created() {
|
||||
created () {
|
||||
this.getNum()
|
||||
//this.$store.state.sidebarMenuList = window.SITE_CONFIG["menuList"];
|
||||
//更新我的待办得数量
|
||||
// this.$store.state.sidebarMenuList = window.SITE_CONFIG.menuList
|
||||
// 更新我的待办得数量
|
||||
bus.$off('updateTaskNum')
|
||||
bus.$on('updateTaskNum', () => {
|
||||
this.getNum()
|
||||
})
|
||||
},
|
||||
methods: {
|
||||
getNum(){
|
||||
http.get('/act/task/myToDoTaskNum').then(({ data: res }) => {
|
||||
this.numObject=res.data
|
||||
let menuList= window.SITE_CONFIG["menuList"];
|
||||
console.log('menuList====>',menuList);
|
||||
console.log('this.numObject====>',this.numObject);
|
||||
for(var i=0;i<menuList.length;i++){
|
||||
let menu=menuList[i];
|
||||
if(menu.id=='1541261628388888578'){//我的待办
|
||||
let daibanNum=0
|
||||
for(let j=0;j<menu.children.length;j++){
|
||||
let children=menu.children[j]
|
||||
if(children.id=="1541261780432408577"){//能力申请 v2
|
||||
//西海岸 v2 市局v3
|
||||
children.total= returnLocationStr() == 'qingdao' ? Number(this.numObject.abilityprocess_v3) : Number(this.numObject.abilityprocess_v2)
|
||||
daibanNum=Number(daibanNum)+Number(children.total)
|
||||
} if(children.id=="1559376285703081986"){//会议室审核
|
||||
children.total=Number(this.numObject.meetingroom_book)
|
||||
daibanNum=Number(daibanNum)+Number(children.total)
|
||||
}if(children.id=="1545292602084827138"){//能力资源上架
|
||||
children.total=Number(this.numObject.resourcemountapply)
|
||||
daibanNum=Number(daibanNum)+Number(children.total)
|
||||
}if(children.id=="1545312045695377410"){//能力需求申请
|
||||
children.total=Number(this.numObject.abilitydemandapply)
|
||||
daibanNum=Number(daibanNum)+Number(children.total)
|
||||
}if(children.id=="1545313018614521857"){//能力需求下架
|
||||
children.total=Number(this.numObject.resourcundercarriageapply)
|
||||
daibanNum=Number(daibanNum)+Number(children.total)
|
||||
}if(children.id=="1545313754106699777"){//评论审核
|
||||
children.total=Number(this.numObject.comment_review)
|
||||
daibanNum=Number(daibanNum)+Number(children.total)
|
||||
}if(children.id=="1554294862931562498"){//会议室 暂无
|
||||
children.total=0
|
||||
daibanNum=Number(daibanNum)+Number(children.total)
|
||||
}
|
||||
}
|
||||
menu.total=daibanNum
|
||||
getNum () {
|
||||
http.get('/act/task/myToDoTaskNum').then(({ data: res }) => {
|
||||
this.numObject = res.data
|
||||
const menuList = window.SITE_CONFIG.menuList
|
||||
console.log('menuList====>', menuList)
|
||||
console.log('this.numObject====>', this.numObject)
|
||||
for (var i = 0; i < menuList.length; i++) {
|
||||
const menu = menuList[i]
|
||||
if (menu.id == '1541261628388888578') { // 我的待办
|
||||
let daibanNum = 0
|
||||
for (let j = 0; j < menu.children.length; j++) {
|
||||
const children = menu.children[j]
|
||||
if (children.id == '1541261780432408577') { // 能力申请 v2
|
||||
// 西海岸 v2 市局v3
|
||||
children.total = returnLocationStr() == 'qingdao' ? Number(this.numObject.abilityprocess_v3) : Number(this.numObject.abilityprocess_v2)
|
||||
daibanNum = Number(daibanNum) + Number(children.total)
|
||||
} if (children.id == '1559376285703081986') { // 会议室审核
|
||||
children.total = Number(this.numObject.meetingroom_book)
|
||||
daibanNum = Number(daibanNum) + Number(children.total)
|
||||
} if (children.id == '1545292602084827138') { // 能力资源上架
|
||||
children.total = Number(this.numObject.resourcemountapply)
|
||||
daibanNum = Number(daibanNum) + Number(children.total)
|
||||
} if (children.id == '1545312045695377410') { // 能力需求申请
|
||||
children.total = Number(this.numObject.abilitydemandapply)
|
||||
daibanNum = Number(daibanNum) + Number(children.total)
|
||||
} if (children.id == '1545313018614521857') { // 能力需求下架
|
||||
children.total = Number(this.numObject.resourcundercarriageapply)
|
||||
daibanNum = Number(daibanNum) + Number(children.total)
|
||||
} if (children.id == '1545313754106699777') { // 评论审核
|
||||
children.total = Number(this.numObject.comment_review)
|
||||
daibanNum = Number(daibanNum) + Number(children.total)
|
||||
} if (children.id == '1554294862931562498') { // 会议室 暂无
|
||||
children.total = 0
|
||||
daibanNum = Number(daibanNum) + Number(children.total)
|
||||
}
|
||||
}
|
||||
menu.total = daibanNum
|
||||
}
|
||||
}
|
||||
this.$store.state.sidebarMenuList = menuList
|
||||
})
|
||||
}
|
||||
}
|
||||
this.$store.state.sidebarMenuList=menuList
|
||||
})
|
||||
}
|
||||
}};
|
||||
}
|
||||
</script>
|
||||
<style scoped lang="scss">
|
||||
.aui-sidebar {
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@
|
|||
<el-select
|
||||
v-model="abilityDepartment"
|
||||
placeholder="请选择部门"
|
||||
filterable
|
||||
clearable
|
||||
>
|
||||
<el-option label="全部" value=""></el-option>
|
||||
|
|
@ -94,6 +95,11 @@
|
|||
$t('reset')
|
||||
}}</el-button>
|
||||
</el-form-item>
|
||||
<!-- 导出 -->
|
||||
<a class='export' :href="exportExcel+exportExcelType+'?'+exportExcelCondition+'&token='+token">导出</a>
|
||||
<!-- <el-form-item>
|
||||
<el-button type="primary" @click="exportExcel()">导出</el-button>
|
||||
</el-form-item> -->
|
||||
</el-form>
|
||||
<el-card shadow="never" class="aui-card--fill" v-if="homeIsShow">
|
||||
<div class="mod-demand__bsdemand">
|
||||
|
|
@ -134,9 +140,12 @@
|
|||
<span v-if='this.choseId===0' :class="[departmentId===4?'departmentStyle':'']" @click="handleChose(4)">
|
||||
能力使用明细
|
||||
</span> -->
|
||||
<span v-if="detailFlag" class="detail-button" @click="goToDetail()">
|
||||
明细
|
||||
</span>
|
||||
<template v-if="detailFlag">
|
||||
<el-checkbox v-model="checked" @change='chagneCheckbox' style="position: absolute;right: 150px;margin-top: -15px;">隐藏空数据</el-checkbox>
|
||||
<span class="detail-button" @click="goToDetail()">
|
||||
明细
|
||||
</span>
|
||||
</template>
|
||||
<span v-else class="detail-button" @click="goToBack()"> 返回 </span>
|
||||
</div>
|
||||
<div class="line-style"></div>
|
||||
|
|
@ -213,6 +222,8 @@
|
|||
|
||||
<el-table
|
||||
:data="tableData"
|
||||
:header-cell-style="{ textAlign: 'center',height:'96px' }"
|
||||
:cell-style="{ textAlign: 'center' }"
|
||||
style="width: 100%"
|
||||
v-show="this.departmentId === 3 || this.departmentId === 4"
|
||||
>
|
||||
|
|
@ -273,12 +284,14 @@
|
|||
|
||||
</template>
|
||||
<script>
|
||||
import Cookies from 'js-cookie'
|
||||
import componentServices from './componentServices.vue'
|
||||
import AbilityDetail from './components/abilityDetails'
|
||||
import applicationResources from './applicationResources.vue'
|
||||
import ComponentUsed from './componentUsed.vue'
|
||||
|
||||
import { mapState } from 'vuex'
|
||||
import qs from 'qs'
|
||||
import Template from '../devtools/template.vue'
|
||||
// import { mapState } from 'vuex'
|
||||
// const props = defineProps({
|
||||
// processDefinitionName: { type: String, default: null },
|
||||
// businessKey: { type: String, default: null },
|
||||
|
|
@ -288,9 +301,15 @@ import { mapState } from 'vuex'
|
|||
// showType: { type: String, default: null },
|
||||
// })
|
||||
export default {
|
||||
components: { componentServices, applicationResources, ComponentUsed, AbilityDetail },
|
||||
components: { componentServices, applicationResources, ComponentUsed, AbilityDetail, Template },
|
||||
data () {
|
||||
return {
|
||||
checked: false,
|
||||
departmentSelects: [],
|
||||
exportExcel: CONFIGITEM.configData[CONFIGITEM.version].apiURL + '/census/center/export',
|
||||
exportExcelCondition: '',
|
||||
exportExcelType: '',
|
||||
token: Cookies.get('ucsToken'),
|
||||
detailType: '',
|
||||
detailParamss: {},
|
||||
isBack: true,
|
||||
|
|
@ -374,9 +393,10 @@ export default {
|
|||
{ name: '基础设施', key: 3 },
|
||||
{ name: '数据资源', key: 4 },
|
||||
{ name: '知识库', key: 5 },
|
||||
{ name: '会议室', value: 6}
|
||||
{ name: '会议室', value: 6 }
|
||||
],
|
||||
tableData: [],
|
||||
tableDataClone: [],
|
||||
tableData2: [
|
||||
{
|
||||
approveStatus: '',
|
||||
|
|
@ -399,7 +419,7 @@ export default {
|
|||
{ name: '通用开发组件', value: 3 },
|
||||
{ name: '页面开发组件', value: 4 },
|
||||
{ name: '应用资源', value: 5 },
|
||||
{ name: '会议室', value: 6}
|
||||
{ name: '会议室', value: 6 }
|
||||
], // 类型备选列表
|
||||
detailFlag: false, // 明细返回按钮显示标志位
|
||||
startDate: '', // 开始时间
|
||||
|
|
@ -407,6 +427,13 @@ export default {
|
|||
}
|
||||
},
|
||||
created () {
|
||||
this.$http.get('/sys/dept/all').then(res => {
|
||||
console.log('获取部门=========>', res)
|
||||
this.departmentSelects = []
|
||||
res.data.data.map(val => {
|
||||
this.departmentSelects.push({ label: val.name, value: val.name })
|
||||
})
|
||||
})
|
||||
// 当前设定的日期时间
|
||||
// const d = new Date()
|
||||
// let year1, month1, day1
|
||||
|
|
@ -432,9 +459,18 @@ export default {
|
|||
}
|
||||
},
|
||||
computed: {
|
||||
...mapState(['departmentSelects'])
|
||||
// ...mapState(['departmentSelects'])
|
||||
},
|
||||
methods: {
|
||||
chagneCheckbox () {
|
||||
if (this.checked) {
|
||||
this.tableData = this.tableDataClone.filter(val => val.count !== 0)
|
||||
this.total = this.tableData.length
|
||||
} else {
|
||||
this.tableData = this.tableDataClone
|
||||
this.total = this.tableData.length
|
||||
}
|
||||
},
|
||||
closeModal () {
|
||||
this.detailsVisible = false
|
||||
},
|
||||
|
|
@ -482,7 +518,7 @@ export default {
|
|||
this.status = '审核中'
|
||||
} else if (this.examineStatus == '1') {
|
||||
this.status = '通过'
|
||||
}else if (this.examineStatus == '2') {
|
||||
} else if (this.examineStatus == '2') {
|
||||
this.status = '不通过'
|
||||
} else {
|
||||
this.status = this.examineStatus
|
||||
|
|
@ -529,7 +565,14 @@ export default {
|
|||
parseInt(result[i].hys)
|
||||
}
|
||||
this.tableData = res.data.data
|
||||
this.tableDataClone = res.data.data
|
||||
this.total = res.data.data.total
|
||||
this.exportExcelCondition = qs.stringify({
|
||||
approveStatus: this.status,
|
||||
deptId: this.abilityDepartment,
|
||||
startDate: this.startDate,
|
||||
endDate: this.endDate
|
||||
})
|
||||
})
|
||||
},
|
||||
// 组件服务部门使用情况列表-改为能力使用统计
|
||||
|
|
@ -587,7 +630,14 @@ export default {
|
|||
parseInt(result[i].hys)
|
||||
}
|
||||
this.tableData = res.data.data
|
||||
this.tableDataClone = res.data.data
|
||||
this.total = res.data.data.total
|
||||
this.exportExcelCondition = qs.stringify({
|
||||
approveStatus: this.status,
|
||||
deptId: this.abilityDepartment,
|
||||
startDate: this.startDate,
|
||||
endDate: this.endDate
|
||||
})
|
||||
})
|
||||
},
|
||||
// 点击查看详情
|
||||
|
|
@ -641,7 +691,7 @@ export default {
|
|||
this.status = '审核中'
|
||||
} else if (this.examineStatus == '1') {
|
||||
this.status = '通过'
|
||||
} else if (this.examineStatus == '2') {
|
||||
} else if (this.examineStatus == '2') {
|
||||
this.status = '不通过'
|
||||
} else {
|
||||
this.status = this.examineStatus
|
||||
|
|
@ -661,7 +711,14 @@ export default {
|
|||
.then((res) => {
|
||||
console.log('111111', this.tableData, res.data.data)
|
||||
this.tableData = res.data.data
|
||||
this.tableDataClone = res.data.data
|
||||
this.total = res.data.data.total
|
||||
this.exportExcelCondition = qs.stringify({
|
||||
approveStatus: this.status,
|
||||
deptId: this.abilityDepartment,
|
||||
startDate: this.startDate,
|
||||
endDate: this.endDate
|
||||
})
|
||||
})
|
||||
},
|
||||
// 能力使用明细
|
||||
|
|
@ -692,7 +749,14 @@ export default {
|
|||
})
|
||||
.then((res) => {
|
||||
this.tableData = res.data.data
|
||||
this.tableDataClone = res.data.data
|
||||
this.total = res.data.data.total
|
||||
this.exportExcelCondition = qs.stringify({
|
||||
approveStatus: this.status,
|
||||
deptId: this.abilityDepartment,
|
||||
startDate: this.startDate,
|
||||
endDate: this.endDate
|
||||
})
|
||||
})
|
||||
},
|
||||
getReleaseTree (page) {
|
||||
|
|
@ -793,12 +857,14 @@ export default {
|
|||
// },
|
||||
// 选择发布or使用表格
|
||||
handleChose (index) {
|
||||
this.checked = false
|
||||
this.departmentId = index
|
||||
if (index === 1) {
|
||||
if (this.choseId === 0) {
|
||||
if (!this.detailFlag) {
|
||||
this.detailFlag = !this.detailFlag
|
||||
}
|
||||
this.exportExcelType = 'SelectDeptDetailTypeCountList'
|
||||
this.getFirstTree()
|
||||
} else if (this.choseId === 1) {
|
||||
// this.getReleaseTree()
|
||||
|
|
@ -808,6 +874,7 @@ export default {
|
|||
if (!this.detailFlag) {
|
||||
this.detailFlag = !this.detailFlag
|
||||
}
|
||||
this.exportExcelType = 'SelectApplyDeptDetailTypeCountList'
|
||||
this.getSecondTree()
|
||||
} else {
|
||||
// this.getUsedTree()
|
||||
|
|
@ -815,6 +882,7 @@ export default {
|
|||
} else if (index === 3) {
|
||||
this.detailFlag = false
|
||||
if (this.choseId === 0) {
|
||||
this.exportExcelType = 'SelectCensusResourceTable'
|
||||
this.getOneDetail()
|
||||
} else {
|
||||
// this.getUsedTree()
|
||||
|
|
@ -822,6 +890,7 @@ export default {
|
|||
} else if (index === 4) {
|
||||
this.detailFlag = false
|
||||
if (this.choseId === 0) {
|
||||
this.exportExcelType = 'SelectCensusApplyTable'
|
||||
this.getTwoDetail()
|
||||
} else {
|
||||
// this.getUsedTree()
|
||||
|
|
@ -861,6 +930,7 @@ export default {
|
|||
},
|
||||
// 返回按钮
|
||||
goToBack () {
|
||||
this.checked = false
|
||||
// departmentId 1，3 2，4 两个值共同判断
|
||||
this.detailFlag = !this.detailFlag
|
||||
if (this.departmentId === 3) {
|
||||
|
|
@ -911,6 +981,13 @@ export default {
|
|||
this.examineStatus = ''
|
||||
this.abilityDepartment = ''
|
||||
this.abilityType = ''
|
||||
this.approveStatus = ''
|
||||
this.exportExcelCondition = qs.stringify({
|
||||
approveStatus: this.status,
|
||||
deptId: this.abilityDepartment,
|
||||
startDate: this.startDate,
|
||||
endDate: this.endDate
|
||||
})
|
||||
if (this.departmentId === 1) {
|
||||
// if (this.detailFlag) {
|
||||
// this.handleChose(3)
|
||||
|
|
@ -1100,4 +1177,31 @@ input::placeholder {
|
|||
text-overflow: ellipsis;
|
||||
word-break: break-all;
|
||||
}
|
||||
.export {
|
||||
display: inline-block;
|
||||
width: 70px;
|
||||
height: 40px;
|
||||
line-height: 40px;
|
||||
text-align: center;
|
||||
border-radius: 5px;
|
||||
background: #fff;
|
||||
border: 1px solid #dcdfe6;
|
||||
color: #000;
|
||||
}
|
||||
.export:hover {
|
||||
border-color: #c5ddfd;
|
||||
background-color: #ecf4fe;
|
||||
color: #0058e1;
|
||||
text-decoration: none;
|
||||
}
|
||||
.export:active {
|
||||
border-color: #c5ddfd;
|
||||
background-color: #ecf4fe;
|
||||
color: #0058e1;
|
||||
text-decoration: none;
|
||||
}
|
||||
.export:visited {
|
||||
color: #fff;
|
||||
text-decoration: none;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ export default {
|
|||
init () {
|
||||
this.visible = true
|
||||
this.$nextTick(() => {
|
||||
this.$refs['dataForm'].resetFields()
|
||||
this.$refs.dataForm.resetFields()
|
||||
this.iconList = getIconList()
|
||||
this.dataForm.parentName = this.$t('menu.parentNameDefault')
|
||||
this.getMenuList()
|
||||
|
|
@ -89,11 +89,12 @@ export default {
|
|||
},
|
||||
// 获取菜单列表
|
||||
getMenuList () {
|
||||
console.log('获取菜单位置1')
|
||||
return this.$http.get('/sys/menu/list?type=0').then(({ data: res }) => {
|
||||
if (res.code !== 0) {
|
||||
return this.$message.error(res.msg)
|
||||
}
|
||||
this.menuList = res.data
|
||||
this.menuList = res.data.filter(item => item.site === 0)
|
||||
}).catch(() => {})
|
||||
},
|
||||
// 上级菜单树, 设置默认值
|
||||
|
|
@ -114,11 +115,11 @@ export default {
|
|||
},
|
||||
// 表单提交
|
||||
dataFormSubmitHandle: debounce(function () {
|
||||
this.$refs['dataForm'].validate((valid) => {
|
||||
this.$refs.dataForm.validate((valid) => {
|
||||
if (!valid) {
|
||||
return false
|
||||
}
|
||||
this.$http['post']('/devtools/menu', this.dataForm).then(({ data: res }) => {
|
||||
this.$http.post('/devtools/menu', this.dataForm).then(({ data: res }) => {
|
||||
if (res.code !== 0) {
|
||||
return this.$message.error(res.msg)
|
||||
}
|
||||
|
|
@ -133,7 +134,7 @@ export default {
|
|||
})
|
||||
}).catch(() => {})
|
||||
})
|
||||
}, 1000, { 'leading': true, 'trailing': false })
|
||||
}, 1000, { leading: true, trailing: false })
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -123,11 +123,12 @@ export default {
|
|||
},
|
||||
// 获取菜单列表
|
||||
getMenuList () {
|
||||
console.log('获取菜单位置2')
|
||||
return this.$http.get('/sys/menu/list?type=0').then(({ data: res }) => {
|
||||
if (res.code !== 0) {
|
||||
return this.$message.error(res.msg)
|
||||
}
|
||||
this.menuList = res.data
|
||||
this.menuList = res.data.filter(item => item.site === 0)
|
||||
}).catch(() => {})
|
||||
},
|
||||
// 获取信息
|
||||
|
|
|
|||
|
|
@ -1,3 +1,10 @@
|
|||
<!--
|
||||
* @Author: hisense.wuhongjian
|
||||
* @Date: 2022-06-14 09:30:23
|
||||
* @LastEditors: hisense.wuhongjian
|
||||
* @LastEditTime: 2022-10-17 14:54:26
|
||||
* @Description: 告诉大家这是什么
|
||||
-->
|
||||
<template>
|
||||
<el-card shadow="never" class="aui-card--fill">
|
||||
<div class="mod-sys__menu">
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@
|
|||
var _global = {}
|
||||
var CONFIGITEM = {
|
||||
// version: 'qingdao', //青岛
|
||||
// version: 'xihaian', // 西海岸
|
||||
version: 'qingdao', // 开发
|
||||
version: 'xihaian', // 西海岸
|
||||
// version: 'qingdao', // 开发
|
||||
// version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
|
||||
// version: 'qingdao', // 测试
|
||||
//version: 'frp', // 内网穿透
|
||||
|
|
@ -28,7 +28,8 @@ var CONFIGITEM = {
|
|||
previewUrl: 'http://15.72.183.90:7008/',
|
||||
//frontUrl: 'http://15.72.183.90:7008/document/#/devModelFile/',
|
||||
//apiURL: 'http://15.72.183.90:8000/renren-admin',
|
||||
websocketURL: '15.72.183.90:8000/renren-admin',
|
||||
// websocketURL: '15.72.183.90:8000/renren-admin',
|
||||
// websocketURL: '192.168.124.233:8888/renren-admin',
|
||||
POI_URL:
|
||||
'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
|
||||
},
|
||||
|
|
@ -62,8 +63,9 @@ var CONFIGITEM = {
|
|||
},
|
||||
// 获取摄像头的后端接口地址
|
||||
camreaInfo: {
|
||||
// cameraUrl: '10.134.135.92:9537', // 测试环境
|
||||
cameraUrl: '10.134.135.9:9537', // 生产环境
|
||||
// cameraUrl: '10.134.135.92:9537', // 西海岸-测试环境
|
||||
// cameraUrl: '10.134.135.9:9537', // 西海岸-生产环境
|
||||
cameraUrl: '192.168.124.236:9537', // 远雄（不挂vpn可直接连）
|
||||
},
|
||||
backUrl: 'http://10.134.135.9:9797',
|
||||
previewUrl: 'http://10.134.135.9:9796/',
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ const state = () => ({
|
|||
accessToken: getAccessToken(),
|
||||
username: '',
|
||||
realName: '',
|
||||
deptName: '',
|
||||
userId: '',
|
||||
avatar: '',
|
||||
role: 0, // 用户管理员权限
|
||||
|
|
@ -26,6 +27,7 @@ const getters = {
|
|||
avatar: (state) => state.avatar,
|
||||
role: (state) => state.role,
|
||||
userId: (state) => state.userId,
|
||||
deptName: (state) => state.deptName,
|
||||
}
|
||||
const mutations = {
|
||||
/**
|
||||
|
|
@ -64,6 +66,10 @@ const mutations = {
|
|||
setUserId(state, id) {
|
||||
state.userId = id
|
||||
},
|
||||
// 设置用户单位
|
||||
setDeptName(state, name) {
|
||||
state.deptName = name
|
||||
},
|
||||
/**
|
||||
* @author chuzhixin 1204505056@qq.com
|
||||
* @description 设置头像
|
||||
|
|
@ -136,6 +142,7 @@ const actions = {
|
|||
commit('setRealname', res.data.data.realName)
|
||||
commit('setRole', res.data.data.roleIdList.length)
|
||||
commit('setUserId', res.data.data.id)
|
||||
commit('setDeptName', res.data.data.deptName)
|
||||
// TODO 获取用户信息，后续执行部分操作
|
||||
// let { username, avatar, roles, ability } = data
|
||||
// if (username && roles && Array.isArray(roles)) {
|
||||
|
|
|
|||
|
|
@ -262,7 +262,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="top-content-father">
|
||||
<infrastructurePage ref="camera" :searchValue="searchValue" />
|
||||
<infrastructurePage ref="camera" :searchValue="searchValue" :searchType="searchType" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="top" v-else>
|
||||
|
|
@ -409,7 +409,7 @@
|
|||
<div class="resultListSearchInput-father" style="background: unset">
|
||||
<div class="resultListSearchInput-son">
|
||||
模糊搜索
|
||||
<a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
|
||||
<a-input-search v-model:value="searchValue" placeholder="请输入关键词" enter-button="搜索" size="large"
|
||||
@search="getAppResources" @change="onSearch" class="resultListSearchInput" />
|
||||
<button class="button-reset" @click="chongzhi()">重置</button>
|
||||
</div>
|
||||
|
|
@ -494,8 +494,11 @@ export default defineComponent({
|
|||
const router = useRouter()
|
||||
let select = router.currentRoute.value.query.select || DETAIL_PAGE_CONTENT_DEFAULT_TAB
|
||||
const select2 = router.currentRoute.value.query.select
|
||||
const type2 = router.currentRoute.value.query.type
|
||||
const queryName=ref('')
|
||||
const str = router.currentRoute.value.query.str
|
||||
const searchValue = ref(str)
|
||||
const searchType= ref(str)
|
||||
let tecHnosphere = router.currentRoute.value.query.tecHnosphere
|
||||
let appLiCation = router.currentRoute.value.query.appLiCation
|
||||
const Cardsname = ref(select)
|
||||
|
|
@ -682,6 +685,7 @@ export default defineComponent({
|
|||
}
|
||||
|
||||
ListContent.records.forEach((val) => {
|
||||
|
||||
if (!val) {
|
||||
return
|
||||
}
|
||||
|
|
@ -689,6 +693,7 @@ export default defineComponent({
|
|||
paramsGetResources.infoList = paramsGetResources.infoList.filter(
|
||||
(item) => item.attrType !== name
|
||||
)
|
||||
|
||||
if (
|
||||
val.selectedTags &&
|
||||
val.selectedTags.indexOf(tag.dict_label) == -1
|
||||
|
|
@ -798,7 +803,34 @@ export default defineComponent({
|
|||
ListContentCopy.value = JSON.parse(JSON.stringify(dataCopy))
|
||||
ListContent.records = []
|
||||
ListContent.records = JSON.parse(JSON.stringify(dataCopy))
|
||||
if(select2=='组件服务'){
|
||||
queryName.value='组件类型'
|
||||
}else if(select2=='应用资源'){
|
||||
queryName.value='应用领域'
|
||||
}else{
|
||||
queryName.value=''
|
||||
}
|
||||
ListContent.records.forEach((val) => {
|
||||
|
||||
if (!val) {
|
||||
return
|
||||
}
|
||||
if (val.name === queryName.value ) {
|
||||
if (
|
||||
val.selectedTags &&
|
||||
val.selectedTags.indexOf(type2) == -1
|
||||
) {
|
||||
val.selectedTags = [type2]
|
||||
} else {
|
||||
val.selectedTags &&
|
||||
val.selectedTags.splice(
|
||||
val.selectedTags.indexOf(type2),
|
||||
1
|
||||
)
|
||||
}
|
||||
|
||||
}
|
||||
})
|
||||
// 智能算法-特殊处理
|
||||
if (whoShow1.value.itShowXiHaiAn) {
|
||||
if (!storageSearchInfo) {
|
||||
|
|
@ -859,6 +891,7 @@ export default defineComponent({
|
|||
// 校验
|
||||
const re = /^[0-9\u4E00-\u9FA5]*$/
|
||||
const getAppResources2 = () => {
|
||||
|
||||
globalFlag.value = false
|
||||
if (
|
||||
whoShow1.value.itShowQingDao &&
|
||||
|
|
@ -1236,7 +1269,24 @@ export default defineComponent({
|
|||
if (searchValue.value && !select2) {
|
||||
globalSearch()
|
||||
} else {
|
||||
paramsGetResources.infoList=[]
|
||||
if(select2=='组件服务'){
|
||||
queryName.value='组件类型'
|
||||
}else if(select2=='应用资源'){
|
||||
queryName.value='应用领域'
|
||||
}else if(select2=='基础设施'){
|
||||
searchType.value=type2
|
||||
}else{
|
||||
queryName.value=type2
|
||||
searchType.value=''
|
||||
}
|
||||
let info={attrType:queryName.value, attrValue: type2}
|
||||
paramsGetResources.infoList.push(info)
|
||||
paramsGetResources.type=select2
|
||||
getAppResources2()
|
||||
|
||||
|
||||
listKey.value++
|
||||
}
|
||||
}
|
||||
})
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -47,6 +47,7 @@ const integrationOrder = reactive({
|
|||
|
||||
// 融合服务--排序
|
||||
const changeOrder = (i, val, type) => {
|
||||
|
||||
console.log('i, val, type------------>', i, val, type);
|
||||
integrationOrder.orderField = val
|
||||
integrationOrder.orderType = type;
|
||||
|
|
|
|||
|
|
@ -230,6 +230,21 @@
|
|||
</span>
|
||||
</template>
|
||||
</div>
|
||||
<div
|
||||
v-if="
|
||||
selectCardsname === '打包模式'
|
||||
"
|
||||
class="label-content1"
|
||||
>
|
||||
发布时间：
|
||||
<template v-if="item.createDate">
|
||||
<span>
|
||||
{{ item.createDate.substring(0, 10) + ' ' }}
|
||||
</span>
|
||||
<span>{{ item.createDate.substring(11, 19) }}</span>
|
||||
</template>
|
||||
<template v-else>--</template>
|
||||
</div>
|
||||
<div v-else>
|
||||
发布时间：
|
||||
<template v-if="item.createDate">
|
||||
|
|
@ -989,7 +1004,7 @@
|
|||
margin: 0 10px 0 0;
|
||||
|
||||
.header-right {
|
||||
display: flex;
|
||||
// display: flex;
|
||||
font-size: 14px;
|
||||
color: #212121;
|
||||
|
||||
|
|
|
|||
|
|
@ -91,6 +91,10 @@ export default defineComponent({
|
|||
})
|
||||
}
|
||||
treeData.value = res.data && res.data.data || []
|
||||
// 只有一个，默认展开到二级菜单
|
||||
if(res.data && res.data.data.length == 1) {
|
||||
showBottom(treeData.value[0])
|
||||
}
|
||||
}
|
||||
}
|
||||
mybus.on('getDeptList', () => {
|
||||
|
|
|
|||
|
|
@ -480,6 +480,7 @@ import moment from 'moment'
|
|||
const props = defineProps({
|
||||
// 模糊查
|
||||
searchValue: { type: String, default: '' },
|
||||
searchType: { type: String, default: '' },
|
||||
})
|
||||
const current = ref(1)
|
||||
const videoTotal = ref(0)
|
||||
|
|
@ -621,6 +622,9 @@ const lookData = ref({})
|
|||
if (props.searchValue) {
|
||||
mapSearchParam.value.cameraName = props.searchValue
|
||||
}
|
||||
if (props.searchType) {
|
||||
tabClick(0, props.searchType.value)
|
||||
}
|
||||
// 消息列表页面
|
||||
let formPage = router.currentRoute.value.query.formPage || ''
|
||||
// 设施类型--无人机和单兵设备
|
||||
|
|
@ -835,6 +839,7 @@ const look = (row) => {
|
|||
}
|
||||
// 搜索
|
||||
const onSearch = (searchValue) => {
|
||||
debugger
|
||||
searchData()
|
||||
chengguoSearch()
|
||||
}
|
||||
|
|
@ -1128,14 +1133,6 @@ const selectType = ref('政务云资源')
|
|||
let tableHeight = ref('600')
|
||||
//tab切换点击事件
|
||||
const tabClick = (indexFather, name) => {
|
||||
console.log(
|
||||
'点击tab================>',
|
||||
indexFather,
|
||||
name,
|
||||
clickList.value,
|
||||
clickList.value[indexFather]
|
||||
)
|
||||
|
||||
selectedRowKeys.value = []
|
||||
selectedList.value = []
|
||||
if (clickList.value[indexFather].content.indexOf(name) != -1) {
|
||||
|
|
|
|||
|
|
@ -146,17 +146,18 @@ const getAppResources = (type, obj) => {
|
|||
num: res.data.data[key],
|
||||
})
|
||||
}
|
||||
} else if(key !== '云资源') { //云资源--暂时隐藏
|
||||
}
|
||||
else {
|
||||
jcList.value.push({
|
||||
name: key,
|
||||
num: res.data.data[key],
|
||||
})
|
||||
}
|
||||
}
|
||||
jcList.value.push({
|
||||
name: '会客厅',
|
||||
num: 4,
|
||||
})
|
||||
// jcList.value.push({
|
||||
// name: '会客厅',
|
||||
// num: 4,
|
||||
// })
|
||||
// 西海岸-单兵设备、无人机 获取数量
|
||||
if (whoShow1.value.itShowXiHaiAn) {
|
||||
getSoldierData('无人机')
|
||||
|
|
@ -328,11 +329,18 @@ const selectOne11 = (name) => {
|
|||
})
|
||||
}
|
||||
const selectOne2 = (name) => {
|
||||
console.log('点击===============》', name)
|
||||
let names=''
|
||||
if(name ==='云资源'){
|
||||
names='政务云资源'
|
||||
} else if(name ==='会客厅'){
|
||||
names='城市云脑会客厅'
|
||||
}else{
|
||||
names=name
|
||||
}
|
||||
router.push({
|
||||
path: '/DetailsPageconetent',
|
||||
query: {
|
||||
type: name,
|
||||
type: names,
|
||||
select: '基础设施',
|
||||
},
|
||||
})
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@
|
|||
<a-button type="primary" @click="modify(props.refObj.id, item)" v-if="item.backToFirst">
|
||||
修改
|
||||
</a-button>
|
||||
<a-popconfirm v-if="!item.ended" title="是否终止此流程?" ok-text="是" cancel-text="否"
|
||||
<a-popconfirm class="aaa" v-if="!item.ended" title="是否撤回此流程?" ok-text="是" cancel-text="否"
|
||||
@confirm="endThis(item.instanceId)" @cancel="cancel">
|
||||
<a-button type="primary" danger style="margin-left: 10px">
|
||||
撤回申请
|
||||
|
|
@ -463,7 +463,19 @@ const openView = (url) => {
|
|||
}
|
||||
|
||||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
.aaa{
|
||||
margin-right: 30px;
|
||||
}
|
||||
:deep(.ant-popover-inner) {
|
||||
position: fixed !important;
|
||||
|
||||
margin-right: 100px;
|
||||
|
||||
|
||||
|
||||
}
|
||||
.title {
|
||||
font-size: 0.18rem;
|
||||
color: #000;
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
<div class="title">基本信息</div>
|
||||
<a-popconfirm
|
||||
v-if="!props.refObj.ended"
|
||||
title="是否终止此流程?"
|
||||
title="是否撤回此流程?"
|
||||
ok-text="是"
|
||||
cancel-text="否"
|
||||
@confirm="endThis"
|
||||
|
|
|
|||
Loading…
Reference in New Issue