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

guanqb

2022-09-23 3462d3513b177f2671e0f64a1eb42f55e900a998

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

 src/views/activity/index.vue

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 16:18:17
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2022-09-23 09:51:43
 * @LastEditTime: 2022-09-23 17:07:31
 * @FilePath: \srs-police-affairs\src\views\activity\index.vue
 * @Description: 安保活动
 * 
@@ -514,7 +514,6 @@

<style scoped lang="scss">
@import '@/styles/public/index.scss';
@import '@/styles/element-ui/element-ui.scss';

.container {
    height: 100%;

 src/views/home/index.vue

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 16:18:17
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2022-09-23 16:25:07
 * @LastEditTime: 2022-09-23 17:07:26
 * @FilePath: \srs-police-affairs\src\views\home\index.vue
 * @Description: 小区-栋-层-房屋
 * 
@@ -1160,7 +1160,6 @@

<style scoped lang="scss">
@import '@/styles/public/index.scss';
@import '@/styles/element-ui/element-ui.scss';

.container {
    color: #fff;

 src/views/house/index.vue

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 16:18:17
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2022-09-22 11:24:11
 * @LastEditTime: 2022-09-23 17:07:10
 * @FilePath: \srs-police-affairs\src\views\house\index.vue
 * @Description: 小区-栋-层-房屋
 * 
@@ -631,12 +631,15 @@
</script>

<style scoped lang="scss">
@import '@/styles/public/index.scss';

.container {
    position: relative;
    width: 400px;
    height: 100%;
    color: #fff;
    background: rgba(7, 22, 37, 0.8);
    background: $bg-color;

    li {
        list-style: none;
    }

 src/views/police/index.vue

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 16:18:17
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2022-09-23 16:52:03
 * @LastEditTime: 2022-09-23 17:12:11
 * @FilePath: \srs-police-affairs\src\views\police\index.vue
 * @Description: 辖区管理
 * 
@@ -372,12 +372,13 @@
    }

    .search-box {
        margin: 5px;
        height: 40px;
        padding: 5px;
        height: 48px;
        display: flex;

        input {
            width: 300px;
            height: 46px;
            height: 100%;
            font-size: 18px;
            text-indent: 1em;
            color: #ffffff;
@@ -395,7 +396,7 @@
            font-size: 24px;
            font-weight: 700;
            width: 80px;
            height: 46px;
            height: 100%;
            background-color: #26426a;
            color: #fff;
            border: 1px solid #26426a;
@@ -410,7 +411,6 @@

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

        & > div {
            height: 100%;

 src/views/video/index.vue

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2022-08-18 16:18:17
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2022-09-20 18:01:35
 * @LastEditTime: 2022-09-23 17:13:15
 * @FilePath: \srs-police-affairs\src\views\video\index.vue
 * @Description: 辖区管理
 * 
@@ -15,6 +15,7 @@
            <input type="text" placeholder="请输入搜索条件" />
            <button class="el-icon-search"></button>
        </div>

        <div class="list-show">
            <div class="car-list">
                <div class="list-box">
@@ -159,20 +160,22 @@
</script>

<style scoped lang="scss">
@import '@/styles/element-ui/element-ui.scss';
@import '@/styles/public/index.scss';

.container {
    position: relative;
    width: 400px;
    height: 100%;
    background: rgba(41, 53, 53, 0.8);
    background: $bg-color;

    .search-box {
        height: 46px;
        padding: 0 0 0 10px;
        margin: 5px 0;
        padding: 5px;
        height: 48px;
        display: flex;

        input {
            width: 300px;
            height: 46px;
            height: 100%;
            font-size: 18px;
            text-indent: 1em;
            color: #ffffff;
@@ -190,7 +193,7 @@
            font-size: 24px;
            font-weight: 700;
            width: 80px;
            height: 46px;
            height: 100%;
            background-color: #26426a;
            color: #fff;
            border: 1px solid #26426a;