浏览代码

解决冲突

YaolongHan 4 年之前
父节点
当前提交
ed50a9976f

+ 2 - 2
config/index.js

@@ -478,8 +478,8 @@ module.exports = {
     // Paths
     assetsRoot: path.resolve(__dirname, '../dist'),
     assetsSubDirectory: 'static',
-    assetsPublicPath: '/adm/',// 39 配置
-    // assetsPublicPath: '/',
+    // assetsPublicPath: '/adm/',// 39 配置
+    assetsPublicPath: '/',
 
 
     /**

+ 1 - 1
src/api/scan/request.js

@@ -1382,7 +1382,7 @@ export function countProperty(param, success) {
 
 //根据id删除资产信息
 export function deleteProperty(param, success) {
-  let url = `${baseUrl}${dataCenter}/property/delete`;
+  let url = `${baseUrl}${object}/property/delete`;
   http.postJson(url, param, success)
 }
 

+ 1 - 1
src/components/business_space/newGraphy/graphy.vue

@@ -29,7 +29,7 @@
         <div>
           <el-autocomplete popper-class="my-autocomplete" v-model="search" :fetch-suggestions="querySearch" placeholder="输入平面图中已有的业务空间名称进行查找"
             width="180px" @select="handleSelect">
-            <i class="el-icon-search el-input__icon" slot="suffix" @click="handleSelect"></i>
+            <i class="el-icon-search el-input__icon" slot="suffix"></i>
             <template slot-scope="{ item }">
               <div class="name" style="position: relative;padding-right:40px;overflow: hidden;text-overflow:ellipsis;white-space: nowrap;"
                 :title="item.data.RoomLocalName">

+ 6 - 2
src/components/ledger/details/detail/exhibitionBaseInformation.vue

@@ -91,8 +91,12 @@ export default {
       oInput.remove()
     },
     handleName(infoPoint, val) {
-      let text = `${infoPoint}:${val}`;
-      return text.length > 21 ? val.substring(0, 21 - `${infoPoint}:`.length) + '...' : val;
+        let value = val;
+        if (Array.isArray(value)) {
+          value = JSON.stringify(val)
+        }
+      let text = `${infoPoint}:${value}`;
+      return text.length > 21 ? value.substring(0, 21 - `${infoPoint}:`.length) + '...' : value;
     }
   }
 }

+ 6 - 2
src/components/ledger/details/detail/exhibitionCrux.vue

@@ -103,8 +103,12 @@ export default {
         oInput.remove()
       },
       handleName(infoPoint, val) {
-        let text = `${infoPoint}:${val}`;
-        return text.length > 21 ? val.substring(0, 21-`${infoPoint}:`.length) + '...' : val;
+        let value = val;
+        if (Array.isArray(value)) {
+          value = JSON.stringify(val)
+        }
+        let text = `${infoPoint}:${value}`;
+        return text.length > 21 ? value.substring(0, 21-`${infoPoint}:`.length) + '...' : value;
       }
     }
   }

+ 1 - 1
src/components/ledger/handsontables/assets.vue

@@ -729,7 +729,7 @@ export default {
       }
       let param = []
       params.map(item => {
-        param.push({ EquipID: item.EquipID })
+        param.push({ id: item.id })
       })
       this.$confirm("此操作将删除资产,是否继续?", "提示", {
         confirmButtonText: '确定',

+ 16 - 16
src/components/ledger/lib/linkassets.vue

@@ -15,7 +15,7 @@
     <el-row style="margin-top:30px;" v-show="spaceShow">
       <span class="condition-title">分区类型:</span>
       <el-select v-model="zone" filterable size="small" @change="handleChangeZone" style="width:350px;">
-        <el-option v-for="item in zoneList" :key="item.Code" :label="item.Name" :value="item.Code"></el-option>
+        <el-option v-for="item in zoneList" :key="item.code" :label="item.name" :value="item.code"></el-option>
       </el-select>
     </el-row>
     <el-row style="margin-top:30px;" v-show="spaceShow && zone != 'all' && zone != 'noKnow'">
@@ -86,7 +86,7 @@ export default {
     //获取未关联资产的设备或部件类型
     getPartsDieType() {
       let _this = this
-      TypePartsDie(res => {
+      TypePartsDie(res => {       
         _this.deviceTypeList = res.content
       })
     },
@@ -204,7 +204,7 @@ export default {
     //判断是否显示空间分区选择
     zoneListIsShow() {
       let lastVal = this.buildFloor.slice(-1)[0]
-      if (!lastVal || lastVal == 'noKnow' || this.buildFloor[0] == 'all' || this.deviceType.length != 4) {
+      if (!lastVal || lastVal == 'noKnow' || this.buildFloor[0] == 'all' || this.deviceType.length != 6) {
         this.spaceShow = false
       } else {
         this.spaceShow = true
@@ -224,27 +224,27 @@ export default {
         let recursionGetData = (pageNum, zone) => {
           pageNum = pageNum ? pageNum : 1
           let params = {
-            Orders: "CreateTime desc, id asc",
-            PageNumber: pageNum,
-            PageSize: 1000,
-            Projection: ["id", "RoomName", "RoomLocalName", "CreateTime"],
-            ZoneType: zone
+            orders: "createTime desc, id asc",
+            pageNumber: pageNum,
+            pageSize: 1000,
+            projection: ["id", "name", "localName", "createTime"],
+            zoneType: zone
           }
           if (this.spaceShow) {
             if (this.buildFloor.length == 2 && this.buildFloor[1] != 'all') {
-              pa.BuildingId = this.buildFloor[0];
-              pa.FloorId = this.buildFloor[1];
+              params.buildingId = this.buildFloor[0];
+              params.floorId = this.buildFloor[1];
             } else {
-              pa.BuildingId = this.buildFloor[0];
+              params.buildingId = this.buildFloor[0];
             }
           }
           zoneQuery(params, res => {
-            nodes = nodes.concat(res.Content.map(item => ({
-              value: item.RoomID,
-              label: item.RoomLocalName ? item.RoomLocalName : item.RoomName
+            nodes = nodes.concat(res.content.map(item => ({
+              value: item.id,
+              label: item.localName ? item.localName : item.name
             })))
-            if (res.Total / (res.PageSize * res.PageNumber) > 1) {
-              recursionGetData(res.PageNumber + 1, zone)
+            if (res.total / (res.pageSize * res.pageNumber) > 1) {
+              recursionGetData(res.pageNumber + 1, zone)
             } else {
               this.spaceList = nodes
             }

+ 1 - 1
src/components/model/file/addFloorDialog.vue

@@ -196,7 +196,7 @@
             ProjectId: this.projectId,
             ReplaceReason: null,
             Size: this.form.file.size,
-            UserName: this.userInfo.username,
+            UserName: this.userInfo.userName,
             UserId: this.userInfo.userId
           };
           request.modelFileUpload(data, res => {

+ 1 - 1
src/components/model/file/addFolder.vue

@@ -11,7 +11,7 @@
           class="demo-ruleForm"
         >
           <el-form-item label="文件夹名称" prop="name">
-            <el-input v-model="ruleForm.name"  @keyup.enter.native="addFolder" focus></el-input>
+            <el-input v-model.trim="ruleForm.name"  @keyup.enter.native="addFolder" focus></el-input>
           </el-form-item>
         </el-form>
       </div>

+ 1 - 1
src/components/model/file/changeFolderName.vue

@@ -16,7 +16,7 @@
           class="demo-ruleForm"
         >
           <el-form-item label="文件夹名称" prop="name">
-            <el-input v-model="ruleForm.name" @keyup.enter.native="changeFolder" focus></el-input>
+            <el-input v-model.trim="ruleForm.name" @keyup.enter.native="changeFolder" focus></el-input>
           </el-form-item>
         </el-form>
       </div>

+ 1 - 1
src/components/ready/buildfloor/buildfloorCascader.vue

@@ -12,7 +12,7 @@ export default {
       props: {
         multiple: true,
         value: 'id',
-        label: 'name',
+        label: 'localName',
         children: 'floor'
       },
       options: []

+ 5 - 9
src/components/ready/buildfloor/formItems.vue

@@ -175,15 +175,11 @@ export default {
         pageSize: 1000,
         orders: "sort asc, name desc",
       };
-      getDataDictionary(params, (res) => {
-        let arr = res.content.map((item) => {
-          const category = ["ENUM", "MENUM", "BOOLEAN"];
-          if (
-            item.category == "STATIC" &&
-            item.dataType.includes(category) &&
-            item.dataSource
-          ) {
-            item.options = item.dataSource;
+      getDataDictionary(params, res => {
+        let arr = res.content.map(item => {
+          const category = ['ENUM', 'MENUM', 'BOOLEAN']
+          if (item.category == 'STATIC' && category.includes(item.dataType) && item.dataSource) {
+            item.options = item.dataSource
             if (item.options[0]) {
               item.props = {
                 value: "code",

+ 5 - 5
src/data/menus.js

@@ -46,11 +46,11 @@ export default [
     icon: 'icon-jianzhu'
   },
 // 需采集的信息点
-//   {
-//     path: '/ready/collectsetting',
-//     name: '需采集的信息点',
-//     icon: 'icon-xinxi'
-//   },
+  {
+    path: '/ready/collectsetold',
+    name: '需采集的信息点',
+    icon: 'icon-xinxi'
+  },
 // 扫楼App用户管理
   {
     path: '/ready/appuser',

+ 7 - 284
src/framework/layout/layout-store.js

@@ -2,6 +2,8 @@ import frameworkApi from '@/api/framework'
 import storage from '@/framework/utils/storage'
 import lStorage from '@/utils/localStorage'
 
+import project from "./project";
+
 const KEY_MENU_SELECTED = 'menu_selected'
 const KEY_PROJECT_SELECTED = 'global_project_selected'
 const KEY_PAGE_BRANDCRUMB = 'page_brandcrumb'
@@ -24,286 +26,7 @@ export default {
     },
     projectId: 'Pj1101051029',
     group_code: '',
-    // projects: [ // 14 全平台测试环境
-    //   {
-    //     id: "Pj1101051029",
-    //     name: "北京万达广场",
-    //     pwd: "saga123456",
-    //     group_code: "WD"
-    //   },
-    //   {
-    //     id: "Pj1101050029",
-    //     name: "东坝万达广场",
-    //     pwd: "saga123456",
-    //     group_code: "WD"
-    //   },
-    //   {
-    //     id: "Pj4403070003",
-    //     name: "深圳龙岗万达广场",
-    //     pwd: "saga123456",
-    //     group_code: "WD"
-    //   },
-    //   {
-    //     id: "Pj5001120003",
-    //     name: "香港置地约克北郡",
-    //     pwd: "saga123456",
-    //     group_code: "XG"
-    //   },
-    //
-    //   {
-    //     id: "Pj1101050013",
-    //     name: "BIM测试项目_亚投行",
-    //     pwd: "saga123456",
-    //     group_code: "BT"
-    //
-    //   },
-    //   {
-    //     id: "Pj1101080259",
-    //     name: "博锐尚格北京总部办公楼",
-    //     pwd: "saga123456",
-    //     group_code: "BR"
-    //
-    //   },],
-    // projects: [// 39环境
-    //   {
-    //     id: "Pj4501030002",
-    //     name: "南宁万象城",
-    //     pwd: "saga123456",
-    //     group_code: "HR"
-    //   }, {
-    //     id: "Pj4403050002",
-    //     name: "深圳万象天地",
-    //     pwd: "saga123456",
-    //     group_code: "HR"
-    //   }, {
-    //     id: "Pj1101051029",
-    //     name: "北京万达广场",
-    //     pwd: "saga123456",
-    //     group_code: "WD"
-    //   }, {
-    //     id: "Pj0001110001",
-    //     name: "飞龙商场",
-    //     pwd: "saga123456",
-    //     group_code: "WD"
-    //   }, {
-    //     id: "Pj1101050029",
-    //     name: "东坝万达广场",
-    //     pwd: "saga123456",
-    //     group_code: "WD"
-    //   }, {
-    //     id: "Pj4403070003",
-    //     name: "深圳龙岗万达广场",
-    //     pwd: "saga123456",
-    //     group_code: "WD"
-    //   }, {
-    //     id: "Pj4403050019",
-    //     name: "招商深圳太子广场汇港二期",
-    //     pwd: "saga123456",
-    //     group_code: "ZS"
-    //   }, {
-    //     id: "Pj5001120003",
-    //     name: "香港置地约克北郡",
-    //     pwd: "saga123456",
-    //     group_code: "XG"
-    //   }, {
-    //     id: "Pj3201110003",
-    //     name: "弘阳集团弘云智慧管理平台",
-    //     pwd: "saga123456",
-    //     group_code: "HY"
-    //   }, {
-    //     id: "Pj3702020002",
-    //     name: "青岛海天中心",
-    //     pwd: "saga123456",
-    //     group_code: "GX"
-    //   }, {
-    //     id: "Pj1101010006",
-    //     name: "亚投行",
-    //     pwd: "saga123456",
-    //     group_code: "BT"
-    //   }, {
-    //     id: "Pj1101050013",
-    //     name: "BIM测试项目_亚投行",
-    //     pwd: "saga123456",
-    //     group_code: "BT"
-    //   }, {
-    //     id: "Pj1101080259",
-    //     name: "博锐尚格北京总部办公楼",
-    //     pwd: "saga123456",
-    //     group_code: "BR"
-    //   }, {
-    //     id: "Pj1101150002",
-    //     name: "华润生命科学园",
-    //     pwd: "saga123456",
-    //     group_code: "WD"
-    //   }, {
-    //     id: "Pj3101150007",
-    //     name: "招商上海森兰花园城",
-    //     pwd: "saga123456",
-    //     group_code: "WD"
-    //   }, {
-    //     id: "Pj5101080004",
-    //     name: "成都招商花园城",
-    //     pwd: "saga123456",
-    //     group_code: "WD"
-    //   }, {
-    //     id: "Pj3201130004",
-    //     name: "招商南京燕子矶花园城",
-    //     pwd: "saga123456",
-    //     group_code: "WD"
-    //   }, {
-    //     id: "Pj3702120001",
-    //     name: "金融中心",
-    //     pwd: "saga123456",
-    //     group_code: "WD"
-    //   }, {
-    //     id: "Pj1101051130",
-    //     name: "万达模型测试项目2",
-    //     pwd: "saga123456",
-    //     group_code: "WD"
-    //   } ,{
-    //     id: "Pj0002220001",
-    //     name: "数字化交付01",
-    //     pwd: "saga123456",
-    //     group_code: "BR"
-    //   },{
-    //     id: "Pj0002220002",
-    //     name: "数字化交付02",
-    //     pwd: "saga123456",
-    //     group_code: "BR"
-    //   },{
-    //     id: "Pj0002220003",
-    //     name: "数字化交付03",
-    //     pwd: "saga123456",
-    //     group_code: "BR"
-    //   },{
-    //     id: "Pj0002220004",
-    //     name: "数字化交付04",
-    //     pwd: "saga123456",
-    //     group_code: "BR"
-    //   },{
-    //     id: "Pj0002220005",
-    //     name: "数字化交付05",
-    //     pwd: "saga123456",
-    //     group_code: "BR"
-    //   },{
-    //     id: "Pj0002220006",
-    //     name: "数字化交付06",
-    //     pwd: "saga123456",
-    //     group_code: "BR"
-    //   },{
-    //     id: "Pj0002220007",
-    //     name: "数字化交付07",
-    //     pwd: "saga123456",
-    //     group_code: "BR"
-    //   },{
-    //     id: "Pj0002220008",
-    //     name: "数字化交付08",
-    //     pwd: "saga123456",
-    //     group_code: "BR"
-    //   },{
-    //     id: "Pj0002220009",
-    //     name: "数字化交付09",
-    //     pwd: "saga123456",
-    //     group_code: "BR"
-    //   },{
-    //     id: "Pj0002220010",
-    //     name: "数字化交付10",
-    //     pwd: "saga123456",
-    //     group_code: "BR"
-    //   }
-    // ],
-    projects: [// 18环境
-      {
-        id: "Pj1101051029",
-        name: "北京万达广场",
-        pwd: "saga123456",
-        group_code: "WD"
-      }, {
-        id: "Pj0001110001",
-        name: "飞龙商场",
-        pwd: "saga123456",
-        group_code: "MK"
-      }, {
-        id: "Pj0001110002",
-        name: "常州常武",
-        pwd: "saga123456",
-        group_code: "MK"
-      }, {
-        id: "Pj1101050029",
-        name: "东坝万达广场",
-        pwd: "saga123456",
-        group_code: "WD"
-      }, {
-        id: "Pj4403070003",
-        name: "深圳龙岗万达广场",
-        pwd: "saga123456",
-        group_code: "WD"
-      }, {
-        id: "Pj4403050019",
-        name: "招商深圳太子广场汇港二期",
-        pwd: "saga123456",
-        group_code: "ZS"
-      }, {
-        id: "Pj5001120003",
-        name: "香港置地约克北郡",
-        pwd: "saga123456",
-        group_code: "XG"
-      }, {
-        id: "Pj3201110003",
-        name: "弘阳集团弘云智慧管理平台",
-        pwd: "saga123456",
-        group_code: "HY"
-      }, {
-        id: "Pj3702020002",
-        name: "青岛海天中心",
-        pwd: "saga123456",
-        group_code: "GX"
-      }, {
-        id: "Pj1101010006",
-        name: "亚投行",
-        pwd: "saga123456",
-        group_code: "BT"
-      }, {
-        id: "Pj1101050013",
-        name: "BIM测试项目_亚投行",
-        pwd: "saga123456",
-        group_code: "BT"
-      }, {
-        id: "Pj1101080259",
-        name: "博锐尚格北京总部办公楼",
-        pwd: "saga123456",
-        group_code: "BR"
-      }, {
-        id: "Pj1101150002",
-        name: "华润生命科学园",
-        pwd: "saga123456",
-        group_code: "WD"
-      }, {
-        id: "Pj3101150007",
-        name: "招商上海森兰花园城",
-        pwd: "saga123456",
-        group_code: "WD"
-      }, {
-        id: "Pj5101080004",
-        name: "成都招商花园城",
-        pwd: "saga123456",
-        group_code: "WD"
-      }, {
-        id: "Pj3201130004",
-        name: "招商南京燕子矶花园城",
-        pwd: "saga123456",
-        group_code: "WD"
-      }, {
-        id: "Pj3702120001",
-        name: "金融中心",
-        pwd: "saga123456",
-        group_code: "WD"
-      }, {
-        id: "Pj1101051130",
-        name: "万达模型测试项目2",
-        pwd: "saga123456",
-        group_code: "WD"
-      }],
+    projects: project["14"],
     breadcrumb: [],
     uploaderList: [], //当前上传文件列表
     secret: "saga123456", //项目密码
@@ -356,7 +79,7 @@ export default {
     setSidebarSelected: (state, val) => {
       state.sidebarSelected = val
       storage.set(KEY_MENU_SELECTED, val)
-      lStorage.set('screen_data', { path: val, data: {} })
+      lStorage.set('screen_data', {path: val, data: {}})
     },
     setprojectId: (state, val) => {
       lStorage.remove('cacheInfo') //待删除(删除用户浏览器无用缓存)
@@ -393,14 +116,14 @@ export default {
     setErrorReport(contentx, value) {
       contentx.commit('setErrorReport', value)
     },
-    loadUserInfo({ state }) {
+    loadUserInfo({state}) {
       console.log(state)
       // 获取 userInfo 信息
       return new Promise((resolve, reject) => {
         frameworkApi.loadUserInfo().then(resp => {
           console.log(resp)
           if (resp.Result == 'success' && resp.UserId) {
-            state.userInfo = { userName: resp.Username, userId: resp.UserId }
+            state.userInfo = {userName: resp.Username, userId: resp.UserId}
             state.userId = resp.UserId
             storage.set('user_name', resp.Username)
             storage.set('user_id', resp.UserId)
@@ -433,7 +156,7 @@ export default {
     },
     setBreadcrumb: {
       root: true,
-      handler({ state, commit }, val) {
+      handler({state, commit}, val) {
         let label = val[0].label;
         if (label === "消息中心") {
           commit("setSidebarSelected", "message"); // 当进入消息中心页面的时候不选中导航栏

+ 285 - 0
src/framework/layout/project.js

@@ -0,0 +1,285 @@
+const project = {
+  '39': [
+    {
+      id: "Pj4501030002",
+      name: "南宁万象城",
+      pwd: "saga123456",
+      group_code: "HR"
+    }, {
+      id: "Pj4403050002",
+      name: "深圳万象天地",
+      pwd: "saga123456",
+      group_code: "HR"
+    }, {
+      id: "Pj1101051029",
+      name: "北京万达广场",
+      pwd: "saga123456",
+      group_code: "WD"
+    }, {
+      id: "Pj0001110001",
+      name: "飞龙商场",
+      pwd: "saga123456",
+      group_code: "WD"
+    }, {
+      id: "Pj1101050029",
+      name: "东坝万达广场",
+      pwd: "saga123456",
+      group_code: "WD"
+    }, {
+      id: "Pj4403070003",
+      name: "深圳龙岗万达广场",
+      pwd: "saga123456",
+      group_code: "WD"
+    }, {
+      id: "Pj4403050019",
+      name: "招商深圳太子广场汇港二期",
+      pwd: "saga123456",
+      group_code: "ZS"
+    }, {
+      id: "Pj5001120003",
+      name: "香港置地约克北郡",
+      pwd: "saga123456",
+      group_code: "XG"
+    }, {
+      id: "Pj3201110003",
+      name: "弘阳集团弘云智慧管理平台",
+      pwd: "saga123456",
+      group_code: "HY"
+    }, {
+      id: "Pj3702020002",
+      name: "青岛海天中心",
+      pwd: "saga123456",
+      group_code: "GX"
+    }, {
+      id: "Pj1101010006",
+      name: "亚投行",
+      pwd: "saga123456",
+      group_code: "BT"
+    }, {
+      id: "Pj1101050013",
+      name: "BIM测试项目_亚投行",
+      pwd: "saga123456",
+      group_code: "BT"
+    }, {
+      id: "Pj1101080259",
+      name: "博锐尚格北京总部办公楼",
+      pwd: "saga123456",
+      group_code: "BR"
+    }, {
+      id: "Pj1101150002",
+      name: "华润生命科学园",
+      pwd: "saga123456",
+      group_code: "WD"
+    }, {
+      id: "Pj3101150007",
+      name: "招商上海森兰花园城",
+      pwd: "saga123456",
+      group_code: "WD"
+    }, {
+      id: "Pj5101080004",
+      name: "成都招商花园城",
+      pwd: "saga123456",
+      group_code: "WD"
+    }, {
+      id: "Pj3201130004",
+      name: "招商南京燕子矶花园城",
+      pwd: "saga123456",
+      group_code: "WD"
+    }, {
+      id: "Pj3702120001",
+      name: "金融中心",
+      pwd: "saga123456",
+      group_code: "WD"
+    }, {
+      id: "Pj1101051130",
+      name: "万达模型测试项目2",
+      pwd: "saga123456",
+      group_code: "WD"
+    }, {
+      id: "Pj0002220001",
+      name: "数字化交付01",
+      pwd: "saga123456",
+      group_code: "BR"
+    }, {
+      id: "Pj0002220002",
+      name: "数字化交付02",
+      pwd: "saga123456",
+      group_code: "BR"
+    }, {
+      id: "Pj0002220003",
+      name: "数字化交付03",
+      pwd: "saga123456",
+      group_code: "BR"
+    }, {
+      id: "Pj0002220004",
+      name: "数字化交付04",
+      pwd: "saga123456",
+      group_code: "BR"
+    }, {
+      id: "Pj0002220005",
+      name: "数字化交付05",
+      pwd: "saga123456",
+      group_code: "BR"
+    }, {
+      id: "Pj0002220006",
+      name: "数字化交付06",
+      pwd: "saga123456",
+      group_code: "BR"
+    }, {
+      id: "Pj0002220007",
+      name: "数字化交付07",
+      pwd: "saga123456",
+      group_code: "BR"
+    }, {
+      id: "Pj0002220008",
+      name: "数字化交付08",
+      pwd: "saga123456",
+      group_code: "BR"
+    }, {
+      id: "Pj0002220009",
+      name: "数字化交付09",
+      pwd: "saga123456",
+      group_code: "BR"
+    }, {
+      id: "Pj0002220010",
+      name: "数字化交付10",
+      pwd: "saga123456",
+      group_code: "BR"
+    }
+  ],
+  '14': [{
+    id: "Pj1101051029",
+    name: "北京万达广场",
+    pwd: "saga123456",
+    group_code: "WD"
+  },
+    {
+      id: "Pj1101050029",
+      name: "东坝万达广场",
+      pwd: "saga123456",
+      group_code: "WD"
+    },
+    {
+      id: "Pj4403070003",
+      name: "深圳龙岗万达广场",
+      pwd: "saga123456",
+      group_code: "WD"
+    },
+    {
+      id: "Pj5001120003",
+      name: "香港置地约克北郡",
+      pwd: "saga123456",
+      group_code: "XG"
+    },
+
+    {
+      id: "Pj1101050013",
+      name: "BIM测试项目_亚投行",
+      pwd: "saga123456",
+      group_code: "BT"
+
+    },
+    {
+      id: "Pj1101080259",
+      name: "博锐尚格北京总部办公楼",
+      pwd: "saga123456",
+      group_code: "BR"
+
+    }],
+  '18': [
+    {
+      id: "Pj1101051029",
+      name: "北京万达广场",
+      pwd: "saga123456",
+      group_code: "WD"
+    }, {
+      id: "Pj0001110001",
+      name: "飞龙商场",
+      pwd: "saga123456",
+      group_code: "MK"
+    }, {
+      id: "Pj0001110002",
+      name: "常州常武",
+      pwd: "saga123456",
+      group_code: "MK"
+    }, {
+      id: "Pj1101050029",
+      name: "东坝万达广场",
+      pwd: "saga123456",
+      group_code: "WD"
+    }, {
+      id: "Pj4403070003",
+      name: "深圳龙岗万达广场",
+      pwd: "saga123456",
+      group_code: "WD"
+    }, {
+      id: "Pj4403050019",
+      name: "招商深圳太子广场汇港二期",
+      pwd: "saga123456",
+      group_code: "ZS"
+    }, {
+      id: "Pj5001120003",
+      name: "香港置地约克北郡",
+      pwd: "saga123456",
+      group_code: "XG"
+    }, {
+      id: "Pj3201110003",
+      name: "弘阳集团弘云智慧管理平台",
+      pwd: "saga123456",
+      group_code: "HY"
+    }, {
+      id: "Pj3702020002",
+      name: "青岛海天中心",
+      pwd: "saga123456",
+      group_code: "GX"
+    }, {
+      id: "Pj1101010006",
+      name: "亚投行",
+      pwd: "saga123456",
+      group_code: "BT"
+    }, {
+      id: "Pj1101050013",
+      name: "BIM测试项目_亚投行",
+      pwd: "saga123456",
+      group_code: "BT"
+    }, {
+      id: "Pj1101080259",
+      name: "博锐尚格北京总部办公楼",
+      pwd: "saga123456",
+      group_code: "BR"
+    }, {
+      id: "Pj1101150002",
+      name: "华润生命科学园",
+      pwd: "saga123456",
+      group_code: "WD"
+    }, {
+      id: "Pj3101150007",
+      name: "招商上海森兰花园城",
+      pwd: "saga123456",
+      group_code: "WD"
+    }, {
+      id: "Pj5101080004",
+      name: "成都招商花园城",
+      pwd: "saga123456",
+      group_code: "WD"
+    }, {
+      id: "Pj3201130004",
+      name: "招商南京燕子矶花园城",
+      pwd: "saga123456",
+      group_code: "WD"
+    }, {
+      id: "Pj3702120001",
+      name: "金融中心",
+      pwd: "saga123456",
+      group_code: "WD"
+    }, {
+      id: "Pj1101051130",
+      name: "万达模型测试项目2",
+      pwd: "saga123456",
+      group_code: "WD"
+    }
+  ]
+
+}
+
+export default project

+ 7 - 0
src/router/system.js

@@ -8,6 +8,7 @@ import roleAdm from '@/views/platfrom/role'
 /**前期准备 */
 import buildFloor from '@/views/ready/buildfloor'
 import collectsetting from '@/views/ready/collectsetting'
+import collectsetold from '@/views/ready/collectsetting/index_old'
 import buildUser from '@/views/ready/appuser'
 import repetitionGraphy from '@/views/ready/buildfloor/repetitionGraphy'
 /**模型管理 */
@@ -168,6 +169,12 @@ export default [{
         path: 'collectsetting',
         name: 'collectsetting',
         component: collectsetting,
+        meta: {keepAlive: false, breadcrumbs: [{label: '需采集的信息点(解决方案版)'}]}
+      },
+      {
+        path: 'collectsetold',
+        name: 'collectsetold',
+        component: collectsetold,
         meta: {keepAlive: false, breadcrumbs: [{label: '需采集的信息点'}]}
       },
       {

+ 12 - 14
src/utils/handsontable/notShow.js

@@ -435,10 +435,9 @@ const showTools = {
         }
       }
     } else {// 动态信息点
-      // console.log(`%c${item.category}-${item.dataType}`,`color:#c215e1;font-size: 20px;background:#434101`);
       return {
         data: item.path,
-        readOnly: !item.editable
+        readOnly: onlyRead
       }
     }
   },
