Jelajahi Sumber

Merge remote-tracking branch 'origin/master'

shaun-sheep 4 tahun lalu
induk
melakukan
077fcf0b61

+ 3 - 3
src/components/public/adm-multi-table.vue

@@ -1,9 +1,9 @@
 <template>
-    <div>
+    <div style="height: 100%;">
         <el-table
             :data="tableData"
             style="width: 100%"
-            max-height="550"
+            height="100%"
             class="adm-multi-table"
             :row-style="{ height: '10px' }"
             border
@@ -33,11 +33,11 @@
             >
                 <el-table-column
                     v-for="(child,index) in item.data"
+                    :min-width="child.path === 'outline'? 800: 110"
                     :key="index"
                     :label="child.name"
                     :prop="child.path"
                     align="center"
-                    show-overflow-tooltip
                 >
                 </el-table-column>
             </el-table-column>

+ 26 - 12
src/views/maintain/device/index.vue

@@ -29,7 +29,7 @@
             </el-tabs>
             <div class="table" v-loading="loading">
 <!--                <template v-if="deviceType">-->
-                <template v-if="linshi.length >0">
+                <template v-if="linshi.length > 0">
                     <admMultiTable :currentHeader="currentHeader" :tableData="tableData" :headersStage="headersStage"/>
                     <Pagination v-if="tableData.length > 0" :paginationList="paginationList"
                                 @handleCurrentChange="handleCurrentChange"
@@ -99,24 +99,37 @@ export default class extends Vue {
     linshi=''
     options= [{
         value: 'zhinan',
-        label: '水景系统',
+        label: '空调末端系统',
         children: [{
             value: 'ACATAH',
             label: '空调机组',
         }, {
             value: 'ACATFC',
             label: '风机盘管',
-        }]
-    },{
-        value: 'zzzz',
-        label: '室外动力系统',
-        children: [{
+        },{
             value: 'ACATFU',
             label: '新风机组',
         }, {
             value: 'ACATIO',
             label: '空调风口',
         }]
+    }, {
+        value: 'fangpaiyan',
+        label: '防排烟系统',
+        children: [{
+            value: 'FFSCIO',
+            label: '排烟风机',
+        }]
+    }, {
+        value: 'fangfeng',
+        label: '通风系统',
+        children: [{
+            value: 'ACVTSF',
+            label: '通风风机',
+        }, {
+            value: 'ACVTIO',
+            label: '通风风口',
+        }]
     }]
 
     // loading
@@ -383,7 +396,6 @@ export default class extends Vue {
                 })
             })
         }
-
     }
 
     // 维护阶段 tabs
@@ -484,14 +496,16 @@ $border: 1px solid #E1E7EA;
     }
 
     .content {
-        height: 100%;
+        position: relative;
+        height: calc(100% - 140px);
 
         .table {
             border-left: $border;
             border-right: $border;
             border-bottom: $border;
-            height: calc(100% - 180px);
+            height: calc(100% - 41px);
             padding: 12px;
+            padding-bottom: 50px;
 
             .void {
 
@@ -519,9 +533,9 @@ $border: 1px solid #E1E7EA;
     }
 
     .adm-pagination {
-        right: 40px;
+        right: 10px;
         position: absolute;
-        bottom: 30px;
+        bottom: 10px;
     }
 }
 

+ 4 - 4
src/views/maintain/space/index.vue

@@ -18,8 +18,8 @@
                                  v-if="activeName==='picture'"></el-cascader>
                     <admSearch @SearchValue="searchValue" class="item" v-if="activeName==='table'"/>
                 </div>
-                <div v-if="activeName==='table'" v-loading="loading">
-                    <template v-if="building.length > 0">
+                <div v-if="activeName==='table'" v-loading="loading" style="height: calc(100% - 100px);">
+                    <template style="height: 100%;" v-if="building.length > 0">
                         <admMultiTable :currentHeader="currentHeader" :headersStage="headersStage"
                                        :tableData="tableData"/>
                         <Pagination v-if="tableData.length > 0" :paginationList="paginationList"
@@ -447,9 +447,9 @@ export default class spaceIndex extends Vue {
     }
 
     .adm-pagination {
-        right: 40px;
+        right: 10px;
         position: absolute;
-        bottom: 30px;
+        bottom: 10px;
     }
 }
 </style>

