Bläddra i källkod

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

yangjunjing 5 år sedan
förälder
incheckning
c5f065995f

+ 4 - 4
package.json

@@ -25,10 +25,10 @@
         "vue-router": "^3.0.1",
         "vuex": "^3.1.0",
         "cad-engine": "2.0.250",
-        "@saga-web/base": "2.1.8",
-        "@saga-web/draw": "2.1.57",
-        "@saga-web/graphy": "2.1.28",
-        "@saga-web/cad-engine": "2.0.308"
+        "@saga-web/base": "2.1.9",
+        "@saga-web/draw": "2.1.58",
+        "@saga-web/graphy": "2.1.30",
+        "@saga-web/cad-engine": "2.0.406"
     },
     "devDependencies": {
         "ajv": "^6.9.1",

+ 227 - 202
src/components/data_admin/buildTask/detail/deviceDetail.vue

@@ -1,219 +1,244 @@
 <template>
-  <div class="detail-box">
-    <el-scrollbar style="height:100%;">
-      <div class="attribute-detail detail-item">
-        <el-form :model="detail" label-width="150px">
-          <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.EquipCategory?detail.EquipCategory.EquipName?detail.EquipCategory.EquipName:'--':'--' }}</el-form-item>
-          <el-form-item label="全局名称:">{{ detail.EquipName || '--' }}</el-form-item>
-          <el-form-item label="设备本地名称:">{{ detail.EquipLocalName || '--' }}</el-form-item>
-          <el-form-item label="设备本地编码:">{{ detail.EquipLocalID || '--' }}</el-form-item>
-          <el-form-item label="设计图纸中编码:">{{ detail.CadId || '--' }}</el-form-item>
-          <el-form-item label="安装位置:">{{ detail.InstallLocation || '--' }}</el-form-item>
-          <el-form-item label="生产厂家:">{{ detail.Manufacturer || '--' }}</el-form-item>
-          <el-form-item label="型号:">{{ detail.Specification || '--' }}</el-form-item>
-          <el-form-item label="供应商:">{{ detail.Supplier || '--' }}</el-form-item>
-          <el-form-item label="包含部件:">
-            <div v-if="detail.Component && detail.Component.length">
-              <p v-for="(item, index) in detail.Component?detail.Component:[]" :key="index" show-overflow-tooltip>
-               {{ item.EquipName }}
-              </p>
+    <div class="detail-box">
+        <el-scrollbar style="height:100%;">
+            <div class="attribute-detail detail-item">
+                <el-form :model="detail" label-width="150px">
+                    <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.EquipCategory?detail.EquipCategory.EquipName?detail.EquipCategory.EquipName:'--':'--' }}
+                    </el-form-item>
+                    <el-form-item label="全局名称:">{{ detail.EquipName || '--' }}</el-form-item>
+                    <el-form-item label="设备本地名称:">{{ detail.EquipLocalName || '--' }}</el-form-item>
+                    <el-form-item label="设备本地编码:">{{ detail.EquipLocalID || '--' }}</el-form-item>
+                    <el-form-item label="设计图纸中编码:">{{ detail.CadId || '--' }}</el-form-item>
+                    <el-form-item label="安装位置:">{{ detail.InstallLocation || '--' }}</el-form-item>
+                    <el-form-item label="生产厂家:">{{ detail.Manufacturer || '--' }}</el-form-item>
+                    <el-form-item label="型号:">{{ detail.Specification || '--' }}</el-form-item>
+                    <el-form-item label="供应商:">{{ detail.Supplier || '--' }}</el-form-item>
+                    <el-form-item label="包含部件:">
+                        <div v-if="detail.Component && detail.Component.length">
+                            <p v-for="(item, index) in detail.Component?detail.Component:[]" :key="index"
+                               show-overflow-tooltip>
+                                {{ item.EquipName }}
+                            </p>
+                        </div>
+                        <div v-else>--</div>
+                    </el-form-item>
+                </el-form>
             </div>
