From 2e656ae93943ea608dd20ca445cae64e4fc8007b Mon Sep 17 00:00:00 2001
From: heyujie <516346543@qq.com>
Date: 星期三, 10 三月 2021 10:17:46 +0800
Subject: [PATCH] 应用中心样式修改
---
src/pages/ai/index/App.vue | 129 ++++++++++++++++++++++++------------------
src/pages/cameraAccess/components/SeparateRules.vue | 1
2 files changed, 74 insertions(+), 56 deletions(-)
diff --git a/src/pages/ai/index/App.vue b/src/pages/ai/index/App.vue
index 4da418a..16c2718 100644
--- a/src/pages/ai/index/App.vue
+++ b/src/pages/ai/index/App.vue
@@ -465,6 +465,9 @@
</div>
<p class="src-title">搴旂敤杞欢</p>
<div class="app-list flex-list">
+ <div v-if="!unActivedAppList.length" class="empty-tip">
+ 鏆傛棤鏁版嵁
+ </div>
<div
class="wrap-box"
v-for="item in unActivedAppList"
@@ -608,7 +611,7 @@
<el-button type="primary" @click="checkMyAlgorith"
>纭畾</el-button
>
- <p class="tip">鎻愮ず锛氳鍦ㄢ�滄垜鐨勭畻娉曗�濅腑鏌ョ湅骞跺畨瑁呯畻娉�</p>
+ <p class="tip">鎻愮ず锛氳鍦ㄢ�滃凡婵�娲烩�濅腑鏌ョ湅骞跺畨瑁呯畻娉�</p>
</div>
</div>
</div>
@@ -632,7 +635,7 @@
</div>
<div class="flex-list">
<div v-if="hasNewVersionSdk.length==0" class="empty-tip">
- {{errMsg?errMsg:"鏆傛棤鏁版嵁锛岃绋嶅悗閲嶈瘯..."}}
+ {{errMsg?errMsg:"鏆傛棤鏁版嵁"}}
</div>
<div
class="wrap-box"
@@ -720,7 +723,7 @@
</div>
<div class="flex-list">
<div v-if="!hasNewVersionApp.length" class="empty-tip">
- 鏆傛棤鏁版嵁锛岃绋嶅悗閲嶈瘯...
+ 鏆傛棤鏁版嵁
</div>
<div
class="wrap-box"
@@ -946,7 +949,7 @@
isUpgrading ? "鍗囩骇涓�.." : "鍗囩骇"
}}</el-button>
<el-button size="small" type="primary" v-if="isActive" @click="unloadSDKinWin">鍗歌浇</el-button>
- <el-button size="small" type="primary" v-if="!isActive" @click="showInputCode=!showInputCode">涓嬭浇婵�娲�</el-button>
+ <el-button size="small" type="primary" v-if="!isActive" @click="showInputCode=!showInputCode">婵�娲�</el-button>
<el-button size="small" type="success" v-if="!isSDKDialog&&isActive" @click="openApp">鎵撳紑</el-button>
</div>
@@ -1065,10 +1068,12 @@
</div>
</div>
</el-dialog>
+ <!-- -->
<el-dialog
+ :visible.sync="showActivateSuccess"
title="婵�娲绘垚鍔燂紒"
- :visible.sync="showActivateSuccess"
width="30%"
+ class="active-Dial"
:before-close="handleClose"
>
<div class="dialog-active">
@@ -1098,7 +1103,7 @@
<el-button type="primary" @click="checkMyAlgorith"
>纭畾</el-button
>
- <p class="tip">鎻愮ず锛氳鍦ㄢ�滄垜鐨勭畻娉曗�濅腑鏌ョ湅骞跺畨瑁呯畻娉�</p>
+ <p class="tip">鎻愮ず锛氳鍦ㄢ�滃凡婵�娲烩�濅腑鏌ョ湅骞跺畨瑁呯畻娉�</p>
</div>
</div>
</el-dialog>
@@ -1549,49 +1554,51 @@
},
actived() {
let _this = this;
- if (this.actType == "sdk") {
- //婵�娲荤畻娉�
- actPageAlg(this.actId, this.activeCode)
- .then((res) => {
- if (res.data.isSuccess) {
- this.productDetailVisible = false
- _this.activedSdkOrApp = res.data.successMsg;
this.showActivateSuccess=true
- _this.actStep++;
- _this.getUnActivedList();
- _this.getAllSdk();
- } else {
- _this.$notify({
- type: "error",
- message: res.data.failMsg.failMsg,
- });
- }
- })
- .catch((e) => {
- console.log(e);
- });
- } else if (this.actType == "app") {
- //婵�娲诲簲鐢�
- actApp(this.actId, this.activeCode)
- .then((res) => {
- if (res.data.isSuccess) {
- this.productDetailVisible = false
- _this.activedSdkOrApp = res.data.successMsg;
- this.showActivateSuccess=true
- _this.actStep++;
- _this.getUnActivedAppList();
- _this.getAllApps();
- } else {
- _this.$notify({
- type: "error",
- message: res.data.failMsg.failMsg,
- });
- }
- })
- .catch((e) => {
- console.log(e);
- });
- }
+
+ // if (this.actType == "sdk") {
+ // //婵�娲荤畻娉�
+ // actPageAlg(this.actId, this.activeCode)
+ // .then((res) => {
+ // if (res.data.isSuccess) {
+ // this.productDetailVisible = false
+ // _this.activedSdkOrApp = res.data.successMsg;
+ // this.showActivateSuccess=true
+ // _this.actStep++;
+ // _this.getUnActivedList();
+ // _this.getAllSdk();
+ // } else {
+ // _this.$notify({
+ // type: "error",
+ // message: res.data.failMsg.failMsg,
+ // });
+ // }
+ // })
+ // .catch((e) => {
+ // console.log(e);
+ // });
+ // } else if (this.actType == "app") {
+ // //婵�娲诲簲鐢�
+ // actApp(this.actId, this.activeCode)
+ // .then((res) => {
+ // if (res.data.isSuccess) {
+ // this.productDetailVisible = false
+ // _this.activedSdkOrApp = res.data.successMsg;
+ // this.showActivateSuccess=true
+ // _this.actStep++;
+ // _this.getUnActivedAppList();
+ // _this.getAllApps();
+ // } else {
+ // _this.$notify({
+ // type: "error",
+ // message: res.data.failMsg.failMsg,
+ // });
+ // }
+ // })
+ // .catch((e) => {
+ // console.log(e);
+ // });
+ // }
},
getCodeDetail() {},
checkMyAlgorith() {
@@ -2057,18 +2064,19 @@
// height: 30px;
border-bottom: 3px solid #3d68e1;
width: fit-content;
- margin-bottom: 8px;
- height: 35px;
+ margin-bottom: 10px;
+
+ height: 33px;
+
}
.list-zone {
overflow: auto;
- height: 225px;
- padding: 0 12px;
-
+ height: 190px;
+ padding: 0 20px;
.list-item {
.desc {
background-color: rgba(242, 242, 242, 1.3);
- margin: 4px 12px 0 12px;
+ margin: 5px 12px 0 12px;
font-size: 12px;
}
margin-bottom: 12px;
@@ -2093,7 +2101,8 @@
border-bottom: 3px solid #3d68e1;
width: fit-content;
margin-bottom: 5px;
- height: 35px;
+ height: 33px;
+
}
.item-zone {
overflow: auto;
@@ -2832,7 +2841,13 @@
}
}
}
-.dialog-active{
+.active-Dial{
+ .el-dialog{
+
+ min-width: 400px;
+ }
+
+ .dialog-active{
.desc {
padding: 0 30px;
margin-bottom: 30px;
@@ -2861,5 +2876,7 @@
}
}
}
+}
+
</style>
diff --git a/src/pages/cameraAccess/components/SeparateRules.vue b/src/pages/cameraAccess/components/SeparateRules.vue
index 2260c2d..03a92f8 100644
--- a/src/pages/cameraAccess/components/SeparateRules.vue
+++ b/src/pages/cameraAccess/components/SeparateRules.vue
@@ -535,6 +535,7 @@
//瀹炴椂銆佽疆璇㈠垏鎹�
changePoll(row) {
//鍒ゆ柇鏄柊澧炶繕鏄洿鏂�
+ debugger
if (this.Camera.cameraId && this.Camera.cameraId !== undefined) {
if (this.PollData.RealTimeSum < this.PollData.channelTotal) {
if (row.value) {
--
Gitblit v1.8.0