wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev

This commit is contained in:
gongjiale 2022-10-22 15:29:52 +08:00
parent 1427424073 6b1fc28b4b
commit 70a015cb01
4 changed files with 2279 additions and 1971 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
back/src/components/ren-dept-tree/src/ren-dept-tree.vue
View File

@ -1,42 +1,36 @@
<template> <template>
<div> <div>
<el-input v-model="showDeptName" :placeholder="placeholder" @focus="deptDialog"> <el-input v-model="showDeptName" :placeholder="placeholder" @focus="deptDialog">
<el-button slot="append" icon="el-icon-search" @click="deptDialog"></el-button> <el-button slot="append" icon="el-icon-search" @click="deptDialog"></el-button>
</el-input> </el-input>
<el-input :value="value" style="display: none"></el-input> <el-input :value="value" style="display: none"></el-input>
<el-dialog :visible.sync="visibleDept" width="30%" :modal="false" :title="placeholder" :close-on-click-modal="false" :close-on-press-escape="false"> <el-dialog :visible.sync="visibleDept" width="30%" :modal="false" :title="placeholder" :close-on-click-modal="false"
<el-form size="mini" :inline="true"> :close-on-press-escape="false">
<el-form-item :label="$t('keyword')"> <el-form size="mini" :inline="true">
<el-input v-model="filterText"></el-input> <el-form-item :label="$t('keyword')">
</el-form-item> <el-input v-model="filterText"></el-input>
<el-form-item> </el-form-item>
<!-- <el-button type="default">{{ $t('query') }}</el-button> --> <el-form-item>
<el-button type="default">{{ $t('query') }}</el-button> <!-- <el-button type="default">{{ $t('query') }}</el-button> -->
</el-form-item> <el-button type="default">{{ $t('query') }}</el-button>
</el-form> </el-form-item>
<el-tree </el-form>
class="filter-tree" <el-tree class="filter-tree" :data="deptList" :default-expanded-keys="expandedKeys"
:data="deptList" :props="{ label: 'name', children: 'children' }" :expand-on-click-node="false" :filter-node-method="filterNode"
:default-expanded-keys="expandedKeys" :highlight-current="true" node-key="id" ref="tree">
:props="{ label: 'name', children: 'children' }" </el-tree>
:expand-on-click-node="false" <template slot="footer">
:filter-node-method="filterNode" <el-button type="default" @click="cancelHandle()" size="mini">{{ $t('cancel') }}</el-button>
:highlight-current="true" <el-button v-if="query" type="info" @click="clearHandle()" size="mini">{{ $t('clear') }}</el-button>
node-key="id" <el-button type="primary" @click="commitHandle()" size="mini">{{ $t('confirm') }}</el-button>
ref="tree"> </template>
</el-tree> </el-dialog>
<template slot="footer">
<el-button type="default" @click="cancelHandle()" size="mini">{{ $t('cancel') }}</el-button>
<el-button v-if="query" type="info" @click="clearHandle()" size="mini">{{ $t('clear') }}</el-button>
<el-button type="primary" @click="commitHandle()" size="mini">{{ $t('confirm') }}</el-button>
</template>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: 'RenDeptTree', name: 'RenDeptTree',
data () { data() {
return { return {
filterText: '', filterText: '',
visibleDept: false, visibleDept: false,
@ -56,15 +50,20 @@ export default {
placeholder: String placeholder: String
}, },
watch: { watch: {
filterText (val) { filterText(val) {
this.$refs.tree.filter(val) this.$refs.tree.filter(val)
}, },
deptName (val) { deptName(val) {
this.showDeptName = val this.showDeptName = val
},
visibleDept(val) {
if (!val) {
this.filterText = ''
}
} }
}, },
methods: { methods: {
deptDialog () { deptDialog() {
this.expandedKeys = null this.expandedKeys = null
if (this.$refs.tree) { if (this.$refs.tree) {
this.$refs.tree.setCurrentKey(null) this.$refs.tree.setCurrentKey(null)
@ -72,11 +71,11 @@ export default {
this.visibleDept = true this.visibleDept = true
this.getDeptList(this.value) this.getDeptList(this.value)
}, },
filterNode (value, data) { filterNode(value, data) {
if (!value) return true if (!value) return true
return data.name.indexOf(value) !== -1 return data.name.indexOf(value) !== -1
}, },
getDeptList (id) { getDeptList(id) {
return this.$http.get('/sys/dept/list').then(({ data: res }) => { return this.$http.get('/sys/dept/list').then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
@ -86,14 +85,14 @@ export default {
this.$refs.tree.setCurrentKey(id) this.$refs.tree.setCurrentKey(id)
this.expandedKeys = [id] this.expandedKeys = [id]
}) })
}).catch(() => {}) }).catch(() => { })
}, },
cancelHandle () { cancelHandle() {
this.visibleDept = false this.visibleDept = false
this.deptList = [] this.deptList = []
this.filterText = '' this.filterText = ''
}, },
clearHandle () { clearHandle() {
this.$emit('input', '') this.$emit('input', '')
this.$emit('update:deptName', '') this.$emit('update:deptName', '')
this.showDeptName = '' this.showDeptName = ''
@ -101,7 +100,7 @@ export default {
this.deptList = [] this.deptList = []
this.filterText = '' this.filterText = ''
}, },
commitHandle () { commitHandle() {
const node = this.$refs.tree.getCurrentNode() const node = this.$refs.tree.getCurrentNode()
if (!node) { if (!node) {
this.$message.error(this.$t('dept.chooseerror')) this.$message.error(this.$t('dept.chooseerror'))

10
front/public/static/config/basicConfig.js
View File

@ -1,14 +1,14 @@
/* /*
* @Author: hisense.wuhongjian * @Author: hisense.wuhongjian
* @Date: 2020-07-07 16:03:23 * @Date: 2020-07-07 16:03:23
* @LastEditors: hisense.wuhongjian * @LastEditors: Light
* @LastEditTime: 2022-10-13 21:31:09 * @LastEditTime: 2022-10-22 11:08:16
* @Description: 系统静态参数配置 * @Description: 系统静态参数配置
*/ */
var _global = {} var _global = {}
var CONFIGITEM = { var CONFIGITEM = {
// version: 'qingdao', //青岛 // version: 'qingdao', //青岛
version: 'xihaian', // 西海岸 version: 'dev', // 西海岸
// version: 'qingdao', // 开发 // version: 'qingdao', // 开发
// version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加) // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
// version: 'qingdao', // 测试 // version: 'qingdao', // 测试
@ -86,8 +86,8 @@ var CONFIGITEM = {
userPwd: '', userPwd: '',
}, },
backUrl: 'http://localhost:8001', backUrl: 'http://localhost:8001',
previewUrl: 'http://192.168.124.236:9796/', previewUrl: 'http://192.168.124.243:9796/',
websocketURL: '192.168.124.233:8888/renren-admin', websocketURL: '192.168.124.243:8888/renren-admin',
// websocketURL: '10.18.1.99:8889/renren-admin', // websocketURL: '10.18.1.99:8889/renren-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',

4144
front/src/views/home/infrastructurePage.vue
View File

File diff suppressed because it is too large Load Diff

15
front/src/views/personalCenter/components/asideMenu.vue
View File

@ -33,15 +33,16 @@ export default defineComponent({
imgActive: require('@/assets/personalCenter/applyactive.png'), imgActive: require('@/assets/personalCenter/applyactive.png'),
key: 'apply', key: 'apply',
} }
const push = {
title: '我的发布',
img: require('@/assets/personalCenter/push.png'),
imgActive: require('@/assets/personalCenter/pushactive.png'),
key: 'push',
}
let menuList = [ let menuList = [
car, car,
{
title: '我的发布',
img: require('@/assets/personalCenter/push.png'),
imgActive: require('@/assets/personalCenter/pushactive.png'),
key: 'push',
},
apply, apply,
push,
{ {
title: '我的收藏', title: '我的收藏',
img: require('@/assets/personalCenter/collect.png'), img: require('@/assets/personalCenter/collect.png'),
@ -69,7 +70,7 @@ export default defineComponent({
] ]
// 西海岸 // 西海岸
if (itShowXiHaiAn) { if (itShowXiHaiAn) {
menuList = [car, apply] menuList = [car, apply, push]
} }
const selectedKeys = ref(['apply']) const selectedKeys = ref(['apply'])