-            <div v-else>--</div>
-          </el-form-item>
-        </el-form>
-      </div>
-      <div class="implement-detail detail-item" v-if="detail.TaskState == '未找到'">
-        <el-form :model="detail" label-width="150px">
-          <el-form-item label="执行任务人:">{{ detail.WorkerName || '--' }}</el-form-item>
-          <el-form-item label="执行时间:">{{ detail.ProcessTime || '--' }}</el-form-item>
-          <el-form-item label="未找到对象信息"></el-form-item>
-          <el-form-item label="设备信息:" v-if="!detail.isComponent">{{ detail.EquipLocalName || detail.EquipName ||'--' }}</el-form-item>
-          <el-form-item label="部件信息:" v-else>
-            <div v-if="detail.Component && detail.Component.length">
-              <p v-for="item in detail.Component?detail.Component:[]" :key="item.TaskId" show-overflow-tooltip>
-               {{ item.EquipLocalName || item.EquipName }}
-              </p>
+            <div class="implement-detail detail-item" v-if="detail.TaskState == '未找到'">
+                <el-form :model="detail" label-width="150px">
+                    <el-form-item label="执行任务人:">{{ detail.WorkerName || '--' }}</el-form-item>
+                    <el-form-item label="执行时间:">{{ detail.ProcessTime || '--' }}</el-form-item>
+                    <el-form-item label="未找到对象信息"></el-form-item>
+                    <el-form-item label="设备信息:" v-if="!detail.isComponent">{{ detail.EquipLocalName || detail.EquipName
+                        ||'--' }}
+                    </el-form-item>
+                    <el-form-item label="部件信息:" v-else>
+                        <div v-if="detail.Component && detail.Component.length">
+                            <p v-for="item in detail.Component?detail.Component:[]" :key="item.TaskId"
+                               show-overflow-tooltip>
+                                {{ item.EquipLocalName || item.EquipName }}
+                            </p>
+                        </div>
+                        <div v-else>--</div>
+                    </el-form-item>
+                    <el-form-item label="全景图:" v-show="panoramaList && panoramaList.length">
+                        <div class="img-item" @click="dialogVisible = true" v-for="item in panoramaList"
+                             :key="item.Key">
+                            <img :src="`/image-service/common/image_get?systemId=dataPlatform&key=${item.Key}`"
+                                 style="width:100%;" :alt="item.Name">
+                        </div>
+                    </el-form-item>
+                    <el-form-item label="资产照片:" v-show="imgList && imgList.length">
+                        <div class="img-item">
+                            <div class="demo-image__preview">
+                                <el-image style="width:100%;" v-for="item in imgList"
+                                          :key="item.Key" :title="item.Name"
+                                          @click="nowUrl = item.Key"
+                                          :src="`/image-service/common/image_get?systemId=dataPlatform&key=${item.Key}&width=400`"
+                                          :preview-src-list="srcList">
+                                </el-image>
+                            </div>
+                        </div>
+                    </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">
+                            您的浏览器不支持 HTML5 video ,暂无法播放。
+                        </video>
+                    </el-form-item>
+                    <el-form-item label="备注信息:">{{ detail.Note || '--' }}</el-form-item>
+                </el-form>
             </div>
-            <div v-else>--</div>
-          </el-form-item>
-          <el-form-item label="全景图:" v-show="panoramaList && panoramaList.length">
-            <div class="img-item" @click="dialogVisible = true"  v-for="item in panoramaList" :key="item.Key">
-              <img :src="`/image-service/common/image_get?systemId=dataPlatform&key=${item.Key}`" style="width:100%;" :alt="item.Name">
+            <div class="operation-detail detail-item">
+                <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-card>
+                                    <h4>更新 Github 模板</h4>
+                                    <p>王小虎 提交于 2018/4/2 20:46</p>
+                                </el-card>
+                            </el-timeline-item>
+                        </el-timeline>
+                    </div>
+                </el-form>
             </div>
