From 818974046db55a4a1912e928bee2b729d7c67a41 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 20 三月 2024 17:10:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/work-order/distribute/index.vue | 78 +++++++++++++++++--
src/views/system/face/index.vue | 67 ++++++++++------
src/views/system/car/index.vue | 73 +++++++++++-------
3 files changed, 155 insertions(+), 63 deletions(-)
diff --git a/src/views/system/car/index.vue b/src/views/system/car/index.vue
index 3fc493a..cb7b06c 100644
--- a/src/views/system/car/index.vue
+++ b/src/views/system/car/index.vue
@@ -34,14 +34,27 @@
</el-row>
</el-card>
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
- <el-form-item label="璁惧鍚嶇О" prop="name">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+ <el-form-item label="鍏抽敭瀛�" prop="name">
<el-input
v-model="queryParams.name"
- placeholder="璇疯緭鍏ヨ澶囧悕绉�"
+ placeholder="璇疯緭鍏ュ叧閿瓧"
clearable
@keyup.enter.native="handleQuery"
/>
+ </el-form-item>
+ <el-form-item label="鍦板尯" prop="onState">
+ <el-select
+ v-model="queryParams.address"
+ placeholder="鍦板尯"
+ clearable
+ >
+ <el-option label="鑷础甯�" value="鑷础甯�"/>
+ <el-option label="娌挎哗鍖�" value="娌挎哗鍖�"/>
+ <el-option label="澶у畨鍖�" value="澶у畨鍖�"/>
+ <el-option label="璐′簳鍖�" value="璐′簳鍖�"/>
+ <el-option label="鑷祦浜曞尯" value="鑷祦浜曞尯"/>
+ </el-select>
</el-form-item>
<el-form-item label="璁惧鐘舵��" prop="onState">
<el-select
@@ -94,34 +107,34 @@
</el-row>
<el-table v-loading="loading" :data="monitorList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column label="璁惧缂栫爜" align="center" prop="serialNumber" width="180px"/>
- <el-table-column label="璁惧鍚嶇О" align="center" prop="name" />
- <el-table-column label="涓婃姤閮ㄩ棬" align="center" prop="deptName" />
+ <el-table-column type="selection" align="center" />
+ <el-table-column label="璁惧鍚嶇О" align="center" prop="name" width="280" fixed/>
+ <el-table-column label="璁惧缂栫爜" align="center" prop="serialNumber" width="180"/>
+ <el-table-column label="鍖哄煙" align="center" prop="address" width="180"/>
+ <el-table-column label="鏍囩" align="center" prop="publicSecurity" width="180"/>
<el-table-column label="璁惧鐘舵��" align="center" prop="onState">
<template slot-scope="scope">
<dict-tag :options="dict.type.camera_state" :value="scope.row.onState"/>
</template>
</el-table-column>
- <el-table-column label="鍦板潃" align="center" prop="address" />
- <el-table-column label="鏄惁鐢熸垚寮傚父宸ュ崟" align="center" prop="defaultOrder">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.platform_yes_no" :value="scope.row.defaultOrder"/>
- </template>
+ <el-table-column label="鏄惁鐢熸垚寮傚父宸ュ崟" align="center" prop="defaultOrder" width="180">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.platform_yes_no" :value="scope.row.defaultOrder"/>
+ </template>
</el-table-column>
- <el-table-column label="寮傚父鍘熷洜" align="center" prop="reason" />
- <el-table-column label="鏁版嵁鏃堕棿" align="center" prop="installedTime" width="180">
- </el-table-column>
- <el-table-column label="绠＄悊鍗曚綅" align="center" prop="managementUnit" />
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-view"
- @click="handleView(scope.row,scope.index)"
- >璇︾粏</el-button>
- </template>
+ <el-table-column label="鏁版嵁鏃堕棿" align="center" prop="installedTime" width="180"/>
+ <el-table-column label="绠＄悊鍗曚綅" align="center" prop="managementUnit" width="180"/>
+ <el-table-column label="杩囪溅鏁版嵁閲�" align="center" prop="model" width="180"/>
+ <el-table-column label="鎸佺画鏃犳暟鎹ぉ鏁�" align="center" prop="recovery" width="180"/>
+ <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" fixed="right">
+ <template slot-scope="scope">
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-view"
+ @click="handleView(scope.row,scope.index)"
+ >璇︾粏</el-button>
+ </template>
</el-table-column>
</el-table>
@@ -140,6 +153,7 @@
<el-col :span="12">
<el-form-item label="璁惧缂栫爜锛�">{{ form.serialNumber }}</el-form-item>
<el-form-item label="璁惧鍚嶇О锛�">{{ form.name }} </el-form-item>
+ <el-form-item label="鍦板尯锛�">{{ form.address }} </el-form-item>
<el-form-item label="涓婃姤閮ㄩ棬锛�">{{ form.deptName }} </el-form-item>
<el-form-item label="璁惧鐘舵�侊細">
<div v-if="form.onState === 1">鍙敤</div>
@@ -155,14 +169,17 @@
</el-form-item>
</el-col>
<el-col :span="24">
- <el-form-item label="寮傚父鍘熷洜锛�">{{ form.reason }}</el-form-item>
- </el-col>
- <el-col :span="24">
<el-form-item label="瀹夎鏃堕棿锛�">{{ form.installedTime }}</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="绠＄悊鍗曚綅锛�">{{ form.managementUnit }}</el-form-item>
</el-col>
+ <el-col :span="24">
+ <el-form-item label="杩囪溅鏁版嵁閲忥細">{{ form.model }}</el-form-item>
+ </el-col>
+ <el-col :span="24">
+ <el-form-item label="鎸佺画鏃犳暟鎹ぉ鏁帮細">{{ form.recovery }}</el-form-item>
+ </el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
diff --git a/src/views/system/face/index.vue b/src/views/system/face/index.vue
index 0834270..eee39a8 100644
--- a/src/views/system/face/index.vue
+++ b/src/views/system/face/index.vue
@@ -34,14 +34,27 @@
</el-row>
</el-card>
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
- <el-form-item label="璁惧鍚嶇О" prop="name">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+ <el-form-item label="鍏抽敭瀛�" prop="name">
<el-input
v-model="queryParams.name"
- placeholder="璇疯緭鍏ヨ澶囧悕绉�"
+ placeholder="璇疯緭鍏ュ叧閿瓧"
clearable
@keyup.enter.native="handleQuery"
/>
+ </el-form-item>
+ <el-form-item label="鍦板尯" prop="onState">
+ <el-select
+ v-model="queryParams.address"
+ placeholder="鍦板尯"
+ clearable
+ >
+ <el-option label="鑷础甯�" value="鑷础甯�"/>
+ <el-option label="娌挎哗鍖�" value="娌挎哗鍖�"/>
+ <el-option label="澶у畨鍖�" value="澶у畨鍖�"/>
+ <el-option label="璐′簳鍖�" value="璐′簳鍖�"/>
+ <el-option label="鑷祦浜曞尯" value="鑷祦浜曞尯"/>
+ </el-select>
</el-form-item>
<el-form-item label="璁惧鐘舵��" prop="onState">
<el-select
@@ -93,34 +106,34 @@
</el-row>
<el-table v-loading="loading" :data="monitorList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column label="璁惧缂栫爜" align="center" prop="serialNumber" width="180px"/>
- <el-table-column label="璁惧鍚嶇О" align="center" prop="name" />
- <el-table-column label="涓婃姤閮ㄩ棬" align="center" prop="deptName" />
+ <el-table-column type="selection" align="center" />
+ <el-table-column label="璁惧鍚嶇О" align="center" prop="name" width="280" fixed/>
+ <el-table-column label="璁惧缂栫爜" align="center" prop="serialNumber" width="180"/>
+ <el-table-column label="鍖哄煙" align="center" prop="address" width="180"/>
+ <el-table-column label="鏍囩" align="center" prop="publicSecurity" width="180"/>
<el-table-column label="璁惧鐘舵��" align="center" prop="onState">
<template slot-scope="scope">
<dict-tag :options="dict.type.camera_state" :value="scope.row.onState"/>
</template>
</el-table-column>
- <el-table-column label="鍦板潃" align="center" prop="address" />
- <el-table-column label="鏄惁鐢熸垚寮傚父宸ュ崟" align="center" prop="defaultOrder">
+ <el-table-column label="鏄惁鐢熸垚寮傚父宸ュ崟" align="center" prop="defaultOrder" width="180">
<template slot-scope="scope">
<dict-tag :options="dict.type.platform_yes_no" :value="scope.row.defaultOrder"/>
</template>
</el-table-column>
- <el-table-column label="寮傚父鍘熷洜" align="center" prop="reason" />
- <el-table-column label="鏁版嵁鏃堕棿" align="center" prop="installedTime" width="180">
- </el-table-column>
- <el-table-column label="绠＄悊鍗曚綅" align="center" prop="managementUnit" />
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-view"
- @click="handleView(scope.row,scope.index)"
- >璇︾粏</el-button>
- </template>
+ <el-table-column label="鏁版嵁鏃堕棿" align="center" prop="installedTime" width="180"/>
+ <el-table-column label="绠＄悊鍗曚綅" align="center" prop="managementUnit" width="180"/>
+ <el-table-column label="鎶撴媿閲�" align="center" prop="model" width="180"/>
+ <el-table-column label="鎸佺画鏃犳暟鎹ぉ鏁�" align="center" prop="recovery" width="180"/>
+ <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" fixed="right">
+ <template slot-scope="scope">
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-view"
+ @click="handleView(scope.row,scope.index)"
+ >璇︾粏</el-button>
+ </template>
</el-table-column>
</el-table>
@@ -181,6 +194,7 @@
<el-col :span="12">
<el-form-item label="璁惧缂栫爜锛�">{{ form.serialNumber }}</el-form-item>
<el-form-item label="璁惧鍚嶇О锛�">{{ form.name }} </el-form-item>
+ <el-form-item label="鍦板尯锛�">{{ form.address }} </el-form-item>
<el-form-item label="涓婃姤閮ㄩ棬锛�">{{ form.deptName }} </el-form-item>
<el-form-item label="璁惧鐘舵�侊細">
<div v-if="form.onState === 1">鍙敤</div>
@@ -195,14 +209,17 @@
</el-form-item>
</el-col>
<el-col :span="24">
- <el-form-item label="寮傚父鍘熷洜锛�">{{ form.reason }}</el-form-item>
- </el-col>
- <el-col :span="24">
<el-form-item label="瀹夎鏃堕棿锛�">{{ form.installedTime }}</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="绠＄悊鍗曚綅锛�">{{ form.managementUnit }}</el-form-item>
</el-col>
+ <el-col :span="24">
+ <el-form-item label="鎶撴媿閲忥細">{{ form.model }}</el-form-item>
+ </el-col>
+ <el-col :span="24">
+ <el-form-item label="鎸佺画鏃犳暟鎹ぉ鏁帮細">{{ form.recovery }}</el-form-item>
+ </el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
diff --git a/src/views/system/work-order/distribute/index.vue b/src/views/system/work-order/distribute/index.vue
index 8e9ab85..d868567 100644
--- a/src/views/system/work-order/distribute/index.vue
+++ b/src/views/system/work-order/distribute/index.vue
@@ -4,23 +4,51 @@
<el-col :span="24" style="position: relative">
<el-menu :default-active="activeIndex" class="el-menu" mode="horizontal" @select="handleSelect">
<el-menu-item index="0" @click="changeUnit(null, '鍏ㄩ儴')">
- 鍏ㄩ儴鍗曚綅
+ 鍏ㄩ儴鍗曚綅(430)
</el-menu-item>
<el-menu-item index="1">
- 鑷祦浜曡繍缁村崟浣�(70/70)
+ 鑷祦浜曡繍缁村崟浣�(70)
</el-menu-item>
<el-menu-item index="2">
- 澶у畨杩愮淮(50/50)
+ 澶у畨杩愮淮(50)
</el-menu-item>
- <el-menu-item index="3">瀵岄『杩愮淮鍗曚綅(20/70)</el-menu-item>
- <el-menu-item index="4">楂樻柊杩愮淮鍗曚綅(15/40)</el-menu-item>
- <el-menu-item index="5">鑽ｅ幙杩愮淮鍗曚綅(90/90)</el-menu-item>
- <el-menu-item index="6">璐′簳杩愮淮鍗曚綅(45/45)</el-menu-item>
- <el-menu-item index="7">娌挎哗杩愮淮鍗曚綅(70/70)</el-menu-item>
+ <el-menu-item index="3">瀵岄『杩愮淮鍗曚綅(70)</el-menu-item>
+ <el-menu-item index="4">楂樻柊杩愮淮鍗曚綅(15)</el-menu-item>
+ <el-menu-item index="5">鑽ｅ幙杩愮淮鍗曚綅(90)</el-menu-item>
+ <el-menu-item index="6">璐′簳杩愮淮鍗曚綅(45)</el-menu-item>
+ <el-menu-item index="7">娌挎哗杩愮淮鍗曚綅(70)</el-menu-item>
</el-menu>
- <el-tooltip class="item" effect="dark" content="鑷姩涓嬪彂璁剧疆" placement="left">
- <el-button class="setting" style="" type="success" icon="el-icon-s-tools" circle></el-button>
+ <el-tooltip class="item" effect="dark" content="宸ュ崟鐢熸垚璁剧疆" placement="left">
+
</el-tooltip>
+ <el-popover
+ placement="right"
+ width="400"
+ trigger="click">
+ <el-form :model="settingForm" :rules="settingRules" ref="settingForm" label-width="120px">
+ <el-form-item label="褰曞儚璐ㄩ噺" prop="videoQuality">
+ <el-select style="width: 100%" v-model="settingForm.videoQuality" placeholder="鏈�浣庡綍鍍忚川閲�">
+ <el-option label="鍏ㄥ綍鍍�" value="鍏ㄥ綍鍍�"/>
+ <el-option label="閮ㄥ垎褰曞儚" value="閮ㄥ垎褰曞儚"/>
+ <el-option label="鏃犲綍鍍�" value="鏃犲綍鍍�"/>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鐐逛綅绂荤嚎鏃堕暱" prop="outLine">
+ <el-input type="number" v-model="settingForm.outLine" placeholder="涓嶈兘瓒呰繃澶氫箙">
+ <template slot="append">鍒嗛挓</template>
+ </el-input>
+ </el-form-item>
+ <el-form-item label="瑙嗛鏍囨敞鍑嗙‘鐜�" prop="videoLabel">
+ <el-input type="number" v-model="settingForm.videoLabel" placeholder="鏈�浣庡噯纭巼">
+ <template slot="append">%</template>
+ </el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" @click="submitSetting">淇濆瓨</el-button>
+ </el-form-item>
+ </el-form>
+ <el-button title="鑷姩鐢熸垚宸ュ崟璁剧疆" slot="reference" class="setting" style="" type="success" icon="el-icon-s-tools" circle></el-button>
+ </el-popover>
</el-col>
</el-row>
@@ -100,6 +128,14 @@
name: 'index',
data() {
return {
+ settingForm: {
+ // 绂荤嚎
+ outLine: null,
+ // 瑙嗛鍙敤
+ videoQuality: "",
+ // 瑙嗛鏍囨敞
+ videoLabel: ""
+ },
// 褰撳墠杩愮淮鍗曚綅
unitId: null,
unitName: "",
@@ -114,6 +150,18 @@
start: null,
end: null,
unitId: null
+ },
+ // 鑷姩鐢熸垚宸ュ崟瑙勫垯
+ settingRules: {
+ outLine: [
+ { required: true, message: "璇峰～鍐欑偣浣嶇绾挎椂闀�", trigger: "blur" }
+ ],
+ videoQuality: [
+ { required: true, message: "璇峰～鍐欒棰戝彲鐢ㄧ▼搴�", trigger: "change" }
+ ],
+ videoLabel: [
+ { required: true, message: "璇峰～鍐欑偣瑙嗛鏍囨敞鍑嗙‘鐜�", trigger: "blur" }
+ ],
},
// 涓嬪彂琛ㄥ崟楠岃瘉
fastDistributeRules: {
@@ -142,6 +190,16 @@
this.page();
},
methods: {
+ submitSetting() {
+ this.$refs['settingForm'].validate((valid) => {
+ if (valid) {
+ this.$modal.msgSuccess("淇濆瓨鎴愬姛")
+ } else {
+ console.log('error submit!!');
+ return false;
+ }
+ });
+ },
page() {
this.loading = true;
distributeWorkOrder(this.queryParams).then(res => {
--
Gitblit v1.8.0