Browse Source

Merge branch 'master' of http://39.106.8.246:3003/BDTP/adm-frontend

niuheng 3 years ago
parent
commit
94fbfb50f0
34 changed files with 5846 additions and 1595 deletions
  1. 2 1
      .gitignore
  2. BIN
      padm/favicon.ico
  3. 3 0
      padm/index.html
  4. 102 0
      padm/public/css/chunk-vendors.edf142db.css
  5. 2 0
      padm/public/css/index.4c03d5e7.css
  6. BIN
      padm/public/fonts/element-icons.535877f5.woff
  7. BIN
      padm/public/fonts/element-icons.732389de.ttf
  8. BIN
      padm/public/fonts/fontawesome-webfont.674f50d2.eot
  9. BIN
      padm/public/fonts/fontawesome-webfont.af7ae505.woff2
  10. BIN
      padm/public/fonts/fontawesome-webfont.b06871f2.ttf
  11. BIN
      padm/public/fonts/fontawesome-webfont.fee66e71.woff
  12. BIN
      padm/public/fonts/iconfont.413770c1.woff
  13. BIN
      padm/public/fonts/iconfont.8486c8af.ttf
  14. BIN
      padm/public/fonts/iconfont.a9f43e82.woff2
  15. 5 0
      padm/public/img/barController.1b36802b.svg
  16. 30 0
      padm/public/img/editLogo.18652260.svg
  17. 4 0
      padm/public/img/fontStyle.a57fbf8b.svg
  18. 2671 0
      padm/public/img/fontawesome-webfont.912ec66d.svg
  19. BIN
      padm/public/img/login_bg.2d60ec49.png
  20. BIN
      padm/public/img/logo.87be7c6e.png
  21. 1110 0
      padm/public/js/chunk-vendors.6cdf1e69.js
  22. 1 0
      padm/public/js/chunk-vendors.6cdf1e69.js.map
  23. 2 0
      padm/public/js/index.bd3e0adf.js
  24. 1 0
      padm/public/js/index.bd3e0adf.js.map
  25. 70 0
      padm/systemConf.js
  26. 1596 1375
      src/components/old-adm/ledger/components/handsontables/device.vue
  27. 11 2
      src/components/old-adm/ledger/components/handsontables/system.vue
  28. 71 51
      src/components/old-adm/ledger/components/lib/cascader.vue
  29. 117 117
      src/components/old-adm/ledger/components/lib/equipCascader.vue
  30. 3 2
      src/components/old-adm/ledger/system/index.vue
  31. 22 21
      src/controller/old-adm/ScanController.ts
  32. 15 19
      src/controller/old-adm/buildController.ts
  33. 4 4
      src/controller/old-adm/dicController.ts
  34. 4 3
      src/controller/old-adm/preTypes.ts

+ 2 - 1
.gitignore

@@ -1,3 +1,4 @@
 node_modules
 package-lock.json