-          </el-form-item>
-          <el-form-item label="资产照片:" v-show="imgList && imgList.length">
-            <div class="img-item">
-              <div class="demo-image__preview">
-                <el-image style="width:100%;" v-for="item in imgList"
-                 :key="item.Key" :title="item.Name"
-                 @click="nowUrl = item.Key" 
-                 :src="`/image-service/common/image_get?systemId=dataPlatform&key=${item.Key}&width=400`" 
-                 :preview-src-list="srcList">
-                </el-image>
-              </div>
-            </div>
-          </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">
-              您的浏览器不支持 HTML5 video ,暂无法播放。
-            </video>
-          </el-form-item>
-          <el-form-item label="备注信息:">{{ detail.Note || '--' }}</el-form-item>
-        </el-form>
-      </div>
-      <div class="operation-detail detail-item">
-        <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-card>
-                  <h4>更新 Github 模板</h4>
-                  <p>王小虎 提交于 2018/4/2 20:46</p>
-                </el-card>
-              </el-timeline-item>
-            </el-timeline>
-          </div>
-        </el-form>
-      </div>
-    </el-scrollbar>
-    <el-dialog title="全景图" :visible.sync="dialogVisible" width="70%" append-to-body>
-      一张图
-    </el-dialog>
-  </div>
+        </el-scrollbar>
+        <el-dialog title="全景图" :visible.sync="dialogVisible" width="70%" append-to-body>
+            一张图
+        </el-dialog>
+    </div>
 </template>
 
 <script>