+ 254 - 260
src/views/maintain/system/index.vue

@@ -1,72 +1,61 @@
 <template>
     <div class="adm-system">
-        <statistics :statistics-msg="statisticsMsg"/>
+        <statistics :statistics-msg="statisticsMsg" />
         <div class="hr"></div>
         <div class="operation">
-<!--            <el-select-->
-<!--                v-model="systemType"-->
-<!--                class="adm-select"-->
-<!--                clearable-->
-<!--                filterable-->
-<!--                placeholder="请选择系统类别"-->
-<!--                @change="handleFilter"-->
-<!--            >-->
-<!--                <el-option-->
-<!--                    v-for="item in list"-->
-<!--                    :key="item.code"-->
-<!--                    :label="item.name"-->
-<!--                    :value="{ value: item.code,label: item.name }"-->
-<!--                />-->
-<!--            </el-select>-->
-            <el-cascader :options="options" clearable v-model="linshi" ref="floorCascader" @change="changeLinshi"  class="adm-select" ></el-cascader>
-
-            <admSearch @SearchValue="SearchValue"/>
+            <!--            <el-select-->
+            <!--                v-model="systemType"-->
+            <!--                class="adm-select"-->
+            <!--                clearable-->
+            <!--                filterable-->
+            <!--                placeholder="请选择系统类别"-->
+            <!--                @change="handleFilter"-->
+            <!--            >-->
+            <!--                <el-option-->
+            <!--                    v-for="item in list"-->
+            <!--                    :key="item.code"-->
+            <!--                    :label="item.name"-->
+            <!--                    :value="{ value: item.code,label: item.name }"-->
+            <!--                />-->
+            <!--            </el-select>-->
+            <el-cascader :options="options" clearable v-model="linshi" ref="floorCascader" @change="changeLinshi" class="adm-select"></el-cascader>
+
+            <admSearch @SearchValue="SearchValue" />
             <el-button class="adm-btn" type="default" @click="addDevice">添加系统</el-button>
         </div>
 
         <div class="content">
             <div v-loading="loading" class="table">
-<!--                <template v-if="systemType">-->
+                <!--                <template v-if="systemType">-->
                 <template v-if="linshi.length > 0">
-                    <admMultiTable :currentHeader="currentHeader" :headersStage="headersStage" :tableData="tableData"/>
-                    <Pagination :paginationList="paginationList" @handleCurrentChange="handleCurrentChange"
-                                v-if="tableData.length > 0"
-                                @handleSizeChange="handleSizeChange"/>
+                    <admMultiTable :currentHeader="currentHeader" :headersStage="headersStage" :tableData="tableData" />
+                    <Pagination
+                        :paginationList="paginationList"
+                        @handleCurrentChange="handleCurrentChange"
+                        v-if="tableData.length > 0"
+                        @handleSizeChange="handleSizeChange"
+                    />
                 </template>
                 <div v-else class="void align">
-                    <svg-icon :height="String(123)" :width="String(120)" name="void"/>
+                    <svg-icon :height="String(123)" :width="String(120)" name="void" />
                     <p class="void-title">暂无内容</p>
                     <p class="void-tips">可点击左上角选择系统类型</p>
                 </div>
             </div>
         </div>
         <!--        添加/编辑 系统-->
-        <el-dialog
-            :title="deviceMsg"
-            :visible.sync="dialogVisible"
-            @close="close"
-        >
+        <el-dialog :title="deviceMsg" :visible.sync="dialogVisible" @close="close">
             <template v-if="next">
                 <div class="align" style="height: 400px">
