检测数
@@ -144,6 +144,7 @@ export default {
// 流量数值
flow: 0,
isRefer: true,
+
valueShow: {},
//排队数
queue: '',
@@ -158,8 +159,8 @@ export default {
methods: {
// 计算类型数量的总和
getDataArr(val) {
-
- this.getNewQueue(val)
+ this.newDataArr = val
+ this.getNewQueue(this.newDataArr)
},
getTotal(dataArr) {
if (this.title == '类型') {
@@ -168,16 +169,15 @@ export default {
}, 0);
}
},
- // 计算类型的数值
getNewQueue(val) {
- this.newDataArr = val
+
if (val[0].n_queue) {
- this.newDataArr[0].n_queue = val[0].n_queue;
- }
- if (val[0].ave_queue) {
- this.newDataArr[0].n_queue = val[0].ave_queue;
+ this.queue = val[0].n_queue;
}
- if (val[0].headway) {
+ if (val[0].ave_queue) {
+ this.queue = val[0].ave_queue;
+ }
+ if (val[0].headway) {
this.newDataArr[0].headway = val[0].headway;
}
if (val[0].ave_headway) {
@@ -185,11 +185,10 @@ export default {
}
if (val[0].n_stay) {
this.newDataArr[0].n_stay = val[0].n_stay;
- }
+ }
if (val[0].ave_stay) {
this.newDataArr[0].n_stay = val[0].ave_stay;
}
-
},
},
diff --git a/src/config/apiurl.js b/src/config/apiurl.js
index c11bf1a9..2161f5c1 100644
--- a/src/config/apiurl.js
+++ b/src/config/apiurl.js
@@ -24,7 +24,12 @@ export default {
//编辑保存组件弹窗传参
setHostName: 'http://172.16.1.168:5000/api/SetHostName',
setHostTime: 'http://172.16.1.168:5000/api/SetHostTime',
- changePassowrd:'http://172.16.1.168:5000/api/ChangePassword'
+ changePassowrd:'http://172.16.1.168:5000/api/ChangePassword',
+ //还原服务器设置上传
+ postConfigRestore:'http://172.16.1.168:5000/api/ConfigRestore',
+ //更新软件版本
+ postConfigUpdate:'http://172.16.1.168:5000/api/Update'
+
// `http://${ipUurl}:5000/api/AddShipjk`
// dataUrl: `http://${ipUurl}:5000/api/AddShipjk`,
// getSpareElementOrder: `http://${ipUurl}:5000/api/Upload`,
@@ -41,5 +46,10 @@ export default {
// saveSetFtppz: `http://${ipUurl}:5000/api/SetFtppz`,
// //编辑保存组件弹窗传参
// setHostName: `http://${ipUurl}:5000/api/SetHostName`,
- // setHostTime: `http://${ipUurl}:5000/api/SetHostTime`
+ // setHostTime: `http://${ipUurl}:5000/api/SetHostTime`,
+ // changePassowrd:`http://${ipUurl}:5000/api/ChangePassword`,
+ // //还原服务器设置上传
+ // postConfigRestore:`http://${ipUurl}:5000/api/ConfigRestore`,
+ // //更新软件版本
+ // postConfigUpdate:`http://${ipUurl}:5000/api/Update`
};
diff --git a/src/router/index.js b/src/router/index.js
index e2a77898..33f6d844 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -70,15 +70,16 @@ export default new VueRouter({
},
component: () =>
import ('@/views/general/CustomOperations.vue'),
- }, {
- path: 'HealthCheck',
- name: 'HealthCheck',
- meta: {
- title: '健康检测'
- },
- component: () =>
- import ('@/views/general/HealthCheck.vue'),
- },
+ },
+ // {
+ // path: 'HealthCheck',
+ // name: 'HealthCheck',
+ // meta: {
+ // title: '健康检测'
+ // },
+ // component: () =>
+ // import ('@/views/general/HealthCheck.vue'),
+ // },
{
path: 'AboutMachine',
name: 'AboutMachine',
@@ -111,15 +112,16 @@ export default new VueRouter({
},
component: () =>
import('@/views/general/CustomOperations.vue'),
- }, {
- path: 'HealthCheck',
- name: 'HealthCheck',
- meta: {
- title: '健康检测'
- },
- component: () =>
- import('@/views/general/HealthCheck.vue'),
},
+ // {
+ // path: 'HealthCheck',
+ // name: 'HealthCheck',
+ // meta: {
+ // title: '健康检测'
+ // },
+ // component: () =>
+ // import('@/views/general/HealthCheck.vue'),
+ // },
{
path: 'StateOperation',
name: 'StateOperation',
diff --git a/src/utils/mqttConfig.js b/src/utils/mqttConfig.js
index db9d9785..1f56a8e9 100644
--- a/src/utils/mqttConfig.js
+++ b/src/utils/mqttConfig.js
@@ -36,8 +36,8 @@ class mqttHandle {
//配置链接
const { host, port, endpoint, ...options } = this.connect;
console.log("this.connect.host",this.connect.host)
- const connectUrl = 'ws://172.16.1.168:10087/';
- // const connectUrl = `ws://${this.connect.host}:${this.connect.port}`;
+ // const connectUrl = 'ws://172.16.1.168:10087/';
+ const connectUrl = `ws://${this.connect.host}:${this.connect.port}`;
// if (!client.connected) {
// client.on('connect', function () {
// console.log('连接成功')
diff --git a/src/utils/request.js b/src/utils/request.js
index b5e62453..baea9477 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -1,34 +1,35 @@
-// import axios from 'axios';
-// import store from '@/store/index.js';
-// import { Message } from 'element-ui';
+import axios from 'axios';
+import store from '@/store/index.js';
+import { Message } from 'element-ui';
-// // 创建 axios 实例
-// const service = axios.create({
-// baseURL: 'https://api.example.com',
-// // withCredentials: true,
-// timeout: 60000
-// });
+// 创建 axios 实例
+const service = axios.create({
+ baseURL: process.env.BASE_API, // api 的 base_url
+ withCredentials: true,
+ // withCredentials: true,
+ timeout: 600000
+});
-// // 请求拦截器
-// service.interceptors.request.use(config => {
-// config.headers['authToken'] = store.state.authToken;
-// config.headers['ms_username'] = localStorage.getItem('ms_username');
-// return config;
-// }, error => {
-// console.log('request error',error);
-// return Promise.reject(error);
-// });
+// 请求拦截器
+service.interceptors.request.use(config => {
+ config.headers['authToken'] = store.state.authToken;
+ config.headers['ms_username'] = localStorage.getItem('ms_username');
+ return config;
+}, error => {
+ console.log('request error',error);
+ return Promise.reject(error);
+});
-// // 响应拦截器
-// service.interceptors.response.use(response => {
-// return response;
-// }, error => {
-// console.log('response error', error);
-// Message({
-// message: error.message,
-// type: 'error'
-// });
-// return Promise.reject(error);
-// });
+// 响应拦截器
+service.interceptors.response.use(response => {
+ return response;
+}, error => {
+ console.log('response error', error);
+ Message({
+ message: error.message,
+ type: 'error'
+ });
+ return Promise.reject(error);
+});
-// export default service;
\ No newline at end of file
+export default service;
\ No newline at end of file
diff --git a/src/views/AnalysisMain.vue b/src/views/AnalysisMain.vue
index d97a2ba5..5e3ffe05 100644
--- a/src/views/AnalysisMain.vue
+++ b/src/views/AnalysisMain.vue
@@ -582,7 +582,7 @@ this.getVideoList()
for (var i = 0; i < count; i++) {
let formData = new FormData();//new一个formData事件
formData.append("file", arrFile[i].File); //将file属性添加到formData里
- var url = serverUrl.getSpareElementOrder+"?Name=" + filename + "&Number=" + i + "&BufferSize=" + bufferSize + "&Count=" + count + "&Start=" + arrFile[i].Start + "&End=" + arrFile[i].End + "&Size=" + size;
+ var url = serverUrl.getSpareElementOrder+"?Name=" + filename + "&Number=" + i + "&BufferSize=" + bufferSize + "&Count=" + count + "&Start=" + arrFile[i].Start + "&End=" + arrFile[i].End + "&Size=" + size + "&FolderName=OfflineVideo";
axios.post(url, formData, {
headers: {
"Content-Type": "multipart/form-data;",
diff --git a/src/views/IdManagement.vue b/src/views/IdManagement.vue
index f7b5b7bd..e0b62bfc 100644
--- a/src/views/IdManagement.vue
+++ b/src/views/IdManagement.vue
@@ -18,7 +18,7 @@
编辑
- 删除
+ 删除
@@ -32,7 +32,7 @@
-
+
- 备份
+ 还原
-
-
+
+
+
+
+ 点击上传
- 出厂默认值
-
+ 恢复出厂设置
+
重置默认值
@@ -45,7 +66,7 @@
-
+
-
-
+
+ 重新启动
- 更正软件
+ 更新软件
-
- 重新启动
+
+ 更新
+
+
+
+ 点击上传
全局设置
@@ -89,7 +115,7 @@