From b2d0ac2db80c08783fd848933230618cc30d76a2 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期三, 30 八月 2023 11:38:24 +0800
Subject: [PATCH] 添加锦汇企业编码. 修复点位列表平铺的bug
---
src/views/dataPush/components/point.vue | 143 +++++++++++++++++++++--------------------------
1 files changed, 65 insertions(+), 78 deletions(-)
diff --git a/src/views/dataPush/components/point.vue b/src/views/dataPush/components/point.vue
index 9b9be52..b63d6af 100644
--- a/src/views/dataPush/components/point.vue
+++ b/src/views/dataPush/components/point.vue
@@ -19,27 +19,35 @@
</div>
</div>
<div class="switchBox">
- 寮�鍚笂鎶�
- <el-table-column prop="Enable" label="寮�鍏�" width="70px" show-overflow-tooltip>
- <el-switch v-model="value1" active-color="#0065ff" @change="changeAll($event)"> </el-switch>
- </el-table-column>
+ <span style="margin-right:10px">寮�鍚笂鎶�</span>
+ <el-switch v-model="value1" active-color="#0065ff" @change="changeAll($event)"> </el-switch>
</div>
<div class="table-area">
<el-table
- id="multipleTable"
- ref="multipleTable"
+ v-loading="tbLoading"
+ id="pointTable"
+ ref="pointTable"
:data="dataList"
:fit="true"
:default-sort="{ prop: 'companyCode', order: 'ascending' }"
>
<el-table-column prop="cameraName" label="鐐逛綅鍚嶇О" width="130px" show-overflow-tooltip></el-table-column>
- <el-table-column prop="channelCode" label="鎶ヨ閫氶亾缂栫爜" show-overflow-tooltip></el-table-column>
- <el-table-column prop="companyCode" label="浼佷笟缂栫爜" width="130px" show-overflow-tooltip></el-table-column>
- <el-table-column prop="scenes" label="鎺ㄩ�佸満鏅�" show-overflow-tooltip></el-table-column>
+ <el-table-column
+ prop="channelCode"
+ label="鎶ヨ閫氶亾缂栫爜"
+ min-width="250px"
+ show-overflow-tooltip
+ ></el-table-column>
+ <el-table-column prop="companyCode" label="浼佷笟缂栫爜" width="150px" show-overflow-tooltip>
+ <template slot-scope="scope">
+ {{ scope.row.companyCode | fillCompanyCode(companyCodeOptions) }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="scenes" label="鎺ㄩ�佸満鏅�" min-width="100px" show-overflow-tooltip></el-table-column>
<el-table-column prop="updatedAt" label="鎺ㄩ�佹椂闂�" width="100px" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.startTime }}-{{ scope.row.endTime }}</template>
</el-table-column>
- <el-table-column prop="Enable" label="寮�鍏�" width="70px" show-overflow-tooltip>
+ <el-table-column prop="Enable" label="寮�鍏�" width="60px" show-overflow-tooltip>
<template slot-scope="scope">
<el-switch v-model="scope.row.enable" @change="changeSwitch($event, scope.row)" active-color="#0065ff">
</el-switch>
@@ -86,7 +94,10 @@
<el-input v-model="ruleForm.ChannelCode" placeholder="璇疯緭鍏ユ姤璀﹂�氶亾缂栫爜" style="width: 350px"></el-input>
</el-form-item>
<el-form-item label="浼佷笟缂栫爜" prop="CompanyCode">
- <el-input v-model="ruleForm.CompanyCode" placeholder="璇疯緭鍏ヤ紒涓氱紪鐮�" style="width: 350px"></el-input>
+ <el-select style="width: 350px" v-model="ruleForm.CompanyCode" placeholder="璇烽�夋嫨">
+ <el-option v-for="item in companyCodeOptions" :key="item.value" :label="item.label" :value="item.value">
+ </el-option>
+ </el-select>
</el-form-item>
<el-form-item label="鎺ㄩ�佸満鏅�" prop="Sceneslist">
<el-select multiple style="width: 350px" v-model="ruleForm.Sceneslist" filterable placeholder="璇烽�夋嫨">
@@ -145,60 +156,22 @@
import "./point/point.scss"
export default {
+ filters: {
+ fillCompanyCode(key, opts) {
+ let obj = opts.find((t) => t.value == key)
+ return obj ? obj.label : key
+ }
+ },
data() {
return {
+ tbLoading: false,
activeColor: "",
inactiveColor: "#f0f3f5",
value1: false,
query: {},
inputText: "", //杈撳叆妗嗗唴瀹�
cameraOptions: [],
- scene_nameOptions: [
- {
- value: "鏄庣伀",
- label: "鏄庣伀"
- },
- {
- value: "鐑熼浘",
- label: "鐑熼浘"
- },
- {
- value: "缈昏秺鍥存爮",
- label: "缈昏秺鍥存爮"
- },
- {
- value: "鍖哄煙鍏ヤ镜",
- label: "鍖哄煙鍏ヤ镜"
- },
- {
- value: "浜哄憳绂诲矖",
- label: "浜哄憳绂诲矖"
- },
- {
- value: "浜哄憳鑱氶泦",
- label: "浜哄憳鑱氶泦"
- },
- {
- value: "鎵撶數璇�",
- label: "鎵撶數璇�"
- },
- {
- value: "鎶界儫",
- label: "鎶界儫"
- },
- {
- value: "鏈僵鎴村畨鍏ㄥ附",
- label: "鏈僵鎴村畨鍏ㄥ附"
- },
- {
- value: "鏈┛宸ヨ",
- label: "鏈┛宸ヨ"
- },
- {
- value: "鐫″矖",
- label: "鐫″矖"
- }
- ],
+ scene_nameOptions: [],
isShowAdd: false, //鏄惁灞曠ず鏂板寮圭獥
ruleForm: {
CameraName: "", // 鎽勫儚鏈哄悕绉�
@@ -227,31 +200,40 @@
EndTime: [{ type: "string", required: true, message: "璇烽�夋嫨缁撴潫鏃堕棿", trigger: "change" }]
},
page: 1,
- size: 10, //鍒嗛〉鐩稿叧
- total: 0 //鎬绘暟,
+ size: 20, //鍒嗛〉鐩稿叧
+ total: 0, //鎬绘暟
+ companyCodeOptions: [
+ {
+ value: "370300010",
+ label: "370300010/姹囦赴"
+ },
+ {
+ value: "370300450",
+ label: "370300450/娴风泭"
+ },
+ {
+ value: "370300440",
+ label: "370300440/閲戞眹涓�"
+ },
+ {
+ value: "370300480",
+ label: "370300480/涓眹"
+ },
+ {
+ value: "370380545",
+ label: "370380545/閿︽眹"
+ }
+ ]
}
},
- // computed: {
- // // activeColor() {
- // // return this.value1 ? "#13ce66" : "#f0f3f5"
- // // }
- // },
- // watch: {
- // value1: {
- // handler(newVal, oldVal) {
- // console.log(newVal, oldVal, "newVal, oldVal")
- // newVal ? (this.activeColor = "#13ce66") : (this.activeColor = "#f0f3f5")
- // },
- // deep: true
- // }
- // },
async created() {
let query = { pageIndex: this.page, pageSize: this.size, keyword: this.inputText }
this.query = query
let res = await camerasList(query)
this.dataList = res.data
this.total = res.total
- this.aaaaa()
+ this.scene_nameOptions = this.Constants.sceneNameOptions
+ this.pageInit()
},
methods: {
@@ -264,7 +246,7 @@
type: "success",
message: "鎴愬姛!"
})
- this.checkCamerasList()
+ // this.checkCamerasList()
}
},
changeSwitch(val, row) {
@@ -308,7 +290,7 @@
this.ruleForm.updatedAt = row.updatedAt
this.ruleForm.id = row.id
},
- async aaaaa() {
+ async pageInit() {
// 杩涘叆椤甸潰鍓嶇殑鍒濆鍖�
let res = await camerasConfig()
// 鎬诲紑鍏�
@@ -396,12 +378,12 @@
},
handleSizeChange(size) {
this.size = size
- this.checkCamerasList()
+ this.checkCamerasList(1)
},
//鍒嗛〉鍔熻兘
refrash(page) {
this.page = page
- this.checkCamerasList()
+ this.checkCamerasList(1)
},
delCameras(row) {
this.$confirm("纭瑕佸垹闄よ鐐逛綅鍚�, 鏄惁缁х画?", "鎻愮ず", {
@@ -420,6 +402,7 @@
})
},
async checkCamerasList(val) {
+ this.tbLoading = true
if (val === 1) {
let query = { pageIndex: this.page, pageSize: this.size, keyword: this.inputText }
this.query = query
@@ -431,6 +414,10 @@
this.dataList = res.data
this.total = res.total
}
+
+ setTimeout(() => {
+ this.tbLoading = false
+ }, 300)
},
resetUser() {
// this.ruleForm. = {
--
Gitblit v1.8.0