增加项目交付范围

.gitignore

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

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,
@@ -200,7 +201,7 @@ class ScanController {
   }
   static async countGeneralSys(params: any, fn: any) {
     const res = await ScanController.http.postRequest(
-      "/datacenter/object/general-system/count",
+      adm_middleware + "/object/general-system/count",
       params
     );
     return fn ? fn(res) : res;

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'