fix conflict

package.json

@@ -6,7 +6,7 @@
   "license": "MIT",
   "scripts": {
     "dev": "vue-cli-service serve",
-    "build:prod": "vue-cli-service build",
+    "build": "vue-cli-service build",
     "build:stage": "vue-cli-service build --mode staging",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src"

src/views/base/comeAndGo/index.vue

@@ -252,8 +252,8 @@
 </template>
 
 <script>
-import { addUnit, delUnit, unitInfoAll, updateUnit } from '@/api/base/base'
+// import { addUnit, delUnit, unitInfoAll, updateUnit } from '@/api/base/base'
-import { unitTypeListAll } from '@/api/base/base'
+// import { unitTypeListAll } from '@/api/base/base'
 import { deptTreeSelect } from '@/api/system/user'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'

src/views/base/comeAndGo/people.vue

@@ -381,10 +381,9 @@
 </template>
 
 <script>
+
 import { deptTreeSelect } from "@/api/system/user";
 import { getUserList, getTypeList, unitPersonAll, delUnitPerson } from "@/api/base/base";
-
-
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";

src/views/system/log/abnormalLog/index.vue

@@ -1,9 +1,12 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-
+      <el-input
-      <el-input v-model="listQuery.ip" placeholder="请输入IP地址"
+        v-model="listQuery.ip"
-        style="width: 200px" class="filter-item ml-20" :maxlength="30"
+        placeholder="请输入IP地址"
+        style="width: 200px"
+        class="filter-item ml-20"
+        :maxlength="30"
         @keyup.enter.native="handleFilter"
       />
       <el-date-picker
@@ -16,27 +19,80 @@
         start-placeholder="开始日期"
         end-placeholder="结束日期"
       />
-      <el-select v-model="listQuery.grade" placeholder="请选择异常等级" style="width: 200px" class="filter-item ml-20">
+      <el-select
-          <el-option v-for="item in Object.keys(levelList)" :key="item" :value="levelList[item]" :label="levelList[item]" />
+        v-model="listQuery.grade"
+        placeholder="请选择异常等级"
+        style="width: 200px"
+        class="filter-item ml-20"
+      >
+        <el-option
+          v-for="item in Object.keys(levelList)"
+          :key="item"
+          :value="levelList[item]"
+          :label="levelList[item]"
+        />
       </el-select>
       <!-- <el-input v-model="listQuery.errType" placeholder="请输入异常类型"
         style="width: 200px" class="filter-item" :maxlength="30"
         @keyup.enter.native="handleFilter"
       /> -->
-      <el-select v-model="listQuery.errType" placeholder="请选择异常类型" style="width: 200px" class="filter-item ml-20">
+      <el-select
-          <el-option v-for="item in Object.keys(typeList)" :key="item" :value="typeList[item]" :label="typeList[item]" />
+        v-model="listQuery.errType"
+        placeholder="请选择异常类型"
+        style="width: 200px"
+        class="filter-item ml-20"
+      >
+        <el-option
+          v-for="item in Object.keys(typeList)"
+          :key="item"
+          :value="typeList[item]"
+          :label="typeList[item]"
+        />
       </el-select>
 
-      <el-select v-model="listQuery.logSort" clearable filterable style="width: 200px" class="filter-item ml-20" placeholder="请选择" >
+      <el-select
-          <el-option v-for="item in timeList" :key="item.id" :label="item.name" :value="item.id" />
+        v-model="listQuery.logSort"
+        clearable
+        filterable
+        style="width: 200px"
+        class="filter-item ml-20"
+        placeholder="请选择"
+      >
+        <el-option
+          v-for="item in timeList"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        />
       </el-select>
-      <el-select v-model="listQuery.logDesc" clearable filterable style="width: 200px" class="filter-item ml-20" placeholder="请选择" >
+      <el-select
-          <el-option v-for="item in sortList" :key="item.id" :label="item.name" :value="item.id" />
+        v-model="listQuery.logDesc"
+        clearable
+        filterable
+        style="width: 200px"
+        class="filter-item ml-20"
+        placeholder="请选择"
+      >
+        <el-option
+          v-for="item in sortList"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        />
       </el-select>
-      <el-button style="margin-left: 20px" class="filter-item" type="primary" @click="handleFilter">
+      <el-button
+        style="margin-left: 20px"
+        class="filter-item"
+        type="primary"
+        @click="handleFilter"
+      >
         查询
       </el-button>
-      <el-button style="margin-left: 20px" class="filter-item"  @click="resetFilter">
+      <el-button
+        style="margin-left: 20px"
+        class="filter-item"
+        @click="resetFilter"
+      >
         重置
       </el-button>
       <!-- <el-button @click="handleBackups" class="filter-item" style="margin-left: 20px" type="warning">
@@ -55,23 +111,28 @@
       :max-height="tableHeight"
     >
       <el-table-column label="序号" align="center" width="80" type="index">
-        <template scope="scope">
+        <template slot-scope="scope">
-          <span>{{ (listQuery.pageNum - 1) * listQuery.pageSize + scope.$index + 1 }}</span>
+          <span>{{
+            (listQuery.pageNum - 1) * listQuery.pageSize + scope.$index + 1
+          }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作人" align="center" prop="operaUserName">
         <template slot-scope="scope">
-            <span>{{ scope.row.operaUserName||'/' }}</span>
+          <span>{{ scope.row.operaUserName || "/" }}</span>
         </template>
-
       </el-table-column>
-      <el-table-column label="操作时间" align="center" prop="operTime" width="180"/>
+      <el-table-column
+        label="操作时间"
+        align="center"
+        prop="operTime"
+        width="180"
+      />
       <el-table-column label="IP地址" align="center" prop="ip" />
       <el-table-column label="操作模块" align="center" prop="model">
         <template slot-scope="scope">
-            <span>{{ scope.row.model||'/' }}</span>
+          <span>{{ scope.row.model || "/" }}</span>
         </template>
-
       </el-table-column>
       <el-table-column label="异常类型" align="center" prop="errType" />
       <el-table-column label="异常原因" align="center" prop="operateDetail" />
@@ -103,22 +164,21 @@
 </template>
 
 <script>
-import Pagination from '@/components/Pagination'
+import Pagination from "@/components/Pagination";
 
-import _ from 'lodash/fp'
+import _ from "lodash/fp";
-import { downloadFile } from '@/utils/download'
+import { downloadFile } from "@/utils/download";
-
-import { getErrLogs,downloadErrLogs } from '@/api/system/log'
 
+import { getErrLogs, downloadErrLogs } from "@/api/system/log";
 
 const levelList = {
-  1:'高',
+  1: "高",
-  2:'中',
+  2: "中",
-  3:'低'
+  3: "低",
 };
 const typeList = {
-  1:'越权访问',
+  1: "越权访问",
-  2:'IP异常',
+  2: "IP异常",
   // 3:'删除',
   // 4:'查询',
   // 5:'导出',
@@ -139,33 +199,42 @@ export default {
       listLoading: false,
       tableHeight: 650,
       typeList: typeList,
-      timeList:[{id:1,name:'时间'},{id:2,name:'操作人'},{id:4,name:'ip'},{id:5,name:'异常等级'}],
+      timeList: [
-      sortList:[{id:1,name:'倒序'},{id:2,name:'升序'}],
+        { id: 1, name: "时间" },
+        { id: 2, name: "操作人" },
+        { id: 4, name: "ip" },
+        { id: 5, name: "异常等级" },
+      ],
+      sortList: [
+        { id: 1, name: "倒序" },
+        { id: 2, name: "升序" },
+      ],
       listQuery: {
         pageNum: 1,
         pageSize: 10,
-        errType: '',
+        errType: "",
-        ip: '',
+        ip: "",
-        errLevel: '',
+        errLevel: "",
-        operTime:'',
+        operTime: "",
         // logSort:1,
         logDesc: 1,
       },
       rangeDate: [],
-    }
+    };
   },
   created() {
     // this.getList()
     // this.getOperate()
   },
   mounted() {
-    this.listQuery.operTime = this.getCurrentDate()+' - '+this.getCurrentDate();
+    this.listQuery.operTime =
-    this.rangeDate = [this.getCurrentDate(),this.getCurrentDate()]
+      this.getCurrentDate() + " - " + this.getCurrentDate();
-    this.getList()
+    this.rangeDate = [this.getCurrentDate(), this.getCurrentDate()];
+    this.getList();
   },
   methods: {
     getStatus(val) {
-      return this.levelList[val]
+      return this.levelList[val];
     },
     //获取下拉数据
     getOperate() {
@@ -175,48 +244,51 @@ export default {
     },
 
     getList() {
-      this.listLoading = true
+      this.listLoading = true;
       if (this.rangeDate && this.rangeDate.length > 0) {
-        this.listQuery.operTime = this.rangeDate[0]+' - '+this.rangeDate[1];
+        this.listQuery.operTime = this.rangeDate[0] + " - " + this.rangeDate[1];
       }
       getErrLogs(this.listQuery).then((response) => {
-        this.list = response.rows.map(item => {
+        this.list = response.rows.map((item) => {
-          return item
+          return item;
-        })
+        });
-        this.total = response.total
+        this.total = response.total;
-      })
+      });
       setTimeout(() => {
-        this.listLoading = false
+        this.listLoading = false;
-      },500)
+      }, 500);
     },
     // 查询
     handleFilter() {
-      this.listQuery.pageNum = 1
+      this.listQuery.pageNum = 1;
-      this.getList()
+      this.getList();
     },
     //重置
     resetFilter() {
       this.listQuery = {
         pageNum: 1,
         pageSize: 10,
-        errType: '',
+        errType: "",
-        ip: '',
+        ip: "",
-        grade: '',
+        grade: "",
         // logSort:1,
         logDesc: 1,
       };
-      this.rangeDate=[this.getCurrentDate(),this.getCurrentDate()]
+      this.rangeDate = [this.getCurrentDate(), this.getCurrentDate()];
-      this.handleFilter()
+      this.handleFilter();
     },
     // 备份
     handleBackups() {
-      downloadErrLogs().then(res => {
+      downloadErrLogs().then((res) => {
-        downloadFile({ fileName: '异常日志.sql', fileData: res, fileType: 'text/html;charset=UTF-8'})
+        downloadFile({
-      })
+          fileName: "异常日志.sql",
+          fileData: res,
+          fileType: "text/html;charset=UTF-8",
+        });
+      });
     },
     //导出
     handleExport() {
-
       // exportCarDetail().then(res => {
       //   downloadFile({ fileName: '设备详情.xlsx', fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
       // })
@@ -226,15 +298,14 @@ export default {
       let year = now.getFullYear();
       let month = now.getMonth() + 1;
       if (month < 10) {
-        month = '0'+month
+        month = "0" + month;
       }
       let day = now.getDate();
       if (day < 10) {
-        day = '0'+day
+        day = "0" + day;
       }
       return year + "-" + month + "-" + day;
-    }
+    },
-
+  },
-  }
+};
-}
 </script>

