From 1fbbb592d4646f86e8a272b13c16ca54abc08414 Mon Sep 17 00:00:00 2001
From: heyujie <516346543@qq.com>
Date: 星期四, 08 七月 2021 10:30:12 +0800
Subject: [PATCH] 应用中心详情按钮错误
---
src/pages/ai/index/App.vue | 4
src/pages/shuohuangMonitorAnalyze/index/App.vue | 5
src/pages/settings/index/App.vue | 189 ++++++++++++++++++++++++++++++-----------------
src/pages/shuohuangMonitorAnalyze/components/guideIndex.vue | 11 ++
4 files changed, 134 insertions(+), 75 deletions(-)
diff --git a/src/pages/ai/index/App.vue b/src/pages/ai/index/App.vue
index acaffc7..d8852e1 100644
--- a/src/pages/ai/index/App.vue
+++ b/src/pages/ai/index/App.vue
@@ -230,7 +230,7 @@
<div v-if="item.remoteVersion">鏈�鏂扮増鏈�:{{ item.remoteVersion }}</div>
</div>
<!-- v-if="!item.isDefault" -->
- <div class="info-onmask" @click="checkDetail(item,'active')">鏌ョ湅璇︽儏</div>
+ <div class="info-onmask" @click="checkDetail(item,'activeNotInstall')">鏌ョ湅璇︽儏</div>
<div class="mask-btn">
<el-button
@click="downloadApp(item)"
@@ -676,7 +676,6 @@
</div>
</div>
<div class="top-right">
- <!-- <div class="title">{{curCheckTarget.sdk_name}}</div> -->
<div class="summary">
<div class="icon">
<img
@@ -1271,7 +1270,6 @@
this.hasNewVersionApp = nArry;
},
- //鍗歌浇
unLoad(app) {
let _this = this;
this.$confirm("纭畾瑕佸嵏杞借搴旂敤鍚�?", "鎻愮ず")
diff --git a/src/pages/settings/index/App.vue b/src/pages/settings/index/App.vue
index ef71b7c..dfbe342 100644
--- a/src/pages/settings/index/App.vue
+++ b/src/pages/settings/index/App.vue
@@ -33,7 +33,6 @@
:src="`data:image/png;base64,${item.headpic}`"
alt=""
/>
-
</div>
<span class="user-name">{{ item.username }}</span>
</div>
@@ -91,6 +90,9 @@
:src="`data:image/png;base64,${activeAccountItem.headpic}`"
alt=""
/>
+ <div class="touxiang-mask" v-if="showChangePic==true">
+ <span class="enable">淇敼澶村儚</span>
+ </div>
</div>
<div class="user-desc">
<div class="username">
@@ -126,7 +128,28 @@
</div>
</div>
</div>
- <div class="list-btn">
+ <div class="chang-pic-arr">
+ <div class="upload-group">
+ <div
+ class="upload-jpg"
+ :class="selectedPic == index ? 'upload-jpg-border' : ''"
+ v-for="(item, index) in jpgArr"
+ :key="index"
+ @click="pickHeadDefPic(item, index)"
+ >
+ <img
+ v-if="item"
+ :src="`data:image/png;base64,${item.path}`"
+ alt=""
+ srcset=""
+ />
+ <div class="img-mask" v-if="selectedPic == index">
+ <span class="icon iconfont enable"></span>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="list-btn" v-if="isChangePic == false">
<div class="item-btn" @click="showChangePassword">淇敼瀵嗙爜</div>
<div class="item-btn" @click="deleteAccount">鍒犻櫎璐︽埛</div>
<div class="item-btn" @click="openPermission">鏉冮檺璁剧疆</div>
@@ -214,9 +237,7 @@
<div class="upload-group">
<div
class="upload-jpg"
- :class="
- selectedPic == index? 'upload-jpg-border' : ''
- "
+ :class="selectedPic == index ? 'upload-jpg-border' : ''"
v-for="(item, index) in jpgArr"
:key="index"
@click="pickHeadDefPic(item, index)"
@@ -250,7 +271,7 @@
<el-form-item prop="userName">
<div class="p-title">鐢ㄦ埛鍚嶏細</div>
<el-input
- placeholder="蹇呭～"
+ placeholder="蹇呭～锛岄暱搴︿负2~10浣嶅瓧绗︼紝涓嶈兘浠ユ暟瀛楀紑澶淬�佷笉鍏佽鏈夋眽瀛�"
v-model="addForm.userName"
></el-input>
</el-form-item>
@@ -494,37 +515,37 @@
></generalSettings>
</div>
<div class="welcome-page" v-else>
- <div class="child" @click="openWelcome('璐︽埛',0)">
+ <div class="child" @click="openWelcome('璐︽埛', 0)">
<div class="child-info">
<span class="icon iconfont welcome-icon"></span>
<span class="welcome-title">璐︽埛</span>
</div>
</div>
- <div class="child" @click="openWelcome('鏃ユ湡鏃堕棿',1)">
+ <div class="child" @click="openWelcome('鏃ユ湡鏃堕棿', 1)">
<div class="child-info">
<span class="icon iconfont welcome-icon"></span>
<span class="welcome-title">鏃ユ湡鏃堕棿</span>
</div>
</div>
- <div class="child" @click="openWelcome('闆嗙兢绠＄悊',2)">
+ <div class="child" @click="openWelcome('闆嗙兢绠＄悊', 2)">
<div class="child-info">
<span class="icon iconfont welcome-icon"></span>
<span class="welcome-title">闆嗙兢绠＄悊</span>
</div>
</div>
- <div class="child" @click="openWelcome('缃戠粶璁剧疆',3)">
+ <div class="child" @click="openWelcome('缃戠粶璁剧疆', 3)">
<div class="child-info">
<span class="icon iconfont welcome-icon"></span>
<span class="welcome-title">缃戠粶璁剧疆</span>
</div>
</div>
- <div class="child" @click="openWelcome('閿洏鍜岃瑷�',4)">
+ <div class="child" @click="openWelcome('閿洏鍜岃瑷�', 4)">
<div class="child-info">
<span class="icon iconfont welcome-icon"></span>
<span class="welcome-title">閿洏鍜岃瑷�</span>
</div>
</div>
- <div class="child" @click="openWelcome('閫氱敤璁剧疆',5)">
+ <div class="child" @click="openWelcome('閫氱敤璁剧疆', 5)">
<div class="child-info">
<span class="icon iconfont welcome-icon"></span>
<span class="welcome-title">閫氱敤璁剧疆</span>
@@ -553,6 +574,7 @@
import netSettings from "../views/NetSettings";
import keyboardLanguage from "../views/keyboardLanguage";
import generalSettings from "../views/generalSettings";
+import treeVue from "@/components/treeMenu/jsTree/tree.vue";
export default {
name: "settings",
components: {
@@ -584,6 +606,7 @@
};
return {
showAccount: true,
+ showChangePic:false,
syncYrs: "",
activeAccountItem: {},
syncMonth: "",
@@ -661,13 +684,14 @@
confirmPassword: "",
roleId: "",
},
+ isChangePic: true,
rules: {
userName: [
{ required: true, message: "璇疯緭鍏ョ敤鎴峰悕", trigger: "blur" },
{
- min: 3,
+ min: 2,
max: 10,
- message: "闀垮害鍦� 3 鍒� 10 涓瓧绗�",
+ message: "闀垮害鍦� 2 鍒� 10 涓瓧绗�",
trigger: "blur",
},
],
@@ -974,9 +998,9 @@
this.initClockConf();
}
},
- openWelcome(name,i){
- this.showWelcome = false
- this.openMenu(name,i)
+ openWelcome(name, i) {
+ this.showWelcome = false;
+ this.openMenu(name, i);
},
showInput(typ) {
this[`show${typ}Input`] = true;
@@ -1010,7 +1034,7 @@
this.isAddAccount = true;
getRoles().then((res) => {
if (res.success) {
- this.roleList = res.data;
+ this.roleList = res.data.slice(0, 2);
}
});
},
@@ -1046,7 +1070,9 @@
});
},
saveAddAccount(formName) {
+ debugger;
this.$refs[formName].validate((valid) => {
+ debugger;
if (valid) {
let data = {
username: this.addForm.userName,
@@ -1221,9 +1247,9 @@
-moz-box-shadow: 5px 5px 10px #ddd;
-webkit-box-shadow: 5px 5px 10px #ddd;
box-shadow: 5px 5px 10px #ddd;
- transform: translate3d(0,-2.5px,0);
- transition: all 0.3s;
-}
+ transform: translate3d(0, -2.5px, 0);
+ transition: all 0.3s;
+ }
}
.container {
height: 100%;
@@ -1234,7 +1260,7 @@
box-sizing: border-box;
.container-left {
height: 100%;
- width: 230px;
+ width: 230px;
overflow: auto;
box-sizing: border-box;
flex-shrink: 0;
@@ -1387,13 +1413,32 @@
width: 100px;
height: 100px;
background-color: bisque;
+ position: relative;
border-radius: 50px;
img {
border: none;
width: 100px;
height: 100px;
+ position: relative;
border-radius: 50px;
+ }
+ .touxiang-mask {
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 100px;
+ height: 100px;
+ background-color: rgba(0, 0, 0, 0.2);
+ color: white;
+ cursor: pointer;
+ border-radius: 50%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ .selected {
+ font-size: 20px;
+ }
}
}
.user-desc {
@@ -1507,67 +1552,75 @@
}
}
- .add-account-page {
- .upload-group {
- height: 120px;
- width: 360px;
- margin: 0 auto;
- overflow: hidden;
- .upload-jpg {
- position: relative;
+ .upload-group {
+ height: 120px;
+ width: 360px;
+ margin: 0 auto;
+ overflow: hidden;
+ .upload-jpg {
+ position: relative;
+ height: 48px;
+ width: 48px;
+ float: left;
+ margin: 0 10px;
+ margin-bottom: 10px;
+ background-color: rgba(242, 242, 242, 1);
+ border: 2px solid transparent;
+ border-radius: 50%;
+ cursor: pointer;
+ img {
height: 48px;
width: 48px;
- float: left;
- margin: 0 10px;
- margin-bottom: 10px;
- background-color: rgba(242, 242, 242, 1);
- border: 2px solid transparent;
border-radius: 50%;
- cursor: pointer;
- img {
- height: 48px;
- width: 48px;
- border-radius: 50%;
- }
- .img-mask {
- position: absolute;
- left: 0;
- top: 0;
- height: 48px;
- width: 48px;
- background-color: rgba(0, 0, 0, 0.3);
- color: white;
- border-radius: 50%;
- display: flex;
- justify-content: center;
- align-items: center;
- .selected {
- font-size: 22px;
- }
- }
}
- .upload-jpg-border {
- border: 2px solid cornflowerblue;
- }
- .upload-jpg-up {
+ .img-mask {
+ position: absolute;
+ left: 0;
+ top: 0;
height: 48px;
width: 48px;
- float: left;
+ background-color: rgba(0, 0, 0, 0.3);
+ color: white;
+ border-radius: 50%;
display: flex;
- background-color: rgba(242, 242, 242, 1);
- border: 2px solid transparent;
- border-radius: 50%;
-
justify-content: center;
align-items: center;
- font-size: 12px;
- cursor: pointer;
+ .selected {
+ font-size: 22px;
+ }
}
}
+ .upload-jpg-border {
+ border: 2px solid cornflowerblue;
+ }
+ .upload-jpg-up {
+ height: 48px;
+ width: 48px;
+ float: left;
+ display: flex;
+ background-color: rgba(242, 242, 242, 1);
+ border: 2px solid transparent;
+ border-radius: 50%;
+
+ justify-content: center;
+ align-items: center;
+ font-size: 12px;
+ cursor: pointer;
+ }
+ }
+ .add-account-page {
.fill-group {
+ .el-form-item__content {
+ line-height: 44px;
+ }
.p-title {
height: 34px;
text-align: left;
+ line-height: 50px;
+ }
+ .el-form-item__error {
+ line-height: 0.8;
+ left: 3.3%;
}
.el-form-item {
.el-select {
diff --git a/src/pages/shuohuangMonitorAnalyze/components/guideIndex.vue b/src/pages/shuohuangMonitorAnalyze/components/guideIndex.vue
index 0ad72a0..47156be 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/guideIndex.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/guideIndex.vue
@@ -1076,7 +1076,16 @@
methods: {
refreshShoubiNum(){
let n = sessionStorage.getItem("shoubiNum")
- this.optionsOfHidDangerBar.series[0].data[1].value = +n
+ // this.optionsOfHidDangerBar.series[0].data[1].value = +n
+ this.$set(this.optionsOfHidDangerBar.series,0, {
+ name: '鏁伴噺',
+ type: 'bar',
+ barWidth: '60%',
+ label:{
+ show:true,position: 'top'
+ },
+ data: [{value:1,itemStyle:{color:'#3aa0ff'}},{value:+n,itemStyle:{color:'#36cbcb'}},{value:1,itemStyle:{color:'#4dcb73'}},{value:1,itemStyle:{color:'#fad337'}},{value:3,itemStyle:{color:'#f2637b'}}, {value:2,itemStyle:{color:'#975fe4'}}]
+ })
},
initTabContent(tab){
if(tab.name == "hidDanderStatistic"){
diff --git a/src/pages/shuohuangMonitorAnalyze/index/App.vue b/src/pages/shuohuangMonitorAnalyze/index/App.vue
index ca74772..0989569 100644
--- a/src/pages/shuohuangMonitorAnalyze/index/App.vue
+++ b/src/pages/shuohuangMonitorAnalyze/index/App.vue
@@ -12,8 +12,7 @@
</div>
<div class="container">
<!-- 棣栭〉 -->
- <GuideIndex ref="GuideIndex" v-show="actPage=='guideIndex'"></GuideIndex>
-
+ <GuideIndex ref="GuideIndex" v-if="actPage=='guideIndex'"></GuideIndex>
<searchForVideoAnalyze v-if="actPage=='searchForVideoAnalyze'"></searchForVideoAnalyze>
<memberManage v-if="actPage=='memberManage'"></memberManage>
<taskManage v-if="actPage=='taskManage'"></taskManage>
@@ -71,7 +70,7 @@
},
menuChange(path) {
if (path=='guideIndex') {
- this.$refs.GuideIndex.refreshShoubiNum()
+ // this.$refs.GuideIndex.refreshShoubiNum()
}
if (path == 'taskscreen') {
//window.location.href = window.location.href+'taskscreen/index.html'
--
Gitblit v1.8.0