From cce5e625e8870248081302513b9cb38e676a04e5 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期五, 25 六月 2021 15:34:37 +0800
Subject: [PATCH] 调整全景跟踪目标选择的样式
---
src/pages/systemSettings/index/App.vue | 171 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 125 insertions(+), 46 deletions(-)
diff --git a/src/pages/systemSettings/index/App.vue b/src/pages/systemSettings/index/App.vue
index c4a9817..c477954 100644
--- a/src/pages/systemSettings/index/App.vue
+++ b/src/pages/systemSettings/index/App.vue
@@ -118,7 +118,7 @@
ref="passwordForm"
class="password-form"
>
- <el-form-item prop="pw">
+ <el-form-item prop="curPassword">
<div class="p-title">褰撳墠瀵嗙爜锛�</div>
<el-input
@@ -127,7 +127,7 @@
show-password
></el-input>
</el-form-item>
- <el-form-item prop="newPw">
+ <el-form-item prop="newPassword">
<div class="p-title">鏂板瘑鐮侊細</div>
<el-input
placeholder="蹇呭～"
@@ -135,7 +135,7 @@
show-password
></el-input>
</el-form-item>
- <el-form-item prop="confirmNewPw">
+ <el-form-item prop="confirmPassword">
<div class="p-title">纭瀵嗙爜锛�</div>
<el-input
placeholder="蹇呭～"
@@ -153,28 +153,26 @@
<div class="permission" v-if="inAccountDetail && isSetPermission">
<div class="title">鏉冮檺绠＄悊</div>
- <div class="line">
- <div class="name">瀹炴椂鐩戞帶</div>
- <el-switch
- v-model="isRealtime"
- active-color="rgba(61, 104, 225, 1)"
- >
- </el-switch>
+ <div class="line-wrap" v-for="item in sysMenus" :key="item.id">
+ <div class="line">
+ <div class="name">{{ item.name }}</div>
+ <el-switch
+ v-model="item.selected"
+ active-color="rgba(61, 104, 225, 1)"
+ >
+ </el-switch>
+ </div>
+ <div v-if="item.children">
+ <div class="line" style="margin-left:55px;" v-for="x in item.children" :key="x.id">
+ <div class="name">{{ x.name }}</div>
+ <el-switch
+ v-model="x.selected"
+ active-color="rgba(61, 104, 225, 1)"
+ >
+ </el-switch>
+ </div>
+ </div>
</div>
- <div class="line">
- <div class="name">缁熻鏌ヨ</div>
- <el-switch v-model="isCount" active-color="rgba(61, 104, 225, 1)">
- </el-switch>
- </div>
- <div class="line">
- <div class="name">绠楀姏绠＄悊</div>
- <el-switch
- v-model="isCalculate"
- active-color="rgba(61, 104, 225, 1)"
- >
- </el-switch>
- </div>
-
<div class="btns">
<div class="cancel" @click="cancelSet">鍙栨秷</div>
<div class="ok">淇濆瓨</div>
@@ -216,7 +214,7 @@
<el-form-item prop="nickName">
<div class="p-title">鏄电О锛�</div>
<el-input
- placeholder="蹇呭～"
+ placeholder="閫夊～"
v-model="addForm.nickName"
></el-input>
</el-form-item>
@@ -445,7 +443,16 @@
<script>
import { getClockInfo, saveClockInfo, testNTPserver } from "@/api/system";
-import { uploadHeadPic, addUser, getUsers, updateUser,updatePassword } from "@/api/user";
+import {
+ uploadHeadPic,
+ addUser,
+ getUsers,
+ updateUser,
+ updatePassword,
+ deleteUser,
+ getUserMenus,
+ getSysMenus,
+} from "@/api/user";
import switchBar from "../components/switchBar";
import ipInput from "@/components/subComponents/IPInput";
import clusterManagement from "../views/clusterManagement";
@@ -482,6 +489,35 @@
callback();
}
};
+ var validatePass3 = (rule, value, callback) => {
+ if (value === "") {
+ callback(new Error("璇疯緭鍏ュ瘑鐮�"));
+ } else {
+ if (this.passwordForm.password !== "") {
+ this.$refs.passwordForm.validateField("pw");
+ }
+ callback();
+ }
+ };
+ var validatePass5 = (rule, value, callback) => {
+ if (value === "") {
+ callback(new Error("璇疯緭鍏ュ瘑鐮�"));
+ } else {
+ if (this.passwordForm.newPassword !== "") {
+ this.$refs.passwordForm.validateField("newPw");
+ }
+ callback();
+ }
+ };
+ var validatePass4 = (rule, value, callback) => {
+ if (value === "") {
+ callback(new Error("璇峰啀娆¤緭鍏ュ瘑鐮�"));
+ } else if (value !== this.passwordForm.confirmPassword) {
+ callback(new Error("涓ゆ杈撳叆瀵嗙爜涓嶄竴鑷�!"));
+ } else {
+ callback();
+ }
+ };
return {
showAccount: true,
syncYrs: "",
@@ -506,7 +542,8 @@
showYrsInput: false,
showMonthInput: false,
showDayInput: false,
-
+ cameraInfo: false,
+ dependentScene: false,
timestamp: 0,
inAccountDetail: false,
isChangePw: false,
@@ -547,6 +584,7 @@
confirmPassword: "",
},
activeAccountIndex: 0,
+ sysMenus: [],
addForm: {
userName: "",
nickName: "",
@@ -555,15 +593,23 @@
confirmPassword: "",
},
rules: {
+ userName: [
+ { required: true, message: "璇疯緭鍏ョ敤鎴峰悕", trigger: "blur" },
+ {
+ min: 3,
+ max: 10,
+ message: "闀垮害鍦� 3 鍒� 10 涓瓧绗�",
+ trigger: "blur",
+ },
+ ],
password: [{ validator: validatePass, trigger: "blur" }],
confirmPassword: [{ validator: validatePass2, trigger: "blur" }],
- // age: [{ validator: checkAge, trigger: "blur" }],
},
- pwRules:{
+ pwRules: {
pw: [{ validator: validatePass3, trigger: "blur" }],
- newPw: [{ validator: validatePass3, trigger: "blur" }],
- confirmNewPw: [{ validator : validatePass4, trigger: "blur" }],
- }
+ newPw: [{ validator: validatePass5, trigger: "blur" }],
+ confirmNewPw: [{ validator: validatePass4, trigger: "blur" }],
+ },
};
},
beforeDestroy() {
@@ -571,14 +617,15 @@
clearInterval(this.browserTimer);
},
mounted() {
- const s = document.getElementsByClassName("left-card")[0];
- s.style.backgroundColor = "rgba(61, 104, 225, 1)";
- s.style.color = "#fff";
+ // const s = document.getElementsByClassName("left-card")[0];
+ // s.style.backgroundColor = "rgba(61, 104, 225, 1)";
+ // s.style.color = "#fff";
this.$nextTick(() => {
this.initClockConf();
});
this.fetchUserList();
+ this.fetchSysMenus();
},
methods: {
fetchUserList() {
@@ -844,7 +891,6 @@
syncBrowser(val) {
this.isSyncBrowser = val;
if (val == false) {
- console.log(12121);
clearInterval(this.browserTimer);
} else {
this.browserTimer = setInterval(() => {
@@ -856,7 +902,6 @@
}, 1000);
}
},
- openChangePw() {},
showAddAccount() {
this.inAccountDetail = false;
this.isAddAccount = true;
@@ -868,6 +913,14 @@
cancelChangePassword() {
this.isChangePw = false;
this.inAccountDetail = false;
+ },
+ fetchSysMenus() {
+ getSysMenus().then((rsp) => {
+ if (rsp && rsp.success) {
+ this.sysMenus = rsp.data;
+ console.log(this.sysMenus);
+ }
+ });
},
saveAddAccount(formName) {
this.$refs[formName].validate((valid) => {
@@ -939,9 +992,19 @@
cancelButtonText: "鍙栨秷",
})
.then(() => {
- this.$message({
- type: "success",
- message: "鍒犻櫎鎴愬姛!",
+ debugger;
+ deleteUser({
+ ids: [this.activeAccountItem.id],
+ }).then((res) => {
+ if (res.success) {
+ this.fetchUserList();
+ this.$message({
+ type: "success",
+ message: "鍒犻櫎鎴愬姛!",
+ });
+ } else {
+ this.$message.warning("鍒犻櫎澶辫触");
+ }
});
})
.catch(() => {});
@@ -949,9 +1012,25 @@
openPermission() {
this.inAccountDetail = true;
this.isSetPermission = true;
+ getUserMenus({
+ userId: this.activeAccountItem.id,
+ }).then((res) => {
+ if (res && res.success) {
+ res.data.menus.forEach(e => {
+
+ });
+ }
+ });
+
+ // getUserMenus({ userId: row.id }).then(rsp => {
+ // if (rsp && rsp.success) {
+ // this.userMenus = rsp.data.menus.map(menu => {
+ // return menu.id
+ // })
+ // }
+ // })
},
},
-
watch: {
isManual(v) {
this.isNtp = !v;
@@ -1134,12 +1213,12 @@
background-color: bisque;
border-radius: 50px;
img {
- border: none;
+ border: none;
- width: 100px;
- height: 100px;
- border-radius: 50px;
- }
+ width: 100px;
+ height: 100px;
+ border-radius: 50px;
+ }
}
.user-desc {
height: 100px;
--
Gitblit v1.8.0