src/views/system/log/businessLog/index.vue

@@ -1,12 +1,20 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-        <el-input v-model="listQuery.operaUserName" placeholder="请输入操作人"
+      <el-input
-          style="width: 200px" class="filter-item" :maxlength="30"
+        v-model="listQuery.operaUserName"
+        placeholder="请输入操作人"
+        style="width: 200px"
+        class="filter-item"
+        :maxlength="30"
         @keyup.enter.native="handleFilter"
       />
-        <el-input v-model="listQuery.ip" placeholder="请输入IP地址"
+      <el-input
-          style="width: 200px" class="filter-item ml-20" :maxlength="30"
+        v-model="listQuery.ip"
+        placeholder="请输入IP地址"
+        style="width: 200px"
+        class="filter-item ml-20"
+        :maxlength="30"
         @keyup.enter.native="handleFilter"
       />
       <el-date-picker
@@ -23,23 +31,76 @@
           style="width: 200px" class="filter-item ml-20" :maxlength="30"
           @keyup.enter.native="handleFilter"
         /> -->
-        <el-select v-model="listQuery.result" placeholder="请选择事件结果" style="width: 200px" class="filter-item ml-20">
+      <el-select
-            <el-option v-for="item in Object.keys(outcomeList)" :key="item" :value="outcomeList[item]" :label="outcomeList[item]" />
+        v-model="listQuery.result"
+        placeholder="请选择事件结果"
+        style="width: 200px"
+        class="filter-item ml-20"
+      >
+        <el-option
+          v-for="item in Object.keys(outcomeList)"
+          :key="item"
+          :value="outcomeList[item]"
+          :label="outcomeList[item]"
+        />
       </el-select>