@@ -451,7 +450,7 @@ const showTools = {
       return {
         data: item.path,
         renderer: text.lookQRCode,
-        readOnly: !item.editable
+        readOnly: onlyRead
       }
     }
 
@@ -464,7 +463,7 @@ const showTools = {
       return {
         data: item.path,
         renderer: text.picType,
-        readOnly: !item.editable
+        readOnly: onlyRead
       }
     }
 
@@ -489,7 +488,7 @@ const showTools = {
       return {
         data: item.path,
         renderer: text.fileType,
-        readOnly: !item.editable
+        readOnly: onlyRead
       }
     }
 
@@ -503,7 +502,7 @@ const showTools = {
     //   return {
     //     data: item.path,
     //     renderer: text.idType,
-    //     readOnly: !item.editable
+    //     readOnly: onlyRead
     //   }
     // }
     if (!item.category) {
@@ -515,7 +514,7 @@ const showTools = {
           data: item.path,
           renderer: tools.customDropdownRenderer,
           editor: "chosen",
-          readOnly: !item.editable,
+          readOnly: onlyRead,
           chosenOptions: {
             data: item.dataSource ? tools.formatDataSource(item.dataSource) : ""
           }
@@ -525,7 +524,7 @@ const showTools = {
           data: item.path,
           renderer: tools.customDropdownRenderer,
           editor: "chosen",
-          readOnly: !item.editable,
+          readOnly: onlyRead,
           chosenOptions: {
             multiple: true, //多选
             data: item.dataSource ? tools.formatDataSource(item.dataSource) : ""
@@ -535,7 +534,7 @@ const showTools = {
         return {
           data: item.path,
           type: "numeric",
-          readOnly: !item.editable,
+          readOnly: onlyRead,
           numericFormat: {
             pattern: "0,0.00"
           }
@@ -545,25 +544,24 @@ const showTools = {
           data: item.path,
           type: "date",
           dateFormat: item.formater || "YYYYMMDDHHmmss",
-          readOnly: !item.editable,
+          readOnly: onlyRead,
           correctFormat: true
         };
       } else if (item.dataType == dataTypeMap.STRING) { // 文本输入
         return {
           data: item.path,
-          readOnly: !item.editable
+          readOnly: onlyRead
         }
       } else { // (未支持的输入方式)暂不支持编辑
         return {
           data: item.path,
-          readOnly: !item.editable
+          readOnly: onlyRead
         }
       }
     } else { // 动态信息点
-      // console.log(`%c${item.category}-${item.dataType}`,`color:#c215e1;font-size: 20px;background:#434101`);
       return {
         data: item.path,
-        readOnly: !item.editable
+        readOnly: onlyRead
       }
     }
   },

+ 1 - 1
src/views/ledger/cenotelist/cenoteadd/index.vue

@@ -6,7 +6,7 @@
         <el-option v-for="item in showTypes" :key="item.value" :label="item.label" :value="item.value"></el-option>
       </el-select>
       <span>增加</span>
-      <el-input v-model="addNum" style="width:50px;" size="small"></el-input>
+      <el-input-number v-model="addNum" :controls="false" style="width:50px;" :min="1" :max="50"></el-input-number>
       <span>个竖井</span>
       <el-button @click="handleAddTableRow">增加</el-button>
     </el-row>

+ 1 - 1
src/views/ledger/facility/addfacility.vue

@@ -6,7 +6,7 @@
         <el-option v-for="item in showTypes" :key="item.value" :label="item.label" :value="item.value"></el-option>
       </el-select>
       <span>增加</span>
-      <el-input v-model="addNum" style="width:50px;" size="small"></el-input>
+      <el-input-number v-model="addNum" :controls="false" style="width:50px;" :min="1" :max="50"></el-input-number>
       <span>个{{ category.name }}</span>
       <el-button @click="handleAddTableRow">增加</el-button>
     </el-row>

+ 7 - 4
src/views/ledger/facility/batchPoint.vue

@@ -77,7 +77,7 @@
                 <p>距地面高度:{{equipZ}}mm</p>
             </el-row>
             <div class="elSlider">
-                <el-slider v-model="equipZ" :max="maxHeight" :step="1" :marks="marks"></el-slider>
+                <el-slider v-model="equipZ" :min="minHeight" :max="maxHeight" :step="1" :marks="marks"></el-slider>
             </div>
             <el-row style="text-align: right;">
                 <el-button size="mini" @click="visible = false">取消</el-button>
@@ -105,6 +105,7 @@ export default {
         visible: false,
         equipZ: 0,
         maxHeight: 99000,
+        minHeight: -99000,
         popoverPosition: {
             top: 0,
             left: 0,
@@ -117,7 +118,7 @@ export default {
 		classCode: "", //设备类别
 		isPoint: "all", //是否有坐标(全部-all、有坐标-yes、无坐标-no)
 		keyword: "", //设备标识关键字
-		showName: "EquipLocalName", //显示名称
+		showName: "localName", //显示名称
 		isIndeterminate: false, //全选样式显示
 		checkAll: false, //是否全选
 		checkedEquip: [], //选中的设备
@@ -138,10 +139,10 @@ export default {
           label: "无坐标"
 		}],
 		showNameOptions: [{
-          value: "EquipLocalName",
+          value: "localName",
           label: "显示设备本地名称"
         }, {
-          value: "EquipLocalID",
+          value: "localId",
           label: "显示设备本地编码"
         }, {
           value: "cADID",
@@ -431,8 +432,10 @@ export default {
         }
         if (this.floorData.infos && this.floorData.infos.height) {
             this.maxHeight = this.floorData.infos.height;
+            this.minHeight = -(this.floorData.infos.height);
         } else {
             this.maxHeight = 99000;
+            this.minHeight = -99000;
         }
 		if (this.floorData.outline && this.floorData.outline.length) {
 			this.floorOutline = this.floorData.outline;

+ 1 - 15
src/views/ledger/facility/batchlink.vue

@@ -118,6 +118,7 @@ export default {
       let param = {
         category: fl.category || undefined,
         spaceIdList: fl.spaceIdList || undefined,
+        
         orders: "createTime desc",
         pageNumber: 1,
         pageSize: 1000
@@ -125,7 +126,6 @@ export default {
       equipCategoryProperty(param, res => {
         this.unlinkNumber = res.total
         this.linkNumber += res.content.length
-        // this.page.total = res.Total
         this.contentData = this.contentData.concat(res.content)
         if (res.total / (res.pageSize * res.pageNumber) > 1) {
           this.getTableData(res.pageNumber + 1)
@@ -153,20 +153,6 @@ export default {
       pageNum = pageNum ? pageNum : 1
       let param = {
         data: {
-          //   Cascade: [
-          //   {
-          //     Name: "equipCategory",
-          //     Projection: ["EquipCode", "EquipName"]
-          //   },
-          //   {
-          //     Name: "building",
-          //     Projection: [ "BuildLocalName", "BuildName", "BuildID" ]
-          //   },
-          //   {
-          //     Name: "floor",
-          //     Projection: [ "FloorLocalName", "FloorName", "FloorID" ]
-          //   }
-          // ],
           orders: "createTime desc, id asc",
           pageNumber: pageNum,
           pageSize: 1000

+ 1 - 1
src/views/ledger/facility/partsmanage/addparts/index.vue

@@ -11,7 +11,7 @@
         </el-option>
       </el-select>
       <span>增加</span>
-      <el-input v-model="addNum" style="width:50px;" size="small"></el-input>
+      <el-input-number v-model="addNum" :controls="false" style="width:50px;" :min="1" :max="50"></el-input-number>
       <span>个{{ category.Name }}</span>
       <el-button @click="handleAddTableRow">增加</el-button>
     </el-row>

+ 1 - 1
src/views/ledger/property/addproperty.vue

@@ -6,7 +6,7 @@
         <el-option v-for="item in showTypes" :key="item.value" :label="item.label" :value="item.value"></el-option>
       </el-select>
       <span>增加</span>
-      <el-input v-model="addNum" style="width:50px;" size="small"></el-input>
+      <el-input-number v-model="addNum" :controls="false" style="width:50px;" :min="1" :max="50"></el-input-number>
       <span>个{{ category.name }}</span>
       <el-button @click="handleAddTableRow">增加</el-button>
     </el-row>

+ 1 - 1
src/views/ledger/rentlist/rentadd/index.vue

@@ -6,7 +6,7 @@
         <el-option v-for="item in showTypes" :key="item.value" :label="item.label" :value="item.value"></el-option>
       </el-select>
       <span>增加</span>
-      <el-input v-model="addNum" style="width:50px;" size="small"></el-input>
+      <el-input-number v-model="addNum" :controls="false" style="width:50px;" :min="1" :max="50"></el-input-number>
       <span>个租户</span>
       <el-button @click="handleAddTableRow">增加</el-button>
     </el-row>

+ 62 - 61
src/views/ledger/report/index.vue

@@ -139,7 +139,8 @@ import {
   queryTenantCompletion,
   queryZoneCount,
   ShaftRelationBusinessSpace,
-  systemInfoPoint
+  systemInfoPoint,
+  gatherInfoPoint
 } from "@/api/scan/request";
 import { getDataDictionary } from "@/api/dict";
 import dataOrigin from "@/components/ledger/report/dataorigin";
@@ -259,7 +260,7 @@ export default {
     this.getFunctionType();
     this.getStatisticsCount();
     this.getEquipCount();
-    // this.gatherInfoPoints();
+    this.gatherInfoPoints();
     this.systemInfoPoints();
     this.infoPoints();
     this.getAssetsCount();
@@ -358,40 +359,40 @@ export default {
       })
     },
     // 统计设备信息点与需采集数据占比
-    // gatherInfoPoints() {
-    //   gatherInfoPoint(this.params, res => {
-    //     let arr = JSON.parse(JSON.stringify(res.Content))
-    //     arr.forEach(i => {
-    //       this.$set(this.deviceMessageData, 0, {
-    //         title: '统计设备信息点与需采集数据占比',
-    //         tips: '统计设备信息点与需采集数据占比',
-    //         contentValueO: '总数:',
-    //         contentValueT: '标准静态:',
-    //         needCountO: i.gatherInfoPointCounts,
-    //         needCountT: i.gatherStaticInfoPointCounts,
-    //         text: this.toPercent(i.gatherStaticInfoPointCounts / i.gatherInfoPointCounts),
-    //         val: this.static
-    //       })
-    //       this.$set(this.deviceMessageData, 1, {
-    //         contentValueO: '总数:',
-    //         contentValueT: '标准动态:',
-    //         needCountO: i.gatherInfoPointCounts,
-    //         needCountT: i.gatherDynamicInfoPointCounts,
-    //         text: this.toPercent(i.gatherDynamicInfoPointCounts / i.gatherInfoPointCounts),
-    //         val: this.dynamic
-    //       })
-    //
-    //       this.$set(this.deviceMessageData, 2, {
-    //         contentValueO: '总数:',
-    //         contentValueT: '自定义:',
-    //         needCountO: i.gatherInfoPointCounts,
-    //         needCountT: i.gatherCustomInfoPointCounts,
-    //         text: this.toPercent(i.gatherCustomInfoPointCounts / i.gatherInfoPointCounts),
-    //         val: this.custom
-    //       })
-    //     })
-    //   })
-    // },
+    gatherInfoPoints() {
+      gatherInfoPoint(this.params, res => {
+        let arr = JSON.parse(JSON.stringify(res.content))
+        arr.forEach(i => {
+          this.$set(this.deviceMessageData, 0, {
+            title: '统计设备信息点与需采集数据占比',
+            tips: '统计设备信息点与需采集数据占比',
+            contentValueO: '总数:',
+            contentValueT: '标准静态:',
+            needCountO: i.gatherInfoPointCounts,
+            needCountT: i.gatherStaticInfoPointCounts,
+            text: this.toPercent(i.gatherStaticInfoPointCounts / i.gatherInfoPointCounts),
+            val: this.static
+          })
+          this.$set(this.deviceMessageData, 1, {
+            contentValueO: '总数:',
+            contentValueT: '标准动态:',
+            needCountO: i.gatherInfoPointCounts,
+            needCountT: i.gatherDynamicInfoPointCounts,
+            text: this.toPercent(i.gatherDynamicInfoPointCounts / i.gatherInfoPointCounts),
+            val: this.dynamic
+          })
+    
+          // this.$set(this.deviceMessageData, 2, {
+          //   contentValueO: '总数:',
+          //   contentValueT: '自定义:',
+          //   needCountO: i.gatherInfoPointCounts,
+          //   needCountT: i.gatherCustomInfoPointCounts,
+          //   text: this.toPercent(i.gatherCustomInfoPointCounts / i.gatherInfoPointCounts),
+          //   val: this.custom
+          // })
+        })
+      })
+    },
 
     // 统计系统信息点与需采集数据占比
     systemInfoPoints() {
@@ -416,14 +417,14 @@ export default {
             text: this.toPercent(i.gatherDynamicInfoPointCounts / i.gatherInfoPointCounts),
             val: this.dynamic
           })
-          this.$set(this.sysMessageData, 2, {
-            contentValueO: '总数:',
-            contentValueT: '自定义:',
-            needCountO: i.gatherInfoPointCounts,
-            needCountT: i.gatherCustomInfoPointCounts,
-            text: this.toPercent(i.gatherCustomInfoPointCounts / i.gatherInfoPointCounts),
-            val: this.custom
-          })
+          // this.$set(this.sysMessageData, 2, {
+          //   contentValueO: '总数:',
+          //   contentValueT: '自定义:',
+          //   needCountO: i.gatherInfoPointCounts,
+          //   needCountT: i.gatherCustomInfoPointCounts,
+          //   text: this.toPercent(i.gatherCustomInfoPointCounts / i.gatherInfoPointCounts),
+          //   val: this.custom
+          // })
         })
 
       })
@@ -452,20 +453,20 @@ export default {
             text: this.toPercent(i.dynamicInfoPoint / i.dynamicInfoPointCounts),
             val: this.dynamic
           })
-          let obj = i.customInfoPointCounts ? {} : ''
-          if (obj) {
-            obj = {
-              contentValueO: '总数:',
-              contentValueT: '自定义:',
-              needCountO: i.customInfoPointCounts,
-              needCountT: i.customInfoPoint,
-              text: this.toPercent(i.customInfoPoint / i.customInfoPointCounts),
-              val: this.custom
-            }
-          }
-          this.$set(this.deviceMessageTotal, 2, {
-            ...obj
-          })
+          // let obj = i.customInfoPointCounts ? {} : ''
+          // if (obj) {
+          //   obj = {
+          //     contentValueO: '总数:',
+          //     contentValueT: '自定义:',
+          //     needCountO: i.customInfoPointCounts,
+          //     needCountT: i.customInfoPoint,
+          //     text: this.toPercent(i.customInfoPoint / i.customInfoPointCounts),
+          //     val: this.custom
+          //   }
+          // }
+          // this.$set(this.deviceMessageTotal, 2, {
+          //   ...obj
+          // })
 
 
         })
@@ -721,7 +722,7 @@ export default {
       this.shaft = [];
       // 获取竖井总数
       queryCenoteCount(this.params, res => {
-        this.shaftCount = res.Count;
+        this.shaftCount = res.count;
       })
 
       let promise1 = new Promise((resolve) => {
@@ -770,7 +771,7 @@ export default {
   watch: {
     projectId(n, o) {
       this.params = {
-        ProjectId: this.projectId
+        projectId: this.projectId
       }
       this.getFunctionType();
       this.getStatisticsCount();
@@ -780,7 +781,7 @@ export default {
       this.getSystemCount();
       this.getTenantCount();
       this.getShaftFunType();
-      // this.gatherInfoPoints();
+      this.gatherInfoPoints();
       this.systemInfoPoints();
       this.infoPoints();
     }

+ 1 - 1
src/views/ledger/spacelist/spaceadd/index.vue

@@ -6,7 +6,7 @@
         <el-option v-for="item in showTypes" :key="item.value" :label="item.label" :value="item.value"></el-option>
       </el-select>
       <span>增加</span>
-      <el-input v-model="addNum" style="width:50px;" size="small"></el-input>
+      <el-input-number v-model="addNum" :controls="false" style="width:50px;" :min="1" :max="50"></el-input-number>
       <span>个{{ space.spaceName }}</span>
       <el-button @click="handleAddTableRow">增加</el-button>
     </el-row>

+ 1 - 1
src/views/ledger/system/addsystem.vue

@@ -6,7 +6,7 @@
         <el-option v-for="item in showTypes" :key="item.value" :label="item.label" :value="item.value"></el-option>
       </el-select>
       <span>增加</span>
-      <el-input v-model="addNum" style="width:50px;" size="small"></el-input>
+      <el-input-number v-model="addNum" :controls="false" style="width:50px;" :min="1" :max="50"></el-input-number>
       <span>个{{ category.CategoryName }}</span>
       <el-button @click="handleAddTableRow">增加</el-button>
     </el-row>

+ 38 - 26
src/views/model/file/index.vue

@@ -156,34 +156,42 @@ export default {
     },
     //删除模型文件夹
     removeFolder() {
-      this.$alert(`确定要删除文件夹 <${this.currentFolderName}> 吗?`, "提示", {
-        confirmButtonText: "确定",
-        callback: action => {
-          if (action == "confirm") {
-            let params = {
-              Id: this.currentFolderId,
-              ProjectId: this.projectId
-            };
-            request.deleteModel(params, res => {
-              this.$message({
-                message: "删除成功!",
-                type: "success"
-              });
-              this.queryModel();
-            });
-          } else {
-            this.$message({
-              type: "info",
-              message: `取消操作`
-            });
-          }
-        }
-      });
+			if (this.currentFolderId) {
+				this.$alert(`确定要删除文件夹 <${this.currentFolderName}> 吗?`, "提示", {
+					confirmButtonText: "确定",
+					callback: action => {
+						if (action == "confirm") {
+							let params = {
+								Id: this.currentFolderId,
+								ProjectId: this.projectId
+							};
+							request.deleteModel(params, res => {
+								this.$message({
+									message: "删除成功!",
+									type: "success"
+								});
+								this.queryModel();
+							});
+						} else {
+							this.$message({
+								type: "info",
+								message: `取消操作`
+							});
+						}
+					}
+				});
+			} else {
+				this.$message.info("请选择模型文件夹!")
+			}
     },
     //编辑文件夹
     editFolder() {
-      this.folderName = this.currentFolderName;
-      this.changeFolderNameVisible = true;
+			if (this.currentFolderId) {
+				this.folderName = this.currentFolderName;
+      	this.changeFolderNameVisible = true;
+			} else {
+				this.$message.info("请选择模型文件夹!")
+			}
     },
     // 查询所有文件夹模型
     queryModel() {
@@ -294,7 +302,7 @@ export default {
         ProjectId: this.projectId,
         ReplaceReason: 0,
         Size: data.file.size,
-        UserName: this.userInfo.username,
+        UserName: this.userInfo.userName,
         UserId: this.userInfo.userId
       };
       //  替换模型文件
@@ -337,6 +345,10 @@ export default {
   },
   watch: {
     projectId() {
+      this.choiceIndex = 0;
+      this.currentFolderId = "";
+      this.currentFolderName = "";
+      this.currentFloorModelId = "";
       this.queryModel()
     }
   },