Browse Source

扫楼日志ui

GuoYuFu123 5 years ago
parent
commit
32997ee6f9
2 changed files with 134 additions and 52 deletions
  1. 71 6
      src/views/data_admin/buildLog/Action.vue
  2. 63 46
      src/views/data_admin/buildLog/index.vue

+ 71 - 6
src/views/data_admin/buildLog/Action.vue

@@ -1,18 +1,83 @@
 <template>
-<div>
-    
-</div>    
+    <el-dialog title='动作说明' :visible.sync='dialogVisible' width='500px'>
+        <div class='log-dialog'>
+            <dl>二维码</dl>
+            <dt>查询设备资产</dt>
+            <dt>查询点位标签</dt>
+            <dl>信标</dl>
+            <dt>创建信标</dt>
+            <dt>批量删除信标</dt>
+            <dt>查询信标</dt>
+            <dt>批量更新信标</dt>
+            <dl>建筑</dl>
+            <dt>下载建筑信息</dt>
+            <dt>根据建筑ID获得楼层信息</dt>
+            <dt>根据项目ID获得建筑列表</dt>
+            <dl>扫楼用户</dl>
+            <dt>扫楼用户切换项目</dt>
+            <dt>创建扫楼用户</dt>
+            <dt>删除扫楼用户</dt>
+            <dt>扫楼用户登录</dt>
+            <dt>查询扫楼用户</dt>
+            <dt>批量更新扫楼用户</dt>
+            <dt>扫楼用户获得验证码</dt>
+            <dl>扫楼用户日志</dl>
+            <dt>导出扫楼用户日志</dt>
+            <dt>查看扫楼用户日志</dt>
+            <dl>数据字典</dl>
+            <dt>查看所有设备族</dt>
+            <dt>设备族信息点</dt>
+            <dl>模板</dl>
+            <dt>打印标签模板</dt>
+            <dl>点位标签</dl>
+            <dt>创建点位标签</dt>
+            <dt>批量删除点位标签</dt>
+            <dt>查询点位标签</dt>
+            <dt>批量更新扫楼用户</dt>
+            <dl>设备资产</dl>
+            <dt>创建设备资产</dt>
+            <dt>批量删除设备资产</dt>
+            <dt>异常设备资产</dt>
+            <dt>设备族列表</dt>
+            <dt>按标签分组查询修改信息</dt>
+            <dt>查询设备资产</dt>
+            <dt>查询设备资产(专供revit)</dt>
+            <dt>批量更新设备资产</dt>
+            <dl>项目</dl>
+            <dt>登记项目(在扫楼app中登录项目信息)</dt>
+            <dt>查询项目信息</dt>
+            <dt>更新项目信息</dt>
+        </div>
+    </el-dialog>
 </template>
 
 <script>
 export default {
     name: '',
     data() {
-        
+        return {
+            dialogVisible: false
+        }
+    },
+    methods: {
+        show() {
+            this.dialogVisible = true
+        }
     }
 }
 </script>
 
-<style>
-
+<style scoped lang='less'>
+.log-dialog {
+    height: 500px;
+    overflow: auto;
+    dl {
+        font-size: 20px;
+        font-weight: 600;
+    }
+    dt {
+        margin-left: 20px;
+        line-height: 25px;
+    }
+}
 </style>

+ 63 - 46
src/views/data_admin/buildLog/index.vue

@@ -1,46 +1,56 @@
 <template>
