diff --git a/package.json b/package.json index 449813e..fc57ee2 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "js-cookie": "^3.0.1", "less": "3.9.0", "less-loader": "7", + "moment": "^2.30.1", "sass": "^1.26.5", "sass-loader": "^8.0.2", "swiper": "4.5.1", diff --git a/public/static/config.js b/public/static/config.js index 00a7a49..6edc2f9 100644 --- a/public/static/config.js +++ b/public/static/config.js @@ -14,6 +14,9 @@ window.$mapCfg = { window.$SYSTEMCONFIG = { SYS_NAME: "镇海平安企业（园区）", //"镇海平安企业（园区）", //系统名称 }; +window.$TOKEN = { + SYS_TOKENS: "Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImE2ZDdkNTg5LTkxN2MtNDlkMS1iODhjLTMxN2E3Zjc4NzcwMyJ9.tEZrwiMSSNSkKVaP2TlOoQtvqgpV-0Vstqy8b9RqQOgSavblX2zRn_8a_6EZsLOtiRTaURvnlJ4HwPRotENhHQ", //"镇海平安企业（园区）", //系统名称 +}; window.$SERVICE = { BASEURL:"http://121.41.91.94:8080/zhapi" diff --git a/src/api/archives/index.js b/src/api/archives/index.js index 41299a5..d98c199 100644 --- a/src/api/archives/index.js +++ b/src/api/archives/index.js @@ -1,4 +1,5 @@ import request from '@/utils/request' +import request1 from '@/utils/request1' //基本信息 export function baseInfo(params) { return request({ @@ -32,6 +33,14 @@ export function realTimePassageFlowFace(params) { params }) } +// 车辆3.0 +export function list(params) { + return request1({ + url: '/user/record/list', + method: 'post', + params + }) +} //实时车辆卡口流量 export function realTimePassageFlowVehicle(params) { return request({ diff --git a/src/utils/request.js b/src/utils/request.js index 8733804..0ba041f 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -8,9 +8,11 @@ const request = axios.create({ //baseURL: 'http://172.18.113.13:8080/zhapi', // 孙强 //baseURL: 'http://172.18.100.57:8080/zhapi', // 刘建 //baseURL: 'http://192.168.0.188:8888/zhapi', - //baseURL: 'http://121.41.91.94:12002/zhapi', - //baseURL: `http://${window.location.host}/zhapi`, - baseURL: window.$SERVICE.BASEURL, + // baseURL: 'http://121.41.91.94:12002/zhapi', + // baseURL: 'http://172.18.113.50:8080/zhapi', + // baseURL: 'http://172.18.113.50:8080/zhapi', // 刘建 + baseURL: `http://${window.location.host}/zhapi`, + // baseURL: window.$SERVICE.BASEURL, timeout: 50000, headers: { "content-type": "application/json" }, }); @@ -23,7 +25,7 @@ request.interceptors.request.use( // 是否需要防止数据重复提交 if (getToken() && !isToken) { - config.headers["Authorization"] = "Bearer " + getToken(); // 让每个请求携带自定义token 请根据实际情况自行修改 + config.headers["Authorization"] = "Bearer " + getToken(); // 让每个请求携带自定义token 请根据实际情况自行修z //console.log(config) } //防止重复提交 diff --git a/src/utils/request1.js b/src/utils/request1.js new file mode 100644 index 0000000..b4c1574 --- /dev/null +++ b/src/utils/request1.js @@ -0,0 +1,98 @@ +import axios from "axios"; +//import Vue from 'vue' +import vm from "../main"; +import { getToken } from "@/utils/auth"; +axios.defaults.headers["Content-Type"] = "application/json;charset=utf-8"; +const request = axios.create({ + //baseURL: 'http://172.18.113.50:8080/zhapi', + //baseURL: 'http://172.18.113.13:8080/zhapi', // 孙强 + //baseURL: 'http://172.18.100.57:8080/zhapi', // 刘建 + //baseURL: 'http://192.168.0.188:8888/zhapi', + // baseURL: 'http://121.41.91.94:12002/zhapi', + // baseURL: "http://218.92.207.242:20118/hjapi", + baseURL: "http://41.204.233.90:8118/hjapi", + + //baseURL: `http://${window.location.host}/zhapi`, + // baseURL: window.$SERVICE.BASEURL, + timeout: 50000, + headers: { "content-type": "application/json" }, +}); +//const vm = Vue.prototype +// request拦截器 +request.interceptors.request.use( + (config) => { + // 是否需要设置 token + const isToken = (config.headers || {}).isToken === false; + // 是否需要防止数据重复提交 + + if (getToken() && !isToken) { + console.log(777, window.$TOKEN.SYS_TOKENS); + config.headers["Authorization"] = "Bearer " + window.$TOKEN.SYS_TOKENS; // 让每个请求携带自定义token 请根据实际情况自行修z + //console.log(config) + } + //防止重复提交 + + return config; + }, + (error) => { + console.log(error); + Promise.reject(error); + } +); + +// response 拦截器 +// 可以在接口响应后统一处理结果 +request.interceptors.response.use( + (response) => { + if (response.data) { + switch (response.data.code) { + case 200: + // 如果是返回的文件 + if (response.config.responseType === "blob") { + return response.data; + } + // 兼容服务端返回的字符串数据 + if (typeof response.data === "string") { + response.data = response.data + ? JSON.parse(response.data) + : response.data; + } + return response.data; + + case 401: + if (vm.$route.name !== "login") { + vm.$message.warning({ + content: "身份认证信息已失效，请重新登录。", + duration: 2, + onClose: () => { + // vm.$router.push({ name: "login" }); + }, + }); + } else { + return Promise.reject(); + } + break; + case 403: + vm.$message.warning({ + content: response.data.msg, + duration: 3, + }); + break; + case 500: + // 如果是返回的文件 + vm.$message.warning({ + content: response.data.msg, + duration: 3, + }); + return response.data; + } + } + }, + (error) => { + console.log("err" + error); // for debug + + return Promise.reject(error); + } +); + +export default request; diff --git a/src/views/archives/kakou.vue b/src/views/archives/kakou.vue index 2a93b90..2197010 100644 --- a/src/views/archives/kakou.vue +++ b/src/views/archives/kakou.vue @@ -1,656 +1,919 @@ \ No newline at end of file + diff --git a/src/views/archives/monitor.vue b/src/views/archives/monitor.vue index 68bfb8a..b4ba1ea 100644 --- a/src/views/archives/monitor.vue +++ b/src/views/archives/monitor.vue @@ -32,7 +32,7 @@
离线
-
  查看实时监控
@@ -44,7 +44,6 @@
-