Pārlūkot izejas kodu

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

haojianlong 4 gadi atpakaļ
vecāks
revīzija
df779277ee

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

@@ -4,27 +4,27 @@ import {
   api1,
   baseUrl,
   business,
-  physics,
-  venders,
-  zone,
-  object,
-  dictCustom,
-  system,
-  shContainSp,
-  compSpace,
-  shaft,
+  classDef,
   compEquipQuery,
-  statistics,
-  floor,
+  component,
+  compSpace,
+  dataCenter,
   dict,
-  locationPoint,
+  floor,
   graphicUrl,
-  tenant,
-  dataCenter,
-  classDef,
+  locationPoint,
+  object,
+  physics,
   rel,
-  component,
-  rwd
+  rwd,
+  scan,
+  shaft,
+  shContainSp,
+  statistics,
+  system,
+  tenant,
+  venders,
+  zone
 } from './config.js'
 import http from './httpUtil'
 import storage from '@/framework/utils/storage'
@@ -1233,7 +1233,7 @@ export function createEquip(param, success) {
 //设备清单 - 创建设备-关联资产-关联系统
 export function createEquipAndProperty(param, success) {
   // let url = `${baseUrl}${compEquipQuery}/creat-equip-pro`;
-  let url = `${baseUrl}${compEquipQuery}/creat-equip-pro`;
+  let url = `${baseUrl}${object}/equip/creat-equip-pro`;
   http.postJson(url, param, success)
 }
 
@@ -2371,6 +2371,7 @@ export function objectDeleteBuild(param, success) {
 
 // 查询记录
 export function problemQuery(param, success) {
-  let url = `${baseUrl}${dataCenter}/problems/query`
+  // let url = `${baseUrl}${dataCenter}/problems/query`
+  let url = `${baseUrl}${scan}/task/problems/query`
   http.postJson(url, param, success)
 }

+ 6 - 5
src/components/ledger/details/detail/exhibitionEnergy.vue

@@ -4,17 +4,18 @@
       <section v-for="(val,key,i) in exhibitionEnergy.list">
         <h4 class="base">{{key}}</h4>
         <div class="table-dynamic" v-for="(value,keys,index) in val.paths">
-            <div class="table-title"> {{value.InfoPointName}}:</div>
-          <p :style="{'color':value.value? '' :'#F56C6C'}">{{value.value? `表号功能号:${value.value} `:'未维护'}}</p>
-          <p v-if="value.data">{{value.data}}{{value.Unit}}</p>
-<!--          <p v-else-if="value.error">{{value.error}}</p>-->
+          <div class="table-title"> {{ value.InfoPointName }}:</div>
+          <p :style="{'color':value.value? '' :'#F56C6C'}">{{ value.value ? `表号功能号:${value.value} ` : '未维护' }}</p>
+          <p v-if="value.data == '0'">{{ value.data }}{{ value.Unit }}</p>
+          <p v-else-if="value.data">{{ value.data }}{{ value.Unit }}</p>
+          <!--          <p v-else-if="value.error">{{value.error}}</p>-->
           <el-popover
             v-else-if="value.error"
             placement="right"
             width="160"
             trigger="hover">
             <p style="border-bottom: 1px solid #eee;padding:2px 0 4px 0;'">错误原因</p>
-            <p>{{value.error}}</p>
+            <p>{{ value.error }}</p>
             <div style="text-align: center; margin: 0">
               <el-button type="text" size="mini" @click="handleCopy(value.error)">复制</el-button>
             </div>

+ 5 - 4
src/components/ledger/lib/system.vue

@@ -3,7 +3,7 @@
     <span class="buildFloor" style="padding-right: 12px;">所属专业系统类型</span>
     <el-select v-model="value" placeholder="请选择" :props="props" filterable :style="isWidth ? '' : 'width:160px;'"
                size="small" @change="changeVal">
-      <el-option v-for="item in options" :key="item.classCode" :label="item.name"
+      <el-option v-for="item in options" :key="item.classCode" :label="item.categoryName"
                  :value="item.classCode"></el-option>
     </el-select>
     <!-- <el-cascader placeholder="请选择" :options="options" v-model="value" :props="props" filterable :style="isWidth ? '' : 'width:160px;'" size="small"
@@ -36,7 +36,7 @@ export default {
       options: [],
       props: {
         value: "classCode",
-        label: "name"
+        label: "categoryName"
       }
     };
   },
@@ -79,7 +79,7 @@ export default {
         pageNumber: 1,
         pageSize: 1000,
         projection: [
-          "classCode", "name"
+          "classCode", "CategoryName"
         ]
       }
       queryLinkSys(param, res => {
@@ -103,8 +103,9 @@ export default {
     changeArr(arr) {
       let data = [];
       arr.forEach(item => {
-        data.push({ classCode: item.classCode || item.code, name: item.name });
+        data.push({ classCode: item.classCode || item.code, categoryName: item.categoryName || item.name });
       });
+      console.log(data, 'data')
       return data;
     }
   }

+ 3 - 3
src/components/ledger/system/table/spaceTable.vue

@@ -82,10 +82,10 @@ export default {
     // 获取列表数据
     getTableData() {
       let params = {
-        Filters: `id='${this.params.SysID}'`,
-        Cascade: [
+        filters: `id='${this.params.SysID}'`,
+        cascade: [
           {
-            Name: "zoneSpaceBaseTableList"
+            name: "zoneSpaceBaseTableList"
           }
         ]
       };

+ 42 - 42
src/components/relation/relationShip/Modal/exportExcel.vue

@@ -12,14 +12,14 @@
             {{values.currentNum}}{{length}}
           </p>
 
-          <a :href="downloadProject('excel')">
+          <a :href="downloadProject('excel')" target="_self">
 
             <!--          <a :href=`/api/datacenter/graphic/export?code=对象ID${localStorage.getItem('RelationType')?relType=${localStorage.getItem('RelationType')} : null}${ localStorage.getItem('ZoneType') ? `&zoneType=${localStorage.getItem('ZoneType')}` : null}` >-->
             <el-button
               type="primary"
               class="mt-10"
             >
-              {{values.download}}
+              {{ values.download }}
             </el-button>
           </a>
         </el-col>
@@ -87,50 +87,50 @@
 </template>
 
 <script>
-  import {mapGetters} from 'vuex'
-  import storage from '@/framework/utils/storage'
-
-  export default {
-    name: "exportExcel",
-    props: ['values','length'],
-    data() {
+import { mapGetters } from 'vuex'
+import storage from '@/framework/utils/storage'
+
+export default {
+  name: "exportExcel",
+  props: ['values', 'length'],
+  data() {
+    return {
+      // relationCount:localStorage.getItem('count'),
+      dialogExport: false,
+      dialogProcess: false,
+      activities: [{
+        content: '数据文件处理中..',
+        size: 'large',
+        type: 'primary',
+        icon: 'el-icon-check',
+        color: '#0bbd87'
+      }, {
+        content: '数据处理成功',
+        color: '#0bbd87',
+        icon: 'el-icon-check',
+        size: 'large',
+        type: 'primary',
+      }],
+    }
+  },
+  computed: {
+    ...mapGetters('layout', ['projectId']),
+    headers() {
       return {
-        // relationCount:localStorage.getItem('count'),
-        dialogExport: false,
-        dialogProcess: false,
-        activities: [{
-          content: '数据文件处理中..',
-          size: 'large',
-          type: 'primary',
-          icon: 'el-icon-check',
-          color: '#0bbd87'
-        }, {
-          content: '数据处理成功',
-          color: '#0bbd87',
-          icon: 'el-icon-check',
-          size: 'large',
-          type: 'primary',
-        }],
+        'ProjectId': this.projectId,
+        'Comming': 'adm',
+        'Account': storage.get("user_name")
       }
     },
-    computed: {
-      ...mapGetters('layout', ['projectId']),
-      headers() {
-        return {
-          'ProjectId': this.projectId,
-          'Comming': 'adm',
-          'Account': storage.get("user_name")
-        }
-      },
-      dataId() {
-        return {
-          relType: localStorage.getItem('RelationType') || '',
-          zoneType: localStorage.getItem('ZoneType') || '',
-          projectId: this.projectId
-        }
-      },
+    dataId() {
+      return {
+        relType: localStorage.getItem('RelationType') || '',
+        zoneType: localStorage.getItem('ZoneType') || '',
+        projectId: this.projectId
+      }
     },
-    methods: {
+  },
+  methods: {
       downloadProject(str) {
         let relType = localStorage.getItem('RelationType') != '' ? `?relType=${localStorage.getItem('RelationType')}` : '';
         let zoneType = localStorage.getItem('ZoneType') != '' ? `&zoneType=${localStorage.getItem('ZoneType')}` : '';

+ 1 - 1
src/framework/layout/layout-store.js

@@ -53,7 +53,7 @@ export default {
         name: "亚投行",
         pwd: "saga123456"
       }, {
-        id: " Pj1101050013",
+        id: "Pj1101050013",
         name: "BIM测试项目_亚投行",
         pwd: "saga123456"
       }],

+ 5 - 5
src/views/data_admin/buildAssets/index.vue

@@ -108,13 +108,13 @@ export default {
     handleTime(val) {
       console.log(val)
       let param = {
-        Filters: `createTime > '${val[0]}';createTime < '${val[1]}'`,
-        PageNumber: 1,
-        PageSize: 50
+        filters: `createTime > '${val[0]}';createTime < '${val[1]}'`,
+        pageNumber: 1,
+        pageSize: 50
       }
       problemQuery(param, res => {
-        this.total = res.Total
-        this.setErrorReport(res.Content)
+        this.total = res.total
+        this.setErrorReport(res.content)
       })
 
     },

+ 9 - 1
src/views/ledger/facility/details/index.vue

@@ -241,9 +241,17 @@ export default {
             res.data.length && res.data.map(child => {
               this.pointData.map(head => {
                 if (head.code == child.infoCode) {
+                  if (head.dataSource) {
+                    head.dataSource.forEach(i => {
+                      if (i.code == child.data) {
+                        this.$set(head, 'data', i.name)
+                      }
+                    })
+                  } else {
+                    this.$set(head, 'data', child.data)
+                  }
                   // this.$set(head, 'svalue', child.value)
                   this.$set(head, 'svalue', child.infoValue)
-                  this.$set(head, 'data', child.data)
                   // this.$set(head, 'receivetime', child.receivetime)
                   this.$set(head, 'receivetime', child.time)
                   this.$set(head, 'error', child.error)

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

@@ -63,7 +63,7 @@
 <script>
 import { mapGetters } from "vuex";
 import tools from "@/utils/scan/tools";
-import { zoneDelete, zoneQuery, BeatchQueryParam } from '@/api/scan/request';
+import { BeatchQueryParam, zoneDelete, zoneQuery } from '@/api/scan/request';
 import { getDataDictionary } from "@/api/dict";
 
 import eqToSpaceTable from '@/components/business_space/newTables/eqToSpaceTable';
@@ -246,8 +246,17 @@ export default {
             res.data.length && res.data.map(child => {
               this.pointData.map(head => {
                 if (head.code == child.infoCode) {
+                  if (head.dataSource) {
+                    head.dataSource.forEach(i => {
+                      if (i.code == child.data) {
+                        this.$set(head, 'data', i.name)
+                      }
+                    })
+                  } else {
+                    this.$set(head, 'data', child.data)
+                  }
                   this.$set(head, 'svalue', child.infoValue)
-                  this.$set(head, 'data', child.data)
+                  // this.$set(head, 'data', child.data)
                   this.$set(head, 'receivetime', child.time)
                   this.$set(head, 'error', child.error)
                 }

+ 59 - 58
src/views/model/report/index.vue

@@ -170,53 +170,54 @@
 </template>
 
 <script>
-  import {mapGetters} from "vuex";
-  import dasBoard from "@/views/dasboard/index";
-  import {queryFloorList, queryLostReportList, queryModel, queryReportList} from "@/api/model/report.js";
-  import {getSupplement, getToBeDelEquip} from "@/api/scan/request.js";
-  import axios from 'axios'
+import { mapGetters } from "vuex";
+import dasBoard from "@/views/dasboard/index";
+import { queryFloorList, queryLostReportList, queryModel, queryReportList } from "@/api/model/report.js";
+import { getSupplement, getToBeDelEquip } from "@/api/scan/request.js";
+import axios from 'axios'
 
-  export default {
-    components: {
-      dasBoard
-    },
-    data() {
-      return {
-        params: null,
-        ModelFileCount: null,// 模型文件夹数量
-        modelFloorCount: null,// 包含楼层模型文件数量
-        problemCount: 0,// 检查出问题的楼层模型文件数量
-        tableList: [], // tab数据
-        tableData: [],// 列表数据
-        activeTab: '', // tab当前选中项
-        headerStyle: { // 列表样式
-          backgroundColor: '#e1e4e5',
-          color: '#2b2b2b',
-          lineHeight: '30px'
-        },
-        page: {
-          pageSize: 50,
-          pageSizes: [10, 20, 50, 100],
-          pageNumber: 1,
-          total: 0
-        },
-        loading: false,
-        load: false,
-        floorIconType: null,
-        toBeSuppCount: 0,
-        toBeDelCount: 0
-      }
-    },
-    mounted() { },
-    created() {
-      this.params = {
-        Orders: "Name asc"
-      }
-      this.getModelFileCount();
-      this.getModelFloorCount();
-    },
-    computed: {
-      ...mapGetters('layout', ['projectId'])
+export default {
+  components: {
+    dasBoard
+  },
+  data() {
+    return {
+      params: null,
+      ModelFileCount: null,// 模型文件夹数量
+      modelFloorCount: null,// 包含楼层模型文件数量
+      problemCount: 0,// 检查出问题的楼层模型文件数量
+      tableList: [], // tab数据
+      tableData: [],// 列表数据
+      activeTab: '', // tab当前选中项
+      headerStyle: { // 列表样式
+        backgroundColor: '#e1e4e5',
+        color: '#2b2b2b',
+        lineHeight: '30px'
+      },
+      page: {
+        pageSize: 50,
+        pageSizes: [10, 20, 50, 100],
+        pageNumber: 1,
+        total: 0
+      },
+      loading: false,
+      load: false,
+      floorIconType: null,
+      toBeSuppCount: 0,
+      toBeDelCount: 0
+    }
+  },
+  mounted() {
+  },
+  created() {
+    this.params = {
+      Orders: "Name asc"
+    }
+    this.getModelFileCount();
+    this.getModelFloorCount();
+  },
+  computed: {
+    ...mapGetters('layout', ['projectId'])
     },
     methods: {
       cellStyle({row, column, rowIndex, columnIndex}) {
@@ -317,7 +318,7 @@
         this.LostFloorName.forEach(item => {
           if (item.CurrentModelId) {
             equipComDelList.push({
-              ModelId: item.CurrentModelId
+              modelId: item.CurrentModelId
             });
             this.equipComDelList.push(item.CurrentModelId)
           } else {
@@ -326,15 +327,15 @@
           }
           if (item.Id) {
             toBeAdded.push({
-              ModelId: item.Id
+              modelId: item.Id
             })
           }
         })
         let params = {
-          ProjectId: this.projectId,
+          projectId: this.projectId,
           data: equipComDelList
         }, paramsToBe = {
-          ProjectId: this.projectId,
+          projectId: this.projectId,
           data: toBeAdded
         }
         let promise1 = new Promise(resolve => {
@@ -352,23 +353,23 @@
           let res1 = response[1];
           this.toBeDelCount = 0;
           this.toBeSuppCount = 0;
-          res.Content.forEach(item => {
-            if (item.Count > 0) {
+          res.content.forEach(item => {
+            if (item.count > 0) {
               this.toBeDelCount += 1;
             }
             this.LostFloorName.forEach(it => {
-              if (item.ModelId === it.CurrentModelId) {
-                it.toBeDel = item.Count;
+              if (item.modelId === it.CurrentModelId) {
+                it.toBeDel = item.count;
               }
             })
           })
-          res1.Content.forEach(item => {
-            if (item.Count > 0) {
+          res1.content.forEach(item => {
+            if (item.count > 0) {
               this.toBeSuppCount += 1;
             }
             this.LostFloorName.forEach(it => {
-              if (item.ModelId === it.Id) {
-                it.toBeSupplement = item.Count;
+              if (item.modelId === it.Id) {
+                it.toBeSupplement = item.count;
               }
             })
           })

+ 1 - 1
src/views/point/dynamicdata/addRelation/systemRela/index.vue

@@ -417,7 +417,7 @@ export default {
         queryLinkSys(pa, res => {
           this.rPage.total = res.total;
           let tempArr = res.content.map(t => {
-            t.ObjectID = t.SysID.substr(12);
+            t.ObjectID = t.id.substr(12);
             t.ObjectLocalName = t.localName;
             t.ObjectLocalCode = t.localId;
             return t;