更新

src/api/operationLog.js

@@ -22,5 +22,6 @@ export function exportInfo(data) {
       url: '/hyOperLog/api/export',
       method: 'post',
       data: data,
+      responseType: 'arraybuffer'
     })
   }

src/utils/request.js

@@ -44,6 +44,9 @@ service.interceptors.response.use(
   response => {
     const res = response.data
     // if the custom code is not 20000, it is judged as an error.
+     if(res.data instanceof Blob){
+      return res.data
+    }
     if (res.code && res.code !== 200 && res.code !== '200') {
       Message({
         message: res.message || 'Error',
@@ -71,7 +74,6 @@ service.interceptors.response.use(
       }else{
         return res
       }
-      
     }
   },
   error => {

src/views/operationLog/logManagement.vue

@@ -4,7 +4,7 @@
     <div class="center_css">
       <div class="top_css">
         <el-row>
-          <el-col :span="16" style="height: 45px">
+          <el-col :span="14" style="height: 45px">
             <span type="primary" class="batch_text">
               <i class="el-icon-tickets"></i>数据列表</span>
             <el-button type="danger" plain icon="el-icon-delete" size="small" @click="delBtn()">删除</el-button>
@@ -14,7 +14,7 @@
               range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
             </el-date-picker>
           </el-col>
-          <el-col :span="8" style="height: 45px">
+          <el-col :span="10" style="height: 45px">
             <div class="screen">
               <el-input class="find" placeholder="可按系统模块，操作人员进行筛选" @keyup.enter.native="find" v-model="searchkeyWord"
                 clearable @change="find"></el-input>
@@ -185,9 +185,9 @@
           let a = document.createElement("a");
           //由于后台返回文件名称是通过response返回的
           //因此需要从response headers中content-disposition响应头中获取文件名称fileName，如上图所示
-          let headers = response.headers;
-          let fileName = headers["content-disposition"];
-          fileName = fileName.split('=')[1]
+          // let headers = response.headers;
+          // let fileName = headers["content-disposition"];
+          // fileName = fileName.split('=')[1]
           //download是a标签的一个属性，可以自定义文件名称
           a.download = "日志记录.xlsx";
           let binaryData = [];
@@ -197,12 +197,6 @@
           document.body.appendChild(a);
           a.click();
           document.body.removeChild(a);
-          //  downloadFile({
-          // res: response,
-          // fileName: `导出日志记录`,
-          // type: "xls",
-          // });
-
         });
         // const {
         //   data
@@ -362,6 +356,7 @@
         text-align: center;
         line-height: 40px;
         color: #666666;
+        min-width: 80px;
       }
     }
 

src/views/parkReportManagement/driverInformationReporting.vue

@@ -98,7 +98,14 @@
             </el-tooltip>
           </template>
         </el-table-column>
-        <el-table-column prop="escalationStatus" label="状态" min-width="100"></el-table-column>
+        <el-table-column prop="escalationStatus" label="状态" min-width="100">
+          <template slot-scope="scope">
+            <span>{{scope.row.escalationStatus}}</span>
+              <el-tooltip class="item" effect="dark" content="提示文字" placement="top" v-if="scope.row.escalationStatus == '未通过'">
+                 <img src="../../../public/img/wenhao.png" alt="" class="ask_css" />
+              </el-tooltip>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" min-width="200">
           <template slot-scope="scope">
             <el-link target="_blank" @click="see(scope.row)" type="primary" :underline="false"

vue.config.js

@@ -55,7 +55,7 @@ module.exports = {
         },
         proxy: {
             '/pb': {
-                target: 'http://192.168.110.67:8999/', 
+                target: 'http://192.168.110.9:8099/', 
                 // target: 'http://192.168.110.9:8099/',       
                 // target: 'https://apitest.eliangeyun.com',
                 changeOrigin: true, // 开启代理：在本地会创建一个虚拟服务端，然后发送请求的数据，并同时接收请求的数据，这样服务端和服务端进行数据的交互就不会有跨域问题