From 7c0b59a30b7b3e46f90d9726999b3a007f9fc666 Mon Sep 17 00:00:00 2001 From: odc.xiaohui <xiaohui@Q1> Date: 星期一, 09 一月 2023 18:05:47 +0800 Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0 --- src/views/intelligentPatrol/illegalSearch/index.vue | 30 +++++++++++++++++++++--------- 1 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/views/intelligentPatrol/illegalSearch/index.vue b/src/views/intelligentPatrol/illegalSearch/index.vue index 781cf30..715c12b 100644 --- a/src/views/intelligentPatrol/illegalSearch/index.vue +++ b/src/views/intelligentPatrol/illegalSearch/index.vue @@ -34,7 +34,7 @@ </div> <!-- 鏁版嵁灞曠ず --> <el-table ref="multipleTable" - :header-cell-style="{ background: '#06122c', 'font-size': '12px', color: '#4b9bb7', 'font-weight': '650', 'line-height': '45px' }" + :header-cell-style="{ 'font-weight': '650', 'line-height': '45px' }" :data="tableData" style="width: 100%" :row-class-name="tableRowClassName"> <el-table-column type="selection" min-width="5"> </el-table-column> @@ -107,6 +107,8 @@ import basecase from "@/api/operate/basecase"; import department from "@/api/system/department"; import { getVideoPoint } from "@/api/operate/storeManagement"; +import baseInfo from "@/api/baseInfo"; +import {getTypeList} from "@/utils/helper" export default { components: { @@ -128,6 +130,13 @@ this.headerList[4].options = records; }) .catch(err => this.$message.error(err)) + + baseInfo.getCategoryList().then((result)=>{ + this.headerList[2].options = result; + }) + getTypeList("1","02").then((result)=>{ + this.headerList[8].options = result; + }) }, data() { @@ -162,7 +171,8 @@ value: '', placeholder: '璇疯緭鍏ヨ繚瑙勭被鍨�', prop: 'typeId', - type: 'input' + type: 'select', + options: [] }, { id: 4, @@ -187,6 +197,7 @@ value: '', placeholder: '璇疯緭鍏ュ鏍哥姸鎬�', type: 'select', + prop: 'state', options: [{ id: 7, name: '鏈鏍�' }, { id: 8, name: '宸茬粡瀹℃牳' }, { id: 9, name: '缁撴' }] }, { @@ -211,7 +222,8 @@ value: '', placeholder: '璇疯緭鍏ヤ簨浠剁瓑绾�', prop: 'gradeId', - type: 'input' + type: 'select', + options: [] }, ], form: { @@ -352,7 +364,7 @@ color: #4b9bb7; header { - background-color: #09152f; + background-color: white; .headerContent { padding: 20px 40px; @@ -377,7 +389,7 @@ } main { - background-color: #09152f; + background-color: #ffffff; margin-top: 20px; padding-bottom: 50px; @@ -392,14 +404,14 @@ padding: 0 20px; .el-button { - background-color: #17324c; + background-color: #2f91ec; border: 1px solid #17324c; - color: #4b9bb7; + color: #ffffff; } } .el-table { - color: #4b9bb7; + // color: #4b9bb7; } .tools { @@ -430,7 +442,7 @@ &::v-deep .el-input__inner { border: none; - background-color: #09152f; + // background-color: #09152f; } } } -- Gitblit v1.8.0