From 5971cc5cb75b8cf1dd06b852a35653e4533c6e10 Mon Sep 17 00:00:00 2001
From: heyujie <516346543@qq.com>
Date: 星期二, 22 六月 2021 16:06:51 +0800
Subject: [PATCH] 视频大小展示
---
vue.config.js | 2
src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue | 7 +++
src/pages/systemSettings/index/App.vue | 79 ++++++++++++++++++++++++++++++---------
3 files changed, 68 insertions(+), 20 deletions(-)
diff --git a/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue b/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue
index 7fbb1ab..7b6daaf 100644
--- a/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue
+++ b/src/pages/shuohuangMonitorAnalyze/components/searchForVideoAnalyze.vue
@@ -236,7 +236,12 @@
</template>
</el-table-column>
- <el-table-column label="澶у皬" prop="VideoSize" sortable></el-table-column>
+ <el-table-column label="澶у皬" prop="VideoSize" sortable>
+ <template slot-scope="scope" style="cursor: pointer">
+ <div>{{ Math.round((+scope.row.VideoSize) / (1024*1024)) + " MB" }}</div>
+ </template>
+
+ </el-table-column>
<el-table-column label="瑙嗛鏃堕棿" prop="VideoDate" sortable></el-table-column>
<!-- <el-table-column label="鍒涘缓鏃ユ湡" prop="VideoCreateDate" sortable></el-table-column> -->
diff --git a/src/pages/systemSettings/index/App.vue b/src/pages/systemSettings/index/App.vue
index c4a9817..c78557c 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="蹇呭～"
@@ -216,7 +216,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 +445,13 @@
<script>
import { getClockInfo, saveClockInfo, testNTPserver } from "@/api/system";
-import { uploadHeadPic, addUser, getUsers, updateUser,updatePassword } from "@/api/user";
+import {
+ uploadHeadPic,
+ addUser,
+ getUsers,
+ updateUser,
+ updatePassword,
+} from "@/api/user";
import switchBar from "../components/switchBar";
import ipInput from "@/components/subComponents/IPInput";
import clusterManagement from "../views/clusterManagement";
@@ -477,6 +483,35 @@
if (value === "") {
callback(new Error("璇峰啀娆¤緭鍏ュ瘑鐮�"));
} else if (value !== this.addForm.password) {
+ callback(new Error("涓ゆ杈撳叆瀵嗙爜涓嶄竴鑷�!"));
+ } else {
+ 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();
@@ -555,15 +590,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,9 +614,9 @@
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();
});
@@ -1134,12 +1177,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;
diff --git a/vue.config.js b/vue.config.js
index 54f38e8..f623575 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -41,7 +41,7 @@
})
// const serverUrl = "http://58.118.225.79:41243" // 缇婁簲
-const serverUrl = "http://192.168.20.189:7003"
+const serverUrl = "http://192.168.20.117:7009"
module.exports = {
pages,
--
Gitblit v1.8.0