-                    <span class="text ">系统类别</span>
-                    <el-select
-                        v-model="systemVal"
-                        clearable
-                        filterable
-                        placeholder="请选择系统类别"
-                    >
-                        <el-option
-                            v-for="item in list"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                        />
+                    <span class="text">系统类别</span>
+                    <el-select v-model="systemVal" clearable filterable placeholder="请选择系统类别">
+                        <el-option v-for="item in list" :key="item.value" :label="item.label" :value="item.value" />
                     </el-select>
                 </div>
                 <el-button class="fr" type="primary" @click="handleNext">下一步</el-button>
             </template>
             <template v-else>
-                <dataForm/>
+                <dataForm />
                 <el-button class="fr ml-10" type="primary">确定</el-button>
             </template>
         </el-dialog>
@@ -75,359 +64,371 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-property-decorator";
-import { AdmMultiTable, AdmSearch, dataForm, Pagination, Statistics } from '../components/index'
+import { AdmMultiTable, AdmSearch, dataForm, Pagination, Statistics } from "../components/index";
 import { dictCategoryQuery, dictQuery, queryCountSystem, querySystem } from "@/api/datacenter";
-import tools from "@/utils/maintain"
+import tools from "@/utils/maintain";
 import { UserModule } from "@/store/modules/user";
 import { BeatchQueryParam } from "@/api/equipComponent";
 
-
 @Component({
-    name: 'adm-device',
-    components: { Statistics, AdmSearch, AdmMultiTable, Pagination, dataForm }
+    name: "adm-device",
+    components: { Statistics, AdmSearch, AdmMultiTable, Pagination, dataForm },
 })
 export default class extends Vue {
     // 临时假数据
-    linshi=''
-    options= [{
-        value: 'zzzz',
-        label: '安防专业',
-        children: [{
-            value: 'CFPK',
-            label: '停车场',
-
-        }, {
-            value: 'WEMM',
-            label: '气象监测系统',
-        }]
-    },{
-        value: 'zzzz',
-        label: '弱电专业',
-        children: [{
-            value: 'SEOP',
-            label: '室外动力系统',
-        }, {
-            value: 'WSWS',
-            label: '水景系统',
-        }]
-    }]
+    linshi = "";
+    options = [
+        {
+            value: "zzzz",
+            label: "土建专业",
+            children: [
+                {
+                    value: "CFPK",
+                    label: "停车场",
+                }
+            ],
+        },
+        {
+            value: "zzzz",
+            label: "弱电系统",
+            children: [
+                {
+                    value: "WEMM",
+                    label: "气象监测系统",
+                },
+            ],
+        },
+        {
+            value: "zzzz",
+            label: "强电专业",
+            children: [
+                {
+                    value: "SEOP",
+                    label: "室外动力系统",
+                },
+            ],
+        },
+        {
+            value: "zzzz",
+            label: "给排水系统",
+            children: [
+                {
+                    value: "WSWS",
+                    label: "水景系统",
+                },
+            ],
+        },
+    ];
     // loading
-    loading = false
+    loading = false;
     // 下拉数据
-    list = []
+    list = [];
     // 信息点集合(表头)
-    all = []
-    codeToDataSource = {}
+    all = [];
+    codeToDataSource = {};
     // 系统类值
-    systemType = ''
+    systemType = "";
     // 系统名称 label值
-    systemLabel = ''
-    systemVal = ''
-    currentHeader = '运维阶段'
-    tableData = []
+    systemLabel = "";
+    systemVal = "";
+    currentHeader = "运维阶段";
+    tableData = [];
     // 表头阶段信息结合
-    headersStage = {}
+    headersStage = {};
     // 统计信息对象
     private statisticsMsg = {
-        title: '全部系统',
-        total: 0
-
-    }
+        title: "全部系统",
+        total: 0,
+    };
     // 分页
     private paginationList = {
         page: 1,
         size: 50,
         sizes: [10, 30, 50, 100, 150, 200],
-        total: 0
-    }
+        total: 0,
+    };
     // 下一步
