From 0e9392ec89207247a3fb73fac5eec7ff45b42689 Mon Sep 17 00:00:00 2001
From: heyujie <516346543@qq.com>
Date: 星期三, 26 一月 2022 18:18:52 +0800
Subject: [PATCH] 算力轮询周期
---
src/api/system.ts | 8 ++++++++
src/pages/desktop/index/components/Desktop.vue | 41 +++++++++++++++++++++++++----------------
src/pages/analysisPower/index/App.vue | 4 +++-
3 files changed, 36 insertions(+), 17 deletions(-)
diff --git a/src/api/system.ts b/src/api/system.ts
index bc85f5c..e4bc3f2 100644
--- a/src/api/system.ts
+++ b/src/api/system.ts
@@ -471,6 +471,14 @@
data: qs.stringify(data)
})
}
+export const getShopOrderList = (data: any) => {
+ return request({
+ url: "/version/auth/shop/getOrderList",
+ method: "post",
+ data: qs.stringify(data)
+ })
+}
+
export const setBakConfig = (data: any) => {
return request({
url: "/version/autoBak/saveConf",
diff --git a/src/pages/analysisPower/index/App.vue b/src/pages/analysisPower/index/App.vue
index a5a1294..e5b7ce9 100644
--- a/src/pages/analysisPower/index/App.vue
+++ b/src/pages/analysisPower/index/App.vue
@@ -231,13 +231,15 @@
return arry;
},
pollCycle() {
+ if (this.PollData.PollValidCount===0||!this.PollData.PollValidCount) {
+ return 0
+ }
let sumPollingCamera = 0;
this.PollData.CameraList.forEach(cam => {
if (cam.run_type === 0) {
sumPollingCamera++
}
})
-
// 鎵�鏈夎疆璇㈢殑鎽勫儚鏈烘�绘暟 * 杞鏃堕棿 / 杞绠楀姏 - 1
let ret = (sumPollingCamera * this.PollData.Config.poll_period) / this.PollData.PollValidCount - 1
if (String(ret).indexOf(".") > 0) {
diff --git a/src/pages/desktop/index/components/Desktop.vue b/src/pages/desktop/index/components/Desktop.vue
index 4962358..2883f2b 100644
--- a/src/pages/desktop/index/components/Desktop.vue
+++ b/src/pages/desktop/index/components/Desktop.vue
@@ -210,7 +210,7 @@
activateVersion,
uploadKey,
getSmsCode,
- loginShopInSmart,
+ loginShopInSmart,getShopOrderList,
} from "@/api/system";
export default {
name: "Desktop",
@@ -231,7 +231,7 @@
codeDisabled: false,
innerVisible: false,
snExpire: false,
- timer: null,
+ timer: null,token: "",
phone: {
phoneNum: "",
verifyCode: "",
@@ -274,21 +274,30 @@
loginShop() {
// this.innerDialog = true
// this.activeDialog=false
- this.$refs["phoneLogin"].validate((valid) => {
- if (valid) {
+ getShopOrderList({token:"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2NDMyMTYyODMsInVzZXIiOiJ7XCJpZFwiOlwiZTZjY2QzNmQtNGYxNi00NmZjLTg4ZDUtMDczNjU4NjZkMjA1XCIsXCJwZXJtaXNzaW9uc1wiOltcIm9yZGVyTWFuZ2U6dmlld1wiLFwib3JkZXJNYW5nZTpjYW5jZWxcIixcImRldmljZU1hbmFnZTp2aWV3XCIsXCJhZG1pbk1hbmFnZTphZGRcIixcImRldmljZU1hbmFnZTphZGRcIixcImFkbWluTWFuYWdlOmVkaXRcIixcImNvZGVNYW5nZTp2aWV3XCIsXCJjb2RlTWFuZ2U6YWRkXCIsXCJkZXZpY2VNYW5hZ2U6dW5iaW5kXCIsXCJvcmRlck1hbmdlXCIsXCJwcm9kdWN0Q2VudGVyXCIsXCJ2aXBNYW5hZ2VcIixcImRpY01hbmFnZVwiLFwicHJvZHVjdENlbnRlcjp2aWV3XCIsXCJvcmRlck1hbmdlOnBheVwiLFwibG9nTWFuYWdlXCIsXCJkZXZpY2VNYW5hZ2VcIixcImFkbWluTWFuYWdlXCIsXCJwcm9kdWN0TWFuZ2VcIixcInZpcE1hbmFnZTplZGl0XCIsXCJjb2RlTWFuZ2VcIixcInByb2R1Y3RDZW50ZXI6YnV5XCIsXCJwcm9kdWN0TWFuZ2U6dmlld1wiLFwic2RrTWFuYWdlXCIsXCJob21lXCIsXCJwcm9kdWN0Q2VudGVyOmRvd25sb2FkXCIsXCJwcm9kdWN0TWFuZ2U6b2ZmU2FsZVwiLFwiYWRtaW5NYW5hZ2U6dmlld1wiLFwib3JkZXJNYW5nZTpkb3dubG9hZFwiLFwicHJvZHVjdE1hbmdlOmFkZFwiLFwidmlwTWFuYWdlOmFkZFwiLFwiYXBwTWFuYWdlXCIsXCJ2aXBNYW5hZ2U6dmlld1wiLFwicHJvZHVjdE1hbmdlOmVkaXRcIixcImFwaVwiLFwicHJvZHVjdE1hbmdlOnB1Ymxpc2hcIl0sXCJ1c2VybmFtZVwiOlwiYmFzaWNcIn0ifQ.DaTOv8pnh8kG1TPtuNVSo2qPc2z9wGxl2cMZtJ8iwo0"}).then((res) => {
+ debugger
+ res.data
+ })
+ // this.$refs["phoneLogin"].validate((valid) => {
+ // if (valid) {
- let param = {
- phoneNum: this.phone.phoneNum,
- verifyCode: this.phone.verifyCode,
- };
- loginShopInSmart(param).then((res) => {
- this.innerDialog = true;
- this.activeDialog = false;
- });
- } else {
- this.nullRule = {};
- }
- });
+ // let param = {
+ // phoneNum: this.phone.phoneNum,
+ // verifyCode: this.phone.verifyCode,
+ // };
+ // loginShopInSmart(param).then((res) => {
+ // this.innerDialog = true;
+ // this.activeDialog = false;
+ // this.token = res.data.access_token
+ // getShopOrderList({token:"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2NDMyMTYyODMsInVzZXIiOiJ7XCJpZFwiOlwiZTZjY2QzNmQtNGYxNi00NmZjLTg4ZDUtMDczNjU4NjZkMjA1XCIsXCJwZXJtaXNzaW9uc1wiOltcIm9yZGVyTWFuZ2U6dmlld1wiLFwib3JkZXJNYW5nZTpjYW5jZWxcIixcImRldmljZU1hbmFnZTp2aWV3XCIsXCJhZG1pbk1hbmFnZTphZGRcIixcImRldmljZU1hbmFnZTphZGRcIixcImFkbWluTWFuYWdlOmVkaXRcIixcImNvZGVNYW5nZTp2aWV3XCIsXCJjb2RlTWFuZ2U6YWRkXCIsXCJkZXZpY2VNYW5hZ2U6dW5iaW5kXCIsXCJvcmRlck1hbmdlXCIsXCJwcm9kdWN0Q2VudGVyXCIsXCJ2aXBNYW5hZ2VcIixcImRpY01hbmFnZVwiLFwicHJvZHVjdENlbnRlcjp2aWV3XCIsXCJvcmRlck1hbmdlOnBheVwiLFwibG9nTWFuYWdlXCIsXCJkZXZpY2VNYW5hZ2VcIixcImFkbWluTWFuYWdlXCIsXCJwcm9kdWN0TWFuZ2VcIixcInZpcE1hbmFnZTplZGl0XCIsXCJjb2RlTWFuZ2VcIixcInByb2R1Y3RDZW50ZXI6YnV5XCIsXCJwcm9kdWN0TWFuZ2U6dmlld1wiLFwic2RrTWFuYWdlXCIsXCJob21lXCIsXCJwcm9kdWN0Q2VudGVyOmRvd25sb2FkXCIsXCJwcm9kdWN0TWFuZ2U6b2ZmU2FsZVwiLFwiYWRtaW5NYW5hZ2U6dmlld1wiLFwib3JkZXJNYW5nZTpkb3dubG9hZFwiLFwicHJvZHVjdE1hbmdlOmFkZFwiLFwidmlwTWFuYWdlOmFkZFwiLFwiYXBwTWFuYWdlXCIsXCJ2aXBNYW5hZ2U6dmlld1wiLFwicHJvZHVjdE1hbmdlOmVkaXRcIixcImFwaVwiLFwicHJvZHVjdE1hbmdlOnB1Ymxpc2hcIl0sXCJ1c2VybmFtZVwiOlwiYmFzaWNcIn0ifQ.DaTOv8pnh8kG1TPtuNVSo2qPc2z9wGxl2cMZtJ8iwo0"}).then((res) => {
+ // debugger
+ // res.data
+ // })
+ // });
+ // } else {
+ // this.nullRule = {};
+ // }
+ // });
},
cancelLogin(){
this.innerVisible= false
--
Gitblit v1.8.0