Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/srs-police-aff...

guanqb

2023-06-27 6fc3091508091b48b7749f7294579ff0c10d7883

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/srs-police-affairs

 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: 2023-06-25 14:25:12
 * @LastEditTime: 2023-06-26 20:28:45
 * @FilePath: \srs-police-affairs\src\views\home\index.vue
 * @Description: 小区-栋-层-房屋
 *
@@ -1626,7 +1626,7 @@
                this.policeSituationList.forEach((item, index) => {
                    let pointColor, pointOutlineColor

                    switch (item.jqlxName) {
                    switch (item.jqlxJointName) {
                        case '盗窃':
                            pointColor = global.DC.Namespace.Cesium.Color.fromBytes(57, 16, 133, 255)
                            pointOutlineColor = global.DC.Namespace.Cesium.Color.fromBytes(57, 16, 133, 125)

 src/views/house/index.vue

@@ -74,20 +74,20 @@
                                <div class="p-r">
                                    <div>
                                        <div style="color:#0e88ff">{{ villageInfo.censusRegisterNumber ?
                                            villageInfo.censusRegisterNumber
                                            : '0' }}</div>
                                                                                    villageInfo.censusRegisterNumber
                                                                                    : '0' }}</div>
                                        <div>户籍人口</div>
                                    </div>
                                    <div>
                                        <div style="color:#71fdf7">{{ villageInfo.realExistenceNumber ?
                                            villageInfo.realExistenceNumber :
                                            '0' }}</div>
                                                                                    villageInfo.realExistenceNumber :
                                                                                    '0' }}</div>
                                        <div>实有人口</div>
                                    </div>
                                    <div>
                                        <div style="color:#ff796c">{{ villageInfo.emphasisNumber ?
                                            villageInfo.emphasisNumber :
                                            '0' }}</div>
                                                                                    villageInfo.emphasisNumber :
                                                                                    '0' }}</div>
                                        <div>重点人口</div>
                                    </div>
                                </div>
@@ -97,26 +97,26 @@
                                <div class="p-r">
                                    <div>
                                        <div style="color:#2a91f5">{{ villageInfo.busTotalNumber ?
                                            villageInfo.busTotalNumber :
                                            '0' }}</div>
                                                                                    villageInfo.busTotalNumber :
                                                                                    '0' }}</div>
                                        <div>户室总数</div>
                                    </div>
                                    <div>
                                        <div style="color:#eeeeee">{{ villageInfo.uncorrelatedNumber ?
                                            villageInfo.uncorrelatedNumber :
                                            '0' }}</div>
                                                                                    villageInfo.uncorrelatedNumber :
                                                                                    '0' }}</div>
                                        <div>未关联</div>
                                    </div>
                                    <div>
                                        <div style="color:#ee0000">{{ villageInfo.unexaminedNumber ?
                                            villageInfo.unexaminedNumber :
                                            '0' }}</div>
                                                                                    villageInfo.unexaminedNumber :
                                                                                    '0' }}</div>
                                        <div>未核实</div>
                                    </div>
                                    <div>
                                        <div style="color:#00ee00">{{ villageInfo.verifiedNumber ?
                                            villageInfo.verifiedNumber
                                            : '0' }}</div>
                                                                                    villageInfo.verifiedNumber
                                                                                    : '0' }}</div>
                                        <div>已核实</div>
                                    </div>
                                </div>
@@ -168,8 +168,8 @@
                                                :key="index" @click="buildingClick(item)"
                                                :class="{ on: buildingChoosed.name == item.name }" :title="item.name">
                                                {{
                                                    item.name
                                                }}
                                                                                                item.name
                                                                                                }}
                                                <div @click.stop title="显示/隐藏楼栋高亮">
                                                    <el-checkbox v-model="isBuildHighLightchecked"
                                                        v-show="buildingChoosed.name == item.name"
@@ -228,26 +228,26 @@
                                <div class="one">
                                    <div>
                                        <div style="color:#2a91f5">{{ buildingInfo.busTotalNumber ?
                                            buildingInfo.busTotalNumber :
                                            '0' }}</div>
                                                                                    buildingInfo.busTotalNumber :
                                                                                    '0' }}</div>
                                        <div>户室总数</div>
                                    </div>
                                    <div>
                                        <div style="color:#eeeeee">{{ buildingInfo.uncorrelatedNumber ?
                                            buildingInfo.uncorrelatedNumber :
                                            '0' }}</div>
                                                                                    buildingInfo.uncorrelatedNumber :
                                                                                    '0' }}</div>
                                        <div>未关联</div>
                                    </div>
                                    <div>
                                        <div style="color:#ee0000">{{ buildingInfo.unexaminedNumber ?
                                            buildingInfo.unexaminedNumber :
                                            '0' }}</div>
                                                                                    buildingInfo.unexaminedNumber :
                                                                                    '0' }}</div>
                                        <div>未核实</div>
                                    </div>
                                    <div>
                                        <div style="color:#00ee00">{{ buildingInfo.verifiedNumber ?
                                            buildingInfo.verifiedNumber
                                            : '0' }}</div>
                                                                                    buildingInfo.verifiedNumber
                                                                                    : '0' }}</div>
                                        <div>已核实</div>
                                    </div>
                                </div>