-/adm-frontend/*
+/adm-frontend/*
+/padm/*

BIN
padm/favicon.ico


File diff suppressed because it is too large
+ 3 - 0
padm/index.html


File diff suppressed because it is too large
+ 102 - 0
padm/public/css/chunk-vendors.edf142db.css


File diff suppressed because it is too large
+ 2 - 0
padm/public/css/index.4c03d5e7.css


BIN
padm/public/fonts/element-icons.535877f5.woff


BIN
padm/public/fonts/element-icons.732389de.ttf


BIN
padm/public/fonts/fontawesome-webfont.674f50d2.eot


BIN
padm/public/fonts/fontawesome-webfont.af7ae505.woff2


BIN
padm/public/fonts/fontawesome-webfont.b06871f2.ttf


BIN
padm/public/fonts/fontawesome-webfont.fee66e71.woff


BIN
padm/public/fonts/iconfont.413770c1.woff


BIN
padm/public/fonts/iconfont.8486c8af.ttf


BIN
padm/public/fonts/iconfont.a9f43e82.woff2


+ 5 - 0
padm/public/img/barController.1b36802b.svg

@@ -0,0 +1,5 @@
+<svg width="17" height="17" viewBox="0 0 17 17" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="0.5" y="0.5" width="16" height="16" fill="white" stroke="black"/>
+<rect x="10.5" y="4.5" width="6" height="12" fill="#C4C4C4" stroke="black"/>
+<rect x="0.5" y="0.5" width="16" height="4" fill="white" stroke="black"/>
+</svg>

+ 30 - 0
padm/public/img/editLogo.18652260.svg

@@ -0,0 +1,30 @@
+<svg width="28" height="24" viewBox="0 0 28 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20.1162 1.09209e-05L15.3643 2.77225L15.5898 3.16346L20.3417 0.391226L20.1162 1.09209e-05Z" fill="#D7282F"/>
+<path d="M10.0102 0.00033932L9.78467 0.39151L14.536 3.1643L14.7616 2.77313L10.0102 0.00033932Z" fill="#D7282F"/>
+<path d="M27.7745 3.86746L6.90234 16.0153L7.12797 16.4076L28.0001 4.25976L27.7745 3.86746Z" fill="#D7282F"/>
+<path d="M17.4608 11.4016L12.135 14.4881L12.3594 14.88L17.6852 11.7934L17.4608 11.4016Z" fill="#D7282F"/>
+<path d="M27.7628 5.40641L18.7805 10.6234L19.0053 11.0151L27.9876 5.79803L27.7628 5.40641Z" fill="#D7282F"/>
+<path d="M26.9589 9.45151L26.7332 9.06032L27.7685 8.46503L27.9942 8.85722L26.9589 9.45151Z" fill="#D7282F"/>
+<path d="M25.3885 9.8532L16.1013 15.2473L16.3261 15.6389L25.6133 10.2448L25.3885 9.8532Z" fill="#D7282F"/>
+<path d="M16.1121 13.7095L6.96094 19.0246L7.18571 19.4162L16.3368 14.1011L16.1121 13.7095Z" fill="#D7282F"/>
+<path d="M10.7941 15.2539L6.97852 17.502L7.20621 17.8931L11.0218 15.645L10.7941 15.2539Z" fill="#D7282F"/>
+<path d="M17.6579 13.3264L17.4331 12.9352L22.7351 9.8627L22.9608 10.2549L17.6579 13.3264Z" fill="#D7282F"/>
+<path d="M14.7606 16.0117L6.94482 20.5695L7.17077 20.9616L14.9865 16.4038L14.7606 16.0117Z" fill="#D7282F"/>
+<path d="M12.1062 19.0932L6.93921 22.0867L7.16407 22.4795L12.331 19.4859L12.1062 19.0932Z" fill="#D7282F"/>
+<path d="M21.3304 13.7345L13.4404 18.3265L13.6661 18.7188L21.5561 14.1268L21.3304 13.7345Z" fill="#D7282F"/>
+<path d="M27.7669 11.528L6.96777 23.6084L7.19254 24L27.9916 11.9196L27.7669 11.528Z" fill="#D7282F"/>
+<path d="M0.239302 11.972L0.0148926 12.365L6.61638 16.1798L6.84079 15.7868L0.239302 11.972Z" fill="#D7282F"/>
+<path d="M0.255004 13.5367L0.0314941 13.9291L6.62288 17.7285L6.84639 17.3361L0.255004 13.5367Z" fill="#D7282F"/>
+<path d="M0.235106 15.0512L0.0107422 15.443L6.60507 19.264L6.82944 18.8721L0.235106 15.0512Z" fill="#D7282F"/>
+<path d="M0.241988 16.6031L0.0175781 16.9961L6.60527 20.8029L6.82967 20.41L0.241988 16.6031Z" fill="#D7282F"/>
+<path d="M0.250044 18.1434L0.0256348 18.5353L6.626 22.3605L6.85041 21.9687L0.250044 18.1434Z" fill="#D7282F"/>
+<path d="M0.242251 19.6809L0.0180664 20.0741L6.62615 23.8875L6.85033 23.4944L0.242251 19.6809Z" fill="#D7282F"/>
+<path d="M0.23866 2.72583L0.0141602 3.11877L7.37713 7.37583L7.60163 6.98289L0.23866 2.72583Z" fill="#D7282F"/>
+<path d="M0.235126 4.26478L0.0109863 4.65677L6.05156 8.15216L6.2757 7.76018L0.235126 4.26478Z" fill="#D7282F"/>
+<path d="M0.227294 5.80197L0.00292969 6.19382L4.72461 8.92972L4.94898 8.53787L0.227294 5.80197Z" fill="#D7282F"/>
+<path d="M0.224641 7.34609L0.0012207 7.73853L3.39309 9.69269L3.61651 9.30025L0.224641 7.34609Z" fill="#D7282F"/>
+<path d="M0.241048 8.89908L0.0141602 9.29062L2.05904 10.4898L2.28593 10.0982L0.241048 8.89908Z" fill="#D7282F"/>
+<path d="M0.228994 10.4239L0 10.813L0.745412 11.2569L0.974406 10.8678L0.228994 10.4239Z" fill="#D7282F"/>
+<path d="M24.3214 9.46151L24.0967 9.06932L27.7686 6.93729L27.9943 7.32948L24.3214 9.46151Z" fill="#D7282F"/>
+<path d="M27.7535 9.99776L22.5955 13.0057L22.8214 13.3978L27.9794 10.3898L27.7535 9.99776Z" fill="#D7282F"/>
+</svg>

File diff suppressed because it is too large
+ 4 - 0
padm/public/img/fontStyle.a57fbf8b.svg


File diff suppressed because it is too large
+ 2671 - 0
padm/public/img/fontawesome-webfont.912ec66d.svg


BIN
padm/public/img/login_bg.2d60ec49.png


BIN
padm/public/img/logo.87be7c6e.png


File diff suppressed because it is too large
+ 1110 - 0
padm/public/js/chunk-vendors.6cdf1e69.js


File diff suppressed because it is too large
+ 1 - 0
padm/public/js/chunk-vendors.6cdf1e69.js.map


File diff suppressed because it is too large
+ 2 - 0
padm/public/js/index.bd3e0adf.js


File diff suppressed because it is too large
+ 1 - 0
padm/public/js/index.bd3e0adf.js.map


+ 70 - 0
padm/systemConf.js

@@ -0,0 +1,70 @@
+var __systemConf = {
+  //基础数据根域名
+  baseServiceUrl: '/baseService',
+  //系统图服务域名
+  sysGraphServiceUrl: '/sysGraphService',
+  // 地图key
+  mapKey: 'd42beb96e0e4fb0d49482975abeae1b7',
+  //导航菜单
+  menus: [{
+    "id": "ready",
+    "name": "信息录入工具",
+    "orders": 1,
+    child: [{
+      "id": "build_floor",
+      "name": "建筑楼层管理",
+      "orders": 2,
+      "url": "/ready/buildfloor",
+      "type": "menu",
+      "icon": "icon-jianzhu"
+    },{
+      "id": "equipment",
+      "name": "设备台账",
+      "orders": 3,
+      "url": "/ledger/facility"
+    },
+    {
+      "id": "system",
+      "name": "系统台账",
+      "orders": 4,
+      "url": "/ledger/list"
+    },{
+      "id": "overview",
+      "name": "全部关系总览",
+      "orders": 5,
+      "url": "/relation/overview",
+      "icon": "icon-jiqixuexi-"
+    }
+    ,{
+      "id": "projectmanage",
+      "name": "项目信息管理",
+      "orders": 6,
+      "url": "/project/manage",
+      "icon": "icon-jiqixuexi-"
+    }
+  ]
+  }, {
+    "id": "xianchangjiaofugongjv",
+    "name": "现场交付工具",
+    "orders": 6,
+    child: [{
+      "id": "CADtuzhiguanli",
+      "name": "CAD核查图纸管理",
+      "orders": 7,
+      "url": "/deliveryTools/cadDrawingManage",
+      "icon": "icon-topology"
+    }]
+  }, {
+    "id": "draw",
+    "name": "绘图工具",
+    "orders": 8,
+    child: [{
+      "id": "xitongtubianji",
+      "name": "系统图编辑工具",
+      "orders": 9,
+      "url": "/systemGraph",
+      "icon": "icon-topology"
+    }]
+  }]
+};
+window.__systemConf = __systemConf;

File diff suppressed because it is too large
+ 1596 - 1375
src/components/old-adm/ledger/components/handsontables/device.vue


+ 11 - 2
src/components/old-adm/ledger/components/handsontables/system.vue

@@ -73,7 +73,11 @@
         <!-- 新增系统 -->
         <el-dialog title="确定新增系统的类型" :visible.sync="myDialog.addDevice" width="30%">
             <el-row>
-                <my-cascader ref="cascader" @change="changeAddType" :all="true"></my-cascader>
+                <div class="row_class">
+                    <my-cascader ref="cascader" @change="changeAddType" :all="true"></my-cascader>
+                    <el-checkbox v-model="checked">仅项目交付范围内</el-checkbox>
+                </div>
+                
             </el-row>
             <span slot="footer" class="dialog-footer">
                 <el-button type="primary" @click="toAddDevice">下 一 步</el-button>
@@ -843,7 +847,7 @@ export default {
 </style>
 <style lang="less">
 .hanson-bar {
-    height: 40px;
+    height: 52px;
     padding: 5px 0;
     font-size: 14px;
     overflow: hidden;
@@ -854,4 +858,9 @@ export default {
         font-size: 12px;
     }
 }
+.row_class {
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+}
 </style>

+ 71 - 51
src/components/old-adm/ledger/components/lib/cascader.vue

@@ -1,35 +1,50 @@
 <template>
   <div id="cascaderMap">
-    <span class="buildFloor" style="margin-right: 12px;">设备类别</span>
+    <span class="buildFloor" style="margin-right: 12px">设备类别</span>
     <slot></slot>
-    <el-select v-model="value" placeholder="请选择" clearable :props="props" filterable
-               :style="isWidth ? '' : 'width:160px;'" size="small"
-               @change="changeVal">
-      <el-option v-for="item in options" :key="item.code" :label="item.facility" :value="item.code"></el-option>
+    <el-select
+      v-model="value"
+      placeholder="请选择"
+      clearable
+      :props="props"
+      filterable
+      :style="isWidth ? '' : 'width:160px;'"
+      size="small"
+      @change="changeVal"
+    >
+      <el-option
+        v-for="item in options"
+        :key="item.code"
+        :label="item.facility"
+        :value="item.code"
+      ></el-option>
     </el-select>
+    <el-checkbox v-model="checked" @change="getData"
+      >仅项目交付范围内</el-checkbox
+    >
     <!-- <el-cascader placeholder="请选择" :options="options" v-model="value" :props="props" filterable :style="isWidth ? '' : 'width:160px;'" size="small"
       @change="changeVal" change-on-select></el-cascader> -->
   </div>
 </template>
 <script>
-import { mapGetters } from 'vuex';
-import DicController from '@/controller/old-adm/dicController';
-import EquipController from '@/controller/old-adm/equipController';
+import { mapGetters } from "vuex";
+import DicController from "@/controller/old-adm/dicController";
+import EquipController from "@/controller/old-adm/equipController";
 
 export default {
   name: "getCode",
   props: {
     isWidth: {
       type: Boolean,
-      default: true
+      default: true,
     },
     all: {
       type: Boolean,
       default: false,
-    }
+    },
   },
   computed: {
-    ...mapGetters("layout", ["projectId"])
+    ...mapGetters("layout", ["projectId"]),
   },
   data() {
     return {
@@ -37,41 +52,41 @@ export default {
       options: [],
       props: {
         value: "code",
-        label: "facility"
+        label: "facility",
       },
       falg: true,
-      content: []
+      content: [],
+      checked: true,
     };
   },
   created() {
     this.getData();
-
   },
   watch: {
     projectId() {
-      this.value = '';
+      this.value = "";
       this.getData();
-    }
+    },
   },
   methods: {
     setValue(val) {
-      this.value = val
+      this.value = val;
     },
     //修改val
     changeVal(val) {
-      let value = {}
+      let value = {};
       let flag = true;
-      this.options.map(item => {
+      this.options.map((item) => {
         if (item.code == val) {
           flag = false;
-          value = item
+          value = item;
         }
-      })
-      this.value = val
+      });
+      this.value = val;
       if (flag) {
-        this.value = '';
+        this.value = "";
       }
-      this.$emit("change", value)
+      this.$emit("change", value);
     },
     //获取当前项目下的设备类型(只拿到编码-需要过滤)
     getData(val) {
@@ -79,12 +94,10 @@ export default {
         distinct: true,
         pageNumber: 1,
         pageSize: 1000,
-        projection: [
-          "classCode"
-        ]
-      }
-      if (val && val[0] != 'all') {
-        param2.filters = ''
+        projection: ["classCode"],
+      };
+      if (val && val[0] != "all") {
+        param2.filters = "";
         if (val[0] == "noKnow") {
           param2.filters += `;buildingId isNull`;
         } else if (val[0] && val[0] != "all") {
@@ -95,47 +108,54 @@ export default {
         } else if (val[1] && val[1] != "all") {
           param2.filters += `;floorId='${val[1]}'`;
         }
-        param2.filters = param2.filters.slice(1)
+        param2.filters = param2.filters.slice(1);
       }
 
       let param1 = {
-        type: "equipment"
-      }
+        type: "equipment",
+        deliveryType: this.checked ? 0 : 1,
+      };
 
-      Promise.all([EquipController.queryEquip(param2), DicController.queryPhysicsAllType(param1)]).then((res) => {
-        let allData = res[0], data = res[1]
-        this.options = this.formatOptions(data.content)
+      Promise.all([
+        EquipController.queryEquip(param2),
+        DicController.queryPhysicsAllType(param1),
+      ]).then((res) => {
+        let allData = res[0],
+          data = res[1];
+        this.options = this.formatOptions(data.content);
         if (!this.all) {
-          this.content = data.content.map(t => {
-            return t.classCode
+          this.content = data.content.map((t) => {
+            return t.classCode;
           });
           this.filterForOptions();
         }
         if (this.value) {
-          this.changeVal(this.value)
+          this.changeVal(this.value);
         }
-      })
+      });
     },
     //格式化options数据
     formatOptions(arr) {
       let data = [];
-      arr && arr.map(t => {
-        let temp = {};
-        temp.code = t.code;
-        temp.facility = t.name === t.aliasName ? t.name : `${t.name}(${t.aliasName})`;
-        data.push(temp)
-      })
+      arr &&
+        arr.map((t) => {
+          let temp = {};
+          temp.code = t.code;
+          temp.facility =
+            t.name === t.aliasName ? t.name : `${t.name}(${t.aliasName})`;
+          data.push(temp);
+        });
       return data;
     },
     //过滤
     filterForOptions() {
-      this.options = this.options.filter(item => {
+      this.options = this.options.filter((item) => {
         if (this.content.indexOf(item.code) > -1) {
-          return item
+          return item;
         }
-      })
-    }
-  }
+      });
+    },
+  },
 };
 </script>
 <style lang="less" scoped>

+ 117 - 117
src/components/old-adm/ledger/components/lib/equipCascader.vue

@@ -1,142 +1,142 @@
 <template>
-    <div id="cascaderMap">
-        <span class="buildFloor" style="margin-right: 12px">设备类别</span>
-        <el-cascader
-            ref="cascader"
-            v-model="value"
-            placeholder="请选择"
-            filterable
-            clearable
-            :props="props"
-            :options="options"
-            :style="isWidth ? '' : 'width:160px;'"
-            size="small"
-            @change="changeVal"
-            popper-class="equip-cascader"
-        >
-        </el-cascader>
-    </div>
+  <div id="cascaderMap">
+    <span class="buildFloor" style="margin-right: 12px">设备类别</span>
+    <el-cascader
+      ref="cascader"
+      v-model="value"
+      placeholder="请选择"
+      filterable
+      clearable
+      :props="props"
+      :options="options"
+      :style="isWidth ? '' : 'width:160px;'"
+      size="small"
+      @change="changeVal"
+      popper-class="equip-cascader"
+    >
+    </el-cascader>
+  </div>
 </template>
 <script>
 import { mapGetters } from "vuex";
 import Dic from "@/controller/old-adm/dicController";
 
 export default {
-    name: "getCode",
-    props: {
-        isWidth: {
-            type: Boolean,
-            default: true,
-        },
-        all: {
-            type: Boolean,
-            default: false,
-        },
+  name: "getCode",
+  props: {
+    isWidth: {
+      type: Boolean,
+      default: true,
     },
-    computed: {
-        ...mapGetters("layout", ["projectId"]),
+    all: {
+      type: Boolean,
+      default: false,
     },
-    data() {
-        return {
-            value: [],
-            options: [],
-            props: {
-                value: "code",
-                label: "name",
-                children: "children",
-            },
-        };
+  },
+  computed: {
+    ...mapGetters("layout", ["projectId"]),
+  },
+  data() {
+    return {
+      value: [],
+      options: [],
+      props: {
+        value: "code",
+        label: "name",
+        children: "children",
+      },
+    };
+  },
+  created() {
+    this.getData();
+  },
+  watch: {
+    projectId() {
+      this.value = "";
+      this.getData();
     },
-    created() {
-        this.getData();
+  },
+  methods: {
+    setValue(val) {
+      let flag = true;
+      this.options.forEach((sys) => {
+        sys.children.forEach((eq) => {
+          if (eq.code === val) {
+            flag = false;
+            this.value = [sys.code, eq.code];
+          }
+        });
+      });
+      // 如果未找到对应的设备类,则置空
+      if (flag) this.value = [];
     },
-    watch: {
-        projectId() {
-            this.value = "";
-            this.getData();
-        },
-    },
-    methods: {
-        setValue(val) {
-            let flag = true;
-            this.options.forEach((sys) => {
-                sys.children.forEach((eq) => {
-                    if (eq.code === val) {
-                        flag = false;
-                        this.value = [sys.code, eq.code];
-                    }
-                });
-            });
-            // 如果未找到对应的设备类,则置空
-            if (flag) this.value = [];
-        },
-        //修改val
-        changeVal(val) {
-            let value = {};
-            if (val && val[1]) {
-                this.options.forEach((sys) => {
-                    sys.children.forEach((eq) => {
-                        if (eq.code === val[1]) {
-                            value.facility = eq.name;
-                            value.code = eq.code;
-                        }
-                    });
-                });
-            }
-            this.$emit("change", value);
-        },
-        //获取当前项目下的设备类型(只拿到编码-需要过滤)
-        async getData(val) {
-            let params = {
-                distinct: true,
-                pageNumber: 1,
-                pageSize: 1000,
-                projection: ["classCode"],
-            };
-            if (val && val[0] != "all") {
-                params.filters = "";
-                if (val[0] == "noKnow") {
-                    params.filters += `;buildingId isNull`;
-                } else if (val[0] && val[0] != "all") {
-                    params.filters += `;buildingId='${val[0]}'`;
-                }
-                if (val[1] == "noKnow") {
-                    params.filters += `;floorId isNull`;
-                } else if (val[1] && val[1] != "all") {
-                    params.filters += `;floorId='${val[1]}'`;
-                }
-                params.filters = params.filters.slice(1);
+    //修改val
+    changeVal(val) {
+      let value = {};
+      if (val && val[1]) {
+        this.options.forEach((sys) => {
+          sys.children.forEach((eq) => {
+            if (eq.code === val[1]) {
+              value.facility = eq.name;
+              value.code = eq.code;
             }
-            const res = await Dic.getEquipLkSys(params)
-            if (res.content) {
-                this.options = res.content;
-            } else {
-                this.options = [];
-            }
-            
-        },
+          });
+        });
+      }
+      this.$emit("change", value);
+    },
+    //获取当前项目下的设备类型(只拿到编码-需要过滤)
+    async getData(val) {
+      let params = {
+        distinct: true,
+        pageNumber: 1,
+        pageSize: 1000,
+        projection: ["classCode"],
+        type: "equipment",
+      };
+      if (val && val[0] != "all") {
+        params.filters = "";
+        if (val[0] == "noKnow") {
+          params.filters += `;buildingId isNull`;
+        } else if (val[0] && val[0] != "all") {
+          params.filters += `;buildingId='${val[0]}'`;
+        }
+        if (val[1] == "noKnow") {
+          params.filters += `;floorId isNull`;
+        } else if (val[1] && val[1] != "all") {
+          params.filters += `;floorId='${val[1]}'`;
+        }
+        params.filters = params.filters.slice(1);
+      }
+      const res = await Dic.getEquipLkSys(params);
+      if (res.content) {
+        this.options = res.content;
+      } else {
+        this.options = [];
+      }
     },
+  },
 };
 </script>
 <style lang="less">
 .equip-cascader {
-    .el-cascader-menu__wrap {
-        height: 550px;
-    }
+  .el-cascader-menu__wrap {
+    height: 550px;
+  }
 }
 </style>
 <style lang="less" scoped>
 #cascaderMap {
-    float: left;
-    margin-left: 10px;
+  float: left;
+  margin-left: 10px;
 
-    .buildFloor {
-        color: #999999;
-        font-size: 14px;
-    }
+  .buildFloor {
+    color: #999999;
+    font-size: 14px;
+  }
 
-    /deep/ .el-scrollbar__wrap {
-        height: 563px;
-    }
+  /deep/ .el-scrollbar__wrap {
+    height: 563px;
+  }
 }
 </style>

+ 3 - 2
src/components/old-adm/ledger/system/index.vue

@@ -18,7 +18,7 @@ import floorCascader from "@/components/old-adm/ledger/components/lib/floorCasca
 import myCascader from "@/components/old-adm/ledger/components/lib/system";
 import hansonTable from "@/components/old-adm/ledger/components/handsontables/system";
 import tableTransfers from "@/components/old-adm/ledger/components/tableTransfers";
-import { mapGetters } from "vuex";
+import { mapGetters, mapState } from "vuex";
 // import { countGeneralSys } from "@/api/scan/request"
 import Scan from '@/controller/old-adm/ScanController'
 import 'handsontable-pro/dist/handsontable.full.css'
@@ -52,7 +52,8 @@ export default {
     }
   },
   computed: {
-    ...mapGetters("layout", ["projectId", "secret", "userId"])
+    ...mapGetters("layout", ["projectId", "secret", "userId"]),
+    ...mapState(['selectProject'])
   },
   created() {
     this.param.ProjId = this.projectId

+ 22 - 21
src/controller/old-adm/ScanController.ts

@@ -1,4 +1,5 @@
 import { baseHttpUtils } from "@/utils/http/baseHttpUtils";
+import { adm_middleware } from '@/controller/old-adm/preTypes'
 import {
   datacenter_pre,
   dict_pre,
@@ -46,7 +47,7 @@ class ScanController {
   */
   static async countPartsDie(params) {
     const res = await ScanController.http.postRequest(
-      "/equip-component/equip-query/count",
+      equipquery_pre + "/count",
       params
     );
   }