-        <el-select v-model="listQuery.operType" placeholder="请选择操作类型" style="width: 200px" class="filter-item ml-20">
+      <el-select
-            <el-option v-for="item in Object.keys(operateList)" :key="item" :value="operateList[item]" :label="operateList[item]" />
+        v-model="listQuery.operType"
+        placeholder="请选择操作类型"
+        style="width: 200px"
+        class="filter-item ml-20"
+      >
+        <el-option
+          v-for="item in Object.keys(operateList)"
+          :key="item"
+          :value="operateList[item]"
+          :label="operateList[item]"
+        />
       </el-select>
 
-        <el-select v-model="listQuery.logSort" clearable filterable style="width: 200px" class="filter-item ml-20" placeholder="请选择" >
+      <el-select
-            <el-option v-for="item in timeList" :key="item.id" :label="item.name" :value="item.id" />
+        v-model="listQuery.logSort"
+        clearable
+        filterable
+        style="width: 200px"
+        class="filter-item ml-20"
+        placeholder="请选择"
+      >
+        <el-option
+          v-for="item in timeList"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        />
       </el-select>
-        <el-select v-model="listQuery.logDesc" clearable filterable style="width: 200px" class="filter-item ml-20" placeholder="请选择" >
+      <el-select
-            <el-option v-for="item in sortList" :key="item.id" :label="item.name" :value="item.id" />
+        v-model="listQuery.logDesc"
+        clearable
+        filterable
+        style="width: 200px"
+        class="filter-item ml-20"
+        placeholder="请选择"
+      >
+        <el-option
+          v-for="item in sortList"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        />
       </el-select>
