.gitignore

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

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>

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>

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;

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>

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

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,

src/controller/old-adm/preTypes.ts

@@ -12,3 +12,4 @@ 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'