@@ -296,15 +296,15 @@
                                            <div :class="{ on: floorsType == index }" @click="floorsType = index"
                                                v-for="index in Math.ceil(unitChoosedArr.length / 5)" :key="index">
                                                {{ unitChoosedArr[index * 5 - 5].sname }}{{ unitChoosedArr[index * 5
                                                    - 5].sname ==
                                                    unitChoosedArr[unitChoosedArr.length - 1].sname ? '' : '-' }}{{
        unitChoosedArr[index *
        5
        - 1] ? (unitChoosedArr[index * 5
            - 1].sname) : (unitChoosedArr[index * 5 - 5].sname ==
                unitChoosedArr[unitChoosedArr.length - 1].sname
                ? '' : unitChoosedArr[unitChoosedArr.length - 1].sname)
    }}层
                                                                                                - 5].sname ==
                                                                                                unitChoosedArr[unitChoosedArr.length - 1].sname ? '' : '-' }}{{
                                                                                                unitChoosedArr[index *
                                                                                                5
                                                                                                - 1] ? (unitChoosedArr[index * 5
                                                                                                - 1].sname) : (unitChoosedArr[index * 5 - 5].sname ==
                                                                                                unitChoosedArr[unitChoosedArr.length - 1].sname
                                                                                                ? '' : unitChoosedArr[unitChoosedArr.length - 1].sname)
                                                                                                }}层
                                            </div>
                                        </div>
                                    </div>
@@ -512,7 +512,7 @@
                        <template slot-scope="scope">
                            <span :style="{ color: (scope.row.status == 2 ? '#f00!important' : '#000') }">
                                {{
                                    scope.row.realName }}
                                                                scope.row.realName }}
                            </span>
                        </template>
                    </el-table-column>
@@ -520,7 +520,7 @@
                        <template slot-scope="scope">
                            <span :style="{ color: (scope.row.status == 2 ? '#f00!important' : '#000') }">
                                {{
                                    scope.row.phone }}
                                                                scope.row.phone }}
                            </span>
                        </template>
                    </el-table-column>
@@ -528,7 +528,7 @@
                        <template slot-scope="scope">
                            <span :style="{ color: (scope.row.status == 2 ? '#f00!important' : '#000') }">
                                {{
                                    scope.row.cardNo }}
                                                                scope.row.cardNo }}
                            </span>
                        </template>
                    </el-table-column>
@@ -536,7 +536,7 @@
                        <template slot-scope="scope">
                            <span :style="{ color: (scope.row.status == 2 ? '#f00!important' : '#000') }">
                                {{
                                    scope.row.relation }}
                                                                scope.row.relation }}
                            </span>
                        </template>
                    </el-table-column>
@@ -544,7 +544,7 @@
                        <template slot-scope="scope">
                            <span :style="{ color: (scope.row.status == 2 ? '#f00!important' : '#000') }">
                                {{
                                    scope.row.censusAddress }}
                                                                scope.row.censusAddress }}
                            </span>
                        </template>
                    </el-table-column>
@@ -552,7 +552,7 @@
                        <template slot-scope="scope">
                            <span :style="{ color: (scope.row.status == 2 ? '#f00!important' : '#000') }">
                                {{
                                    scope.row.personType == 1 ? '户籍人口' : '实有人口' }}
                                                                scope.row.personType == 1 ? '户籍人口' : '实有人口' }}
                            </span>
                        </template>
                    </el-table-column>
@@ -560,8 +560,8 @@
                        <template slot-scope="scope">
                            <span :style="{ color: (scope.row.status == 2 ? '#f00!important' : '#000') }">
                                {{
                                    scope.row.zdryxl
                                }}
                                                                scope.row.zdryxl
                                                                }}
                            </span>
                        </template>
                    </el-table-column>
@@ -1936,7 +1936,7 @@
                        if (item.lng != "" && item.lat != "") {
                            let pointColor, pointOutlineColor

                            switch (item.jqlxName) {
                            switch (item.jqlxJointName) {
                                case '盗窃':
                                    pointColor = global.DC.Namespace.Cesium.Color.fromBytes(57, 16, 133, 255)
                                    pointOutlineColor = global.DC.Namespace.Cesium.Color.fromBytes(57, 16, 133, 125)

 src/views/policeInfor/index.vue

@@ -698,7 +698,7 @@
            data.forEach((item, index) => {
                let pointColor, pointOutlineColor

                switch (item.jqlxName) {
                switch (item.jqlxJointName) {
                    case '盗窃':
                        pointColor = global.DC.Namespace.Cesium.Color.fromBytes(57, 16, 133, 255)
                        pointOutlineColor = global.DC.Namespace.Cesium.Color.fromBytes(57, 16, 133, 125)