-        <el-button style="margin-left: 20px" class="filter-item" type="primary" @click="handleFilter">
+      <el-button
+        style="margin-left: 20px"
+        class="filter-item"
+        type="primary"
+        @click="handleFilter"
+      >
         查询
       </el-button>
-        <el-button style="margin-left: 20px" class="filter-item"  @click="resetFilter">
+      <el-button
+        style="margin-left: 20px"
+        class="filter-item"
+        @click="resetFilter"
+      >
         重置
       </el-button>
       <!-- <el-button @click="handleBackups" class="filter-item" style="margin-left: 20px" type="warning">
@@ -58,8 +119,10 @@
       :max-height="tableHeight"
     >
       <el-table-column label="序号" align="center" width="80" type="index">
-          <template scope="scope">
+        <template slot-scope="scope">
-            <span>{{ (listQuery.pageNum - 1) * listQuery.pageSize + scope.$index + 1 }}</span>
+          <span>{{
+            (listQuery.pageNum - 1) * listQuery.pageSize + scope.$index + 1
+          }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作人" align="center" prop="operaUserName" />
@@ -90,28 +153,27 @@
 </template>
 
 <script>
-  import Pagination from '@/components/Pagination'
+import Pagination from "@/components/Pagination";
 
-  import _ from 'lodash/fp'
+import _ from "lodash/fp";
-  import { downloadFile } from '@/utils/download'
+import { downloadFile } from "@/utils/download";
-
-  import { getYwLogs,downloadYwLogs } from '@/api/system/log'
 
+import { getYwLogs, downloadYwLogs } from "@/api/system/log";
 
 const outcomeList = {
-    1:'成功',
+  1: "成功",
-    2:'失败'
+  2: "失败",
 };
 const operateList = {
-    1:'新增',
+  1: "新增",
-    2:'修改',
+  2: "修改",
-    3:'删除',
+  3: "删除",
-    4:'查询',
+  4: "查询",
-    5:'导出',
+  5: "导出",
-    6:'下载',
+  6: "下载",
-    7:'备份',
+  7: "备份",
-    8:'登录',
+  8: "登录",
-    9:'登出'
+  9: "登出",
 };
 
 export default {
@@ -125,35 +187,44 @@
       listLoading: false,
       tableHeight: 650,
       operateList: operateList,
-        timeList:[{id:1,name:'时间'},{id:2,name:'操作人'},{id:3,name:'操作模块'},{id:4,name:'ip'},],
+      timeList: [
-        sortList:[{id:1,name:'倒序'},{id:2,name:'升序'}],
+        { id: 1, name: "时间" },
+        { id: 2, name: "操作人" },
+        { id: 3, name: "操作模块" },
+        { id: 4, name: "ip" },
+      ],
+      sortList: [
+        { id: 1, name: "倒序" },
+        { id: 2, name: "升序" },
+      ],
       listQuery: {
         pageNum: 1,
         pageSize: 10,
-          operaUserName: '',
+        operaUserName: "",
-          ip: '',
+        ip: "",
-          content:'',
+        content: "",
-          result: '',
+        result: "",
-          operTime:'',
+        operTime: "",
-          operType: '',
+        operType: "",
         logSort: 1,
         logDesc: 1,
       },
       rangeDate: [],
-      }
+    };
   },
   created() {
     // this.getList()
     // this.getOperate()
   },
   mounted() {
-      this.listQuery.operTime = this.getCurrentDate()+' - '+this.getCurrentDate();
+    this.listQuery.operTime =
-      this.rangeDate = [this.getCurrentDate(),this.getCurrentDate()]
+      this.getCurrentDate() + " - " + this.getCurrentDate();
-      this.getList()
+    this.rangeDate = [this.getCurrentDate(), this.getCurrentDate()];
+    this.getList();
   },
   methods: {
     getStatus(val) {
-        return this.outcomeList[val]
+      return this.outcomeList[val];
     },
     //获取下拉数据
     getOperate() {
@@ -163,51 +234,54 @@
     },
 
     getList() {
-        this.listLoading = true
+      this.listLoading = true;
       if (this.rangeDate && this.rangeDate.length > 0) {
-          this.listQuery.operTime = this.rangeDate[0]+' - '+this.rangeDate[1];
+        this.listQuery.operTime = this.rangeDate[0] + " - " + this.rangeDate[1];
       }
       getYwLogs(this.listQuery).then((response) => {
-          this.list = response.rows.map(item => {
+        this.list = response.rows.map((item) => {
-            return item
+          return item;
-          })
+        });
-          this.total = response.total
+        this.total = response.total;
-        })
+      });
       setTimeout(() => {
-        this.listLoading = false
+        this.listLoading = false;
-      },500)
+      }, 500);
     },
     // 查询
     handleFilter() {
-        this.listQuery.pageNum = 1
+      this.listQuery.pageNum = 1;
-        this.getList()
+      this.getList();
     },
     //重置
     resetFilter() {
       this.listQuery = {
         pageNum: 1,
         pageSize: 10,
-          operaUserName: '',
+        operaUserName: "",
-          ip: '',
+        ip: "",
 
-          content:'',
+        content: "",
-          result: '',
+        result: "",
-          operType: '',
+        operType: "",
         logSort: 1,
         logDesc: 1,
       };
-        this.rangeDate=[this.getCurrentDate(),this.getCurrentDate()]
+      this.rangeDate = [this.getCurrentDate(), this.getCurrentDate()];
-        this.handleFilter()
+      this.handleFilter();
     },
     // 备份
     handleBackups() {
-        downloadYwLogs().then(res => {
+      downloadYwLogs().then((res) => {
-          downloadFile({ fileName: '业务日志.sql', fileData: res, fileType: 'text/html;charset=UTF-8'})
+        downloadFile({
-        })
+          fileName: "业务日志.sql",
+          fileData: res,
+          fileType: "text/html;charset=UTF-8",
+        });
+      });
     },
     //导出
     handleExport() {
-
       // exportCarDetail().then(res => {
       //   downloadFile({ fileName: '设备详情.xlsx', fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
       // })
@@ -217,15 +291,14 @@
       let year = now.getFullYear();
       let month = now.getMonth() + 1;
       if (month < 10) {
-          month = '0'+month
+        month = "0" + month;
       }
       let day = now.getDate();
       if (day < 10) {
-          day = '0'+day
+        day = "0" + day;
       }
       return year + "-" + month + "-" + day;
-      }
+    },
-
+  },
-    }
+};
-  }
 </script>

