标签修改

src/router/routes.js

@@ -140,12 +140,20 @@ const appRoutes = [
               },
             ]
           },
+          { //  标签管理
+            path: '/systemManagement/lvot', name: 'lvot', component: resolve => require(['@/views/label/labelList'], resolve), //Tbls,
+            meta: { title: '标签管理', menuPath: true, menuIcon: 'setting', hideInBread: false, },
+          },
         ]
       }, 
       {
         path: '/house', name: 'house', component: resolve => require(['@/components/Layout/content-wrapper'], resolve), // ContentWrapper,
         meta: { title: '住宅信息', menuPath: true, menuIcon: 'home', hideInBread: true, requirePerm: false, authCode: '0001' },
         children: [ 
+          {
+            path: '/houseData/basicInfoByLabel', name: 'basicInfoByLabel', component: resolve => require(['@/views/houseData/basicInfoByLabel'], resolve), //basicInfo,
+            meta: { title: '小区列表-标签', menuPath: true, hideInBread: false, },
+          },
           { // 小区列表
             path: '/houseData/basicInfo', name: 'basicInfo', component: resolve => require(['@/views/houseData/basicInfo'], resolve), //basicInfo,
             meta: { title: '住宅小区', menuPath: true, hideInBread: false, authCode: '000101', menuIcon: 'home'},

src/server/api.js

@@ -37,10 +37,11 @@ case 'huangpu-prod':
 default: // 默认环境下（开发环境）
   // BASE_URL = 'http://31.0.161.39/apiv2'
   // BASE_URL = 'http://211.136.105.193/apiv2'
+  // BASE_URL = 'http://yangpu-hm.omniview.pro/api/v2'
   BASE_URL = 'http://yangpu-hm.omniview.pro/api/v2'
-  // BASE_URL = 'http://huangpu.hm.omniview.pro/api/v2'
-  // BASE_URL = 'http://xuhui.hm.omniview.pro/api/v2'
   // BASE_URL = 'http://pudong.hm.omniview.pro/api/v2'
+  // BASE_URL = 'http://xuhui.hm.omniview.pro/api/v2'
+  BASE_URL = 'http://yangpu-hm.omniview.pro/api/v2'
   // BASE_URL = 'http://211.136.105.193/apiv2'
   break
 }
@@ -185,6 +186,10 @@ export default {
   GET_USER_PEIMISSION: '/service-permission/user/perms', // 当前用户角色权限树 -- 传userId
   GET_ALL_PEIMISSION: '/service-permission/perms', // 全部角色权限树 
   GET_ALL_ROLE: '/service-permission/menu/tree', //获取权限
+  GET_PREMSPOINT_LIST: '/service-permission/perm/points', //获取功能点清单
+  POST_PREMSBRANCH: '/service-permission/perm/perm', //单个新增权限分支
+  DELETE_PREMSPOINT: '/service-permission/perm/point/{id}', //删除功能点
+  SYSTEM_LIST_ALL_GET: '/service-user/user/systems', //查询系统列表
   
   GET_USER_CODE: '/service-permission/user/menus/code', //获取用户权限
   GET_USER_PERM: '/service-permission/user/menus/{id}',
@@ -209,4 +214,19 @@ export default {
   GET_RIZHI_INFO: '/service-log/operateRecord/{id}', //日志详情
   GET_XIAOQUTOTAL: '/service-basicdatasync-ddd/summary/community/totare', //查询小区住宅面积，总楼栋数，总户数信息
 
+  GET_LABEL_LIST: '/service-customkey-ddd/label/tree', // 获取标签列表
+  GET_LABEL_DETAIL: '/service-customkey-ddd/label/{id}', // 查看标签详情
+  DELETE_SINGLE_LABEL: '/service-customkey-ddd/label/{id}', // 根据id删除某个标签
+  POST_SINGLE_LABEL: '/service-customkey-ddd/label', // 新增标签
+  PUT_LABEL_INFO: '/service-customkey-ddd/label/{id}', // 修改标签信息
+  POST_AVAILABLE_KEY: '/service-customkey-ddd/entityKeyDic', // 可查询字段新增
+  PUT_AVAILABLE_KEY: '/service-customkey-ddd/entityKeyDic/{id}', // 可查询字段修改
+  GET_AVAILABLE_KEY_LIST: '/service-customkey-ddd/entityKeyDics', // 可查询字段列表
+  DELETE_AVAILABLE_KEY: '/service-customkey-ddd/entityKeyDic/{id}', // 删除字段
+  GET_SINGLE_KEY_INFO: '/service-customkey-ddd/entityKeyDic/{id}', //可查询字段详情
+  GET_LABEL_BIND_FILTER_RESULT: '/service-customkey-ddd/labelResource', // 点击保存后查询是否有结果，有结果则调用绑定接口
+  POST_LABEL_RESULT_PREVIEW: '/service-customkey-ddd/findLabelObject', // 标签预览
+  POST_LABEL_CREATE_CONFIRM: '/service-customkey-ddd/label/confirm',
+  GET_ID_INFO_BY_LABEL: '/service-customkey-ddd/label/resource/datas',
+  GET_WY_AND_YWH_LIST: '/service-customkey-ddd/datas'
 }

src/views/houseData/basicInfoByLabel.vue

@@ -369,7 +369,6 @@ export default {
       this.tableData_ywh = []
     },
     searchXXXByLabel() {
-      console.log(this.checkedKeys)
 
       if(this.checkedKeys.length > 0) {
         this.$ajax.get({
@@ -425,7 +424,7 @@ export default {
     },
     onCheck(keys, node) {
       // console.log(keys, node.node.$children.length)
-      this.checkedKeys = []
+      // this.checkedKeys = []
       console.log(keys, node)
       for(let i = 0; i < keys.length; i++) {
         console.log(keys[i])

src/views/label/labelRightSide.vue

@@ -493,6 +493,7 @@ export default {
                       val: !formData['inputTwo-' + i+'-'+index] ? formData['inputOne-' + i+'-'+index] : formData['inputOne-' + i+'-'+index] + ',' + formData['inputTwo-' + i+'-'+index],
                       codition: formData['codition-' + i + '-' +index],
                       relation: !!formData['relation-' + i + '-' + index]? formData['relation-' + i + '-' + index]: 'and',
+                      randomNum: formData['randomNumInner-' + i + '-' +index],
                     })
                   })
 
@@ -532,7 +533,7 @@ export default {
       console.log(this.loopContent)
 
       Vue.set(this.loopContent, 'data', [
-        ...this.loopContent.data, {randomNum: Math.random().toString(), serial: '新分组', relation: 'and', labelSelConditionList: [ { key: '', val: '', tableName: '', codition: 'eq', relation: '' } ] }
+        ...this.loopContent.data, {randomNum: Math.random().toString(), serial: '新分组', relation: 'and', labelSelConditionList: [ { key: '', val: '', tableName: '', codition: 'eq', relation: '', randomNum: Math.random() } ] }
       ])
 
       this.$forceUpdate()
@@ -556,6 +557,7 @@ export default {
             val: !formData['inputTwo-' + i+'-'+index] ? formData['inputOne-' + i+'-'+index] : formData['inputOne-' + i+'-'+index] + ',' + formData['inputTwo-' + i+'-'+index],
             codition: formData['codition-' + i + '-' +index],
             relation: !!formData['relation-' + i + '-' + index]? formData['relation-' + i + '-' + index]: 'and',
+            randomNum: formData['randomNumInner-' + i + '-' +index],
           })
         })
 
@@ -684,7 +686,7 @@ export default {
       this.deleteVisible = !this.deleteVisible
     },
     resetFormFields() {
-      this.loopContent.data = [ { randomNum: Math.random(), serial: '新分组', relation: 'and', labelSelConditionList: [ {key: '', val: '', tableName: '', codition: 'eq', relation: '' } ] } ]
+      this.loopContent.data = [ { randomNum: Math.random(), serial: '新分组', relation: 'and', labelSelConditionList: [ {key: '', val: '', tableName: '', codition: 'eq', relation: '', randomNum: Math.random()} ] } ]
 
       this.resultList = []
       this.labelForm.resetFields()
@@ -744,6 +746,7 @@ export default {
                 val: !formData['inputTwo-' + i+'-'+index] ? formData['inputOne-' + i+'-'+index] : formData['inputOne-' + i+'-'+index] + ',' + formData['inputTwo-' + i+'-'+index],
                 codition: formData['codition-' + i + '-' +index],
                 relation: !!formData['relation-' + i + '-' + index]? formData['relation-' + i + '-' + index]: 'and',
+                randomNum: formData['randomNumInner-' + i + '-' +index],
               })
             })
             innerResult.push({
@@ -813,6 +816,7 @@ export default {
                       val: !formData['inputTwo-' + i+'-'+index] ? formData['inputOne-' + i+'-'+index] : formData['inputOne-' + i+'-'+index] + ',' + formData['inputTwo-' + i+'-'+index],
                       codition: formData['codition-' + i + '-' +index],
                       relation: !!formData['relation-' + i + '-' + index]? formData['relation-' + i + '-' + index]: 'and',
+                      randomNum: formData['randomNumInner-' + i + '-' +index],
                     })
                   })