Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs

shuishen

2022-09-23 1642bae3bc6ac0263191b3d00972621c1d395ef4

Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs

 src/views/home/index.vue

@@ -101,8 +101,8 @@
                    <el-table
                        :data="arr"
                        style="width: 100%"
                        :header-cell-style="{'text-align':'center','background-color':'#00204f','borderColor':'#073365'}"
                        :cell-style="{'text-align':'center','borderColor':'#073365'}"
                        :header-cell-style="{'text-align':'center','background-color':'#203c60','borderColor':'#324e75'}"
                        :cell-style="{'text-align':'center','borderColor':'#324e75'}"
                        :row-class-name="tableRowClassName"
                    >
                        <el-table-column prop="type" label="人员类型" width="80"></el-table-column>
@@ -1157,7 +1157,7 @@
            }
        }
        :deep(.el-table tr:nth-child(2n)) {
            background: #03254c;
            background: #324e75;
            color: #fff;
        }
        :deep(.el-table tr:nth-child(2n-1)) {
@@ -1165,7 +1165,8 @@
            color: #fff;
        }
        :deep(.el-table tr:hover td) {
            color: #000;
            cursor: pointer;
            background-color: rgba(222, 176, 176, 0.2);
        }
    }


 src/views/house/index.vue

@@ -12,9 +12,11 @@
<template>
    <div class="container">
        <div class="search-box">
            <el-input size="small" placeholder="请输入小区名称" v-model="searchHouse">
            <!-- <el-input size="small" placeholder="请输入小区名称" v-model="searchHouse">
                <el-button slot="append" icon="el-icon-search"></el-button>
            </el-input>
            </el-input>-->
            <input type="text" placeholder="请输入搜索条件" />
            <button class="el-icon-search"></button>
        </div>
        <div class="result-content">
            <div class="housing-estate-info">
@@ -645,6 +647,37 @@
        align-items: center;
        justify-content: center;
        height: 50px;
        input {
            width: 300px;
            height: 46px;
            font-size: 18px;
            text-indent: 1em;
            color: #ffffff;
            background-color: #324e75;
            border: 1px solid #26426a;
            border-radius: 20px 0 0 20px;
        }
        input:focus {
            outline: none;
        }
        input::-webkit-input-placeholder {
            color: #ffffff;
        }
        button {
            font-size: 24px;
            font-weight: 700;
            width: 80px;
            height: 46px;
            background-color: #26426a;
            color: #fff;
            border: 1px solid #26426a;
            cursor: pointer;
            border-radius: 0 20px 20px 0;
        }
        button:active {
            background-color: #324e75;
            border: 1px solid #324e75;
        }
    }

    .result-content {

 src/views/police/index.vue

@@ -17,7 +17,7 @@
        </div>
        <div class="search-box">
            <input type="text" placeholder="请输入搜索条件" />
            <button>搜索</button>
            <button class="el-icon-search"></button>
        </div>

        <div class="list-show">
@@ -26,8 +26,8 @@
                    <el-table
                        :data="arr.slice((currentPage-1)*pagesize,currentPage*pagesize)"
                        style="width: 100%"
                        :header-cell-style="{'text-align':'center','background-color':'#03254c'}"
                        :cell-style="{'text-align':'center', 'cursor':'pointer'}"
                        :header-cell-style="{'text-align':'center','background-color':'#203c60','borderColor':'#324e75'}"
                        :cell-style="{'text-align':'center','borderColor':'#324e75', 'cursor':'pointer'}"
                        @cell-click="rowClick"
                    >
                        <el-table-column type="index" label="序号" width="50">
@@ -57,8 +57,8 @@
                    <el-table
                        :data="arr2.slice((currentPage-1)*pagesize,currentPage*pagesize)"
                        style="width: 100%"
                        :header-cell-style="{'text-align':'center','background-color':'#03254c'}"
                        :cell-style="{'text-align':'center', 'cursor':'pointer'}"
                        :header-cell-style="{'text-align':'center','background-color':'#203c60','borderColor':'#324e75'}"
                        :cell-style="{'text-align':'center','borderColor':'#324e75', 'cursor':'pointer'}"
                        @cell-click="rowClick"
                    >
                        <el-table-column type="index" label="序号" width="50">
@@ -360,12 +360,12 @@
            color: rgb(104, 94, 94);
            font-size: 24px;
            cursor: pointer;
            background-color: #eee;
            background-color: #26426a;
        }
        .choosed {
            background-color: #409eff;
            background-color: #324e75;
            color: #fff;
            border: 1px solid #318fed;
            border: 1px solid #324e75;
        }
    }