src/views/system/log/systemLog/index.vue

@@ -1,12 +1,20 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <el-input v-model="listQuery.operaUserName" placeholder="请输入操作人"
+      <el-input
-        style="width: 200px" class="filter-item" :maxlength="30"
+        v-model="listQuery.operaUserName"
+        placeholder="请输入操作人"
+        style="width: 200px"
+        class="filter-item"
+        :maxlength="30"
         @keyup.enter.native="handleFilter"
       />
-      <el-input v-model="listQuery.ip" placeholder="请输入IP地址"
+      <el-input
-        style="width: 200px" class="filter-item ml-20" :maxlength="30"
+        v-model="listQuery.ip"
+        placeholder="请输入IP地址"
+        style="width: 200px"
+        class="filter-item ml-20"
+        :maxlength="30"
         @keyup.enter.native="handleFilter"
       />
       <el-date-picker
@@ -26,20 +34,63 @@
       <el-select v-model="listQuery.result" placeholder="请选择事件结果" style="width: 200px" class="filter-item ml-20">
           <el-option v-for="item in Object.keys(outcomeList)" :key="item" :value="outcomeList[item]" :label="outcomeList[item]" />
       </el-select>-->
-      <el-select v-model="listQuery.operType" placeholder="请选择操作类型" style="width: 200px" class="filter-item ml-20">
+      <el-select
-          <el-option v-for="item in Object.keys(operateList)" :key="item" :value="operateList[item]" :label="operateList[item]" />
+        v-model="listQuery.operType"
+        placeholder="请选择操作类型"
+        style="width: 200px"
+        class="filter-item ml-20"
+      >
+        <el-option
+          v-for="item in Object.keys(operateList)"
+          :key="item"
+          :value="operateList[item]"
+          :label="operateList[item]"
+        />
       </el-select>
 