-import { } from "@/api/scan/request"
-import { mapGetters } from "vuex"
-export default {
-  components: {
+    import {mapGetters} from "vuex"
 
-  },
-  computed: {
-    ...mapGetters("layout", ["projectId"]),
-    notFoundList(){
-      if(this.detail && this.detail.Component && this.detail.Component.length){//是否存在部件
-        let index = this.detail.Component.findIndex(item => {return item.TaskState == -1})
-        if(index != -1){//部件中存在未找到的对象
-          this.detail.isComponent = true
-          return this.detail.Component[index].TaskPicList?this.detail.Component[index].TaskPicList:[]
-        } else {//部件全部找到
-          this.detail.isComponent = false
-          return this.detail.TaskPicList?this.detail.TaskPicList:[]
-        }
-      } else {
-        this.detail.isComponent = false
-        if(this.detail && this.detail.TaskPicList && this.detail.TaskPicList.length){
-          return this.detail.TaskPicList
-        } else {
-          return []
-        }
-      }
-    },
-    panoramaList(){
-      if(this.notFoundList && this.notFoundList.length){
-        return this.notFoundList.filter(item => {
-          return item.Type == 'panorama'
-        })
-      } else {
-        return []
-      }
-    },
-    imgList(){
-      if(this.notFoundList && this.notFoundList.length){
-        return this.notFoundList.filter(item => {
-          return item.Type == 'image'
-        })
-      } else {
-        return []
-      }
-    },
-    videoList(){
-      if(this.notFoundList && this.notFoundList.length){
-        return this.notFoundList.filter(item => {
-          return item.Type == 'video'
-        })
-      } else {
-        return []
-      }
-    },
-    srcList(){
-      let nowIndex = this.imgList.findIndex(item => {return item.Key == this.nowUrl})
-      let index = nowIndex >= 1 ? nowIndex : 0;
-      let tempArr1 = this.imgList.slice(0, index);
-      let tempArr2 = this.imgList.slice(index, this.imgList.length);
+    export default {
+        components: {
 
-      let res = tempArr2.concat(tempArr1).map(item => {
-        return `/image-service/common/image_get?systemId=dataPlatform&key=${item.Key}`
-      });
-      return res;
-    }
   },
-  props: {
-    detail: Object
-  },
-  data() {
-    return {
-      dialogVisible: false,//全景图弹出框
-      nowUrl: '',//当前正在显示的图
+        created() {
+            console.log(this.detail)
+            // ConfirmTime 确认信息时间
+            //    PositivePhotoTime	string 正面照片时间
+            //    QrCodeTime	打印二维码时间
+            //     RegionPhotoTime	string 局部照片时间
+            //     SidePhotoTime	string 侧面照片时间
+        },
+        computed: {
+            ...mapGetters("layout", ["projectId"]),
+            notFoundList() {
+                if (this.detail && this.detail.Component && this.detail.Component.length) {//是否存在部件
+                    let index = this.detail.Component.findIndex(item => {
+                        return item.TaskState == -1
+                    })
+                    if (index != -1) {//部件中存在未找到的对象
+                        this.detail.isComponent = true
+                        return this.detail.Component[index].TaskPicList ? this.detail.Component[index].TaskPicList : []
+                    } else {//部件全部找到
+                        this.detail.isComponent = false
+                        return this.detail.TaskPicList ? this.detail.TaskPicList : []
+                    }
+                } else {
+                    this.detail.isComponent = false
+                    if (this.detail && this.detail.TaskPicList && this.detail.TaskPicList.length) {
+                        return this.detail.TaskPicList
+                    } else {
+                        return []
+                    }
+                }
+            },
+            panoramaList() {
+                if (this.notFoundList && this.notFoundList.length) {
+                    return this.notFoundList.filter(item => {
+                        return item.Type == 'panorama'
+                    })
+                } else {
+                    return []
+                }
+            },
+            imgList() {
+                if (this.notFoundList && this.notFoundList.length) {
+                    return this.notFoundList.filter(item => {
+                        return item.Type == 'image'
+                    })
+                } else {
+                    return []
+                }
+            },
+            videoList() {
+                if (this.notFoundList && this.notFoundList.length) {
+                    return this.notFoundList.filter(item => {
+                        return item.Type == 'video'
+                    })
+                } else {
+                    return []
+                }
+            },
+            srcList() {
+                let nowIndex = this.imgList.findIndex(item => {
+                    return item.Key == this.nowUrl
+                })
+                let index = nowIndex >= 1 ? nowIndex : 0;
+                let tempArr1 = this.imgList.slice(0, index);
+                let tempArr2 = this.imgList.slice(index, this.imgList.length);
+
+                let res = tempArr2.concat(tempArr1).map(item => {
+                    return `/image-service/common/image_get?systemId=dataPlatform&key=${item.Key}`
+                });
+                return res;
+            }
+        },
+        props: {
+            detail: Object
+        },
+        data() {
+            return {
+                dialogVisible: false,//全景图弹出框
+                nowUrl: '',//当前正在显示的图
+            };
+        },
+        methods: {},
+        watch: {
+            'detail.TaskId'() {
+                console.log(this.detail)
+            }
+        }
     };
-  },
-  methods: {
-  },
-  watch: {
-    'detail.TaskId'() {
-      console.log(this.detail)
-    }
-  }
-};
 </script>
 <style lang="less" scoped>
-.detail-box {
-  width: 100%;
-  height: 100%;
-  box-sizing: border-box;
-  /deep/ .el-scrollbar__wrap {
-    overflow-x: hidden;
-  }
-  /deep/ .el-icon-circle-close {
-    color: white;
-  }
+    .detail-box {
+        width: 100%;
+        height: 100%;
+        box-sizing: border-box;
+
+        /deep/ .el-scrollbar__wrap {
+            overflow-x: hidden;
+        }
+
+        /deep/ .el-icon-circle-close {
+            color: white;
+        }
 
-  /deep/ .el-form-item__content {
-    text-overflow: ellipsis;
-    overflow: hidden;
-  }
+        /deep/ .el-form-item__content {
+            text-overflow: ellipsis;
+            overflow: hidden;
+        }
 
-  .detail-item {
-    width: calc(100% - 30px);
-    margin: 15px 15px 10px;
-    padding: 10px;
-    box-sizing: border-box;
-    border-left: 1px solid #eee;
-    box-shadow: 0px 1px 5px 0px rgba(59, 66, 84, 0.15);
-  }
+        .detail-item {
+            width: calc(100% - 30px);
+            margin: 15px 15px 10px;
+            padding: 10px;
+            box-sizing: border-box;
+            border-left: 1px solid #eee;
+            box-shadow: 0px 1px 5px 0px rgba(59, 66, 84, 0.15);
+        }
 
-  .img-item {
-    position: relative;
-    cursor: pointer;
-  }
+        .img-item {
+            position: relative;
+            cursor: pointer;
+        }
 }
-</style>
+</style>

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

@@ -8,7 +8,7 @@
           <template slot-scope="scope">
             <div>
               {{scope.row.EquipLocalName}}
-              <el-badge v-if="scope.row.Equipment?scope.row.Equipment.Component?scope.row.Equipment.Component.length:false:false" 
+              <el-badge v-if="scope.row.Equipment?scope.row.Equipment.Component?scope.row.Equipment.Component.length:false:false"
                 :value="scope.row.Equipment?scope.row.Equipment.Component?scope.row.Equipment.Component.length:0:0" class="item" type="warning">
               </el-badge>
             </div>
@@ -235,4 +235,4 @@ export default {
     margin-right: 15px;
   }
 }
-</style>
+</style>

+ 2 - 1
src/components/dialogs/list/batchDialog.vue

@@ -149,6 +149,7 @@
             <el-table
                 ref="multipleTable"
                 :data="tableData"
+                max-height="300"
                 tooltip-effect="dark"
                 style="width:100%;margin-bottom: 10px"
                 @selection-change="handleSelectionChange"
@@ -398,7 +399,7 @@
                     InsuranceDoc: insuranceFile.InsuranceFile.length ? {
                         InsuranceFile: insuranceFile.InsuranceFile.length ? insuranceFile.InsuranceFile : undefined
                     } : undefined,
-                    PhotoDoc: archive.Archive.length || drawing.Drawing.length || nameplate.Nameplate.length ? {
+                    PhotoDoc: archive.Archive.length || drawing.Drawing.length || nameplate.Nameplate.length || pic.Pic.length ? {
                         Archive: archive.Archive.length ? archive.Archive : undefined,
                         Drawing: drawing.Drawing.length ? drawing.Drawing : undefined,
                         Nameplate: nameplate.Nameplate.length ? nameplate.Nameplate : undefined,

+ 4 - 4
src/views/data_admin/buildGraphy/graphyCanvas.vue

@@ -1,14 +1,14 @@
 <template>
   <div ref="graphyMain" class="canvasGraphy">
+    <div style="width:100%;height:100%;" v-show="type==3" ref="canvasContainer" v-loading="canvasLoading">
+      <canvas id="canvas" :width="canvasW" :height="canvasH" ref="canvas"></canvas>
+    </div>
     <div v-if="type!=3" class="center" style="height: 400px;padding-top: 315px; box-sizing:border-box;">
       <i class="icon-wushuju iconfont"></i>
       <p>{{type == 1 ? '请选择楼层' : '当前楼层尚无平面图,请去空间管理根据模型生成'}}</p>
     </div>
-    <div style="width:100%;height:100%;" v-show="type==3" ref="canvasContainer" v-loading="canvasLoading">
-      <canvas id="canvas" :width="canvasW" :height="canvasH" ref="canvas"></canvas>
-    </div>
     <!-- 底部操作按钮 -->
-    <el-row v-if="type == 3" class="canvas-actions-box">
+    <el-row v-show="type == 3" class="canvas-actions-box">
       <canvasFun @move="moveCanvas" @fit="fit" @savePng="savePng" @saveSvg="saveSvg" @divide="divide" @clearDivide="clearDivide" @undo="undo"
         @redo="redo" @scale="scale" :isEdit="isEdit" :config="config" ref="canvasFun"></canvasFun>
     </el-row>

+ 1 - 1
src/views/data_admin/buildGraphy/locationPointMsg.vue

@@ -8,7 +8,7 @@
     <div style="padding:5px 10px;">
       <p>勾选需要补充到业务空间的图片信息</p>
       <div v-if="pointObj.ImageList && pointObj.ImageList.length">
-        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange"><span style="padding-left:20px">全选</span></el-checkbox>
+        <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange"><span style="padding-left:25px;vertical-align: text-bottom;">全选</span></el-checkbox>
         <div style="margin: 15px 0;"></div>
         <el-checkbox-group v-model="choImg" @change="handleCheckedCitiesChange">
           <el-checkbox v-for="item in pointObj.ImageList" :label="item" :key="item.key">

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

@@ -52,14 +52,15 @@
 </template>
 
 <script>
-import { mapGetters } from "vuex"
-//组件
-import floorCascader from "@/components/ledger/lib/floorCascader"
-import myCascader from "@/components/ledger/lib/assets"
-//api
-import { queryProperty } from "@/api/scan/request"
-import { createAssetsTask } from "@/api/data_admin/buildTaskApi"
-export default {
+    import {mapGetters} from "vuex"
+    //组件
+    import floorCascader from "@/components/ledger/lib/floorCascader"
+    import myCascader from "@/components/ledger/lib/assets"
+    //api
+    import {queryProperty} from "@/api/scan/request"
+    import {createAssetsTask} from "@/api/data_admin/buildTaskApi"
+
+    export default {
   data() {
     return {
       params: {},

+ 3 - 3
src/views/data_admin/buildTask/addTask/addDeviceTask.vue

@@ -28,7 +28,7 @@
              <template slot-scope="scope">
               <div>
                 {{scope.row.EquipLocalName}}
-                <el-badge v-if="scope.row.Component&&scope.row.Component.length?true:false" 
+                <el-badge v-if="scope.row.Component&&scope.row.Component.length?true:false"
                   :value="scope.row.Component&&scope.row.Component.length?scope.row.Component.length:0" class="item" type="warning">
                 </el-badge>
               </div>
@@ -207,7 +207,7 @@ export default {
         PageNumber: this.page.pageNumber,
         PageSize: this.page.pageSize
       }
-      
+
       if(this.params.isVerification){
         params.Filters += `;TaskState isNull`
       }
@@ -298,4 +298,4 @@ export default {
     margin-left: 120px;
     width: 100%;
   }
-</style>
+</style>

+ 20 - 18
src/views/data_admin/buildTask/index.vue

@@ -26,23 +26,24 @@
 </template>
 
 <script>
-import { mapGetters } from "vuex"
-import taskStatistics from '@/components/data_admin/buildTask/taskStatistics'
-import floorCascader from "@/components/ledger/lib/floorCascader"
+    import {mapGetters} from "vuex"
+    import taskStatistics from '@/components/data_admin/buildTask/taskStatistics'
+    import floorCascader from "@/components/ledger/lib/floorCascader"
 
-import taskState from "@/components/data_admin/buildTask/lib/taskState"
-import modelFile from "@/components/data_admin/buildTask/lib/modelFile"
-import modelCascader from "@/components/data_admin/buildTask/lib/modelCascader"
-import deviceCascader from "@/components/data_admin/buildTask/lib/deviceCascader"
-import assetsCascader from "@/components/data_admin/buildTask/lib/assetsCascader"
+    import taskState from "@/components/data_admin/buildTask/lib/taskState"
+    import modelFile from "@/components/data_admin/buildTask/lib/modelFile"
+    import modelCascader from "@/components/data_admin/buildTask/lib/modelCascader"
+    import deviceCascader from "@/components/data_admin/buildTask/lib/deviceCascader"
+    import assetsCascader from "@/components/data_admin/buildTask/lib/assetsCascader"
 
-import modelTable from "@/components/data_admin/buildTask/table/modelTable"
-import deviceTable from "@/components/data_admin/buildTask/table/deviceTable"
-import assetsTable from "@/components/data_admin/buildTask/table/assetsTable"
-import tearTable from "@/components/data_admin/buildTask/table/tearTable"
-import replaceTable from "@/components/data_admin/buildTask/table/replaceTable"
-import addTask from "@/components/data_admin/buildTask/dialog/addTaskDialog"
-export default {
+    import modelTable from "@/components/data_admin/buildTask/table/modelTable"
+    import deviceTable from "@/components/data_admin/buildTask/table/deviceTable"
+    import assetsTable from "@/components/data_admin/buildTask/table/assetsTable"
+    import tearTable from "@/components/data_admin/buildTask/table/tearTable"
+    import replaceTable from "@/components/data_admin/buildTask/table/replaceTable"
+    import addTask from "@/components/data_admin/buildTask/dialog/addTaskDialog"
+
+    export default {
   components: {
 		taskState,
 		modelCascader,
@@ -71,8 +72,9 @@ export default {
 					{value: "model", label: '现场验证模型'},
 					{value: "device", label: '现场验证设备台账'},
 					{value: "assets", label: '现场验证资产台账'}
-				]}, 
-				{ value: "tear", label: '现场撕码任务' }, 
+                    ]
+                },
+                {value: "tear", label: '现场撕码任务'},
 				{ value: "replace", label: '现场换码任务' }
 			],
 			taskStateList: [{
@@ -155,4 +157,4 @@ export default {
 	.tabel-box{
 		height: calc(100% - 170px);
 	}
-</style>
+</style>

+ 3 - 2
src/views/ledger/cenotelist/relatedSpace.vue

@@ -44,7 +44,7 @@
               </div>
             </div>
           </el-scrollbar>
-          <div style="float:right;height:100%;width:calc(100% - 152px);border:1px solid rgb(201,201,201);border-left:none;">
+          <div style="float:right;height:100%;width:calc(100% - 151px);border:1px solid rgb(201,201,201);border-left:none;">
             <cenote-graphy ref="cenotegraphy"></cenote-graphy>
           </div>
         </div>
@@ -304,7 +304,7 @@ export default {
 <style lang="less" scoped>
 .condition {
   position: relative;
-  padding: 10px 10px;
+  padding: 10px;
   display: flex;
   height: calc(100% - 22px);
   flex-direction: column;
@@ -377,6 +377,7 @@ export default {
 .data-item {
   height: calc(100% - 44px);
   padding: 10px 0px;
+  box-sizing: border-box;
   /deep/ .is-horizontal {
     display: none;
   }

+ 86 - 86
src/views/relation/overview/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div style="overflow-x: hidden">
         <cardList
             :content="content"
             @template="templateDown"
@@ -13,86 +13,86 @@
     import {mapGetters} from 'vuex'
 
     export default {
-    data() {
-        return {
-            content: [
-                // {
-                //     GraphTypeId: '3535436',//大分类id
-                //     GraphTypeName: '架构从属关系',//大分类名称
-                //     GraphTypeCode: '',//大分类编码
-                //     Note: '',//说明
-                //     ParentId: '',//父id
-                //     ChildGraphicTypeList: [
-                //         {
-                //             GraphTypeId: '234534543',//图类型id
-                //             GraphTypeName: '建筑从属关系',//图类型名称
-                //             GraphTypeCode: 'ksaajdk',//图类型编码
-                //             Note: '显示数字字典excel中的xxx',//说明
-                //             ParentId: '3535436',//父id,GraphTypeId
-                //             RelationTypeProjectList: [
-                //                 {
-                //                     Id: '23445433534',
-                //                     RelationTypeName: '项目下的建筑体',//关系类型名称
-                //                     RelationTypeCode: 'Pj2Bd',//关系类型编码
-                //                     GraphicId: 'ksaajdk',//图类型编码
-                //                     Note: '边类型说明(待补充)',//说明
-                //                     ConneObject: '项目→建筑体',//连接对象
-                //                     IsSource: true,//是否需要配置源末端
-                //                     IsAutomatic: true,//是否自动计算类型
-                //                     Manual: 2,//123选一个手动计算类型1禁用2提示引导3手动维护
-                //                     Prompting: '【设备台账】,【系统台账】',//提示信息
-                //                     ProjectId: 'Pj1245',//项目id
-                //                     ComputingTime: '2019.12.12 12:00',//null不显示,最后一次自动计算时间
-                //                     ComputationalState: 1,//计算状态
-                //                 },
-                //             ]
-                //         },
-                //     ]
-                // },
-            ],
-            countNumber: [
-                //     {
-                //     "GraphTypeId": "3243215",
-                //     "GraphTypeName": "从属关系",
-                //     "GraphTypeCode": "ksaajdk",
-                //     "RelationTypeProjectList": [
-                //         {
-                //             "Id": "f3bed766a5ba45868d3a744fb8aaa0c8",
-                //             "RelationTypeName": "项目下的建筑体",
-                //             "RelationTypeCode": "关系类型编码",
-                //             "GraphicCode": "图类型code",
-                //             "ProjectId": "Pj5432532",
-                //             "count": "123"
-                //         },
-                //         {
-                //             "Id": "6b4c9f042d344eb99dd64e8e444ad2b0",
-                //             "RelationTypeName": "项目下的建筑体",
-                //             "RelationTypeCode": "关系类型编码",
-                //             "GraphicCode": "图类型code",
-                //             "ProjectId": "Pj5432532",
-                //             "count": "456"
-                //         },
-                //         {
-                //             "Id": "305170f91eae4bf991be9284e80a9cf4",
-                //             "RelationTypeName": "项目下的建筑体",
-                //             "RelationTypeCode": "关系类型编码",
-                //             "GraphicCode": "图类型code",
-                //             "ProjectId": "Pj5432532",
-                //             "count": "789"
-                //         },
-                //         {
-                //             "Id": "cd7a30cf0f2548a99d4dc99a7948c0db",
-                //             "RelationTypeName": "项目下的建筑体",
-                //             "RelationTypeCode": "关系类型编码",
-                //             "GraphicCode": "图类型code",
-                //             "ProjectId": "Pj5432532",
-                //             "count": "321"
-                //         }
-                //     ]
-                // }
-            ]
-        }
-    },
+        data() {
+            return {
+                content: [
+                    // {
+                    //     GraphTypeId: '3535436',//大分类id
+                    //     GraphTypeName: '架构从属关系',//大分类名称
+                    //     GraphTypeCode: '',//大分类编码
+                    //     Note: '',//说明
+                    //     ParentId: '',//父id
+                    //     ChildGraphicTypeList: [
+                    //         {
+                    //             GraphTypeId: '234534543',//图类型id
+                    //             GraphTypeName: '建筑从属关系',//图类型名称
+                    //             GraphTypeCode: 'ksaajdk',//图类型编码
+                    //             Note: '显示数字字典excel中的xxx',//说明
+                    //             ParentId: '3535436',//父id,GraphTypeId
+                    //             RelationTypeProjectList: [
+                    //                 {
+                    //                     Id: '23445433534',
+                    //                     RelationTypeName: '项目下的建筑体',//关系类型名称
+                    //                     RelationTypeCode: 'Pj2Bd',//关系类型编码
+                    //                     GraphicId: 'ksaajdk',//图类型编码
+                    //                     Note: '边类型说明(待补充)',//说明
+                    //                     ConneObject: '项目→建筑体',//连接对象
+                    //                     IsSource: true,//是否需要配置源末端
+                    //                     IsAutomatic: true,//是否自动计算类型
+                    //                     Manual: 2,//123选一个手动计算类型1禁用2提示引导3手动维护
+                    //                     Prompting: '【设备台账】,【系统台账】',//提示信息
+                    //                     ProjectId: 'Pj1245',//项目id
+                    //                     ComputingTime: '2019.12.12 12:00',//null不显示,最后一次自动计算时间
+                    //                     ComputationalState: 1,//计算状态
+                    //                 },
+                    //             ]
+                    //         },
+                    //     ]
+                    // },
+                ],
+                countNumber: [
+                    //     {
+                    //     "GraphTypeId": "3243215",
+                    //     "GraphTypeName": "从属关系",
+                    //     "GraphTypeCode": "ksaajdk",
+                    //     "RelationTypeProjectList": [
+                    //         {
+                    //             "Id": "f3bed766a5ba45868d3a744fb8aaa0c8",
+                    //             "RelationTypeName": "项目下的建筑体",
+                    //             "RelationTypeCode": "关系类型编码",
+                    //             "GraphicCode": "图类型code",
+                    //             "ProjectId": "Pj5432532",
+                    //             "count": "123"
+                    //         },
+                    //         {
+                    //             "Id": "6b4c9f042d344eb99dd64e8e444ad2b0",
+                    //             "RelationTypeName": "项目下的建筑体",
+                    //             "RelationTypeCode": "关系类型编码",
+                    //             "GraphicCode": "图类型code",
+                    //             "ProjectId": "Pj5432532",
+                    //             "count": "456"
+                    //         },
+                    //         {
+                    //             "Id": "305170f91eae4bf991be9284e80a9cf4",
+                    //             "RelationTypeName": "项目下的建筑体",
+                    //             "RelationTypeCode": "关系类型编码",
+                    //             "GraphicCode": "图类型code",
+                    //             "ProjectId": "Pj5432532",
+                    //             "count": "789"
+                    //         },
+                    //         {
+                    //             "Id": "cd7a30cf0f2548a99d4dc99a7948c0db",
+                    //             "RelationTypeName": "项目下的建筑体",
+                    //             "RelationTypeCode": "关系类型编码",
+                    //             "GraphicCode": "图类型code",
+                    //             "ProjectId": "Pj5432532",
+                    //             "count": "321"
+                    //         }
+                    //     ]
+                    // }
+                ],
+            }
+        },
         created() {
             let data = {
                 "Cascade": [{
@@ -114,7 +114,7 @@
                 this.countNumber = resCount.Content
             })
             api.graphic(data, res => {
-                res.Content.forEach(item => {
+                this.content = res.Content.map(item => {
                     // 二级从属关系
                     (item.ChildGraphicTypeList != null) && item.ChildGraphicTypeList.forEach(child => {
 
@@ -131,11 +131,11 @@
                             }
                         })
                     })
+                    return item
                 })
-                this.$forceUpdate()
-                console.log(this.content,'res')
                 this.content = res.Content
-                // this.transform(this.content, this.num)
+                console.log(this.content)
+                // this.transform(this.content, this.countNumber)
 
             })
 
@@ -173,7 +173,7 @@
             templateDown() { //下载模板
             }
         }
-}
+    }
 </script>
 <style lang="less" scoped>