-    private next = true
+    private next = true;
     // 弹窗 title
-    private deviceMsg = '添加系统'
+    private deviceMsg = "添加系统";
     // 弹窗开关
-    private dialogVisible = false
+    private dialogVisible = false;
     // 搜索内容
-    inputSearch = ''
+    inputSearch = "";
 
     // 项目id
     private get projectId(): string {
-        return UserModule.projectId
+        return UserModule.projectId;
     }
 
     created() {
         // this.systemList();
-        this.dataCount()
+        this.dataCount();
     }
 
-//查询统计数量
+    //查询统计数量
     dataCount() {
-        queryCountSystem({}).then(res => {
-            this.statisticsMsg.total = res.count
-        })
+        queryCountSystem({}).then((res) => {
+            this.statisticsMsg.total = res.count;
+        });
     }
 
     systemList() {
         let param = {
-            type: 'system'
-        }
-        dictCategoryQuery(param).then(res => {
-            this.list = res.content
-        })
+            type: "system",
+        };
+        dictCategoryQuery(param).then((res) => {
+            this.list = res.content;
+        });
     }
 
     // 动态信息点
     getBatch(data) {
         let param = {
-            groupCode: 'WD',
-            appId: 'datacenter',
+            groupCode: "WD",
+            appId: "datacenter",
             projectId: this.projectId,
-            data: []
-        }
-        this.all.forEach(head => {
-            if (head.category != 'STATIC') {
-                data.forEach(item => {
-                    let cur = tools.dataForKey(item, head.path)
+            data: [],
+        };
+        this.all.forEach((head) => {
+            if (head.category != "STATIC") {
+                data.forEach((item) => {
+                    let cur = tools.dataForKey(item, head.path);
                     if (cur) {
                         param.data.push({
                             objectId: item.id,
-                            infoCode: head.code
-                        })
+                            infoCode: head.code,
+                        });
                     }
-                })
+                });
             }
-
-        })
+        });
         if (param.data.length) {
-            BeatchQueryParam(param).then(res => {
-                this.tableData = data.map(item => {
-                    res.data.map(child => {
+            BeatchQueryParam(param).then((res) => {
+                this.tableData = data.map((item) => {
+                    res.data.map((child) => {
                         if (item.id == child.objectId) {
                             if (!!child.data || child.data == 0) {
-                                this.all.map(head => {
+                                this.all.map((head) => {
                                     if (head.code == child.infoCode) {
-                                        let contentVal = child.data
+                                        let contentVal = child.data;
                                         if (this.codeToDataSource[child.infoCode]) {
-                                            contentVal = this.codeToDataSource[child.infoCode][child.data]
+                                            contentVal = this.codeToDataSource[child.infoCode][child.data];
                                         }
                                         tools.setDataForKey(item, head.path, contentVal);
                                     }
-                                })
+                                });
                             } else {
-                                this.all.map(head => {
+                                this.all.map((head) => {
                                     if (head.code == child.infoCode) {
-                                        tools.setDataForKey(
-                                            item,
-                                            head.path,
-                                            child.error
-                                        );
+                                        tools.setDataForKey(item, head.path, child.error);
                                     }
                                 });
                             }
                         }
-                    })
-                    return item
-                })
-            })
+                    });
+                    return item;
+                });
+            });
         }
-
     }
 
     // 搜索
     SearchValue(val: string) {
-        this.inputSearch = val
+        this.inputSearch = val;
         // this.handleFilter(this.systemType)
     }
 
     // 当前分页
     handleCurrentChange(val: number) {
-        this.paginationList.page = val
+        this.paginationList.page = val;
         // this.handleFilter(this.systemType)
     }
 
     handleSizeChange(val: number) {
-        this.paginationList.size = val
+        this.paginationList.size = val;
         // this.handleFilter(this.systemType)
     }
 
     // 添加设备
     addDevice() {
-        this.dialogVisible = true
+        this.dialogVisible = true;
     }
 
     //下一步事件
     handleNext() {
         if (this.system) {
-            this.next = false
+            this.next = false;
         }
     }
 
     // close
     close() {
-        this.next = true
-        this.displayLocation = false
+        this.next = true;
+        this.displayLocation = false;
     }
     // todo 临时假数据函数
     private changeLinshi(val) {
-
-
         if (this.linshi[1]) {
-            let systemLabel = this.$refs['floorCascader'].getCheckedNodes()[0].pathLabels
-            this.systemLabel = systemLabel[1]
-            this.loading = true
+            let systemLabel = this.$refs["floorCascader"].getCheckedNodes()[0].pathLabels;
+            this.systemLabel = systemLabel[1];
+            this.loading = true;
             let param = {
-                "type": this.linshi[1],
-                "orders": "sort asc, name desc"
-            }
+                type: this.linshi[1],
+                orders: "sort asc, name desc",
+            };
             let param2 = {
-                filters: this.linshi[1] ? `classCode='${ this.linshi[1]}'` : undefined,
+                filters: this.linshi[1] ? `classCode='${this.linshi[1]}'` : undefined,
                 pageNumber: this.paginationList.page,
                 pageSize: this.paginationList.size,
                 orders: "createTime desc, id asc",
-                projectId: this.projectId
-            }
-            if (this.inputSearch != '') {
-                param2.filters = `localName contain '${ this.inputSearch }' or localId contain '${ this.inputSearch }'`
+                projectId: this.projectId,
+            };
+            if (this.inputSearch != "") {
+                param2.filters = `localName contain '${this.inputSearch}' or localId contain '${this.inputSearch}'`;
             }
-            let promise = new Promise(resolve => {
-                dictQuery(param).then(res => {
-                    resolve(res)
-                })
-            })
-            let promise2 = new Promise(resolve => {
-                querySystem(param2).then(res => {
-                    resolve(res)
-                })
-            })
-            Promise.all([promise, promise2]).then(res => {
-                let tableData = []
-                this.loading = false
+            let promise = new Promise((resolve) => {
+                dictQuery(param).then((res) => {
+                    resolve(res);
+                });
+            });
+            let promise2 = new Promise((resolve) => {
+                querySystem(param2).then((res) => {
+                    resolve(res);
+                });
+            });
+            Promise.all([promise, promise2]).then((res) => {
+                let tableData = [];
+                this.loading = false;
                 // 类型下信息点,重组数据
-                let basicInfos = [{ path: 'classification', name: '系统分类' }], dictStages = []
-                this.all = res[0].content
-                res[0].content.forEach(item => {
-                    let i = ["localName", "localId"]
+                let basicInfos = [{ path: "classification", name: "系统分类" }],
+                    dictStages = [];
+                this.all = res[0].content;
+                res[0].content.forEach((item) => {
+                    let i = ["localName", "localId"];
                     if (i.includes(item.path)) {
-                        basicInfos.push(item)
+                        basicInfos.push(item);
                     } else {
-                        dictStages.push(item)
+                        dictStages.push(item);
                     }
-                })
+                });
 
                 this.headersStage = {
                     basicInfos: {
-                        name: '基础信息台账',
-                        data: basicInfos
+                        name: "基础信息台账",
+                        data: basicInfos,
                     },
                     dictStages: {
-                        name: '运维阶段',
-                        data: dictStages
-                    }
-                }
-                this.paginationList.total = res[1].total
-                tableData = res[1].content // 主体数据
+                        name: "运维阶段",
+                        data: dictStages,
+                    },
+                };
+                this.paginationList.total = res[1].total;
+                tableData = res[1].content; // 主体数据
                 // 添加系统分类
-                this.tableData = tableData.map(item => {
-                    item = { ...item, classification: this.systemLabel }
-                    return item
-                })
-            })
+                this.tableData = tableData.map((item) => {
+                    item = { ...item, classification: this.systemLabel };
+                    return item;
+                });
+            });
             // 动态信息点
