Bläddra i källkod

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

shaun-sheep 4 år sedan
förälder
incheckning
691efd3d68

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

@@ -50,7 +50,7 @@
             </el-dropdown>
             <!-- 点击已经关联的业务空间 -->
             <el-button type="primary" plain @click="refactorBSP" :disabled="zoneDisable" style="margin-left:10px;">重新划分业务空间</el-button>
-            <el-button type="primary" @click="editeSpaceDetail" :disabled="zoneDisable">编辑空间详情</el-button>
+            <el-button type="primary" @click="editeSpaceDetail" :disabled="zoneDisable">查看空间详情</el-button>
             <el-button type="primary" plain @click="confirmZoneSpace" :disabled="zoneDisable||(!zoneDisable&&!curZoneItem.isInfected)">确认业务空间
             </el-button>
             <el-button plain @click="cancelGraphy" v-show="!zoneDisable">取 消</el-button>

+ 4 - 2
src/components/data_admin/buildTask/dialog/modelTaskDialog.vue

@@ -93,6 +93,7 @@ export default {
   },
   methods: {
     getTableData() {
+      this.loading = true
       let params = {
         Cascade: [
           {
@@ -119,11 +120,11 @@ export default {
       }
 
       if (this.params.isVerification) {
-        params.Filters += `;TaskState isNull`
+        params.Filters += `;(TaskState isNull || TaskState=0)`
       }
 
       if (this.params.device) {
-        params.Filters += `;Category='${this.params.category}'`
+        params.Filters += `;Category='${this.params.device}'`
       }
 
       if (this.params.spaceList && this.params.spaceList.length) {
@@ -135,6 +136,7 @@ export default {
       } else {
         params.Filters += `;ModelId='${this.params.CurrentModelId}'`
         queryEquip(params, res => {
+          this.loading = false
           this.dataFormatter(res)
         })
       }

+ 2 - 0
src/components/data_admin/buildTask/table/assetsTable.vue

@@ -83,6 +83,7 @@ export default {
   methods: {
     // 获取列表数据
     getTableData() {
+      this.loading = true
       let params = {
         Filters: `ProjectId='${this.projectId}'`,
         Cascade: [
@@ -117,6 +118,7 @@ export default {
         params.Filters += `;Category='${this.paramsData.family}'`
       }
       queryAssetsTask(params, res => {
+        this.loading = false
         this.page.total = res.Total;
         this.tableData = res.Content.map(item => {
           item.TaskState = this.taskStateMap[item.TaskState]

+ 2 - 0
src/components/data_admin/buildTask/table/deviceTable.vue

@@ -92,6 +92,7 @@ export default {
   methods: {
     // 获取列表数据
     getTableData() {
+      this.loading = true
       let params = {
         Filters: `ProjectId='${this.projectId}'`,
         Cascade: [
@@ -128,6 +129,7 @@ export default {
         params.Filters += `;Category='${this.paramsData.deviceCategory}'`
       }
       queryDeviceTask(params, res => {
+        this.loading = false
         this.page.total = res.Total;
         this.tableData = res.Content.map(item => {
           if(item.Component && item.Component.length){

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

@@ -89,6 +89,7 @@ export default {
   methods: {
     // 获取列表数据
     getTableData() {
+      this.loading = true
       let params = {
         Filters: `ProjectId='${this.projectId}'`,
         Cascade: [
@@ -114,6 +115,7 @@ export default {
         params.Filters += `;Category='${this.paramsData.modelCategory}'`
       }
       queryModelTask(params, res => {
+        this.loading = false
         this.page.total = res.Total;
         this.tableData = res.Content.map(item => {
           if(item.Component && item.Component.length){

+ 2 - 0
src/components/data_admin/buildTask/table/replaceTable.vue

@@ -92,6 +92,7 @@ export default {
   methods: {
     // 获取列表数据
     getTableData() {
+      this.loading = true
       let params = {
         Filters: `ProjectId='${this.projectId}';TaskType in ['2']`,
         Cascade: [
@@ -124,6 +125,7 @@ export default {
       //   params.Filters += `;Family='${this.paramsData.family}'`
       // }
       queryAssetsTask(params, res => {
+        this.loading = false
         this.page.total = res.Total;
         this.tableData = res.Content.map(item => {
           item.TaskState = this.taskStateMap[item.TaskState]

+ 2 - 0
src/components/data_admin/buildTask/table/tearTable.vue

@@ -92,6 +92,7 @@ export default {
   methods: {
     // 获取列表数据
     getTableData() {
+      this.loading = true
       let params = {
         Filters: `ProjectId='${this.projectId}';TaskType in ['3','-5']`,
         Cascade: [
@@ -124,6 +125,7 @@ export default {
       //   params.Filters += `;Family='${this.paramsData.family}'`
       // }
       queryAssetsTask(params, res => {
+        this.loading = false
         this.page.total = res.Total;
         this.tableData = res.Content.map(item => {
           item.TaskState = this.taskStateMap[item.TaskState]

+ 8 - 0
src/views/business_space/dataUtil/checkJsonUtil.vue

@@ -35,6 +35,9 @@
       <div title="打印">
         <el-button size="mini" @click="console" icon="el-icon-printer"></el-button>
       </div>
+      <div title="下载svg">
+        <el-button size="mini" @click="saveSvg" icon="el-icon-printer">下载svg</el-button>
+      </div>
     </el-aside>
     <el-main>
       <div ref="graphy" v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
@@ -220,6 +223,11 @@ export default {
     clickInputFile() {
       this.$refs.file.click()
     },
+    saveSvg(){
+      if(this.view){
+        this.view.saveSceneSvg(`1.svg`, 6400, 4800);
+      }
+    }
   },
 }
 </script>

+ 1 - 1
src/views/data_admin/buildTask/addTask/addAssetsTask.vue

@@ -176,7 +176,7 @@
       }
 
       if(this.params.isVerification){
-        params.Filters += `;TaskState isNull`
+        params.Filters += `;(TaskState isNull || TaskState=0)`
       }
 
       if(this.keycode){

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

@@ -220,7 +220,7 @@ export default {
       }
 
       if(this.params.isVerification){
-        params.Filters += `;TaskState isNull`
+        params.Filters += `;(TaskState isNull || TaskState=0)`
       }
 
       if(this.keycode){

+ 3 - 0
src/views/ledger/spacelist/index.vue

@@ -175,6 +175,9 @@ export default {
           return t;
         })
         this.options.unshift({ value: "all", label: "全部" }, { value: "noKnow", label: "未明确建筑" })
+        if (this.childBackParam.buildFloorSelectd) {
+          this.buildFloorSelectd = this.childBackParam.buildFloorSelectd;
+        }
         if (this.childBackParam.zone) {
           this.changeCascader(this.buildFloorSelectd);
         }

+ 2 - 2
src/views/ledger/spacelist/spaceDetail/index.vue

@@ -18,8 +18,8 @@
         </div>
       </el-row>
       <div v-if="activeTab=='detail'"  class="content">
-        <iframe v-if="params.isMyTab == 1" height="100%" width="100%" :src="iframeSrc"></iframe>
-        <el-scrollbar v-else style="height:100%;">
+        <!-- <iframe v-if="params.isMyTab == 1" height="100%" width="100%" :src="iframeSrc"></iframe> -->
+        <el-scrollbar style="height:100%;">
           <div class="content-scrollbar">
             <div class="content-left">
               <div class="content-showType">