From 39d577ac7950e87b593d96df0b77d5a386756566 Mon Sep 17 00:00:00 2001 From: mark <mark18340872469@163.com> Date: 星期三, 28 九月 2022 10:43:05 +0800 Subject: [PATCH] 摄像机 find 与 数据推送 的 查询(查询后加的 --- src/views/dataPush/components/device.vue | 47 ++++++++++++++++++++--- src/views/dataPush/components/point.vue | 43 ++++++++++++++++----- src/views/hashrate/CameraManage/CameraRules/components/AddRuleBox.vue | 4 -- src/views/hashrate/CameraManage/CameraRules/components/TimeSlider.vue | 5 -- src/Pool/VideoManageData.ts | 4 +- 5 files changed, 75 insertions(+), 28 deletions(-) diff --git a/src/Pool/VideoManageData.ts b/src/Pool/VideoManageData.ts index ad533e8..1877555 100644 --- a/src/Pool/VideoManageData.ts +++ b/src/Pool/VideoManageData.ts @@ -1,6 +1,7 @@ import { getAllTimeRule, saveTimeRule } from "@/api/timeRule" import { findDictionaryByType } from "@/api/dictionary" import { findBaseByRuleEditor } from "@/api/es" +import store from "@/store" const AllDayRule = [ { day: 1, time_range: [{ start: "00:00", end: "24:00" }] }, @@ -27,8 +28,7 @@ } public async getTimeRule() { - let rsp: any = await getAllTimeRule("") - console.log(rsp) + let rsp: any = await getAllTimeRule(store.state.devId) if (rsp && rsp.success) { this.TimeRules = rsp.data.timeRules diff --git a/src/views/dataPush/components/device.vue b/src/views/dataPush/components/device.vue index 4844177..41f078d 100644 --- a/src/views/dataPush/components/device.vue +++ b/src/views/dataPush/components/device.vue @@ -1,5 +1,18 @@ <template> <div class="sub-account" v-if="!isShowAdd"> + <div class="search"> + <div class="left"> + <div class="id"> + 璁惧鍚嶇О + <el-input v-model="inputText" placeholder="璇疯緭鍏�" clearable></el-input> + </div> + </div> + + <div class="right"> + <div class="button searchBtn" @click="fetchDevicesList(1)">鎼滅储</div> + <!-- <div class="button resetBtn" @click="reset">閲嶇疆</div> --> + </div> + </div> <div class="btns"> <div class="button add" @click="addDevice"> <span class="iconfont"></span> @@ -16,9 +29,15 @@ :default-sort="{ prop: 'createTime', order: 'descending' }" > <el-table-column prop="devName" label="璁惧鍚嶇О" show-overflow-tooltip></el-table-column> - <el-table-column prop="devId" label="璁惧ID" show-overflow-tooltip></el-table-column> + <!-- <el-table-column prop="devId" label="璁惧ID" show-overflow-tooltip></el-table-column> --> <el-table-column prop="devIp" label="璁惧IP" show-overflow-tooltip></el-table-column> <el-table-column prop="devCode" label="璁惧缂栫爜" show-overflow-tooltip></el-table-column> + <el-table-column prop="state" label="鐘舵��" show-overflow-tooltip> + <template slot-scope="scope"> + <div v-if="scope.row.state == 0" class="status green">绂荤嚎</div> + <div v-else class="status">鍦ㄧ嚎</div> + </template> + </el-table-column> <el-table-column prop="companyCode" label="浼佷笟缂栫爜" show-overflow-tooltip></el-table-column> <el-table-column label="鎿嶄綔" align="center" width="100px"> @@ -86,6 +105,8 @@ export default { data() { return { + query: {}, + inputText: "", //杈撳叆妗嗗唴瀹� isShowAdd: false, //鏄惁灞曠ず鏂板寮圭獥 dataList: [], tip: 1, @@ -114,15 +135,27 @@ total: 0 //鎬绘暟, } }, - created() { - this.fetchDevicesList() + async created() { + let query = { pageIndex: this.page, pageSize: this.size, keyword: this.inputText } + this.query = query + let res = await getDevicesList(query) + this.dataList = res.data + this.total = res.total }, mounted() {}, methods: { - async fetchDevicesList() { - let res = await getDevicesList({ pageIndex: this.page, pageSize: this.size }) - this.dataList = res.data - this.total = res.total + async fetchDevicesList(val) { + if (val === 1) { + let query = { pageIndex: this.page, pageSize: this.size, keyword: this.inputText } + this.query = query + let res = await getDevicesList(query) + this.dataList = res.data + this.total = res.total + } else { + let res = await getDevicesList(this.query) + this.dataList = res.data + this.total = res.total + } }, delUser(row) { console.log(row, "row") diff --git a/src/views/dataPush/components/point.vue b/src/views/dataPush/components/point.vue index f1d5c5b..b26d945 100644 --- a/src/views/dataPush/components/point.vue +++ b/src/views/dataPush/components/point.vue @@ -1,5 +1,18 @@ <template> <div class="sub-account" v-if="!isShowAdd"> + <div class="search"> + <div class="left"> + <div class="id"> + 鐐逛綅鍚嶇О + <el-input v-model="inputText" placeholder="璇疯緭鍏�" clearable></el-input> + </div> + </div> + + <div class="right"> + <div class="button searchBtn" @click="checkCamerasList(1)">鎼滅储</div> + <!-- <div class="button resetBtn" @click="reset">閲嶇疆</div> --> + </div> + </div> <div class="btns"> <div class="button add" @click="addPoint"> <span class="iconfont"></span> @@ -119,6 +132,8 @@ export default { data() { return { + query: {}, + inputText: "", //杈撳叆妗嗗唴瀹� cameraOptions: [], scene_nameOptions: [ { @@ -136,10 +151,6 @@ { value: "鍖哄煙鍏ヤ镜", label: "鍖哄煙鍏ヤ镜" - }, - { - value: "浜哄憳鎾ょ", - label: "浜哄憳鎾ょ" }, { value: "浜哄憳绂诲矖", @@ -201,8 +212,12 @@ total: 0 //鎬绘暟, } }, - created() { - this.checkCamerasList() + 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() }, @@ -291,10 +306,18 @@ this.checkCamerasList() }) }, - async checkCamerasList() { - let res = await camerasList({ pageIndex: this.page, pageSize: this.size }) - this.dataList = res.data - this.total = res.total + async checkCamerasList(val) { + if (val === 1) { + 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 + } else { + let res = await camerasList(this.query) + this.dataList = res.data + this.total = res.total + } }, resetUser() { this.ruleForm = { diff --git a/src/views/hashrate/CameraManage/CameraRules/components/AddRuleBox.vue b/src/views/hashrate/CameraManage/CameraRules/components/AddRuleBox.vue index ba2bc1e..9039294 100644 --- a/src/views/hashrate/CameraManage/CameraRules/components/AddRuleBox.vue +++ b/src/views/hashrate/CameraManage/CameraRules/components/AddRuleBox.vue @@ -103,10 +103,6 @@ label: "鍖哄煙鍏ヤ镜" }, { - value: "浜哄憳鎾ょ", - label: "浜哄憳鎾ょ" - }, - { value: "浜哄憳绂诲矖", label: "浜哄憳绂诲矖" }, diff --git a/src/views/hashrate/CameraManage/CameraRules/components/TimeSlider.vue b/src/views/hashrate/CameraManage/CameraRules/components/TimeSlider.vue index abc0e5f..1e20a36 100644 --- a/src/views/hashrate/CameraManage/CameraRules/components/TimeSlider.vue +++ b/src/views/hashrate/CameraManage/CameraRules/components/TimeSlider.vue @@ -174,8 +174,6 @@ repeat = true } }) - console.log("aaa") - console.log(repeat) if (repeat) { this.$notify({ message: "鍚嶇О涓嶈兘閲嶅", @@ -272,12 +270,10 @@ windowSizeChange() { let timeSlideWidth = document.querySelector(".sub-time-box").clientWidth this.cavasLength = timeSlideWidth - console.log("鏃堕棿缁勪欢瀹藉害锛�", timeSlideWidth) }, updateTimeRule(rule) { saveTimeRule(rule) .then(async (rsp) => { - console.log(rsp, "rrr1333331rrrrrrrrrrrrr") if (rsp && rsp.success) { await this.VideoManageData.getTimeRule() this.isAdding = false @@ -319,7 +315,6 @@ save() { saveTimeRule(this.activeTabObj) .then(async (rsp) => { - console.log(rsp, "rrr112222rrrrrrrrrrrrr") if (rsp && rsp.success) { this.$notify({ type: "success", -- Gitblit v1.8.0