-      <el-select v-model="listQuery.logSort" clearable filterable style="width: 200px" class="filter-item ml-20" placeholder="请选择" >
+      <el-select
-          <el-option v-for="item in timeList" :key="item.id" :label="item.name" :value="item.id" />
+        v-model="listQuery.logSort"
+        clearable
+        filterable
+        style="width: 200px"
+        class="filter-item ml-20"
+        placeholder="请选择"
+      >
+        <el-option
+          v-for="item in timeList"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        />
       </el-select>
-      <el-select v-model="listQuery.logDesc" clearable filterable style="width: 200px" class="filter-item ml-20" placeholder="请选择" >
+      <el-select
-          <el-option v-for="item in sortList" :key="item.id" :label="item.name" :value="item.id" />
+        v-model="listQuery.logDesc"
+        clearable
+        filterable
+        style="width: 200px"
+        class="filter-item ml-20"
+        placeholder="请选择"
+      >
+        <el-option
+          v-for="item in sortList"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        />
       </el-select>
-      <el-button style="margin-left: 20px" class="filter-item" type="primary" @click="handleFilter">
+      <el-button
+        style="margin-left: 20px"
+        class="filter-item"
+        type="primary"
+        @click="handleFilter"
+      >
         查询
       </el-button>
-      <el-button style="margin-left: 20px" class="filter-item"  @click="resetFilter">
+      <el-button
+        style="margin-left: 20px"
+        class="filter-item"
+        @click="resetFilter"
+      >
         重置
       </el-button>
       <!-- <el-button @click="handleBackups" class="filter-item" style="margin-left: 20px" type="warning">
@@ -58,8 +109,10 @@
       :max-height="tableHeight"
     >
       <el-table-column label="序号" align="center" width="80" type="index">
