From b582d3dfe4e46a3b978d2663fe54df240a80a710 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期五, 02 九月 2022 03:33:45 +0800
Subject: [PATCH] 修复区域删除的问题. 修正底图显示的区域框
---
src/views/personalCenter/components/SubAccount.vue | 40 ++++++++++----------
src/views/manageCenter/index.vue | 6 +-
src/components/canvas/index.vue | 10 ++--
src/views/hashrate/CameraManage/CameraRules/index.vue | 8 ++++
4 files changed, 36 insertions(+), 28 deletions(-)
diff --git a/src/components/canvas/index.vue b/src/components/canvas/index.vue
index cc706af..977c8ce 100644
--- a/src/components/canvas/index.vue
+++ b/src/components/canvas/index.vue
@@ -93,7 +93,7 @@
},
showProportion: {
type: Number,
- default: 1.666
+ default: 1.834
}
},
computed: {
@@ -241,10 +241,10 @@
})
return
}
- this.$notify({
- type: "success",
- message: "宸蹭繚瀛樼粯鍒讹紒"
- })
+ // this.$notify({
+ // type: "success",
+ // message: "宸蹭繚瀛樼粯鍒讹紒"
+ // })
// 姣忔淇濆瓨鍏抽棴妯℃�佺獥鏃堕兘瑕佹妸妯℃�佺獥鐨勬暟鎹啓鍒扮埗缁勪欢閲屾潵
this.canvasData = this.$refs.bigCanvas.canvasData
// 椤轰究鐢╁埌鏇村灞傚幓
diff --git a/src/views/hashrate/CameraManage/CameraRules/index.vue b/src/views/hashrate/CameraManage/CameraRules/index.vue
index 6e3c503..eb97710 100644
--- a/src/views/hashrate/CameraManage/CameraRules/index.vue
+++ b/src/views/hashrate/CameraManage/CameraRules/index.vue
@@ -64,6 +64,7 @@
:loading="Camera.loading"
:canvasWidth="canvasWidth"
:canvasHeight="canvasHeight"
+ :showProportion="1042 / canvasWidth"
@fromCanvas="getCanvasData"
@changeLoading="changeLoading"
@refresh="refresh"
@@ -487,6 +488,13 @@
let polyon = { ...data }
polyon.camera_id = this.Camera.cameraId
savePolygon(polyon).then((rsp) => {
+ if (rsp && rsp.success) {
+ if (rsp.data.indexOf("澶辫触") >= 0) {
+ this.$message({ type: "error", duration: 5000, message: rsp.data + " 鍖哄煙宸插叧鑱斿満鏅�, 鏃犳硶鍒犻櫎" })
+ } else {
+ this.$message.success(rsp.data)
+ }
+ }
this.Camera.getPolygon()
//this.Camera.getCameraTask();
})
diff --git a/src/views/manageCenter/index.vue b/src/views/manageCenter/index.vue
index 4e0abc8..af36641 100644
--- a/src/views/manageCenter/index.vue
+++ b/src/views/manageCenter/index.vue
@@ -198,7 +198,7 @@
<el-table-column prop="count" align="center" label="鏁存敼鏁伴噺" show-overflow-tooltip></el-table-column>
</el-table>
- <el-pagination
+ <!-- <el-pagination
@current-change="refrash"
@size-change="handleSizeChange"
:current-page="page"
@@ -207,7 +207,7 @@
:page-sizes="[5, 10, 15, 20, 25]"
:total="solvedTotal"
background
- ></el-pagination>
+ ></el-pagination> -->
</div>
</div>
</div>
@@ -611,7 +611,7 @@
if (decodeString != "") {
let decodeResult = JSON.parse(decodeString)
if (decodeResult) {
- console.log("warningStatics", decodeResult)
+ // console.log("warningStatics", decodeResult)
decodeResult.forEach((element) => {
this.solvedTotal = this.solvedTotal + element.doc_count
this.tableDataList.push({
diff --git a/src/views/personalCenter/components/SubAccount.vue b/src/views/personalCenter/components/SubAccount.vue
index 5efb91e..89b3cd1 100644
--- a/src/views/personalCenter/components/SubAccount.vue
+++ b/src/views/personalCenter/components/SubAccount.vue
@@ -45,10 +45,10 @@
<el-table-column label="搴忓彿" width="55" class-name="index">
<template slot-scope="scope">{{ scope.$index + 1 + (page - 1) * size }}</template>
</el-table-column>
- <el-table-column prop="username" label="鐢ㄦ埛鍚�" show-overflow-tooltip ></el-table-column>
- <el-table-column prop="trueName" label="濮撳悕" show-overflow-tooltip ></el-table-column>
- <el-table-column prop="phoneNum" label="鎵嬫満鍙�" show-overflow-tooltip ></el-table-column>
- <el-table-column prop="userType" label="鐢ㄦ埛绫诲瀷" >
+ <el-table-column prop="username" label="鐢ㄦ埛鍚�" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="trueName" label="濮撳悕" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="phoneNum" label="鎵嬫満鍙�" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="userType" label="鐢ㄦ埛绫诲瀷">
<template slot-scope="scope">
<span>{{ scope.row.userType == 1 ? "鏈湴" : "OA璐︽埛" }}</span>
</template>
@@ -324,8 +324,8 @@
username: [{ required: true, message: "璇疯緭鍏ョ敤鎴峰悕", trigger: "blur" }],
// password: [{ required: true, message: "璇疯緭鍏ュ瘑鐮�", trigger: "blur" }],
userType: [{ required: true, message: "璇烽�夋嫨鐢ㄦ埛绫诲瀷", trigger: "blur" }],
- trueName: [{ required: true, message: "璇疯緭鍏ュ鍚�", trigger: "blur" }],
- menuIds: [{ validator: validateTree, trigger: "blur" }]
+ trueName: [{ required: true, message: "璇疯緭鍏ュ鍚�", trigger: "blur" }]
+ // menuIds: [{ validator: validateTree, trigger: "blur" }]
},
sysMenus: [],
DataTree: [],
@@ -416,21 +416,21 @@
}
},
delUser(row) {
- this.$confirm('纭瑕佸垹闄よ鐢ㄦ埛鍚�, 鏄惁缁х画?', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(async () => {
- let rsp = await deleteUser({id:row.id})
- if (rsp && rsp.success) {
- this.$message({
- type: 'success',
- message: '鍒犻櫎鎴愬姛!'
- });
- }
+ this.$confirm("纭瑕佸垹闄よ鐢ㄦ埛鍚�, 鏄惁缁х画?", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ }).then(async () => {
+ let rsp = await deleteUser({ id: row.id })
+ if (rsp && rsp.success) {
+ this.$message({
+ type: "success",
+ message: "鍒犻櫎鎴愬姛!"
+ })
+ }
- this.findUserList()
- })
+ this.findUserList()
+ })
},
resetUser() {
this.ruleForm = {
--
Gitblit v1.8.0