看板echarts预留接口位置， 电子巡更接列表接口；拼接时间 时间转化等

src/api/partol.js

@@ -0,0 +1,25 @@
+import request from '@/utils/request'
+//queryJson: 
+export function getList(query, current = 1, page_size = 10, V_LOGINNAME = 'admin', V_PASSWORD = '123456') {
+    // query.queryJson = { "V_LOGINNAME": "admin", "V_PASSWORD": "e10adc3949ba59abbe56e057f20f883e" };
+    return request({
+
+        // url: '/Device_Manager/companyManagement/queryCompanyList',  
+        // method: 'post',
+
+        // url: '/time',
+        // method: 'get',
+
+        url: '/electronic_patrol/getElectronicPatrolList',
+        method: 'post',
+
+
+        // params
+        data: {
+
+            ...query,
+            current,
+            page_size
+        }
+    })
+}

src/utils/index.js

@@ -202,4 +202,15 @@ export function debounce(func, wait, immediate) {
 
         return result
     }
+}
+
+
+//时间格式化2021-01-21T05:53:00.000+0000
+export function renderTime(date) {
+    var dateee = new Date(date).toJSON();
+    return new Date(+new Date(dateee) + 8 * 3600 * 1000)
+        .toISOString()
+        .replace(/T/g, " ")
+        .replace(/\.[\d]{3}Z/, "");
+
 }

src/views/patrol/elect-partol/index.vue

@@ -47,7 +47,7 @@
 
     <el-divider></el-divider>
     <el-table
-      :data="tableData"
+      :data="list"
       stripe
       border
       :header-cell-style="{ background: '#EBF1FF', color: '#606266' }"
@@ -56,20 +56,34 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="40"> </el-table-column>
+      <el-table-column prop="patrolPlanName" label="巡更计划名称" width="150">
+      </el-table-column>
+
+      <el-table-column prop="deviceName" label="设备名称" width="150">
+      </el-table-column>
+      <el-table-column label="视频">
+        <template>
+          <div class="check" @click="dialogVideoDetailVisible = true">查看</div>
+        </template>
+      </el-table-column>
+      <el-table-column label="巡更开始时间" width="200">
+        <template slot-scope="{ row }">
+          <div>{{ row.startDate }} {{ row.startTime }}</div>
+        </template>
+      </el-table-column>
 
-      <el-table-column prop="electName" label="电子巡更名称"> </el-table-column>
-      <el-table-column prop="period" label="周期" width="300">
+      <el-table-column prop="endDate" label="巡更结束时间" width="200">
+        <template slot-scope="{ row }">
+          <div>{{ row.endDate }} {{ row.endTime }}</div>
+        </template>
       </el-table-column>
-      <el-table-column prop="execuDate" label="执行日期" width="200">
+
+      <el-table-column prop="patrolPlanCycle" label="巡更周期" width="100">
       </el-table-column>
 
-      <el-table-column prop="patrolTime" label="巡更时间"> </el-table-column>
-      <el-table-column prop="device" label="执行设备"> </el-table-column>
-      <el-table-column prop="video" label="视频">
+      <el-table-column label="添加时间" width="200">
         <template slot-scope="{ row }">
-          <div class="check" @click="dialogVideoDetailVisible = true">
-            {{ row.video }}
-          </div>
+          <span>{{ renderTime(row.creationTime) }}</span>
         </template>
       </el-table-column>
 
@@ -257,6 +271,11 @@
 
 
 <script>
+//aa 1：引入api文件
+import { getList } from "@/api/partol";
+
+//import { renderTime } from '@/utils';
+
 // 引入导出Excel表格依赖
 import FileSaver from "file-saver";
 import XLSX from "xlsx";
@@ -267,6 +286,15 @@ export default {
   name: "javascriptthree",
   data() {
     return {
+      //aa 2：声明变量
+      page: {
+        current: 1,
+        size: 20,
+        total: 0,
+      },
+      query: {},
+      list: [],
+
       tableData: [
         {
           electName: "电子巡更名称1",
@@ -441,7 +469,33 @@ export default {
       },
     };
   },
+
+  created() {
+    //aa 2:钩子里调用查询组件
+    this.fetchData();
+  },
+
   methods: {
+    //时间格式化2021-01-21T05:53:00.000+0000
+    renderTime(date) {
+      var dateee = new Date(date).toJSON();
+      return new Date(+new Date(dateee) + 8 * 3600 * 1000)
+        .toISOString()
+        .replace(/T/g, " ")
+        .replace(/\.[\d]{3}Z/, "");
+    },
+
+    //aa 3请求接口
+    fetchData() {
+      getList(this.query, this.page.current, this.page.size).then(
+        (response) => {
+          this.list = response.pageList;
+          //  this.page.total=response.data.total;
+          console.log(response);
+        }
+      );
+    },
+
     //定义导出Excel表格事件
     exportExcel() {
       /* 从表生成工作簿对象 */
@@ -540,11 +594,6 @@ export default {
 .el-dialog {
   min-width: 736px !important;
 }
-
-
-
-
 </style>
 <style >
-
 </style>

vue.config.js

@@ -43,8 +43,8 @@ module.exports = {
         //解决跨越问题
         proxy: {
             [process.env.VUE_APP_BASE_API]: {
-                // target: 'http://127.0.0.1:8080',
-                target: "https://devapimeeting.talkmed.com",
+                target: 'http://172.16.120.25:8080',
+                //target: "https://devapimeeting.talkmed.com",
                 changeOrigin: true,
                 pathRewrite: {
                     ['^' + process.env.VUE_APP_BASE_API]: ''