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
98bdfd71f3
|
|
@ -1,8 +1,8 @@
|
|||
/*
|
||||
* @Author: hisense.wuhongjian
|
||||
* @Date: 2022-08-25 14:37:49
|
||||
* @LastEditors: hisense.wuhongjian
|
||||
* @LastEditTime: 2022-10-13 16:46:41
|
||||
* @LastEditors: Light
|
||||
* @LastEditTime: 2022-10-26 10:48:52
|
||||
* @Description: 告诉大家这是什么
|
||||
*/
|
||||
var _global = {}
|
||||
|
|
@ -43,8 +43,8 @@ var CONFIGITEM = {
|
|||
},
|
||||
dev: {
|
||||
previewUrl: 'http://localhost:8080/',
|
||||
apiURL: 'http://192.168.124.233:8888/renren-admin',
|
||||
websocketURL: 'ws://192.168.124.236:8888/renren-admin/websocket'
|
||||
apiURL: 'http://192.168.124.243:8888/renren-admin',
|
||||
websocketURL: 'ws://192.168.124.243:8888/renren-admin/websocket'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
<template>
|
||||
<div>
|
||||
<el-input v-model="showDeptName" :placeholder="placeholder" @focus="deptDialog">
|
||||
<el-input v-model="showDeptName" :placeholder="placeholder" @focus="deptDialog" readonly
|
||||
@paste.native.capture.prevent="handlePaste">
|
||||
<el-button slot="append" icon="el-icon-search" @click="deptDialog"></el-button>
|
||||
</el-input>
|
||||
<el-input :value="value" style="display: none"></el-input>
|
||||
|
|
@ -63,6 +64,9 @@ export default {
|
|||
}
|
||||
},
|
||||
methods: {
|
||||
handlePaste() {
|
||||
return false
|
||||
},
|
||||
deptDialog() {
|
||||
this.expandedKeys = null
|
||||
if (this.$refs.tree) {
|
||||
|
|
|
|||
|
|
@ -41,7 +41,8 @@
|
|||
</el-menu-item> -->
|
||||
</el-menu>
|
||||
<el-menu class="aui-navbar__menu" mode="horizontal">
|
||||
<el-menu-item index="1">
|
||||
<!-- 暂时隐藏切换语言--勿删 -->
|
||||
<!-- <el-menu-item index="1">
|
||||
<el-dropdown placement="bottom" :show-timeout="0">
|
||||
<el-button size="mini">{{ $t("_lang") }}</el-button>
|
||||
<el-dropdown-menu slot="dropdown">
|
||||
|
|
@ -53,14 +54,14 @@
|
|||
>
|
||||
</el-dropdown-menu>
|
||||
</el-dropdown>
|
||||
</el-menu-item>
|
||||
<el-menu-item index="2">
|
||||
</el-menu-item> -->
|
||||
<!-- <el-menu-item index="2">
|
||||
<a href="//115.28.200.119:9091" target="_blank">
|
||||
<svg class="icon-svg aui-navbar__icon-menu" aria-hidden="true">
|
||||
<use xlink:href="#icon-earth"></use>
|
||||
</svg>
|
||||
</a>
|
||||
</el-menu-item>
|
||||
</el-menu-item> -->
|
||||
<el-menu-item index="3" v-if="$hasPermission('sys:notice:all')">
|
||||
<el-badge :is-dot="messageTip">
|
||||
<a href="#" @click="myNoticeRouter()"
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
-->
|
||||
<template>
|
||||
<div class="aui-theme-tools" :class="{ 'aui-theme-tools--open': isOpen }">
|
||||
<div class="aui-theme-tools__toggle" @click="isOpen = !isOpen">
|
||||
<!-- <div class="aui-theme-tools__toggle" @click="isOpen = !isOpen">
|
||||
<svg class="icon-svg" aria-hidden="true">
|
||||
<use xlink:href="#icon-setting"></use>
|
||||
</svg>
|
||||
</div>
|
||||
</div> -->
|
||||
<div class="aui-theme-tools__content">
|
||||
<div class="aui-theme-tools__item">
|
||||
<h3>Navbar</h3>
|
||||
|
|
|
|||
|
|
@ -45,28 +45,26 @@
|
|||
<el-form-item>
|
||||
<span v-if="this.departmentId === 1 || this.departmentId === 3">上架部门：</span>
|
||||
<span v-else>申请部门：</span>
|
||||
<el-select
|
||||
v-model="abilityDepartment"
|
||||
placeholder="请选择部门"
|
||||
filterable
|
||||
clearable
|
||||
>
|
||||
<el-select v-model="abilityDepartment" placeholder="请选择部门" filterable clearable>
|
||||
<el-option label="全部" value=""></el-option>
|
||||
<el-option v-for="item in departmentSelects" :key="item.label" :label="item.label" :value="item.value" v-bind="item"></el-option>
|
||||
<el-option v-for="item in departmentSelects" :key="item.label" :label="item.label" :value="item.value"
|
||||
v-bind="item"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<!--类型-->
|
||||
<el-form-item>
|
||||
<span>类型：</span>
|
||||
<el-select @change="changeIiem" v-if="this.departmentId === 2 || this.departmentId === 4" v-model="abilityType" placeholder="请选择类型" clearable>
|
||||
<el-select v-if="this.departmentId === 2 || this.departmentId === 4" v-model="abilityType" placeholder="请选择类型" clearable>
|
||||
<el-option label="全部" value=""></el-option>
|
||||
<el-option v-for="(item, i) in typeOptions" :key="`${item.name}${i}`" :label="item.name" :value="item.name" v-bind="item">
|
||||
<el-option v-for="(item, i) in typeOptions" :key="`${item.name}${i}`" :label="item.name" :value="item.name"
|
||||
v-bind="item">
|
||||
</el-option>
|
||||
</el-select>
|
||||
<el-select @change="changeIiem" v-else v-model="abilityType" placeholder="请选择类型" clearable>
|
||||
<el-option label="全部" value=""></el-option>
|
||||
<el-option v-for="(item, i) in typeOptions1" :key="`${item.name}${i}`" :label="item.name" :value="item.name" v-bind="item">
|
||||
<el-option v-for="(item, i) in typeOptions1" :key="`${item.name}${i}`" :label="item.name" :value="item.name"
|
||||
v-bind="item">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
|
@ -82,7 +80,8 @@
|
|||
}}</el-button>
|
||||
</el-form-item>
|
||||
<!-- 导出 -->
|
||||
<a class='export' :href="exportExcel+exportExcelType+'?'+exportExcelCondition+'&token='+token">导出全部</a>
|
||||
<a class='export'
|
||||
:href="exportExcel + exportExcelType + '?' + exportExcelCondition + '&token=' + token">导出全部</a>
|
||||
</el-form>
|
||||
<el-card shadow="never" class="aui-card--fill" v-if="homeIsShow">
|
||||
<div class="mod-demand__bsdemand">
|
||||
|
|
@ -117,7 +116,8 @@
|
|||
能力使用明细
|
||||
</span> -->
|
||||
<template v-if="detailFlag">
|
||||
<el-checkbox v-model="checked" @change='chagneCheckbox' style="position: absolute;right: 150px;margin-top: -15px;">隐藏空数据</el-checkbox>
|
||||
<el-checkbox v-model="checked" @change='chagneCheckbox'
|
||||
style="position: absolute;right: 150px;margin-top: -15px;">隐藏空数据</el-checkbox>
|
||||
<span class="detail-button" @click="goToDetail()">
|
||||
明细
|
||||
</span>
|
||||
|
|
@ -168,13 +168,9 @@
|
|||
</el-table>
|
||||
<!--明细表-->
|
||||
|
||||
<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"
|
||||
>
|
||||
<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">
|
||||
<el-table-column v-if="this.departmentId === 3" prop="deptName" label="上架部门" min-width="100%">
|
||||
</el-table-column>
|
||||
<el-table-column v-if="this.departmentId === 4" prop="deptName" label="申请部门" min-width="100%">
|
||||
|
|
@ -358,7 +354,7 @@ export default {
|
|||
{ name: '图层服务', value: 2 },
|
||||
{ name: '开发组件', value: 3 },
|
||||
{ name: '业务组件', value: 4 },
|
||||
{ name: '应用资源', value: 5 },
|
||||
{ name: '应用资源', value: 5 }
|
||||
|
||||
], // 类型备选列表
|
||||
detailFlag: false, // 明细返回按钮显示标志位
|
||||
|
|
@ -389,6 +385,10 @@ export default {
|
|||
},
|
||||
mounted() {
|
||||
// this.getFirstTree()
|
||||
console.log('this.$route.query.Id;', this.$route.query.type)
|
||||
if (this.$route.query.type === 'use') {
|
||||
this.handleChose(4)
|
||||
} else {
|
||||
if (this.departmentId === 1) {
|
||||
this.handleChose(3)
|
||||
// this.departmentId = 1;
|
||||
|
|
@ -397,6 +397,7 @@ export default {
|
|||
// this.departmentId = 2;
|
||||
} else {
|
||||
}
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
// ...mapState(['departmentSelects'])
|
||||
|
|
@ -414,10 +415,6 @@ export default {
|
|||
closeModal() {
|
||||
this.detailsVisible = false
|
||||
},
|
||||
changeIiem(){
|
||||
this.currentPage=1
|
||||
this.pageSize=10
|
||||
},
|
||||
handleCurrentChange (val) {
|
||||
console.log('val------------>', val)
|
||||
this.currentPage = val
|
||||
|
|
@ -1169,24 +1166,16 @@ input::placeholder {
|
|||
background: #fff;
|
||||
border: 1px solid #dcdfe6;
|
||||
color: #000;
|
||||
color: #FFF;
|
||||
background-color: #0058e1;
|
||||
border-color: #0058e1;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.export:hover {
|
||||
border-color: #c5ddfd;
|
||||
background-color: #ecf4fe;
|
||||
color: #0058e1;
|
||||
text-decoration: none;
|
||||
background: #65a5f9;
|
||||
border-color: #65a5f9;
|
||||
color: #FFF;
|
||||
}
|
||||
|
||||
.export:active {
|
||||
border-color: #c5ddfd;
|
||||
background-color: #ecf4fe;
|
||||
color: #0058e1;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.export:visited {
|
||||
color: #fff;
|
||||
text-decoration: none;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -15,16 +15,28 @@
|
|||
<el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
|
||||
<el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle"
|
||||
style="width: 100%;">
|
||||
<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
|
||||
<el-table-column prop="title" :label="$t('notice.title')" header-align="center" align="center"></el-table-column>
|
||||
<el-table-column prop="title" :label="$t('notice.title')" header-align="center" align="center" width="180">
|
||||
</el-table-column>
|
||||
<!-- 内容 prop="content"-->
|
||||
<el-table-column :label="$t('news.content')" header-align="center" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-tooltip effect="dark" :content="scope.row.content" placement="top">
|
||||
<span class="text-ellipsis">{{ scope.row.content }}</span>
|
||||
</el-tooltip>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="type" :label="$t('notice.type')" header-align="center" align="center" width="150">
|
||||
<template slot-scope="scope">
|
||||
{{ $getDictLabel("notice_type", scope.row.type) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="senderName" :label="$t('notice.senderName')" header-align="center" align="center" width="150"></el-table-column>
|
||||
<el-table-column prop="senderDate" :label="$t('notice.senderDate')" header-align="center" align="center" width="170"></el-table-column>
|
||||
<el-table-column prop="senderName" :label="$t('notice.senderName')" header-align="center" align="center"
|
||||
width="150"></el-table-column>
|
||||
<el-table-column prop="senderDate" :label="$t('notice.senderDate')" header-align="center" align="center"
|
||||
width="170"></el-table-column>
|
||||
<el-table-column prop="status" :label="$t('notice.status')" header-align="center" align="center" width="130">
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="scope.row.status === 0" size="small" type="danger">{{ $t('notice.status0') }}</el-tag>
|
||||
|
|
@ -33,19 +45,17 @@
|
|||
</el-table-column>
|
||||
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
|
||||
<template slot-scope="scope">
|
||||
<el-button v-if="scope.row.status === 0" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
|
||||
<el-button v-if="scope.row.status === 1" type="text" size="small" @click="viewHandle(scope.row)">{{ $t('notice.view') }}</el-button>
|
||||
<el-button v-if="scope.row.status === 0" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">
|
||||
{{ $t('update') }}</el-button>
|
||||
<el-button v-if="scope.row.status === 1" type="text" size="small" @click="viewHandle(scope.row)">{{
|
||||
$t('notice.view')
|
||||
}}</el-button>
|
||||
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</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"
|
||||
<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>
|
||||
<!-- 弹窗, 新增 / 修改 -->
|
||||
|
|
@ -93,3 +103,13 @@ export default {
|
|||
}
|
||||
}
|
||||
</script>
|
||||
<style scoped>
|
||||
.text-ellipsis {
|
||||
/*1. 先强制一行内显示文本*/
|
||||
white-space: nowrap;
|
||||
/*2. 超出的部分隐藏*/
|
||||
overflow: hidden;
|
||||
/*3. 文字用省略号替代超出的部分*/
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ var CONFIGITEM = {
|
|||
},
|
||||
backUrl: 'http://localhost:8001',
|
||||
previewUrl: 'http://192.168.124.243:9796/',
|
||||
websocketURL: '192.168.124.254:8888/renren-admin',
|
||||
websocketURL: '192.168.124.243:8888/renren-admin',
|
||||
// websocketURL: '10.18.1.99:8889/renren-admin',
|
||||
POI_URL:
|
||||
'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@
|
|||
break
|
||||
case '资源申请量':
|
||||
window.open(
|
||||
window.SITE_CONFIG.backUrl + '/#/abilityStatistics-index',
|
||||
window.SITE_CONFIG.backUrl + '/#/abilityStatistics-index?type=use',
|
||||
'_blank'
|
||||
)
|
||||
break
|
||||
|
|
|
|||
|
|
@ -208,6 +208,7 @@
|
|||
onBeforeUnmount,
|
||||
h,
|
||||
defineProps,
|
||||
nextTick,
|
||||
} from 'vue'
|
||||
import {
|
||||
getMyProcessInstancePage,
|
||||
|
|
@ -252,16 +253,19 @@
|
|||
typeList.value.push('设备申请')
|
||||
}
|
||||
const typeStrObj = {
|
||||
能力上架: 'resourcemountapply',
|
||||
能力下架: 'resourcundercarriageapply',
|
||||
能力需求: 'abilitydemandapply',
|
||||
需求评论: 'comment_review',
|
||||
'能力上架': 'resourcemountapply',
|
||||
'能力下架': 'resourcundercarriageapply',
|
||||
'能力需求': 'abilitydemandapply',
|
||||
'需求评论': 'comment_review',
|
||||
}
|
||||
let tabList = ref(['全部', '审核中', '审核完成'])
|
||||
const contentList = reactive({ data: [] })
|
||||
let tabIndex = ref(0)
|
||||
let typeIndex = ref(0)
|
||||
let typeName = ref(typeList.value[0])
|
||||
if(router.currentRoute.value.query.tabTypeName) {
|
||||
typeName.value = router.currentRoute.value.query.tabTypeName
|
||||
}
|
||||
const videoVisible = ref(false)
|
||||
const numFlag = ref(true)
|
||||
const columns = ref([
|
||||
|
|
@ -306,7 +310,7 @@
|
|||
ended.value = ''
|
||||
page.value = 1
|
||||
typeIndex.value = index
|
||||
typeName.value = item
|
||||
typeName.value = item;
|
||||
getApplyList()
|
||||
}
|
||||
|
||||
|
|
@ -565,7 +569,6 @@
|
|||
params.processDefinitionKey = processDefinitionKey.value
|
||||
getMyProcessInstancePage(params).then((res) => {
|
||||
contentList.data = []
|
||||
// initNum(name.value)
|
||||
console.log(res.data.data.list)
|
||||
contentList.data = res.data.data.list
|
||||
total.value = res.data.data.total
|
||||
|
|
|
|||
Loading…
Reference in New Issue