Merge remote-tracking branch 'origin/master'

linwe

2024-12-19 e75a3028891b08bbd3fdbaa6443d6a8f80dd3f31

Merge remote-tracking branch 'origin/master'

 src/components/map/components/placeBasePopup.vue

@@ -72,13 +72,11 @@
  },

  mounted () {

    if (this.getWidth() > 7000) {
      this.scaleDomFlag = true
    } else {
      this.scaleDomFlag = false
    }

  },

  methods: {
@@ -238,8 +236,6 @@
      display: flex;
      flex-direction: row;
      width: calc(100% - 20px);
      height: 30px;
      line-height: 30px;
      margin: 0 10px;
      text-align: left;

@@ -249,13 +245,16 @@
        display: inline-block;
        text-align-last: justify;
        margin-right: 20px;
        line-height: 30px;
      }

      &>div:nth-of-type(2) {
        flex: 1;
        overflow: hidden;
        text-overflow: ellipsis;
        white-space: nowrap;
        max-width: 240px;
        // overflow: hidden;
        // text-overflow: ellipsis;
        white-space: wrap;
        line-height: 30px;
      }
    }
  }

 src/components/map/index.vue

@@ -2,7 +2,7 @@
 * @Author: shuishen 1109946754@qq.com
 * @Date: 2024-06-21 16:37:19
 * @LastEditors: shuishen 1109946754@qq.com
 * @LastEditTime: 2024-12-09 19:48:35
 * @LastEditTime: 2024-12-18 18:16:31
 * @FilePath: \srs-police-affairs\src\components\map\index.vue
 * @Description: 
 * 
@@ -91,6 +91,8 @@

    <architecture-popup></architecture-popup>

    <place-base-popup></place-base-popup>

    <activity-police-popup></activity-police-popup>

    <multip-map-popup></multip-map-popup>
@@ -178,6 +180,7 @@
import mapPopup from "./components/mapPopup.vue"
import architecturePopup from "./components/architecturePopup.vue"
import activityPolicePopup from "./components/activityPolicePopup.vue"
import placeBasePopup from "./components/placeBasePopup.vue"
import multipMapPopup from "./components/multipMapPopup.vue"
import videoListPopup from "./components/videoListPopup.vue"
import videoRowClickPopup from "./components/videoRowClickPopup.vue"
@@ -198,6 +201,7 @@
    mapPopup,
    architecturePopup,
    activityPolicePopup,
    placeBasePopup,
    multipMapPopup,
    videoListPopup,
    mapSearchPopup,

 src/views/home/components/leftContainer.vue

@@ -7,9 +7,8 @@
                        <span :class="{ choosed: peopletype == 0 }">现有人员</span>
                    </div>
                </div>
                <el-main v-loading="personEchartsLoading" element-loading-text="拼命加载中"
                    element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.5)"
                    style="height: calc(100% - 17.6%);">
        <el-main v-loading="personEchartsLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
          element-loading-background="rgba(0, 0, 0, 0.5)" style="height: calc(100% - 17.6%);">
                    <div class="sub-tab" v-show="peopletype == 0">
                        <div class="tab" :class="{ 'select-on-tab': tabType == 0 }" @click="personTabClick(0)">
                            <div class="tab-title-small">人口总数:</div>
@@ -65,19 +64,18 @@

                <use stroke-width="2" xlink:href="#border-box-8-path-974b4d7cfafa444396861ca1d1173c8c"
                    mask="url(#border-box-8-mask-974b4d7cfafa444396861ca1d1173c8c)" stroke="#4fd2dd">
                    <animate attributeName="stroke-dasharray" from="0, 1442" to="1442, 0" dur="8s"
                        repeatCount="indefinite" />
          <animate attributeName="stroke-dasharray" from="0, 1442" to="1442, 0" dur="8s" repeatCount="indefinite" />
                </use>
            </svg>
        </div>
        <div class="house-box" style="position: relative;">
            <div class="box">
                <div class="title">九小场所</div>
                <el-main v-loading="houseEchartsLoading" element-loading-text="拼命加载中"
                    element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.5)">
        <div class="title">重点场所</div>
        <el-main v-loading="houseEchartsLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
          element-loading-background="rgba(0, 0, 0, 0.5)">
                    <div class="sub-tab">
                        <div class="tab" :class="{ 'select-on-tab': tabTypeTwo == 0 }" @click="houseTabClick(0)">
                            <div class="tab-title-small">场所数量:</div>
              <div class="tab-title-small">九小场所:</div>
                            <div class="tab-title-small">{{ placeNum }}</div>
                        </div>
                        <div class="tab" :class="{ 'select-on-tab': tabTypeTwo == 1 }" @click="houseTabClick(1)">
@@ -92,16 +90,15 @@
            <svg class="border-svg">
                <use stroke-width="2" xlink:href="#border-box-8-path-974b4d7cfafa444396861ca1d1173c8c"
                    mask="url(#border-box-8-mask-974b4d7cfafa444396861ca1d1173c8c)" stroke="#4fd2dd">
                    <animate attributeName="stroke-dasharray" from="0, 1442" to="1442, 0" dur="8s"
                        repeatCount="indefinite" />
          <animate attributeName="stroke-dasharray" from="0, 1442" to="1442, 0" dur="8s" repeatCount="indefinite" />
                </use>
            </svg>
        </div>
        <div class="land-box" style="position: relative;">
            <div class="box">
                <div class="title">现有小区</div>
                <el-main v-loading="landEchartsLoading" element-loading-text="拼命加载中"
                    element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.5)">
        <el-main v-loading="landEchartsLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
          element-loading-background="rgba(0, 0, 0, 0.5)">
                    <div class="sub-tab" v-show="isAllPoliceStation">
                        <div class="tab" :class="{ 'select-on-tab': tabTypeThree == 0 }" @click="landTabClick(0)">
                            <div class="tab-title-small">小区:</div>
@@ -125,8 +122,7 @@
            <svg class="border-svg">
                <use stroke-width="2" xlink:href="#border-box-8-path-974b4d7cfafa444396861ca1d1173c8c"
                    mask="url(#border-box-8-mask-974b4d7cfafa444396861ca1d1173c8c)" stroke="#4fd2dd">
                    <animate attributeName="stroke-dasharray" from="0, 1442" to="1442, 0" dur="8s"
                        repeatCount="indefinite" />
          <animate attributeName="stroke-dasharray" from="0, 1442" to="1442, 0" dur="8s" repeatCount="indefinite" />
                </use>
            </svg>
        </div>
@@ -1112,7 +1108,8 @@
        },

        getNineStatistics (flag = false) {
            getNineStatistics({ deptId: this.policeStaionID != '' ? this.policeStaionID : this.userInfo.dept_id,
      getNineStatistics({
        deptId: this.policeStaionID != '' ? this.policeStaionID : this.userInfo.dept_id,
                areaId:this.areaId
             }).then(res => {
                let xDate = []