-            this.codeToDataSource = {}
-            this.all.forEach(item => {
+            this.codeToDataSource = {};
+            this.all.forEach((item) => {
                 if (item.dataSource) {
                     try {
-                        this.codeToDataSource[item.code] = {}
-                        item.dataSource.forEach(dic => {
+                        this.codeToDataSource[item.code] = {};
+                        item.dataSource.forEach((dic) => {
                             this.codeToDataSource[item.code][dic.code] = dic.name;
-                        })
+                        });
                     } catch (e) {
                         console.log(e);
                     }
                 }
             });
-            this.getBatch(this.tableData)
+            this.getBatch(this.tableData);
         } else {
-            console.log('void')
+            console.log("void");
         }
     }
     private handleFilter(val) {
-        this.systemLabel = val.label
+        this.systemLabel = val.label;
         if (val) {
-            this.loading = true
+            this.loading = true;
             let param = {
-                "type": val.value,
-                "orders": "sort asc, name desc"
-            }
+                type: val.value,
+                orders: "sort asc, name desc",
+            };
             let param2 = {
-                filters: val ? `classCode='${ val.value }'` : undefined,
+                filters: val ? `classCode='${val.value}'` : undefined,
                 pageNumber: this.paginationList.page,
                 pageSize: this.paginationList.size,
                 orders: "createTime desc, id asc",
-                projectId: this.projectId
-            }
-            if (this.inputSearch != '') {
-                param2.filters = `localName contain '${ this.inputSearch }' or localId contain '${ this.inputSearch }'`
+                projectId: this.projectId,
+            };
+            if (this.inputSearch != "") {
+                param2.filters = `localName contain '${this.inputSearch}' or localId contain '${this.inputSearch}'`;
             }
-            let promise = new Promise(resolve => {
-                dictQuery(param).then(res => {
-                    resolve(res)
-                })
-            })
-            let promise2 = new Promise(resolve => {
-                querySystem(param2).then(res => {
-                    resolve(res)
-                })
-            })
-            Promise.all([promise, promise2]).then(res => {
-                let tableData = []
-                this.loading = false
+            let promise = new Promise((resolve) => {
+                dictQuery(param).then((res) => {
+                    resolve(res);
+                });
+            });
+            let promise2 = new Promise((resolve) => {
+                querySystem(param2).then((res) => {
+                    resolve(res);
+                });
+            });
+            Promise.all([promise, promise2]).then((res) => {
+                let tableData = [];
+                this.loading = false;
                 // 类型下信息点,重组数据
-                let basicInfos = [{ path: 'classification', name: '系统分类' }], dictStages = []
-                this.all = res[0].content
-                res[0].content.forEach(item => {
-                    let i = ["localName", "localId"]
+                let basicInfos = [{ path: "classification", name: "系统分类" }],
+                    dictStages = [];
+                this.all = res[0].content;
+                res[0].content.forEach((item) => {
+                    let i = ["localName", "localId"];
                     if (i.includes(item.path)) {
-                        basicInfos.push(item)
+                        basicInfos.push(item);
                     } else {
-                        dictStages.push(item)
+                        dictStages.push(item);
                     }
-                })
+                });
 
                 this.headersStage = {
                     basicInfos: {
-                        name: '基础信息台账',
-                        data: basicInfos
+                        name: "基础信息台账",
+                        data: basicInfos,
                     },
                     dictStages: {
-                        name: '运维阶段',
-                        data: dictStages
-                    }
-                }
-                this.paginationList.total = res[1].total
-                tableData = res[1].content // 主体数据
+                        name: "运维阶段",
+                        data: dictStages,
+                    },
+                };
+                this.paginationList.total = res[1].total;
+                tableData = res[1].content; // 主体数据
                 // 添加系统分类
-                this.tableData = tableData.map(item => {
-                    item = { ...item, classification: this.systemLabel }
-                    return item
-                })
-            })
+                this.tableData = tableData.map((item) => {
+                    item = { ...item, classification: this.systemLabel };
+                    return item;
+                });
+            });
             // 动态信息点
