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

back/src/components/ren-dept-tree/src/ren-dept-tree.vue

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

front/public/static/config/basicConfig.js

@@ -1,14 +1,14 @@
 /*
  * @Author: hisense.wuhongjian
  * @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: 系统静态参数配置
  */
 var _global = {}
 var CONFIGITEM = {
   // version: 'qingdao', //青岛
-  version: 'xihaian', // 西海岸
+  version: 'dev', // 西海岸
   // version: 'qingdao', // 开发
   // version: 'zhanTingDev', // 展厅dev (2022-09-13:姜永超让添加)
   // version: 'qingdao', // 测试
@@ -86,8 +86,8 @@ var CONFIGITEM = {
         userPwd: '',
       },
       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',
       POI_URL:
         'http://15.72.178.129:8090/iserver/services/addressmatch-qingdaoPOI181015/restjsr/v1/address',

front/src/views/personalCenter/components/asideMenu.vue

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