Pārlūkot izejas kodu

Merge remote-tracking branch 'origin/dataType' into dataType

shaun-sheep 4 gadi atpakaļ
vecāks
revīzija
e9a7f1f118

+ 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: '确定',

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

@@ -120,7 +120,7 @@ export default {
       getDataDictionary(params, res => {
         let arr = res.content.map(item => {
           const category = ['ENUM', 'MENUM', 'BOOLEAN']
-          if (item.category == 'STATIC' && item.dataType.includes(category) && item.dataSource) {
+          if (item.category == 'STATIC' && category.includes(item.dataType) && item.dataSource) {
             item.options = item.dataSource
             if (item.options[0]) {
               item.props = {

+ 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 - 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: '需采集的信息点'}]}
       },
       {