style:登簿日志查询

@@ -5,4 +5,4 @@ NODE_ENV=development
 VUE_APP_BASE_API = '/api'
 
 # 开发环境
-VUE_APP_API_BASE_URL = 'http://192.168.2.95:8027'
+VUE_APP_API_BASE_URL = 'http://192.168.2.38:8027'

@@ -22,5 +22,6 @@ export default {
   box-sizing: border-box;
   flex: 1;
   width: 100%;
+  margin-right: 15px;
 }
 </style>
\ No newline at end of file

@@ -173,40 +173,36 @@
 // element table 样式修改
 //去掉表格内的线
 table th {
-  border-bottom: 5px solid #000637 !important;
+  border-bottom: 1px solid #29409D !important;
 }
 
 table td {
-  border-bottom: 5px solid #000637 !important;
+  border-bottom: 1px solid #29409D !important;
 }
 
 //去掉最下面的那一条线
 .el-table::before {
-  height: 5px !important;
-  background-color: #000637 !important;
+  height: 1px !important;
+  background-color: #29409D !important;
 }
 
 .lb-table {
-  background-color: #000637 !important;
+  background-color: $containerbg;
 }
 
 .el-table__body-wrapper {
-  background-color: #000637 !important;
+  background-color: $containerbg !important;
 }
 
-.el-table--enable-row-hover .el-table__body tr:hover>td {
-  background-color: #103E99 !important;
+.el-table__body tr:hover {
+  background: rgba(2, 160, 253, 0.1) !important;
+  box-shadow: inset 0px 0px 18px 0px #02A0FD !important;
 }
 
-.el-table__body .el-table__row.hover-row td {
-  background-color: #103E99 !important;
+.el-table__body tr:hover>td.el-table__cell {
+  background: none !important;
 }
 
-.el-table tbody tr:hover>td {
-  background-color: #103E99 !important;
-}
-
-
 // 表格样式
 .el-table th {
   height: 48px !important;

@@ -7,8 +7,7 @@
         }
 
         .el-table__row {
-            background-color: #00275F !important;
-            margin-top: 5px;
+            background-color: $containerbg !important;
         }
 
         thead {
@@ -35,16 +34,15 @@
     height: 100%;
     width: 100%;
     box-sizing: border-box;
-    background-color: #000637;
     overflow-x: hidden;
+    background: url("~@/image/tablebk.png") no-repeat;
+    background-size: 100% 100%;
+    padding: 2px;
 
     &-header {
         width: 100%;
         padding: 10px;
         box-sizing: border-box;
-        background: #061858;
-        box-shadow: inset 0px 0px 14px 0px #1D66DC;
-        border: 2px solid #1A3F81;
 
         /deep/.el-form-item__label {
             color: #E3F1FF;
@@ -95,7 +93,6 @@
     &-content {
         width: 100%;
         box-sizing: border-box;
-        background: #FFFFFF;
         margin-top: 10px;
 
         //修改表头的背景颜色横向渐变色
@@ -105,6 +102,20 @@
             color: #FFFFFF;
         }
 
+        /deep/ .el-pagination {
+            .el-input__inner {
+                background: #1F357A !important;
+                color: #FFFFFF;
+                border: none;
+            }
+        }
+
+        /deep/.btn-next,
+        /deep/.btn-prev {
+            background: #1F357A !important;
+            color: #FFFFFF;
+        }
+
     }
 
     .el-form--inline .el-form-item {

@@ -11,8 +11,7 @@
     transition: width 0.28s;
     width: $sideBarWidth !important;
     font-size: 0px;
-
-
+    margin-right: 15px;
 
     .horizontal-collapse-transition {
       transition: 0s width ease-in-out, 0s padding-left ease-in-out,

@@ -11,9 +11,9 @@ export default {
   computed: {
     ...mapGetters(['dictData']),
   },
-  created () {
-    if (this.fetchData) {
-      this.fetchData()
+  mounted () {
+    if (this.queryClick) {
+      this.queryClick()
     }
   },
   methods: {
@@ -24,14 +24,9 @@ export default {
     },
     handleCurrentChange (val) {
       this.pageData.currentPage = val
-      if (this.fetchData) {
-        this.fetchData()
-      }
-      console.log('this.queryClick,', this.queryClick, 'this.fetchData', this.fetchData);
       if (this.queryClick) {
         this.queryClick()
       }
-      console.log(val, this.pageData.currentPage, 'this.pageDatathis.pageData');
     },
     handleDel () {
       let deleteAfterPage = Math.ceil((this.tableData.total - 1) / this.pageData.pageSize)

+let vm = null
+const sendThis = (_this) => {
+  vm = _this
+}
 class data {
   columns () {
     return [
-
+      {
+        label: '序号',
+        type: 'index',
+        width: '50',
+        render: (h, scope) => {
+          return (
+            <div>
+              {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
+            </div>
+          )
+        }
+      },
       {
         prop: "AREANAME",
         label: "区域名称",
@@ -163,4 +178,9 @@ class data {
     ]
   }
 }
-export default new data()
+let datas = new data()
+export {
+  datas,
+  sendThis
+}
+

@@ -28,7 +28,7 @@
           <!-- 操作按钮 -->
           <el-col :span="6" class="btnColRight">
             <btn nativeType="cz" @click="resetForm('ruleForm')">重置</btn>
-            <btn nativeType="cx" @click="handleSubmit">查询</btn>
+            <btn nativeType="cx" @click="queryClick">查询</btn>
           </el-col>
         </el-row>
       </el-form>
@@ -36,7 +36,7 @@
     <!-- 列表区域 -->
     <div class="from-clues-content">
       <lb-table :page-size="pageData.size" :heightNum="200" :current-page.sync="pageData.current"
-        :total="pageData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
+        :total="tableData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
         :column="tableData.columns" :data="tableData.data">
       </lb-table>
     </div>
@@ -45,14 +45,14 @@
 <script>
 // 登簿日志查询
 // 引入列表数据
-import data from "./data"
+import { datas, sendThis } from "./data"
 // 引入表格混入方法
-import tableMixin from '@/mixins/tableMixin.js'
+import table from "@/utils/mixin/table"
 import { getRecordLogPage } from "@/api/dbrzcx.js";
 import { mapGetters } from 'vuex'
 export default {
   name: "dbrzcx",
-  mixins: [tableMixin],
+  mixins: [table],
   computed: {
     ...mapGetters(['dicData'])
   },
@@ -87,34 +87,27 @@ export default {
       // table数据
       tableData: {
         // 表头
-        columns: [{
-          label: '序号',
-          type: 'index',
-          width: '50',
-          index: this.indexMethod,
-        }].concat(data.columns()),
+        columns: datas.columns(),
         // 列表
         data: [],
         total: 0,
-      },
-      // 分页
-      pageData: {
-        total: 0,
-        pageSize: 15
       }
     }
   },
+  mounted () {
+    sendThis(this);
+  },
   methods: {
     // 重置表单
     resetForm () {
       this.$refs.ruleForm.resetFields();
     },
-    async featchData () {
+    queryClick () {
       getRecordLogPage({ ...this.form, ...this.pageData }).then(res => {
         if (res.code === 200) {
-          let { total, records } = res.result
-          this.tableData.total = total;
+          let { records, total } = res.result
           this.tableData.data = records ? records : []
+          this.tableData.total = total ? total : 0
         }
       })
     }