GuoYuFu123 5 years ago
parent
commit
6372e9b599

+ 5 - 0
src/framework/style/layout.scss

@@ -199,10 +199,15 @@ body {
         flex-shrink: 1;
         overflow-x: auto;
         overflow-y: auto;
+        background: #fff;
+        margin-top: 10px;
     }
     > .data-table-pagination {
+        margin-top: 10px;
         flex-grow: 0;
         flex-shrink: 0;
+        display: flex;
+        justify-content: flex-end;
     }
 }
 

+ 1 - 1
src/store/modules/proMess.js

@@ -1,7 +1,7 @@
 const project_mess = {
     namespaced: true,
     state: {
-        projectId: "Pj1101080003", //项目id
+        projectId: "Pj4201050001", //项目id
         secret: "saga123456", //数据源id
         userId: "test", //数据源类型
     },

+ 55 - 0
src/views/data_admin/buildAssets/NoMap.vue

@@ -0,0 +1,55 @@
+<template>
+    <div class='box1' style='display: flex;flex-direction: column;flex-grow: 1;flex-shrink: 1;'>
+        <el-table :data='tableData' style='width: 100%' border class='data-table'>
+                <el-table-column header-align='center' align='center' prop='c' label='建筑'></el-table-column>、
+                <el-table-column header-align='center' align='center' prop='d' label='楼层'></el-table-column>
+                <el-table-column header-align='center' align='center' prop='f' label='点位标签名称'></el-table-column>
+                <el-table-column header-align='center' align='center' prop='g' label='设备族'></el-table-column>
+                <el-table-column header-align='center' align='center' prop='h' label='本地名称'></el-table-column>
+                <el-table-column header-align='center' align='center' prop='i' label='操作'>
+                    <template slot-scope='scope'>
+                        <el-button type='primary' plain size='mini' @click='look(scope.row)'>查看</el-button>
+                        <el-button type='danger' plain size='mini' @click='create(scope.row)'>创建资产</el-button>
+                    </template>
+                </el-table-column>
+        </el-table>
+        <base-pagination :currentPages='pageNum' :total='total' @pageChanged='pageChanged'></base-pagination>
+    </div>
+</template>
+
+<script>
+export default {
+    name: 'nomap',
+    data() {
+        return {
+            tableData: [],
+            total: 0,
+            pageNum: 1,
+            pageSize: 10,
+        }
+    },
+    props: {
+        buildVlaue: {}
+    },
+    methods: {
+        pageChanged() {
+
+        },
+        look() {
+
+        },
+        create() {
+
+        }
+    },
+    watch: {
+        buildVlaue() {
+            console.log('****')
+        }
+    }
+}
+</script>
+
+<style scoped lang='less'>
+
+</style>

+ 70 - 0
src/views/data_admin/buildAssets/Nofind.vue

@@ -0,0 +1,70 @@
+<template>
+    <div class='box1' style='display: flex;flex-direction: column;flex-grow: 1;flex-shrink: 1;'>
+        <el-table :data='tableData' style='width: 100%' border class='data-table'>
+            <el-table-column header-align='center' align='center' prop='BuildName' label='建筑'></el-table-column>、
+            <el-table-column header-align='center' align='center' prop='d' label='楼层'></el-table-column>
+            <el-table-column header-align='center' align='center' prop='f' label='点位标签名称'></el-table-column>
+            <el-table-column header-align='center' align='center' prop='FamilyName' label='设备族'></el-table-column>
+            <el-table-column header-align='center' align='center' prop='FmId' label='本地编码'></el-table-column>
+            <el-table-column header-align='center' align='center' prop='FmName' label='本地名称'></el-table-column>
+        </el-table>
+        <base-pagination :currentPages='pageNum' :total='total' @pageChanged='pageChanged'></base-pagination>
+    </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+//api
+import {
+    getErrAssets, //获取异常资产type不同不同tab
+} from '@/api/scan/request'
+export default {
+    name: 'nofind',
+    data() {
+        return {
+            tableData: [],
+            total: 0,
+            pageNum: 1,
+            pageSize: 10
+        }
+    },
+    props: {
+        buildVlaue: {}
+    },
+    computed: {
+        ...mapGetters('peojMess', ['projectId', 'userId'])
+    },
+    methods: {
+        pageChanged(page, size) {
+            console.log(page, size)
+            this.pageNum = page
+            this.pageSize = size
+            this.getAsset()
+        },
+        getAsset() {
+            let param = {
+                BuildId: this.buildVlaue,
+                PageNum: this.pageNum,
+                PageSize: this.pageSize,
+                Type: 1,
+                ProjId: this.projectId,
+                UserId: this.userId
+            }
+            getErrAssets(param).then(res => {
+                if (res.data.Result == 'success') {
+                    console.log(res.data.FmList)
+                    this.tableData = res.data.FmList
+                }
+            })
+        }
+    },
+    watch: {
+        buildVlaue() {
+            this.getAsset()
+        }
+    }
+}
+</script>
+
+<style scoped lang='less'>
+</style>

+ 41 - 0
src/views/data_admin/buildAssets/Nopaint.vue

@@ -0,0 +1,41 @@
+<template>
+    <div class='box1' style='display: flex;flex-direction: column;flex-grow: 1;flex-shrink: 1;'>
+        <el-table :data='tableData' style='width: 100%' border class='data-table'>
+            <el-table-column header-align='center' align='center' prop='c' label='建筑'></el-table-column>、
+            <el-table-column header-align='center' align='center' prop='d' label='楼层'></el-table-column>
+            <el-table-column header-align='center' align='center' prop='f' label='点位标签名称'></el-table-column>
+            <el-table-column header-align='center' align='center' prop='g' label='设备族'></el-table-column>
+            <el-table-column header-align='center' align='center' prop='h' label='本地编码' show-overflow-tooltip></el-table-column>
+            <el-table-column header-align='center' align='center' prop='i' label='本地名称'></el-table-column>
+        </el-table>
+        <base-pagination :currentPages='pageNum' :total='total' @pageChanged='pageChanged'></base-pagination>
+    </div>
+</template>
+
+<script>
+export default {
+    name: 'nopaint',
+    data() {
+        return {
+            tableData: [],
+            total: 0,
+            pageNum: 1,
+            pageSize: 10
+        }
+    },
+    props: {
+        buildVlaue: {}
+    },
+    methods: {
+        pageChanged() {}
+    },
+    watch: {
+        buildVlaue() {
+            console.log('****')
+        }
+    }
+}
+</script>
+
+<style scoped lang='less'>
+</style>

+ 47 - 0
src/views/data_admin/buildAssets/Noverify.vue

@@ -0,0 +1,47 @@
+<template>
+    <div class='box1' style='display: flex;flex-direction: column;flex-grow: 1;flex-shrink: 1;'>
+        <el-table :data='tableData' style='width: 100%' border class='data-table'>
+            <el-table-column header-align='center' align='center' prop='c' label='建筑'></el-table-column>、
+            <el-table-column header-align='center' align='center' prop='d' label='楼层'></el-table-column>
+            <el-table-column header-align='center' align='center' prop='f' label='点位标签名称'></el-table-column>
+            <el-table-column header-align='center' align='center' prop='g' label='设备族'></el-table-column>
+            <el-table-column header-align='center' align='center' prop='h' label='本地编码'></el-table-column>
+            <el-table-column header-align='center' align='center' prop='i' label='本地名称'></el-table-column>
+            <el-table-column header-align='center' align='center' prop='i' label='操作'>
+                <template slot-scope='scope'>
+                    <el-button type='danger' plain size='mini' @click='del(scope.row)'>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <base-pagination :currentPages='pageNum' :total='total' @pageChanged='pageChanged'></base-pagination>
+    </div>
+</template>
+
+<script>
+export default {
+    name: 'noverify',
+    data() {
+        return {
+            tableData: [],
+            total: 0,
+            pageNum: 1,
+            pageSize: 10
+        }
+    },
+    props: {
+        buildVlaue: {}
+    },
+    methods: {
+        pageChanged() {},
+        del() {},
+    },
+    watch: {
+        buildVlaue(val) {
+            console.log('****')
+        }
+    }
+}
+</script>
+
+<style scoped lang='less'>
+</style>

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

@@ -1,15 +1,96 @@
 <template>
-    <div>
-            32424
+    <div class='box'>
+        <div class='condition'>
+            <p>
+                <span>建筑名称</span>
+                <el-select v-model='buildVlaue' placeholder='请选择' clearable>
+                    <el-option
+                        v-for='item in options'
+                        :key='item.BuildId'
+                        :label='item.BuildLocalName'
+                        :value='item.BuildId'
+                    ></el-option>
+                </el-select>
+            </p>
+        </div>
+        <el-tabs v-model='activeName' @tab-click='handleClick'>
+            <el-tab-pane label='现场无法找到的资产' name='first'>
+                <saga-nofind :buildVlaue='buildVlaue'></saga-nofind>
+            </el-tab-pane>
+            <el-tab-pane label='未画入模型的资产' name='second'>
+                <saga-nopaint :buildVlaue='buildVlaue'></saga-nopaint>
+            </el-tab-pane>
+            <el-tab-pane label='无对应岗位的资产' name='third'>
+                <saga-nomap :buildVlaue='buildVlaue'></saga-nomap>
+            </el-tab-pane>
+            <el-tab-pane label='未扫楼验证的资产' name='fourth'>
+                <saga-verify :buildVlaue='buildVlaue'></saga-verify>
+            </el-tab-pane>
+        </el-tabs>
     </div>
 </template>
 
 <script>
+import SagaNofind from './Nofind'
+import SagaNopaint from './Nopaint'
+import SagaNomap from './Nomap'
+import SagaVerify from './Noverify'
+import { mapGetters } from 'vuex'
+//api
+import {
+    getBuildSelect //根据项目ID获得建筑列表
+} from '@/api/scan/request'
 export default {
-    name: 'build-assets'
+    name: 'build-assets',
+    data() {
+        return {
+            activeName: 'first',
+            buildVlaue: '',
+            options: []
+        }
+    },
+    computed: {
+        ...mapGetters('peojMess', ['projectId', 'userId'])
+    },
+    components: {
+        SagaNofind,
+        SagaNopaint,
+        SagaNomap,
+        SagaVerify
+    },
+    methods: {
+        handleClick() {},
+        //获取建筑列表
+        getBuilding() {
+            let param = {
+                ProjId: this.projectId,
+                UserId: this.userId
+            }
+            getBuildSelect(param).then(res => {
+                if (res.data.Result == 'success') {
+                    console.log(res.data.BuildList)
+                    let data = res.data.BuildList
+                    this.options = data
+                    this.buildVlaue = data.length ? data[0].BuildId : ''
+                }
+            })
+        },
+        init() {
+            this.getBuilding()
+        }
+    },
+    created() {
+        this.init()
+    }
 }
 </script>
 
-<style>
-
+<style scoped lang='less'>
+.box {
+    .condition {
+        padding: 10px;
+        display: flex;
+        border: 1px solid #dfe6ec;
+    }
+}
 </style>

src/views/data_admin/buildAssets/index1.vue → src/views/data_admin/buildAssets/index2.vue


+ 1 - 1
src/views/data_admin/buildLog/index.vue

@@ -33,7 +33,7 @@
                 :data='tableData'
                 border
                 tooltip-effect='dark'
-                style='width: 100%; margin-top:10px;'
+                style='width: 100%;'
                 v-loading='loading'
             >
                 <el-table-column prop='CreateTime' label='时间' width='150' align='center' header-align='center'></el-table-column>

+ 2 - 2
src/views/data_admin/buildUser/index.vue

@@ -10,7 +10,7 @@
                     @change='searchChange'
                 ></el-input>
                 <el-button @click='refresh' style="margin-left: 10px;">&nbsp;&nbsp;&nbsp;刷新&nbsp;&nbsp;&nbsp;</el-button>
-                <el-button  @click='addUser'>添加人员</el-button>
+                <el-button  @click='addUser'>&nbsp;&nbsp;&nbsp;添加&nbsp;&nbsp;&nbsp;</el-button>
                 <el-button type='danger' @click='someDel'>批量删除</el-button>
             </div>
             <el-table
@@ -18,7 +18,7 @@
                 :data='tableData'
                 border
                 tooltip-effect='dark'
-                style='width: 100%; margin-top:10px;'
+                style='width: 100%;'
                 v-loading='loading'
                 @selection-change='handleSelectionChange'
             >