Explorar el Código

Merge branch 'dev' of http://39.106.8.246:3003/web/ibms into dev

 Conflicts:
	src/views/screen/splitscreen/spaceledger/index.vue
shaun-sheep hace 4 años
padre
commit
ab6372801b
Se han modificado 26 ficheros con 204 adiciones y 88 borrados
  1. 2 2
      package.json
  2. 20 0
      src/api/scan/request.js
  3. 4 2
      src/components/business_space/newGraphy/graphy.vue
  4. 75 19
      src/components/data_admin/buildTask/detail/assetsDetail.vue
  5. 2 3
      src/components/data_admin/buildTask/detail/deviceDetail.vue
  6. 1 12
      src/components/data_admin/buildTask/draw/drawModel.vue
  7. 5 5
      src/components/data_admin/buildTask/table/assetsTable.vue
  8. 1 1
      src/components/data_admin/buildTask/table/deviceTable.vue
  9. 1 1
      src/components/data_admin/buildTask/table/modelTable.vue
  10. 1 1
      src/components/data_admin/buildTask/table/replaceTable.vue
  11. 1 1
      src/components/data_admin/buildTask/table/tearTable.vue
  12. 2 2
      src/components/ledger/lib/cenoteGraphy.vue
  13. 6 4
      src/components/model/file/nodeDialog.vue
  14. 1 1
      src/components/model/file/pathCard.vue
  15. 2 2
      src/components/point/report/objectInstance.vue
  16. 10 5
      src/views/business_space/dataUtil/topology.vue
  17. 36 9
      src/views/data_admin/buildTask/addTask/addAssetsTask.vue
  18. 2 2
      src/views/ledger/rentlist/manageTenantZone.vue
  19. 1 1
      src/views/ledger/spacelist/index.vue
  20. 4 0
      src/views/model/file/pathcontrol/index.vue
  21. 3 3
      src/views/ready/buildfloor/drawGraphy/drawFloor.vue
  22. 2 2
      src/views/ready/buildfloor/repetitionGraphy.vue
  23. 2 2
      src/views/ready/collectsetting/index.vue
  24. 2 2
      src/views/relation/overview/detail/index.vue
  25. 2 2
      src/views/screen/splitscreen/integrateresults/index.vue
  26. 16 4
      src/views/screen/splitscreen/spaceledger/index.vue

+ 2 - 2
package.json