-    <table-page-template>
-        <div slot='form' class='condition'>
-            <el-input
-                v-model.trim='searchValue'
-                class='margin-right'
-                style='width: 300px;'
-                placeholder='请输入操作人、动作、对象id等关键字搜索'
-                @change='searchChange'
-            ></el-input>
-            <el-date-picker
-                class='margin-right'
-                v-model='dateValue'
-                type='daterange'
-                align='right'
-                :clearable='false'
-                unlink-panels
-                range-separator='至'
-                start-placeholder='开始日期'
-                end-placeholder='结束日期'
-                :picker-options='pickerOptions'
-                @change='dateChange'
-                value-format='yyyy-MM-dd'
-            ></el-date-picker>
-            <el-button type='primary'>动作说明</el-button>
-            <el-button type='primary' @click='refresh'>刷新</el-button>
-            <el-button type='primary' @click='downExcel'>导出到Excel</el-button>
-        </div>
-        <el-table slot='table' :data='tableData' border tooltip-effect='dark' style='width: 100%' v-loading='loading'>
-            <el-table-column prop='CreateTime' label='时间' width='150'></el-table-column>
-            <el-table-column prop='Comming' label='来源' width='120'></el-table-column>
-            <el-table-column prop='UserName' label='操作人' width='120'></el-table-column>
-            <el-table-column prop='Phone' label='手机' width='150'></el-table-column>
-            <el-table-column prop='Action' label='动作'></el-table-column>
-            <el-table-column prop='UserId' label='对象id'></el-table-column>
-            <el-table-column label='操作说明' width='350'>
-                <template slot-scope='scope'>
-                    <div class='ellipsis' :title='scope.row.Note'>{{scope.row.Note}}</div>
-                </template>
-            </el-table-column>
-        </el-table>
-        <base-pagination :currentPages='pageNum' :total='total' @pageChanged='pageChanged' slot='pagination'></base-pagination>
-    </table-page-template>
+    <div style="display: flex; flex-direction: column;flex-grow: 1; flex-shrink: 1;">
+        <table-page-template>
+            <div slot='form' class='condition'>
+                <el-input
+                    v-model.trim='searchValue'
+                    class='margin-right'
+                    style='width: 300px;'
+                    placeholder='请输入操作人、动作、对象id等关键字搜索'
+                    @change='searchChange'
+                ></el-input>
+                <el-date-picker
+                    class='margin-right'
+                    v-model='dateValue'
+                    type='daterange'
+                    align='right'
+                    :clearable='false'
+                    unlink-panels
+                    range-separator='至'
+                    start-placeholder='开始日期'
+                    end-placeholder='结束日期'
+                    :picker-options='pickerOptions'
+                    @change='dateChange'
+                    value-format='yyyy-MM-dd'
+                ></el-date-picker>
+                <el-button type='primary' @click='action'>动作说明</el-button>
+                <el-button type='primary' @click='refresh'>刷新</el-button>
+                <el-button type='primary' @click='downExcel'>导出到Excel</el-button>
+            </div>
+            <el-table
+                slot='table'
+                :data='tableData'
+                border
+                tooltip-effect='dark'
+                style='width: 100%; margin-top:10px;'
+                v-loading='loading'
+            >
+                <el-table-column prop='CreateTime' label='时间' width='150'></el-table-column>
+                <el-table-column prop='Comming' label='来源' width='120'></el-table-column>
+                <el-table-column prop='UserName' label='操作人' width='120'></el-table-column>
+                <el-table-column prop='Phone' label='手机' width='150'></el-table-column>
+                <el-table-column prop='Action' label='动作'></el-table-column>
+                <el-table-column prop='UserId' label='对象id'></el-table-column>
+                <el-table-column label='操作说明' width='350'>
+                    <template slot-scope='scope'>
+                        <div class='ellipsis' :title='scope.row.Note'>{{scope.row.Note}}</div>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <base-pagination :currentPages='pageNum' :total='total' @pageChanged='pageChanged' slot='pagination'></base-pagination>
+        </table-page-template>
+        <saga-action ref='action'></saga-action>
+    </div>
 </template>
 
 <script>
@@ -50,7 +60,8 @@ import {
 } from '@/api/scan/request'
 import { mapGetters, mapActions } from 'vuex'
 import axios from 'axios'
-
+//component
+import SagaAction from './Action'
 var date = new Date()
 const nowDate = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate()
 export default {
@@ -115,6 +126,9 @@ export default {
             total: 80
         }
     },
+    components: {
+        SagaAction
+    },
     computed: {
         ...mapGetters('peojMess', ['projectId', 'userId'])
     },
@@ -126,6 +140,9 @@ export default {
         refresh() {
             this.getLogData()
         },
+        action() {
+            this.$refs['action'].show()
+        },
         // 导出
         downExcel() {
             let param = {
@@ -177,7 +194,7 @@ export default {
             this.getLogData()
         },
         getLogData() {
-            this.loading = true;
+            this.loading = true
             let param = {
                 startTime: this.dateValue[0] + ' 00:00:00',
                 endTime: this.dateValue[1] + ' 23:59:59',
@@ -188,7 +205,7 @@ export default {
                 UserId: this.userId
             }
             getBuildLog(param).then(res => {
-                this.loading = false;
+                this.loading = false
                 this.total = res.data.Count
                 this.tableData = res.data.LogList
             })
@@ -208,7 +225,7 @@ export default {
     margin-right: 10px;
 }
 .condition {
-    margin-bottom: 10px;
+    margin: 10px;
     display: flex;
 }
 .ellipsis {