@@ -60,7 +61,7 @@ class ScanController {
   */
   static async createPropertys(params) {
     return await ScanController.http.postRequest(
-      "/equip-component/equip-query/creat-propertys",
+      equipquery_pre + "/creat-propertys",
       params
     );
   }
@@ -74,7 +75,7 @@ class ScanController {
   */
   static async deleteProperty(params) {
     return await ScanController.http.postRequest(
-      "/datacenter/object/property/delete",
+      object_pre + "/property/delete",
       params
     );
   }
@@ -88,7 +89,7 @@ class ScanController {
   */
   static async propertyLinkEq(params) {
     return await ScanController.http.postRequest(
-      "/equip-component/property/property-query",
+      datacenter_pre + "/property/property-query",
       params
     );
   }
@@ -99,7 +100,7 @@ class ScanController {
   */
   static async propertyUpdate(params) {
     return await ScanController.http.postRequest(
-      "/equip-component/property/update",
+      datacenter_pre + "/property/update",
       params
     );
   }
@@ -110,7 +111,7 @@ class ScanController {
    */
   static async queryProperty(params) {
     return await ScanController.http.postRequest(
-      "/datacenter/object/property/query",
+      object_pre + "/property/query",
       params
     );
   }
@@ -121,7 +122,7 @@ class ScanController {
    */
   static async updateProperty(params) {
     return await ScanController.http.postRequest(
-      "/datacenter/object/property/update",
+      object_pre + "/property/update",
       params
     );
   }
@@ -132,7 +133,7 @@ class ScanController {
    */
   static async deleteGeneralSys(params) {
     return await ScanController.http.postRequest(
-      "/datacenter/object/general-system/delete",
+      object_pre + "/general-system/delete",
       params
     );
   }
@@ -144,7 +145,7 @@ class ScanController {
   */
   static async updateGeneralSys(params) {
     return await ScanController.http.postRequest(
-      "/datacenter/object/general-system/update",
+      object_pre + "/general-system/update",
       params
     );
   }
@@ -155,7 +156,7 @@ class ScanController {
   */
   static async getEquipBelongs(params) {
     return await ScanController.http.postRequest(
-      "/datacenter/dict/family/query",
+      dict_pre + "/family/query",
       params
     );
   }
@@ -167,7 +168,7 @@ class ScanController {
   */
   static async buildingQuery(params) {
     return await ScanController.http.postRequest(
-      "/datacenter/object/building/query",
+      object_pre + "/building/query",
       params
     );
   }
@@ -178,7 +179,7 @@ class ScanController {
   */
   static async shaftLinkBuild(params) {
     return await ScanController.http.postRequest(
-      "/datacenter/rel/sh-in-bd/link-bd",
+      datacenter_pre + "/rel/sh-in-bd/link-bd",
       params
     );
   }
@@ -188,7 +189,7 @@ class ScanController {
    *@return {*}
    */
   static async querySysLinkBuild(params, fn) {
-    let url = "/datacenter/object/general-system/query-new";
+    let url = object_pre + "/general-system/query-new";
     if (params.buildingId) {
       url += `?buildingId=${params.buildingId}`;
     }
@@ -200,7 +201,7 @@ class ScanController {
   }
   static async countGeneralSys(params: any, fn: any) {
     const res = await ScanController.http.postRequest(
-      "/datacenter/object/general-system/count",
+      object_pre + "/general-system/count",
       params
     );
     return fn ? fn(res) : res;
@@ -212,7 +213,7 @@ class ScanController {
    */
   static async getFloorMsgByFloorID(params?: any) {
     return await ScanController.http.postRequest(
-      "/datacenter/object/floor/query",
+      object_pre + "/floor/query",
       params
     );
   }
@@ -223,13 +224,13 @@ class ScanController {
    */
   static async queryLinkSys(params) {
     return await ScanController.http.postRequest(
-      "/datacenter/object/general-system/query",
+      object_pre + "/general-system/query",
       params
     );
   }
   static async getAllProject(params, fn) {
     const res = await ScanController.http.postRequest(
-      "/datacenter/object/project/query/obj",
+      object_pre + "/project/query/obj",
       params
     );
     return fn ? fn(res) : res;
@@ -243,7 +244,7 @@ class ScanController {
    */
   static async sysRelateBuild(params, fn) {
     const res = await ScanController.http.postRequest(
-      "/datacenter/rel/sy-in-bd/link-bd",
+      datacenter_pre + "/rel/sy-in-bd/link-bd",
       params
     );
     return fn ? fn(res) : res;
@@ -256,21 +257,21 @@ class ScanController {
    */
   static async sysRelateFloor(params, fn) {
     const res = await ScanController.http.postRequest(
-      "/datacenter/rel/sy-in-fl/link-fl",
+      datacenter_pre + "/rel/sy-in-fl/link-fl",
       params
     );
     return fn ? fn(res) : res;
   }
   static async getEquipInSys(params, fn) {
     const res = await ScanController.http.postRequest(
-      `/equip-component/equip-query/sys-equip`,
+      `${equipquery_pre}/sys-equip`,
       params
     );
     return fn ? fn(res) : res;
   }
   static async sysLinkEquip(params, fn) {
     const res = await ScanController.http.postRequest(
-      `/datacenter/rel/sy-in-eq/link-sy-eq`,
+      `${datacenter_pre}/rel/sy-in-eq/link-sy-eq`,
       params
     );
     return fn ? fn(res) : res;

+ 15 - 19
src/controller/old-adm/buildController.ts

@@ -1,6 +1,7 @@
 import FloorController from "./floorController";
 import { baseHttpUtils } from "@/utils/http/baseHttpUtils";
 import { logicConfig } from "@/logicConfig";
+import { object_pre } from "./preTypes";
 
 export interface BuildReq {
   pageNumber: number;
@@ -10,7 +11,7 @@ export interface BuildReq {
 }
 class BuildController {
   static http = new baseHttpUtils();
-  static pre = "/datacenter/object";
+  static pre = object_pre;
   /**
    * 获取建筑信息
    * @param {BuildReq} params
@@ -21,40 +22,35 @@ class BuildController {
   }
   /**
    * @description: 处理楼层接口数据为树状结构
-   * @param {*} 
+   * @param {*}
    * @return {*}
-   */ 
+   */
   static async buildDataFormat(params) {
     try {
-      const res =  await this.buildingQuery(params);
+      const res = await this.buildingQuery(params);
       if (res.result != logicConfig.resultObj.success) {
         return;
       }
-      return res?.content.map(item => {
-        const { id, localName:name  } = item;
-        const children =  item?.floor?.map(subitem => ({
+      return res?.content.map((item) => {
+        const { id, localName: name } = item;
+        const children = item?.floor?.map((subitem) => ({
           id: subitem.buildingId,
           name: subitem.localName,
           open: false,
           disabled: false,
-          checked: 'uncheck'
-        }))
+          checked: "uncheck",
+        }));
         return {
           id,
           name,
           open: false,
           disabled: false,
-          checked: 'uncheck',
+          checked: "uncheck",
           children,
-        }
-
-      })
-
-    } catch (error) {
-      
-    }
-
-  } 
+        };
+      });
+    } catch (error) {}
+  }
   static async getData(buildFloorData) {
     let data,
       buildParams = {

+ 4 - 4
src/controller/old-adm/dicController.ts

@@ -1,5 +1,5 @@
 import { baseHttpUtils } from "@/utils/http/baseHttpUtils";
-import { dict_pre } from "./preTypes";
+import { dict_pre, equipcomponentdic_pre } from "./preTypes";
 class Dic {
   static http = new baseHttpUtils();
 
@@ -9,7 +9,7 @@ class Dic {
    * @return {*}
    */
   static async getDataDictionary(params, fn) {
-    const res = await Dic.http.postRequest(`/datacenter/dict/query`, params);
+    const res = await Dic.http.postRequest(`${dict_pre}/query`, params);
     return fn ? fn(res) : res;
   }
 
@@ -20,7 +20,7 @@ class Dic {
    */
   static async deliveredInfos(params, fn) {
     const res = await Dic.http.postRequest(
-      "/equip-component/dict/delivered/infos",
+      dict_pre + "/delivered/infos",
       params
     );
     return fn ? fn(res) : res;
@@ -43,7 +43,7 @@ class Dic {
    *  @return {*}
    */
   static async queryPhysicsAllType(params) {
-    return await Dic.http.postRequest("/datacenter/dict/category", params);
+    return await Dic.http.postRequest(dict_pre + "/category", params);
   }
   /**
    *  @description: 设置项目数据字典显隐 --列表表头 api/dict

+ 4 - 3
src/controller/old-adm/preTypes.ts

@@ -1,14 +1,15 @@
-export const datacenter_pre = "/datacenter";
+export const datacenter_pre = "/adm-middleware";
 export const dict_pre = `${datacenter_pre}/dict`;
 export const object_pre = `${datacenter_pre}/object`;
 export const rwd_pre = "/rwd";
 
 export const equipcomponent_pre = "/equip-component";
-export const equipquery_pre = `${equipcomponent_pre}/equip-query`;
-export const equipcomponentdic_pre = `${equipcomponent_pre}/dict`;
+export const equipquery_pre = `${datacenter_pre}/equip-query`;
+export const equipcomponentdic_pre = `${datacenter_pre}/dict`;
 
 export const graphhic_pre = `${datacenter_pre}/graphic`;
 
 export const floor_pre = `${object_pre}/floor`;
 
 export const model_pre = "/revit-algorithm";
+export const adm_middleware = '/adm-middleware'