@@ -20,10 +20,10 @@
   },
   "dependencies": {
     "@saga-web/base": "2.1.9",
-    "@saga-web/cad-engine": "2.0.560",
+    "@saga-web/cad-engine": "2.0.561",
     "@saga-web/draw": "2.1.75",
     "@saga-web/graphy": "2.1.47",
-    "@saga-web/topology": "1.0.82",
+    "@saga-web/topology": "1.0.83",
     "axios": "^0.18.0",
     "echarts": "^4.1.0",
     "el-cascader-multi": "^1.1.8",

+ 20 - 0
src/api/scan/request.js

@@ -1670,6 +1670,16 @@ export function floorUpdate(param, success) {
   let url = `${baseUrl}/datacenter/floor/update`;
   http.postJson(url, param, success)
 }
+//楼层接口-----更新楼层轮廓
+export function floorUpdateOutline(param, success) {
+  let url = `${baseUrl}/datacenter/object/floor/update-outline`;
+  http.postJson(url, param, success)
+}
+//楼层接口-----查询楼层轮廓
+export function floorQueryOutline(param, success) {
+  let url = `${baseUrl}/datacenter/object/floor/query-outline`;
+  http.postJson(url, param, success)
+}
 
 /****关系-竖井****/
 //字典查询接口 竖井所有类型
@@ -1987,6 +1997,16 @@ export function zoneQuery(param,success) {
   let url = `${baseUrl}/datacenter/object/zone/query`
   http.postJson(url,param,success)
 }
+//查询分区对象轮廓线
+export function zoneQueryOutline(param,success) {
+  let url = `${baseUrl}/datacenter/object/zone/query`
+  http.postJson(url,param,success)
+}
+//更新分区对象轮廓线
+export function zoneUpdateOutline(param,success) {
+  let url = `${baseUrl}/datacenter/object/zone/update-outline`
+  http.postJson(url,param,success)
+}
 //查询分区对象信息
 export function zoneCount(param,success) {
   let url = `${baseUrl}/datacenter/object/zone/count`

+ 4 - 2
src/components/business_space/newGraphy/graphy.vue

@@ -131,8 +131,9 @@ import {
   queryZone,
   zoneCount,
   zoneCreate,
-  zoneQuery,
+  zoneQueryOutline,
   zoneUpdate,
+  zoneUpdateOutline,
   handleZoneUpdateBd
 } from "@/api/scan/request"
 
@@ -383,7 +384,7 @@ export default {
         pa.BuildingId = this.buildFloor[0];
         pa.FloorId = this.buildFloor[1];
       }
-      zoneQuery(pa, res => {
+      zoneQueryOutline(pa, res => {
         // 所有业务空间
         this.businessSpaceList = res.Content;
         // 已关联元空间的业务空间
@@ -1033,6 +1034,7 @@ export default {
         Projection: ['BIMLocation', 'ObjectType', 'Outline', 'Height', 'BuildingId', 'FloorId']
       }
       zoneUpdate(pa, res => {
+        zoneUpdateOutline(pa, res => { console.log(res) })
         this.updateZoneBF(zoneObj, IspaceIdList);
       })
     },

+ 75 - 19
src/components/data_admin/buildTask/detail/assetsDetail.vue

@@ -6,7 +6,9 @@
           <el-form-item label="资产基本信息"></el-form-item>
           <el-form-item label="任务创建时间:">{{ detail.CreateTime || '--' }}</el-form-item>
           <el-form-item label="任务当前状态:">{{ detail.TaskState || '--' }}</el-form-item>
-          <el-form-item label="任务执行方案:">{{ detail.ScanScheme?detail.ScanScheme.SchemeName?detail.ScanScheme.SchemeName:'--':'--' }}</el-form-item>
+          <el-form-item label="任务执行方案:">
+            {{detail.SchemeId?detail.SchemeId == 1 ? '极简' : '标准':'--' }}
+          </el-form-item>
           <el-form-item label="设备族:">{{ detail.EquipFamily?detail.EquipFamily.FamilyName?detail.EquipFamily.FamilyName:'--':'--' }}</el-form-item>
           <el-form-item label="全局名称:">{{ detail.EquipName || '--' }}</el-form-item>
           <el-form-item label="资产本地名称:">{{ detail.EquipLocalName || '--' }}</el-form-item>
@@ -43,34 +45,39 @@
           </el-form-item>
           <el-form-item label="现场视频:" v-show="videoList && videoList.length">
             <video controls style="width:100%;" v-for="item in videoList" :key="item.Key" :title="item.Name">
-              <source :src="`/image-service/common/image_get?systemId=dataPlatform&key=${item.Key}`" type="video/mp4">
+              <source :src="`/image-service/common/file_get?systemId=dataPlatform&key=${item.Key}`" type="video/mp4">
               您的浏览器不支持 HTML5 video ,暂无法播放。
             </video>
           </el-form-item>
           <el-form-item label="备注信息:">{{ detail.Note || '--' }}</el-form-item>
         </el-form>
       </div>
-      <div class="operation-detail detail-item">
+      <div class="operation-detail detail-item" v-if="detail.TaskState === '未找到'">
         <el-form>
           <el-form-item label="操作信息:"></el-form-item>
           <div class="block">
             <el-timeline>
-              <el-timeline-item timestamp="2018/4/12" placement="top">
-                <el-card>
-                  <h4>更新 Github 模板</h4>
-                  <p>王小虎 提交于 2018/4/12 20:46</p>
-                </el-card>
-              </el-timeline-item>
-              <el-timeline-item timestamp="2018/4/3" placement="top">
-                <el-card>
-                  <h4>更新 Github 模板</h4>
-                  <p>王小虎 提交于 2018/4/3 20:46</p>
-                </el-card>
-              </el-timeline-item>
-              <el-timeline-item timestamp="2018/4/2" placement="top">
+              <el-timeline-item
+                  placement="top"
+                  v-for="(item,index) in arr"
+                  :key="index"
+                  :timestamp="item.timestamp"
+              >
                 <el-card>
-                  <h4>更新 Github 模板</h4>
-                  <p>王小虎 提交于 2018/4/2 20:46</p>
+                  <small>{{item.content}}</small>
+                  <p>{{item.title}}</p>
+                  <img
+                      v-for="isImg in item.imgs"
+                      :key="isImg.Key"
+                      :src="`/image-service/common/image_get?systemId=dataPlatform&key=${isImg.Key}`">
+
+                  <video controls style="width:100%;" v-for="v in videoList" :key="index"
+                         :title="v.Name">
+                    <source
+                        :src="`/image-service/common/file_get?systemId=dataPlatform&key=${v.Key}`"
+                        type="video/mp4">
+                    您的浏览器不支持 HTML5 video ,暂无法播放。
+                  </video>
                 </el-card>
               </el-timeline-item>
             </el-timeline>
@@ -91,6 +98,53 @@ export default {
   components: {
 
   },
+  created() {
+    let {ConfirmTime, PositivePhotoTime, QrCodeTime, NameplateTime, SidePhotoTime, VideoTime, EquipProblemTime, EquipProblem, TaskPicList} = this.detail;
+    let arr = []
+    QrCodeTime && arr.push({
+      timestamp: QrCodeTime,
+      time: new Date(QrCodeTime).getTime(),
+      content: '黏贴二维码',
+      imgs: TaskPicList.length && TaskPicList.filter(i => i.Name.includes('带二维码的设备近景照片'))
+    })
+    PositivePhotoTime && arr.push({
+      timestamp: PositivePhotoTime,
+      time: new Date(PositivePhotoTime).getTime(),
+      content: '拍摄正面照片',
+      imgs: TaskPicList.length && TaskPicList.filter(i => i.Name.includes('设备正面照片'))
+    })
+    NameplateTime && arr.push({
+      timestamp: NameplateTime,
+      time: new Date(NameplateTime).getTime(),
+      content: '拍摄铭牌照片',
+      imgs: TaskPicList.length && TaskPicList.filter(i => i.Name.includes('铭牌照片'))
+    })
+    SidePhotoTime && arr.push({
+      timestamp: SidePhotoTime,
+      time: new Date(SidePhotoTime).getTime(),
+      content: '拍摄侧面照片',
+      imgs: TaskPicList.length && TaskPicList.filter(i => i.Name.includes('设备左侧照片' || '设备右侧照片'))
+    })
+    VideoTime && arr.push({
+      timestamp: VideoTime,
+      time: new Date(VideoTime).getTime(),
+      content: '拍摄30s视频',
+      videoList: TaskPicList.length && TaskPicList.filter(i => i.Name.includes('视频资料'))
+    })
+    EquipProblemTime && arr.push({
+      timestamp: EquipProblemTime,
+      time: new Date(EquipProblemTime).getTime(),
+      content: '记录设备问题',
+      title: EquipProblem
+    })
+    ConfirmTime && arr.push({
+      timestamp: ConfirmTime,
+      time: new Date(ConfirmTime).getTime(),
+      content: '确认信息',
+      title: '已确认的设备信息'
+    })
+    this.arr = arr.map(i => ({...i})).sort((a, b) => b.time - a.time)
+  },
   computed: {
     ...mapGetters("layout", ["projectId"]),
     panoramaList(){
@@ -138,10 +192,12 @@ export default {
   data() {
     return {
       dialogVisible: false,//全景图弹出框
-      nowUrl: ''//当前正在显示的图
+      nowUrl: '',//当前正在显示的图
+      arr: [],
     };
   },
   methods: {
+
   },
   watch: {
     'detail.TaskId'() {

+ 2 - 3
src/components/data_admin/buildTask/detail/deviceDetail.vue

@@ -7,8 +7,7 @@
           <el-form-item label="任务创建时间:">{{ detail.CreateTime || '--' }}</el-form-item>
           <el-form-item label="任务当前状态:">{{ detail.TaskState || '--' }}</el-form-item>
           <el-form-item label="任务执行方案:">
-<!--            {{detail.ScanScheme?detail.ScanScheme.SchemeName?detail.ScanScheme.SchemeName:'&#45;&#45;':'&#45;&#45;' }}-->
-            {{detail.SchemeId == 1 ? '极简' : '标准' }}
+            {{detail.SchemeId?detail.SchemeId == 1 ? '极简' : '标准':'--' }}
           </el-form-item>
           <el-form-item label="设备类:">{{
             detail.EquipCategory?detail.EquipCategory.EquipName?detail.EquipCategory.EquipName:'--':'--' }}
@@ -101,7 +100,7 @@
                   <video controls style="width:100%;" v-for="v in videoList" :key="index"
                          :title="v.Name">
                     <source
-                        :src="`/image-service/common/image_get?systemId=dataPlatform&key=${v.Key}`"
+                        :src="`/image-service/common/file_get?systemId=dataPlatform&key=${v.Key}`"
                         type="video/mp4">
                     您的浏览器不支持 HTML5 video ,暂无法播放。
                   </video>

+ 1 - 12
src/components/data_admin/buildTask/draw/drawModel.vue

@@ -11,7 +11,7 @@
 import { DivideFloorScene, FloorView } from "@saga-web/cad-engine/lib"
 import { SColor, SPoint } from "@saga-web/draw/lib";
 import canvasFun from "@/components/business_space/newGraphy/canvasFun"
-import { floorQuery, queryEquip } from "@/api/scan/request";
+import { queryEquip } from "@/api/scan/request";
 export default {
   components: {
     canvasFun
@@ -67,17 +67,6 @@ export default {
         this.getGraphtSuc(res);
       })
     },
-    getFloorData() {
-      let pa = {
-        Filters: `FloorID='${this.FloorID}'`
-      }
-      floorQuery(pa, res => {
-        let newArr = res.Content[0].Outline.map(t => {
-          return new SPoint(t.X, t.Y);
-        })
-        this.drawMainScene.addSceneMark(newArr)
-      })
-    },
     getSelectedSpaces() {//获取选中区域
       if (this.view && this.view.scene) {
         let list = this.view.scene.getSelectedSpaces();

+ 5 - 5
src/components/data_admin/buildTask/table/assetsTable.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="table-container">
     <div class="table-list" :style="tableData && tableData.length?'height:calc(100% - 50px);':'height:100%;'">
-      <el-table :data="tableData" style="width: 100%" height="100%" v-loading="loading" :header-cell-style="headerStyle">
+      <el-table :data="tableData" style="width: 100%;" height="100%" v-loading="loading" :header-cell-style="headerStyle">
         <el-table-column label="所属建筑楼层" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
             <div>
@@ -183,10 +183,6 @@ export default {
     handleCurrentChange(pageNo) {
       this.page.pageNumber = pageNo;
       this.getTableData()
-    },
-    projectId() {
-      this.page.pageNumber = 1
-      this.getTableData()
     }
   },
   watch: {
@@ -199,6 +195,10 @@ export default {
       },
       immediate: true,
       deep: true
+    },
+    projectId() {
+      this.page.pageNumber = 1
+      this.getTableData()
     }
   }
 };

+ 1 - 1
src/components/data_admin/buildTask/table/deviceTable.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="table-container">
     <div class="table-list" :style="tableData && tableData.length?'height:calc(100% - 50px);':'height:100%;'">
-      <el-table :data="tableData" style="width: 100%;height:100%;" v-loading="loading" :header-cell-style="headerStyle" >
+      <el-table :data="tableData" style="width: 100%;" height="100%" v-loading="loading" :header-cell-style="headerStyle" >
         <el-table-column label="所属建筑楼层" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
             <div>

+ 1 - 1
src/components/data_admin/buildTask/table/modelTable.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="table-container">
     <div class="table-list" :style="tableData && tableData.length?'height:calc(100% - 50px);':'height:100%;'">
-      <el-table :data="tableData" style="width: 100%" height="100%" v-loading="loading" :header-cell-style="headerStyle">
+      <el-table :data="tableData" style="width: 100%;" height="100%" v-loading="loading" :header-cell-style="headerStyle">
         <el-table-column prop="FolderName" label="所属模型文件夹" show-overflow-tooltip min-width="80"></el-table-column>
         <el-table-column prop="FileName" label="模型文件名" show-overflow-tooltip min-width="80"></el-table-column>
         <el-table-column :label="`${inSpaceType}本地名称`" show-overflow-tooltip min-width="100">

+ 1 - 1
src/components/data_admin/buildTask/table/replaceTable.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="table-container">
     <div class="table-list" :style="tableData && tableData.length?'height:calc(100% - 50px);':'height:100%;'">
-      <el-table :data="tableData" style="width: 100%" height="100%" v-loading="loading" :header-cell-style="headerStyle">
+      <el-table :data="tableData" style="width: 100%;" height="100%" v-loading="loading" :header-cell-style="headerStyle">
         <el-table-column label="所属建筑楼层" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
             <div>

+ 1 - 1
src/components/data_admin/buildTask/table/tearTable.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="table-container">
     <div class="table-list" :style="tableData && tableData.length?'height:calc(100% - 50px);':'height:100%;'">
-      <el-table :data="tableData" style="width: 100%" height="100%" v-loading="loading" :header-cell-style="headerStyle">
+      <el-table :data="tableData" style="width: 100%;" height="100%" v-loading="loading" :header-cell-style="headerStyle">
         <el-table-column label="所属建筑楼层" show-overflow-tooltip min-width="100">
           <template slot-scope="scope">
             <div>

+ 2 - 2
src/components/ledger/lib/cenoteGraphy.vue

@@ -22,7 +22,7 @@ import { SColor, SPoint } from "@saga-web/draw/lib";
 import { DivideFloorScene, SpaceItem, ZoneItem, Opt } from "@saga-web/cad-engine/lib";
 import { FloorView } from "@saga-web/cad-engine/lib/FloorView";
 import { colorArr } from '@/utils/spaceColor';
-import { getFloorMsgByFloorID, shaftSpaceQuery, shaftZoneLinkReplace, zoneQuery } from '@/api/scan/request';
+import { getFloorMsgByFloorID, shaftSpaceQuery, shaftZoneLinkReplace, zoneQueryOutline } from '@/api/scan/request';
 import { resolve, reject } from 'q';
 export default {
   data() {
@@ -144,7 +144,7 @@ export default {
           pa.BuildingId = this.buildingData[0];
           pa.FloorId = this.buildingData[1];
         }
-        zoneQuery(pa, res => {
+        zoneQueryOutline(pa, res => {
           resolve(res);
         })
       })

+ 6 - 4
src/components/model/file/nodeDialog.vue

@@ -6,14 +6,14 @@
         <div v-if='checkType=="firstCheck"||checkType=="secondCheck"'>
           <p>强制检查项</p>
           <p v-for="(t,i) in check[checkType].checkList" :key='i'>
-            <i class="el-icon-check" v-if="!t.check"></i>
-            <i class="el-icon-close" v-else></i>
+            <i class="el-icon-check" v-if="show&&!t.check"></i>
+            <i class="el-icon-close" v-if="show&&t.check"></i>
             {{t.name}}
           </p>
           <p v-if="check[checkType].notCheckList.length">非强制检查项</p>
           <p v-for="(t,i) in check[checkType].notCheckList" :key='-i-1'>
-            <i class="el-icon-check" v-if="!t.check"></i>
-            <i class="el-icon-close" v-else></i>
+            <i class="el-icon-check" v-if="show&&!t.check"></i>
+            <i class="el-icon-close" v-if="show&&t.check"></i>
             {{t.name}}
           </p>
         </div>
@@ -64,6 +64,7 @@ export default {
           notCheckList: [],
         }
       },
+      show: false,
       errMsg: '',
       checkType: ''
     };
@@ -73,6 +74,7 @@ export default {
       this.errMsg = msg.ErrorMsg || '';
       this.checkType = type || '';
       this.title = title
+      this.show = msg.BeginTime
       if (type) {
         this.check[type].checkList.forEach(t => {
           if (t.value && t.value == 'GridCheck') {

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

@@ -3,7 +3,7 @@
     :class="{'pathCard':true,'borderB':data.BeginTime&&!data.EndTime,'borderY':!data.EndTime&&!data.HasError&&data.HasRetry,'borderR':!data.EndTime&&data.HasError}"
     @click="cardClick">
     <div class="path-title">
-      <i v-if="!data.BeginTime" class="iconfont icon-iconfontgengduo" style="color:#333333"></i>
+      <i v-if="!data.BeginTime" class="iconfont icon-iconfontgengduo" style="color:#89969f"></i>
       <i v-else-if="data.BeginTime&&!data.EndTime" class="iconfont icon-conduct" style="color:#409eff"></i>
       <i v-else class="el-icon-success" style="color:#67C23A"></i>
       {{title}}

+ 2 - 2
src/components/point/report/objectInstance.vue

@@ -44,7 +44,7 @@ import {
   floorQuery, //数据中心查询楼层
   buildingQuery, //数据中心建筑查询
   projectQuery, //数据中心查询项目信息
-  zoneQuery, //数据中心所有空间实例
+  zoneQueryOutline, //数据中心所有空间实例
   queryLinkSys, //数据中心系统查询
   queryTenant, //数据中心查询租户
   partsQuery, //数据中心部件查询
@@ -117,7 +117,7 @@ export default {
             } else if (item.TypeCode == 'Sp') {
               //获取空间信息
               if (item.SpaceType) {
-                zoneQuery({
+                zoneQueryOutline({
                   Filters: `RoomID='${item.TypeCode + item.ProjectId + item.ObjectID}'`,
                   ZoneType: item.SpaceType
                 }, zoneMsg => {

+ 10 - 5
src/views/business_space/dataUtil/topology.vue

@@ -9,16 +9,21 @@
         <el-button size="mini" @click="saveGraphy" icon="el-icon-notebook-2">保存</el-button>
       </div>
       <div title="划线">
-        <el-button size="mini" @click="drawline" icon="el-icon-edit">添加关系</el-button>
+        <el-button size="mini" @click="drawline" icon="el-icon-edit">连线</el-button>
       </div>
-      <div title="适配底图">
+      <!-- <div title="适配底图">
         <el-button size="mini" @click="fitClick" icon="el-icon-crop">适配底图</el-button>
-      </div>
-      <div title="添加item">
-        <div v-for="(t,i) in equipList" :key="t.ID" @click="additem(i)" class="equip">
+      </div> -->
+      <div>
+        <div v-for="(t,i) in equipList" :key="t.ID" @click="additem(i)" class="equip" title="添加item">
           <img :src="t.ImgSource" />
         </div>
       </div>
+      <div>
+        <p>使用说明:</p>
+        <p>双击连线添加折点</p>
+        <p>alt+左键删除折点</p>
+      </div>
     </el-aside>
     <el-main>
       <div ref="graphy" v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"

+ 36 - 9
src/views/data_admin/buildTask/addTask/addAssetsTask.vue

@@ -26,6 +26,13 @@
           <el-table-column prop="EquipLocalID" label="资产本地编码" show-overflow-tooltip width="200"></el-table-column>
           <el-table-column prop="FamilyName.Name" label="设备族"></el-table-column>
           <el-table-column prop="LedgerParam.Siteinstall.InstallLocation" label="安装位置"></el-table-column>
+          <el-table-column prop="type" label="现场验证操作规定" width="200">
+            <template slot-scope="scope">
+              <el-select style="width:100px;" v-model="scope.row.SchemeId" placeholder="请选择">
+                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
           <template slot="empty">
           <div style="height: 60%;transform: translateY(50%);">
             <i class="icon-wushuju iconfont"></i>
@@ -72,6 +79,13 @@
         pageNumber: 1,
         total: 0
       },
+      options: [{//方案
+        value: '1',
+        label: '极简'
+      }, {
+        value: '2',
+        label: '标准'
+      }],
       tableData: [],
       multipleSelection:[],
       headerStyle: {
@@ -204,16 +218,29 @@
     },
     //创建已选
     handleClickCreate() {
-      let list = this.multipleSelection.map((item) => {
-        return {EquipId: item.EquipID}
-      })
-      let param = {
-        Content: list
+      if (this.multipleSelection.length) {
+        let list = this.multipleSelection.map((item) => {
+          if (item.SchemeId) {
+            return {
+              EquipId: item.EquipID,
+              SchemeId: item.SchemeId
+            }
+          } else {
+            return {
+              EquipId: item.EquipID
+            }
+          }
+        })
+        let param = {
+          Content: list
+        }
+        createAssetsTask(param, res => {
+          this.$message.success("创建成功!")
+          this.$router.push({ name: "buildTask",query:{ newTaskTypes:this.$route.query.newTaskTypes } })
+        })
+      } else {
+        this.$message('请选择要创建的任务!')
       }
-      createAssetsTask(param, res => {
-        this.$message.success("创建成功!")
-        this.$router.push({ name: "buildTask",query:{ newTaskTypes:this.$route.query.newTaskTypes } })
-      })
     }
   }
 };

+ 2 - 2
src/views/ledger/rentlist/manageTenantZone.vue

@@ -85,7 +85,7 @@ import { mapGetters, mapActions } from "vuex";
 import { SColor, SPoint } from "@saga-web/draw/lib";
 import { DivideFloorScene, SpaceItem, ZoneItem, FloorView, Opt } from "@saga-web/cad-engine/lib";
 import { colorArr } from "@/utils/spaceColor"
-import { buildingQuery, queryTnRelateFloor, queryRentTableData, tnRelateZone, zoneQuery } from '@/api/scan/request'
+import { buildingQuery, queryTnRelateFloor, queryRentTableData, tnRelateZone, zoneQueryOutline } from '@/api/scan/request'
 export default {
   data() {
     return {
@@ -316,7 +316,7 @@ export default {
         }
         this.canvasLoading = false;
         let promise1 = new Promise((resolve) => {
-          zoneQuery(pa, res => {
+          zoneQueryOutline(pa, res => {
             resolve(res);
           })
         })

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

@@ -235,7 +235,7 @@
     // 获取关系是否需要计算
     getRelations() {
       let pa = {
-        Filters: `not ZoneType isNull;ComputationalState>1`
+        Filters: `RelationType in ["bd2sp","fl2sp"];ComputationalState>1`
       }
       getrelationTypeProject(pa, res => {
         if (res.Content.length) {

+ 4 - 0
src/views/model/file/pathcontrol/index.vue

@@ -1,6 +1,10 @@
 <template>
   <div id="path-control" v-loading="loading">
     <el-row class="title-time">
+      <div style="width:200px">
+        <span>模型文件大小:</span>
+        <span>{{(Size/1000/1024).toFixed(1)}}M</span>
+      </div>
       <div style="width:220px">
         <span>模型总耗时:</span>
         <span>{{allTakeTime}}</span>

+ 3 - 3
src/views/ready/buildfloor/drawGraphy/drawFloor.vue

@@ -13,7 +13,7 @@ import { SGraphyView } from "@saga-web/graphy/lib";
 import { DivideFloorScene, FloorView, Opt } from "@saga-web/cad-engine/lib"
 import { SColor, SPoint } from "@saga-web/draw/lib";
 import canvasFun from "@/components/business_space/newGraphy/canvasFun"
-import { floorQuery } from "@/api/scan/request";
+import { floorQueryOutline } from "@/api/scan/request";
 export default {
   components: {
     canvasFun
@@ -120,7 +120,7 @@ export default {
       let pa = {
         Filters: `FloorID='${this.FloorID}'`
       }
-      floorQuery(pa, res => {
+      floorQueryOutline(pa, res => {
         this.floorData = res.Content[0];
         this.getOtherFloorOutLine();
         this.initGraphy(this.floorData.StructureInfo.FloorMap, 2)
@@ -133,7 +133,7 @@ export default {
         Filters: `ModelId='${modelid}'`
       }
       this.shadeList = [];
-      floorQuery(pa, res => {
+      floorQueryOutline(pa, res => {
         res.Content.map(t => {
           if (t.FloorID != this.FloorID && t.Outline && t.Outline.length) {
             let line = t.Outline.map(item => {

+ 2 - 2
src/views/ready/buildfloor/repetitionGraphy.vue

@@ -20,7 +20,7 @@
 <script>
 import drawFloor from "./drawGraphy/drawFloor";
 import checkGraphy from "./drawGraphy/checkGraphy"; //查看图片
-import { floorUpdate, floorQueryAndSign } from "@/api/scan/request";
+import { floorUpdateOutline, floorQueryAndSign } from "@/api/scan/request";
 import { getFileNameById } from "@/api/model/file";
 export default {
   components: {
@@ -82,7 +82,7 @@ export default {
         Content: [{ FloorID: this.FloorID, Outline: Outline }],
         Projection: ['Outline']
       }
-      floorUpdate(pa, res => {
+      floorUpdateOutline(pa, res => {
         this.isEdit = false;
         this.$message.success("更新成功");
       })

+ 2 - 2
src/views/ready/collectsetting/index.vue

@@ -26,7 +26,7 @@
               <ul class="family_list">
                 <li class="family_item" @click="familyActive(family.name,family.code)"
                     :class="active == family.name ? 'active' : ''" v-for="(family,index) in allFamily" :key="index"
-                    v-if="family.capitalize === letter">{{family.name}}-{{family.code}}
+                    v-show="family.capitalize === letter">{{family.name}}-{{family.code}}
                 </li>
               </ul>
             </div>
@@ -34,7 +34,7 @@
               <ul class="family_list">
                 <li class="family_item" @click="familyActive(family.name,family.code)"
                     :class="active == family.name ? 'active' : ''" v-for="(family,index) in searchArr" :key="index"
-                    v-if="family.capitalize === letter">{{family.name}}-{{family.code}}
+                    v-show="family.capitalize === letter">{{family.name}}-{{family.code}}
                 </li>
               </ul>
             </div>

+ 2 - 2
src/views/relation/overview/detail/index.vue

@@ -45,7 +45,7 @@
 <script>
 import {
   buildingQuery, //数据中心-建筑查询
-  zoneQuery, // 业务空间查询
+  zoneQueryOutline, // 业务空间查询
   queryDictionaryHead, //空间类型查询
   createSpaceNeighborhood, //创建邻接关系
   querySpaceNeighborhood, // 查询邻接关系
@@ -298,7 +298,7 @@ export default {
       } else {
         this.$message.warning("请选择建筑楼层");
       }
-      zoneQuery(pa, res => {
+      zoneQueryOutline(pa, res => {
         // 所有业务空间
         this.businessSpaceList = res.Content;
         // 已关联元空间的业务空间

+ 2 - 2
src/views/screen/splitscreen/integrateresults/index.vue

@@ -42,7 +42,7 @@
 import { SGraphyView } from "@saga-web/graphy/lib";
 import { LocationPointScene, DivideFloorScene } from "@saga-web/cad-engine";
 import { SColor } from "@saga-web/draw/lib";
-import { queryEquip, floorQuery, zoneQuery } from '@/api/scan/request';
+import { queryEquip, floorQuery, zoneQueryOutline } from '@/api/scan/request';
 //组件
 import realtimeData from '@/components/screen/integrateresults/realtimeData';
 import exampleList from '@/components/screen/integrateresults/exampleList';
@@ -107,7 +107,7 @@ export default {
               ZoneType: example.SubTypeCode
             }
             //获取空间信息
-            zoneQuery(pa, zoneMsg => {
+            zoneQueryOutline(pa, zoneMsg => {
               if (zoneMsg.Content[0] && zoneMsg.Content[0].Outline) {
                 let canvasOption = {
                   RoomLocalName: zoneMsg.Content[0].RoomLocalName,

+ 16 - 4
src/views/screen/splitscreen/spaceledger/index.vue

@@ -118,7 +118,7 @@
 </template>
 
 <script>
-  import {BeatchQueryParam, floorQuery, getDataDictionary, zoneQuery} from '@/api/scan/request'
+  import {BeatchQueryParam, floorQuery, getDataDictionary, zoneQuery, zoneQueryOutline} from '@/api/scan/request'
   import eqToSpaceTable from '@/components/business_space/newTables/eqToSpaceTable'
   import syInSpaceTable from '@/components/business_space/newTables/syInSpaceTable'
   import {DivideFloorScene, FloorView} from "@saga-web/cad-engine/lib";
@@ -226,9 +226,10 @@
         Promise.all([promise1, promise2]).then(values => {
           this.pointData = values[0].Content;
           this.spaceDetails = values[1].Content[0];
-          if (this.spaceDetails.Outline && this.spaceDetails.Outline[0] && this.spaceDetails.Outline[0].length) {
-            this.getSpaceFloor();
-          }
+          this.getOutline();
+          // if (this.spaceDetails.Outline && this.spaceDetails.Outline[0] && this.spaceDetails.Outline[0].length) {
+          //   this.getSpaceFloor();
+          // }
           let obj = values[1].Content[0] ? this.deepCopy(values[1].Content[0]) : values[1].Content[0];
           obj = tools.flattenKeys(obj);
           for(let key in obj) {
@@ -241,6 +242,17 @@
           this.handleRadios(this.radio);
         })
       },
+      getOutline(){
+        zoneQueryOutline({
+          Filters: `RoomID="${this.$route.query.RoomID}"`,
+          ZoneType: this.$route.query.zone
+        },res => {
+          if(res.Content[0]&&res.Content[0].Outline&&res.Content[0].Outline.length){
+            this.spaceDetails.Outline = res.Content[0].Outline;
+            this.getSpaceFloor();
+          }
+        })
+      },
       deepCopy(obj) {
         return JSON.parse(JSON.stringify(obj))
       },