@@ -375,26 +375,40 @@
        display: flex;
        input {
            width: 300px;
            height: 40px;
            font-size: 16px;
            text-indent: 0.5em;
            border: 1px solid #fff;
            height: 46px;
            font-size: 18px;
            text-indent: 1em;
            color: #ffffff;
            background-color: #324e75;
            border: 1px solid #26426a;
            border-radius: 20px 0 0 20px;
        }
        input:focus {
            outline: none;
        }
        input::-webkit-input-placeholder {
            color: #ffffff;
        }
        button {
            font-size: 16px;
            font-size: 24px;
            font-weight: 700;
            width: 80px;
            height: 40px;
            background-color: #318fed;
            height: 46px;
            background-color: #26426a;
            color: #fff;
            border: 1px solid #318fed;
            border: 1px solid #26426a;
            cursor: pointer;
            border-radius: 0 20px 20px 0;
        }
        button:active {
            background-color: #324e75;
            border: 1px solid #324e75;
        }
    }

    .list-show {
        flex: 1;
        margin-top: 5px;

        & > div {
            height: 100%;
@@ -406,7 +420,7 @@
                position: relative;
                flex: 1;
                :deep(.el-table tr:nth-child(2n)) {
                    background: #191f66;
                    background: #324e75;
                    color: #fff;
                }
                :deep(.el-table tr:nth-child(2n-1)) {
@@ -414,8 +428,8 @@
                    color: #fff;
                }
                :deep(.el-table tr:hover td) {
                    color: #000;
                    cursor: pointer;
                    background-color: rgba(222, 176, 176, 0.2);
                }
                .pages {
                    position: absolute;

 src/views/video/index.vue

@@ -13,7 +13,7 @@
    <div class="container">
        <div class="search-box">
            <input type="text" placeholder="请输入搜索条件" />
            <button>搜索</button>
            <button class="el-icon-search"></button>
        </div>
        <div class="list-show">
            <div class="car-list">
@@ -21,8 +21,8 @@
                    <el-table
                        :data="arr.slice((currentPage-1)*pagesize,currentPage*pagesize)"
                        style="width: 100%"
                        :header-cell-style="{'text-align':'center','background-color':'#03254c'}"
                        :cell-style="{'text-align':'center', 'cursor':'pointer'}"
                        :header-cell-style="{'text-align':'center','background-color':'#203c60','borderColor':'#324e75'}"
                        :cell-style="{'text-align':'center','borderColor':'#324e75'}"
                        @cell-click="rowClick"
                    >
                        <el-table-column type="index" label="序号" width="50">
@@ -32,7 +32,6 @@
                        </el-table-column>
                        <el-table-column prop="equipmentID" label="设备ID" width="80"></el-table-column>
                        <el-table-column prop="equipmentType" label="设备类型"></el-table-column>
                        <!-- <el-table-column prop="position" label="经纬度"></el-table-column> -->
                    </el-table>
                </div>
                <div class="pages">
@@ -167,34 +166,48 @@
    height: 100%;
    background: rgba(41, 53, 53, 0.8);
    .search-box {
        height: 41px;
        height: 46px;
        padding: 0 0 0 10px;
        margin: 5px 0;
        display: flex;
        input {
            width: 300px;
            height: 40px;
            font-size: 16px;
            text-indent: 0.5em;
            height: 46px;
            font-size: 18px;
            text-indent: 1em;
            color: #ffffff;
            background-color: #324e75;
            border: 1px solid #26426a;
            border-radius: 20px 0 0 20px;
        }
        input:focus {
            outline: none;
        }
        input::-webkit-input-placeholder {
            color: #ffffff;
        }
        button {
            font-size: 16px;
            font-size: 24px;
            font-weight: 700;
            width: 80px;
            height: 40px;
            background-color: #318fed;
            height: 46px;
            background-color: #26426a;
            color: #fff;
            border: 1px solid #318fed;
            border: 1px solid #26426a;
            cursor: pointer;
            border-radius: 0 20px 20px 0;
        }
        button:active {
            background-color: #324e75;
            border: 1px solid #324e75;
        }
    }
    .list-show {
        padding: 0 10px;
        height: 745px;
        .list-box {
            height: 705px;
            :deep(.el-table tr:nth-child(2n)) {
                background: #191f66;
                background: #324e75;
                color: #fff;
            }
            :deep(.el-table tr:nth-child(2n-1)) {
@@ -202,8 +215,8 @@
                color: #fff;
            }
            :deep(.el-table tr:hover td) {
                color: #000;
                cursor: pointer;
                background-color: rgba(222, 176, 176, 0.2);
            }
        }
    }