-        <template scope="scope">
+        <template slot-scope="scope">
-          <span>{{ (listQuery.pageNum - 1) * listQuery.pageSize + scope.$index + 1 }}</span>
+          <span>{{
+            (listQuery.pageNum - 1) * listQuery.pageSize + scope.$index + 1
+          }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作人" align="center" prop="operaUserName" />
@@ -90,28 +143,27 @@
 </template>
 
 <script>
-import Pagination from '@/components/Pagination'
+import Pagination from "@/components/Pagination";
 
-import _ from 'lodash/fp'
+import _ from "lodash/fp";
-import { downloadFile } from '@/utils/download'
+import { downloadFile } from "@/utils/download";
-
-import { getSysLogs,downloadSysLogs } from '@/api/system/log'
 
+import { getSysLogs, downloadSysLogs } from "@/api/system/log";
 
 const outcomeList = {
-  1:'成功',
+  1: "成功",
-  2:'失败'
+  2: "失败",
 };
 const operateList = {
-  1:'新增',
+  1: "新增",
-  2:'修改',
+  2: "修改",
-  3:'删除',
+  3: "删除",
-  4:'查询',
+  4: "查询",
-  5:'导出',
+  5: "导出",
-  6:'下载',
+  6: "下载",
-  7:'备份',
+  7: "备份",
-  8:'登录',
+  8: "登录",
-  9:'登出'
+  9: "登出",
 };
 
 export default {
@@ -125,35 +177,44 @@ export default {
       listLoading: false,
       tableHeight: 650,
       operateList: operateList,
-      timeList:[{id:1,name:'时间'},{id:2,name:'操作人'},{id:3,name:'操作模块'},{id:4,name:'ip'},],
+      timeList: [
-      sortList:[{id:1,name:'倒序'},{id:2,name:'升序'}],
+        { id: 1, name: "时间" },
+        { id: 2, name: "操作人" },
+        { id: 3, name: "操作模块" },
+        { id: 4, name: "ip" },
+      ],
+      sortList: [
+        { id: 1, name: "倒序" },
+        { id: 2, name: "升序" },
+      ],
       listQuery: {
         pageNum: 1,
         pageSize: 10,
-        operaUserName: '',
+        operaUserName: "",
-        ip: '',
+        ip: "",
-        content:'',
+        content: "",
-        result: '',
+        result: "",
-        operTime:'',
+        operTime: "",
-        operaType: '',
+        operaType: "",
         logSort: 1,
         logDesc: 1,
       },
       rangeDate: [],
-    }
+    };
   },
   created() {
     // this.getList()
     // this.getOperate()
   },
   mounted() {
-    this.listQuery.operTime = this.getCurrentDate()+' - '+this.getCurrentDate();
+    this.listQuery.operTime =
-    this.rangeDate = [this.getCurrentDate(),this.getCurrentDate()]
+      this.getCurrentDate() + " - " + this.getCurrentDate();
-    this.getList()
+    this.rangeDate = [this.getCurrentDate(), this.getCurrentDate()];
+    this.getList();
   },
   methods: {
     getStatus(val) {
-      return this.outcomeList[val]
+      return this.outcomeList[val];
     },
     //获取下拉数据
     getOperate() {
@@ -163,52 +224,54 @@ export default {
     },
 
     getList() {
-      this.listLoading = true
+      this.listLoading = true;
       if (this.rangeDate && this.rangeDate.length > 0) {
-        this.listQuery.operTime = this.rangeDate[0]+' - '+this.rangeDate[1];
+        this.listQuery.operTime = this.rangeDate[0] + " - " + this.rangeDate[1];
       }
       getSysLogs(this.listQuery).then((response) => {
-        this.list = response.rows.map(item => {
+        this.list = response.rows.map((item) => {
-          return item
+          return item;
-        })
+        });
-        this.total = response.total
+        this.total = response.total;
-      })
+      });
       setTimeout(() => {
-        this.listLoading = false
+        this.listLoading = false;
-      },500)
+      }, 500);
     },
     // 查询
     handleFilter() {
-      this.listQuery.pageNum = 1
+      this.listQuery.pageNum = 1;
-      this.getList()
+      this.getList();
     },
     //重置
     resetFilter() {
       this.listQuery = {
         pageNum: 1,
         pageSize: 10,
-        operaUserName: '',
+        operaUserName: "",
-        ip: '',
+        ip: "",
 
-        content:'',
+        content: "",
-        result: '',
+        result: "",
-        operateType: '',
+        operateType: "",
         logSort: 1,
         logDesc: 1,
       };
-      this.rangeDate=[this.getCurrentDate(),this.getCurrentDate()]
+      this.rangeDate = [this.getCurrentDate(), this.getCurrentDate()];
-      this.handleFilter()
+      this.handleFilter();
     },
     // 备份
     handleBackups() {
-      downloadSysLogs().then(res => {
+      downloadSysLogs().then((res) => {
-          downloadFile({ fileName: '系统日志.sql', fileData: res, fileType: 'text/html;charset=UTF-8' })
+        downloadFile({
-      })
+          fileName: "系统日志.sql",
-
+          fileData: res,
+          fileType: "text/html;charset=UTF-8",
+        });
+      });
     },
     //导出
     handleExport() {
-
       // exportCarDetail().then(res => {
       //   downloadFile({ fileName: '设备详情.xlsx', fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
       // })
@@ -218,15 +281,14 @@ export default {
       let year = now.getFullYear();
       let month = now.getMonth() + 1;
       if (month < 10) {
-        month = '0'+month
+        month = "0" + month;
       }
       let day = now.getDate();
       if (day < 10) {
-        day = '0'+day
+        day = "0" + day;
       }
       return year + "-" + month + "-" + day;
-    }
+    },
-
+  },
-  }
+};
-}
 </script>