-            this.codeToDataSource = {}
-            this.all.forEach(item => {
+            this.codeToDataSource = {};
+            this.all.forEach((item) => {
                 if (item.dataSource) {
                     try {
-                        this.codeToDataSource[item.code] = {}
-                        item.dataSource.forEach(dic => {
+                        this.codeToDataSource[item.code] = {};
+                        item.dataSource.forEach((dic) => {
                             this.codeToDataSource[item.code][dic.code] = dic.name;
-                        })
+                        });
                     } catch (e) {
                         console.log(e);
                     }
                 }
             });
-            this.getBatch(this.tableData)
+            this.getBatch(this.tableData);
         } else {
-            console.log('void')
+            console.log("void");
         }
     }
 }
@@ -435,7 +436,7 @@ export default class extends Vue {
 
 <style lang="scss" scoped>
 $margin: 12px;
-$border: 1px solid #E1E7EA;
+$border: 1px solid #e1e7ea;
 .align {
     display: flex;
     align-items: center;
@@ -449,41 +450,38 @@ $border: 1px solid #E1E7EA;
     padding: 12px;
     height: 100%;
 
-
     .operation {
         margin: 12px 0;
 
         .adm-select {
             margin-right: $margin;
-
         }
 
         .adm-btn {
             float: right;
         }
-
     }
 
     .hr {
-        background: #E1E7EA;
-        color: #E1E7EA;
+        background: #e1e7ea;
+        color: #e1e7ea;
         width: 100%;
         height: 1px;
         margin: 15px 0;
     }
 
     .content {
-        height: 100%;
+        position: relative;
+        height: calc(100% - 142px);
 
         .table {
             //border-left: $border;
             //border-right: $border;
             //border-bottom: $border;
-            //height: calc(100% - 180px);
+            height: calc(100% - 41px);
             padding: 12px;
 
             .void {
-
                 margin-top: 200px;
             }
 
@@ -494,24 +492,20 @@ $border: 1px solid #E1E7EA;
             }
 
             .void-tips {
-                color: #9CA1A9;
+                color: #9ca1a9;
                 line-height: 22px;
                 font-size: 14px;
             }
         }
 
         .adm-multi-table {
-
         }
-
-
     }
 
     .adm-pagination {
-        right: 40px;
+        right: 10px;
         position: absolute;
-        bottom: 30px;
+        bottom: 10px;
     }
 }
-
 </style>

+ 2 - 2
src/views/manage/build/components/FloorTable/index.vue

@@ -48,13 +48,13 @@
                             class="el-icon-bank-card"
                             @click="queryModelLog(scope.row)"
                         ></el-button>
-                        <el-button
+                        <!-- <el-button
                             title="下载BIMID模型"
                             type="primary"
                             size="mini"
                             class="el-icon-download"
                             @click="downloadModelBIMID(scope.row)"
-                        ></el-button>
+                        ></el-button> -->
                     </div>
                     <div :class="['upLoad-loading']" v-show="scope.row.Status !== 4">
                         <div class="progress">

+ 3 - 3
vue.config.js

@@ -53,9 +53,9 @@ module.exports = {
                 target: "http://192.168.64.17:28890",
                 changeOrigin: true
             },
-            '/rwd': {
-                target: 'http://39.102.40.239:9970/',
-                changeOrigin: false
+            "/rwd": {
+                target: "http://39.102.40.239:9970",
+                changeOrigin: true
             },
             "/image-service": {
                 target: "http://39.97.179.199:8891",