linwe
2025-10-28 0b7c058f89b458fed7f2eb889c04e8b4992c5e05
经开分局优化
27 files modified
496 ■■■■■ changed files
public/static/config copy.js 12 ●●●● patch | view | raw | blame | history
src/components/dialog/businessDetailDialog.vue 6 ●●●● patch | view | raw | blame | history
src/components/map/index.vue 8 ●●●●● patch | view | raw | blame | history
src/components/policeDetail/index.vue 4 ●●●● patch | view | raw | blame | history
src/components/pomDialog/index.vue 14 ●●●●● patch | view | raw | blame | history
src/components/prmDialog/index.vue 2 ●●● patch | view | raw | blame | history
src/components/siteDialog/index.vue 19 ●●●●● patch | view | raw | blame | history
src/utils/mapPositionInit.js 2 ●●● patch | view | raw | blame | history
src/utils/tools/images.js 2 ●●● patch | view | raw | blame | history
src/views/antiFraudShow/components/detailDialog.vue 12 ●●●●● patch | view | raw | blame | history
src/views/comprehensiveSearch/components/companyDetail.vue 2 ●●● patch | view | raw | blame | history
src/views/contradictionEventShow/components/detailDialog.vue 112 ●●●● patch | view | raw | blame | history
src/views/home/components/dialog/keyPersonBox.vue 2 ●●● patch | view | raw | blame | history
src/views/home/index.vue 10 ●●●● patch | view | raw | blame | history
src/views/house/components/antiFraud.vue 2 ●●● patch | view | raw | blame | history
src/views/house/components/employees.vue 2 ●●● patch | view | raw | blame | history
src/views/house/components/nineSmallPlaces.vue 4 ●●●● patch | view | raw | blame | history
src/views/house/components/noFraudAuthentication.vue 2 ●●● patch | view | raw | blame | history
src/views/house/components/positionTrading.vue 2 ●●● patch | view | raw | blame | history
src/views/house/components/rentalHouse.vue 2 ●●● patch | view | raw | blame | history
src/views/house/components/scanCodeAlarm.vue 2 ●●● patch | view | raw | blame | history
src/views/house/index.vue 33 ●●●●● patch | view | raw | blame | history
src/views/house/index(商铺用接口前).vue 6 ●●●● patch | view | raw | blame | history
src/views/intelligentSearch/index.vue 115 ●●●●● patch | view | raw | blame | history
src/views/rentalInfo/components/detailDialog.vue 5 ●●●●● patch | view | raw | blame | history
src/views/site/index.vue 112 ●●●●● patch | view | raw | blame | history
vue.config.js 2 ●●● patch | view | raw | blame | history
public/static/config copy.js
@@ -13,20 +13,20 @@
    // 本地开发
    VUE_APP_OUTER_NET: 'http://192.168.0.112:18080',
    // 内网部署
    VUE_APP_INTRANET: 'http://10.141.11.11:18080',
  VUE_APP_INTRANET: 'http://47.217.32.232:80:18080',
    // 大搜
    // 本地开发
    VUE_APP_OUTER_NET_SEARCH: 'http://192.168.0.112:9091',
    // 内网部署
    VUE_APP_INTRANET_SEARCH: 'http://10.141.11.11:9091',
  VUE_APP_INTRANET_SEARCH: 'http://47.217.32.232:80:9091',
    // 视频监控平台
    // 本地开发
    VUE_APP_OUTER_NET_VIDEO: 'http://192.168.0.126:18185/api',
    // VUE_APP_OUTER_NET_VIDEO: 'http://192.168.0.129:18185/api',
    // 内网部署
    VUE_APP_INTRANET_VIDEO: 'http://10.141.11.11:18185/api',
  VUE_APP_INTRANET_VIDEO: 'http://47.217.32.232:80:18185/api',
    // 设备通道号
    VUE_APP_OUTER_NET_EQUIPMENT: '36110000002009999000',
@@ -34,14 +34,14 @@
    // 模型地址
    VUE_APP_OUTER_NET_TILEURL: 'http://192.168.0.112:18080',
    VUE_APP_INTRANET_TILEURL: 'http://10.141.11.11:18080',
  VUE_APP_INTRANET_TILEURL: 'http://47.217.32.232:80:18080',
    // 后台管理跳转地址
    VUE_APP_OUTER_NET_HTURL: 'http://192.168.0.109:1888',
    VUE_APP_INTRANET_HTURL: 'http://10.141.11.11:8081',
  VUE_APP_INTRANET_HTURL: 'http://47.217.32.232:80:8081',
    // 栅格地图的
    VUE_APP_MAP_YX: 'http://10.141.11.12:18088',
    VUE_APP_MAP_SL: 'http://10.141.11.11:8090',
  VUE_APP_MAP_SL: 'http://47.217.32.232:80:8090',
}
src/components/dialog/businessDetailDialog.vue
@@ -222,7 +222,7 @@
                    data.imagesUrlsArr = []
                    if (picArr.length > 0) {
                        picArr.forEach(item => {
                            item = 'http://10.141.11.11/place/' + item
              item = 'http://47.217.32.232:80/place/' + item
                            data.imagesUrlsArr.push(item)
                        })
                    }
@@ -233,7 +233,7 @@
                    data.yyzzUrlsArr = []
                    if (picArr.length > 0) {
                        picArr.forEach(item => {
                            item = 'http://10.141.11.11/place/' + item
              item = 'http://47.217.32.232:80/place/' + item
                            data.yyzzUrlsArr.push(item)
                        })
                    }
@@ -244,7 +244,7 @@
                    data.pmtUrlsArr = []
                    if (picArr.length > 0) {
                        picArr.forEach(item => {
                            item = 'http://10.141.11.11/place/' + item
              item = 'http://47.217.32.232:80/place/' + item
                            data.pmtUrlsArr.push(item)
                        })
                    }
src/components/map/index.vue
@@ -346,14 +346,15 @@
      // })
      // global.viewer.addTerrain(terrain)
      // 内网
      // 内网 ----- 想看效果,这里要注释
      that.switchImg()
      // that.highOrLightChange('light')
      // 地形数据添加
      // 地形数据添加 ----- 想看效果,这里要注释
      that.addTerrain()
      // 外网
      // 外网 ----- 想看效果,这里要打开
      // global.viewer.imageryLayers.addImageryProvider(
      //   new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
      //     url: 'http://t{s}.tianditu.gov.cn/DataServer?T=vec_w&x={x}&y={y}&l={z}&tk=d083e4cf30bfc438ef93436c10c2c20a',
@@ -1173,6 +1174,7 @@
          font: "16px sans-serif",
          pixelOffset: { x: 0, y: -30 },
          distanceDisplayCondition: distanceDisplayCondition,
          ...params.setStyle
        })
        labelElement.attrParams = params
        layersObjcect[layerName].addOverlay(labelElement)
src/components/policeDetail/index.vue
@@ -95,7 +95,7 @@
        // 打开弹窗初始化数据
        initOpen (row) {
            this.popupShow = true
            this.rowDetail = row;
      this.rowDetail = row
            // getDetail({ id: row.id }).then(res => {
            //     let data = res.data.data
            //     data.employerImg = this.getImgUrls(data.employerImg)
@@ -117,7 +117,7 @@
        getImgUrls (imageUrls) {
            if (imageUrls && imageUrls != '' && imageUrls.length > 0) {
                imageUrls = imageUrls.split(',').filter(ele => ele != '').map(ele => {
                    return 'http://10.141.11.11/place/' + ele
          return 'http://47.217.32.232:80/place/' + ele
                    // return 'https://srgdjczzxtpt.com:2080/gminio/jczz/' + ele
                })
            }
src/components/pomDialog/index.vue
@@ -11,8 +11,7 @@
<template>
    <el-dialog class="syld-details-box site-dialog-popup business-detail-box" :title="'场所详情'" append-to-body
        :close-on-click-modal="false" :visible.sync="popupShow" center @close="popupClose">
        <div class="flex f-d-c" style="height: 100%;" v-loading="loading"
            element-loading-background="rgba(0, 0, 0, 0.5)">
    <div class="flex f-d-c" style="height: 100%;" v-loading="loading" element-loading-background="rgba(0, 0, 0, 0.5)">
            <div class="type-tab-box">
                <div class="tab-item" :class="{ 'tab-choose-item': chooseTab == 1 }" @click="tabClick(1)">
                    基本信息</div>
@@ -60,14 +59,11 @@
            <div class="flex-1  flex f-d-c tab-content-box" v-if="chooseTab == 2">
                <el-table :data="tradeTableData" style="width: 100%" :header-cell-style="{ 'text-align': 'center' }"
                    :cell-style="{ 'text-align': 'center' }">
                    <el-table-column prop="transactionObject" :show-overflow-tooltip="true"
                        label="交易对象"></el-table-column>
                    <el-table-column prop="transactionObjectTel" :show-overflow-tooltip="true"
                        label="交易对象电话"></el-table-column>
          <el-table-column prop="transactionObject" :show-overflow-tooltip="true" label="交易对象"></el-table-column>
          <el-table-column prop="transactionObjectTel" :show-overflow-tooltip="true" label="交易对象电话"></el-table-column>
                    <el-table-column prop="idCard" :show-overflow-tooltip="true" label="身份证号"></el-table-column>
                    <el-table-column prop="goodsNums" :show-overflow-tooltip="true" label="交易数量"></el-table-column>
                    <el-table-column prop="transactionMoney" :show-overflow-tooltip="true"
                        label="交易金额"></el-table-column>
          <el-table-column prop="transactionMoney" :show-overflow-tooltip="true" label="交易金额"></el-table-column>
                    <el-table-column label="操作" width="120">
                        <template slot-scope="scope">
                            <el-button @click.native.prevent="viewRow(scope.row)" type="text" size="small">
@@ -187,7 +183,7 @@
        getImgUrls (imageUrls) {
            if (imageUrls && imageUrls != '' && imageUrls.length > 0) {
                imageUrls = imageUrls.split(',').filter(ele => ele != '').map(ele => {
                    return 'http://10.141.11.11/place/' + ele
          return 'http://47.217.32.232:80/place/' + ele
                    // return 'https://srgdjczzxtpt.com:2080/gminio/jczz/' + ele
                })
            }
src/components/prmDialog/index.vue
@@ -133,7 +133,7 @@
        getImgUrls (imageUrls) {
            if (imageUrls && imageUrls != '' && imageUrls.length > 0) {
                imageUrls = imageUrls.split(',').filter(ele => ele != '').map(ele => {
                    return 'http://10.141.11.11/place/' + ele
          return 'http://47.217.32.232:80/place/' + ele
                    // return 'https://srgdjczzxtpt.com:2080/gminio/jczz/' + ele
                })
            }
src/components/siteDialog/index.vue
@@ -108,8 +108,7 @@
                    <div class="pages all-pagination-sty" ref="tablePagination" style="padding-top:-15px">
                        <el-pagination background layout="prev, pager, next" :page-size="pages.size" :total="pages.total"
                            :pager-count="4" :current-page="pages.current"
                            @current-change="handleCurrentChange"></el-pagination>
              :pager-count="4" :current-page="pages.current" @current-change="handleCurrentChange"></el-pagination>
                    </div>
                </div>
@@ -149,10 +148,8 @@
                            <div class="question-name">
                                <div class="key">{{ index + 1 }}、{{ item.itemsName }}</div>
                                <div class="value">
                                    <el-radio v-show="item.state == 0" v-model="item.state" :label="0"
                                        disabled>存在</el-radio>
                                    <el-radio v-show="item.state == 1" v-model="item.state" :label="1"
                                        disabled>不存在</el-radio>
                  <el-radio v-show="item.state == 0" v-model="item.state" :label="0" disabled>存在</el-radio>
                  <el-radio v-show="item.state == 1" v-model="item.state" :label="1" disabled>不存在</el-radio>
                                </div>
                            </div>
                            <div v-show="item.state == 0" class="yh-pic-box">
@@ -178,10 +175,8 @@
                                    整改后图片:
                                </div>
                                <div class="yh-pic-list">
                                    <div class="pic-item" v-for="(pic, picIndex)  in getRectificationImageUrls(item)"
                                        :key="picIndex">
                                        <el-image :src="pic" :fit="fit"
                                            :preview-src-list="getRectificationImageUrls(item)"></el-image>
                  <div class="pic-item" v-for="(pic, picIndex)  in getRectificationImageUrls(item)" :key="picIndex">
                    <el-image :src="pic" :fit="fit" :preview-src-list="getRectificationImageUrls(item)"></el-image>
                                    </div>
                                </div>
                            </div>
@@ -250,7 +245,7 @@
                if (imageUrls && imageUrls != '' && imageUrls.length > 0) {
                    imageUrls = imageUrls.split(',').filter(ele => ele != '').map(ele => {
                        return 'http://10.141.11.11/place/' + ele
            return 'http://47.217.32.232:80/place/' + ele
                    })
                }
@@ -264,7 +259,7 @@
                if (imageUrls && imageUrls != '' && imageUrls.length > 0) {
                    imageUrls = imageUrls.split(',').filter(ele => ele != '').map(ele => {
                        return 'http://10.141.11.11/place/' + ele
            return 'http://47.217.32.232:80/place/' + ele
                    })
                }
src/utils/mapPositionInit.js
@@ -2,7 +2,7 @@
    // 需要做判断
    // 分局的
    const homeCenter = [118.0379085985883, 28.112541349646797]
  const homeCenter = [117.815748, 28.069021]
    global.viewer.flyToPosition(
        new global.DC.Position(
src/utils/tools/images.js
@@ -4,7 +4,7 @@
export default function getImgUrls(imageUrls) {
    if (imageUrls && imageUrls != '' && imageUrls.length > 0) {
        imageUrls = imageUrls.split(',').filter(ele => ele != '').map(ele => {
            // return 'http://10.141.11.11/place/' + ele
      // return 'http://47.217.32.232:80/place/' + ele
            return 'https://srgdjczzxtpt.com:2080/gminio/jczz/' + ele
        })
    }
src/views/antiFraudShow/components/detailDialog.vue
@@ -1,8 +1,7 @@
<template>
    <el-dialog class="syld-details-box anti-fraud-box site-dialog-popup business-detail-box" :title="title"
        append-to-body :close-on-click-modal="false" :visible.sync="popupShow" center @close="popupClose">
        <div class="flex f-d-c" style="height: 100%;" v-loading="loading"
            element-loading-background="rgba(0, 0, 0, 0.5)">
  <el-dialog class="syld-details-box anti-fraud-box site-dialog-popup business-detail-box" :title="title" append-to-body
    :close-on-click-modal="false" :visible.sync="popupShow" center @close="popupClose">
    <div class="flex f-d-c" style="height: 100%;" v-loading="loading" element-loading-background="rgba(0, 0, 0, 0.5)">
            <div class="type-tab-box" v-if="tabList.length != 0">
                <div class="tab-item" :class="{ 'tab-choose-item': chooseTab == order }" @click="tabClick(order)"
                    v-for="(part, order) in tabList" :key="order">
@@ -15,8 +14,7 @@
                        <div class="name">{{ item.label }}:</div>
                        <div class="value" v-if="item.isPic != true">{{ item.value }}</div>
                        <div class="value" v-if="item.isPic == true">
                            <el-image
                                :style="{ width: item.value != '' ? '100px' : '', height: item.value != '' ? '100px' : '' }"
              <el-image :style="{ width: item.value != '' ? '100px' : '', height: item.value != '' ? '100px' : '' }"
                                :src="getImgUrls(item.value)" :preview-src-list="getImgUrls(item.value)">
                                <div slot="error" class="image-slot">
                                    <i class="el-icon-picture-outline"></i> 暂无图片
@@ -101,7 +99,7 @@
        getImgUrls(imageUrls) {
            if (imageUrls && imageUrls != '' && imageUrls.length > 0) {
                imageUrls = imageUrls.split(',').filter(ele => ele != '').map(ele => {
                    return 'http://10.141.11.11/place/' + ele
          return 'http://47.217.32.232:80/place/' + ele
                    // return 'https://srgdjczzxtpt.com:2080/gminio/jczz/' + ele
                })
            }
src/views/comprehensiveSearch/components/companyDetail.vue
@@ -300,7 +300,7 @@
    getImgUrls(imageUrls) {
      if (imageUrls && imageUrls != '' && imageUrls.length > 0) {
        imageUrls = imageUrls.split(',').filter(ele => ele != '').map(ele => {
          // return 'http://10.141.11.11/place/' + ele
          // return 'http://47.217.32.232:80/place/' + ele
          return 'https://srgdjczzxtpt.com:2080/gminio/jczz/' + ele
        })
      }
src/views/contradictionEventShow/components/detailDialog.vue
@@ -1,45 +1,24 @@
<template>
  <el-dialog
    class="syld-details-box prm-dialog-popup business-detail-box"
    :title="title"
    append-to-body
    :close-on-click-modal="false"
    :visible.sync="popupShow"
    center
    @close="popupClose"
  >
  <el-dialog class="syld-details-box prm-dialog-popup business-detail-box" :title="title" append-to-body
    :close-on-click-modal="false" :visible.sync="popupShow" center @close="popupClose">
    <div class="all-box">
      <div class="type-tab-box" v-if="tabList.length != 0">
        <div
          class="tab-item"
          :class="{ 'tab-choose-item': chooseTab == order }"
          @click="tabClick(order)"
          v-for="(part, order) in tabList"
          :key="order"
        >
        <div class="tab-item" :class="{ 'tab-choose-item': chooseTab == order }" @click="tabClick(order)"
          v-for="(part, order) in tabList" :key="order">
          {{ part }}
        </div>
      </div>
      <div class="content" v-show="chooseTab == 0">
        <div
          class="item-box"
          v-for="(item, index) in lableList"
          :key="index"
          :style="{ width: item.width }"
        >
        <div class="item-box" v-for="(item, index) in lableList" :key="index" :style="{ width: item.width }">
          <div class="label">{{ item.label }}:</div>
          <div class="value" v-if="item.isPic != true">
            {{ item.value }}
          </div>
          <div class="value" v-if="item.isPic == true">
            <el-image
              :style="{
            <el-image :style="{
                width: item.value != '' ? '100px' : '',
                height: item.value != '' ? '100px' : '',
              }"
              :src="getImgUrls(item.value)"
              :preview-src-list="getImgUrls(item.value)"
            >
            }" :src="getImgUrls(item.value)" :preview-src-list="getImgUrls(item.value)">
              <div slot="error" class="image-slot">
                <i class="el-icon-picture-outline"></i> 暂无图片
              </div>
@@ -49,52 +28,23 @@
        </div>
      </div>
      <div class="content" v-show="chooseTab == 1">
        <el-table
          :data="tableData"
          style="width: 100%"
          :header-cell-style="{
        <el-table :data="tableData" style="width: 100%" :header-cell-style="{
            'text-align': 'center',
            'background-color': '#203c60',
            borderColor: '#324e75',
          }"
          :cell-style="{
        }" :cell-style="{
            'text-align': 'center',
            borderColor: '#324e75',
            cursor: 'default',
          }"
          :row-class-name="tableRowClassName"
          class="police-infor-table"
        >
          <el-table-column
            prop="name"
            :show-overflow-tooltip="true"
            label="名称"
            :key="Math.random()"
          ></el-table-column>
          <el-table-column
            prop="idCard"
            :show-overflow-tooltip="true"
            label="身份证号"
            :key="Math.random()"
          ></el-table-column>
          <el-table-column
            prop="phoneNumber"
            :show-overflow-tooltip="true"
            label="手机号"
            :key="Math.random()"
          ></el-table-column>
          <el-table-column
            prop="employer"
            :show-overflow-tooltip="true"
            label="工作单位"
            :key="Math.random()"
          ></el-table-column>
          <el-table-column
            prop="confirmFlag"
            :show-overflow-tooltip="true"
            label="审核状态"
            :key="Math.random()"
          >
}" :row-class-name="tableRowClassName" class="police-infor-table">
          <el-table-column prop="name" :show-overflow-tooltip="true" label="名称" :key="Math.random()"></el-table-column>
          <el-table-column prop="idCard" :show-overflow-tooltip="true" label="身份证号"
            :key="Math.random()"></el-table-column>
          <el-table-column prop="phoneNumber" :show-overflow-tooltip="true" label="手机号"
            :key="Math.random()"></el-table-column>
          <el-table-column prop="employer" :show-overflow-tooltip="true" label="工作单位"
            :key="Math.random()"></el-table-column>
          <el-table-column prop="confirmFlag" :show-overflow-tooltip="true" label="审核状态" :key="Math.random()">
            <template slot-scope="scope">
              <div>{{ scope.row.confirmFlag == 1 ? "待确认" : "已确认" }}</div>
            </template>
@@ -117,23 +67,23 @@
      chooseTab: 0,
      tabList: [],
      tableData: [],
    };
    }
  },
  methods: {
    // 打开弹窗初始化数据
    initOpen(row, title, tabList, tableData) {
      this.chooseTab = 0;
      this.popupShow = true;
      this.lableList = row;
      this.title = title;
      this.tabList = tabList;
      this.tableData = tableData;
      this.chooseTab = 0
      this.popupShow = true
      this.lableList = row
      this.title = title
      this.tabList = tabList
      this.tableData = tableData
    },
    // 关闭弹窗按钮
    popupClose() {
      this.popupShow = false;
      this.popupShow = false
    },
    // 图片转换
@@ -143,19 +93,19 @@
          .split(",")
          .filter((ele) => ele != "")
          .map((ele) => {
            return "http://10.141.11.11/place/" + ele;
            return "http://47.217.32.232:80/place/" + ele
            // return 'https://srgdjczzxtpt.com:2080/gminio/jczz/' + ele
          });
          })
      }
      return imageUrls || [];
      return imageUrls || []
    },
    // tab切换
    tabClick(type) {
      this.chooseTab = type;
      this.chooseTab = type
    },
  },
};
}
</script>
<style lang="scss" scoped>
src/views/home/components/dialog/keyPersonBox.vue
@@ -234,7 +234,7 @@
    getPersonInfoPage (status) {
      getPersonInfoPage({
        status,
        depaId: this.userInfo.dept_id,
        deptId: this.userInfo.dept_id,
        zdryxl: this.keyPersonTitle,
        realName: this.peoplePoliceName,
        phone: this.peopleCallPhone,
src/views/home/index.vue
@@ -2566,7 +2566,10 @@
            lat: Number(positions[1]),
            alt: 1,
            url: '/img/icon/house.png',
            id: item.id
            id: item.id,
            setStyle: {
              disableDepthTestDistance: Number.POSITIVE_INFINITY
            }
          },
          incident: this.houseSiteClick,
          distanceDisplayCondition: { "near": 0, "far": 200000 }
@@ -2578,7 +2581,10 @@
            lng: Number(positions[0]),
            lat: Number(positions[1]),
            alt: 1,
            text: item.name
            text: item.name,
            setStyle: {
              disableDepthTestDistance: Number.POSITIVE_INFINITY
            }
          }
        })
      })
src/views/house/components/antiFraud.vue
@@ -306,7 +306,7 @@
    getImgUrls(imageUrls) {
      if (imageUrls && imageUrls != '' && imageUrls.length > 0) {
        imageUrls = imageUrls.split(',').filter(ele => ele != '').map(ele => {
          return 'http://10.141.11.11/jczzMedia/' + ele
          return 'http://47.217.32.232:80/jczzMedia/' + ele
          // return 'https://srgdjczzxtpt.com:2080/gminio/jczz/' + ele
        })
      }
src/views/house/components/employees.vue
@@ -243,7 +243,7 @@
    getImgUrls (imageUrls) {
      if (imageUrls && imageUrls != '' && imageUrls.length > 0) {
        imageUrls = imageUrls.split(',').filter(ele => ele != '').map(ele => {
          return 'http://10.141.11.11/jczzMedia/' + ele
          return 'http://47.217.32.232:80/jczzMedia/' + ele
          // return 'https://srgdjczzxtpt.com:2080/gminio/jczz/' + ele
        })
      }
src/views/house/components/nineSmallPlaces.vue
@@ -506,7 +506,7 @@
        if (imageUrls && imageUrls != '' && imageUrls.length > 0) {
          imageUrls = imageUrls.split(',').filter(ele => ele != '').map(ele => {
            return 'http://10.141.11.11/jczzMedia/' + ele
            return 'http://47.217.32.232:80/jczzMedia/' + ele
          })
        }
@@ -517,7 +517,7 @@
    getImgUrls (imageUrls) {
      if (imageUrls && imageUrls != '' && imageUrls.length > 0) {
        imageUrls = imageUrls.split(',').filter(ele => ele != '').map(ele => {
          // return 'http://10.141.11.11/place/' + ele
          // return 'http://47.217.32.232:80/place/' + ele
          return 'https://srgdjczzxtpt.com:2080/gminio/jczz/' + ele
        })
      }
src/views/house/components/noFraudAuthentication.vue
@@ -248,7 +248,7 @@
    getImgUrls (imageUrls) {
      if (imageUrls && imageUrls != '' && imageUrls.length > 0) {
        imageUrls = imageUrls.split(',').filter(ele => ele != '').map(ele => {
          return 'http://10.141.11.11/jczzMedia/' + ele
          return 'http://47.217.32.232:80/jczzMedia/' + ele
          // return 'https://srgdjczzxtpt.com:2080/gminio/jczz/' + ele
        })
      }
src/views/house/components/positionTrading.vue
@@ -223,7 +223,7 @@
    getImgUrls (imageUrls) {
      if (imageUrls && imageUrls != '' && imageUrls.length > 0) {
        imageUrls = imageUrls.split(',').filter(ele => ele != '').map(ele => {
          return 'http://10.141.11.11/jczzMedia/' + ele
          return 'http://47.217.32.232:80/jczzMedia/' + ele
          // return 'https://srgdjczzxtpt.com:2080/gminio/jczz/' + ele
        })
      }
src/views/house/components/rentalHouse.vue
@@ -458,7 +458,7 @@
    getImgUrls(imageUrls) {
      if (imageUrls && imageUrls != '' && imageUrls.length > 0) {
        imageUrls = imageUrls.split(',').filter(ele => ele != '').map(ele => {
          return 'http://10.141.11.11/jczzMedia/' + ele
          return 'http://47.217.32.232:80/jczzMedia/' + ele
          // return 'https://srgdjczzxtpt.com:2080/gminio/jczz/' + ele
        })
      }
src/views/house/components/scanCodeAlarm.vue
@@ -176,7 +176,7 @@
    getImgUrls (imageUrls) {
      if (imageUrls && imageUrls != '' && imageUrls.length > 0) {
        imageUrls = imageUrls.split(',').filter(ele => ele != '').map(ele => {
          return 'http://10.141.11.11/jczzMedia/' + ele
          return 'http://47.217.32.232:80/jczzMedia/' + ele
          // return 'https://srgdjczzxtpt.com:2080/gminio/jczz/' + ele
        })
      }
src/views/house/index.vue
@@ -188,10 +188,13 @@
            <div class="ridgepole-info" v-if="isShowHouseBox">
              <div class="title">楼栋信息</div>
              <div class="content">
                <div>
                <div class="l">标准地址:{{ this.buildingChoosed.address }}</div>
              </div>
              <div class="content">
                <!-- <div>
                  <div>电梯</div>
                  <div style="color:#59a9ff">{{ floorInfo.elev }}</div>
                </div>
                </div> -->
                <div v-if="isShowFloorCount">
                  <div>楼层总数</div>
                  <div style="color:#59a9ff">{{ floorInfo.floor_num }}</div>
@@ -520,6 +523,7 @@
    <el-dialog :visible.sync="residentDetailsShow" :modal-append-to-body="false" :modal="true"
      :close-on-click-modal="false" :before-close="residentDetailsClose" class="resident-details-box">
      <div class="house-info-box">
        <div class="house-title">标准地址:</div>
        <div class="house-title">{{ residentDetailsTitle }}</div>
        <div class="mini-code">
          <el-image fit="contain" :src="residentCodeUrl" :preview-src-list="[residentCodeUrl]">
@@ -601,14 +605,14 @@
              </span>
            </template>
          </el-table-column>
          <el-table-column prop="relation" label="户主关系">
          <!-- <el-table-column prop="relation" label="户主关系">
            <template slot-scope="scope">
              <span :style="{ color: (scope.row.status == 2 ? '#f00!important' : '#000') }">
                {{
                  scope.row.relation }}
              </span>
            </template>
          </el-table-column>
          </el-table-column> -->
          <el-table-column :show-overflow-tooltip="true" prop="censusAddress" label="户籍地址">
            <template slot-scope="scope">
              <span :style="{ color: (scope.row.status == 2 ? '#f00!important' : '#000') }">
@@ -673,14 +677,14 @@
              </span>
            </template>
          </el-table-column>
          <el-table-column prop="relation" label="户主关系">
          <!-- <el-table-column prop="relation" label="户主关系">
            <template slot-scope="scope">
              <span :style="{ color: (scope.row.status == 2 ? '#f00!important' : '#000') }">
                {{
                  scope.row.relation }}
              </span>
            </template>
          </el-table-column>
          </el-table-column> -->
          <el-table-column :show-overflow-tooltip="true" prop="censusAddress" label="户籍地址">
            <template slot-scope="scope">
              <span :style="{ color: (scope.row.status == 2 ? '#f00!important' : '#000') }">
@@ -1682,7 +1686,7 @@
          baseUrl = "http://192.168.0.112/"
        } else {
          // 部署
          baseUrl = "http://10.141.11.11/"
          baseUrl = "http://47.217.32.232:80/"
        }
        console.log(res.data, "111111111------")
        // 小区名称类型地址
@@ -1760,7 +1764,8 @@
                build_uid: item.uid || '',
                build_std_addr_id: item.std_addr_id ? `${item.std_addr_id.split("|")[1] || ''}` : '',
                floor_num: item.floor_num || '0',
                elev: item.elev ? `${item.elev}` : '0'
                elev: item.elev ? `${item.elev}` : '0',
                address: item.address || '',
              })
            })
            console.log('search---buildingthis.buildingList', this.buildingList)
@@ -1867,8 +1872,8 @@
            this.residentDetailsClick(houseUintList)
            return
          }
          console.log(houseUintList.children_infos.length > 1 && houseUintList.children_infos[0].exttype, "unit**********************")
          if (houseUintList.children_infos.length > 1 && houseUintList.children_infos[0].exttype == 'unit') {
          console.log(houseUintList.children_infos.length >= 1 && houseUintList.children_infos[0].exttype, "unit**********************")
          if (houseUintList.children_infos.length >= 1 && houseUintList.children_infos[0].exttype == 'unit') {
            this.isShowUnitChoose = true
            this.unitOptions = []
            this.unitValue = 1
@@ -1880,7 +1885,7 @@
            })
            this.unitChoosedArr = this.unitAllArr.children_infos[0].children_infos
            console.log(this.unitAllArr.children_infos, 'search---unit')
          } else if (houseUintList.children_infos.length > 1 && houseUintList.children_infos[0].exttype == 'floor') {
          } else if (houseUintList.children_infos.length >= 1 && houseUintList.children_infos[0].exttype == 'floor') {
            this.isShowUnitChoose = false
            this.unitChoosedArr = this.unitAllArr.children_infos
            console.log(this.unitAllArr.children_infos, 'search---floor')
@@ -2023,6 +2028,7 @@
    // 点击户室--大搜
    residentDetailsClick (params) {
      console.log('residentDetailsClick--params', params)
      let residentId = ''
      this.houseDate = []
      if (params.exttype == 'room') {
@@ -2058,7 +2064,8 @@
      }
      this.getPicURL(residentId)
      this.residentDetailsTitle = `${params.name}住户信息`
      // this.residentDetailsTitle = `${params.address} 住户信息`
      this.residentDetailsTitle = `${params.address}`
      this.residentDetailsShow = true
      this.residentNoDataText = ' '
      this.residentLoading = true
@@ -2267,7 +2274,7 @@
      })
      if (params == "business") {
        if (row.imageUrls) {
          row.imageUrls = 'http://10.141.11.11/place/' + row.imageUrls
          row.imageUrls = 'http://47.217.32.232:80/place/' + row.imageUrls
        }
        this.$store.commit('SET_BUSINESSDATAPOPUP', true)
src/views/house/index(商铺用接口前).vue
@@ -1520,7 +1520,7 @@
          baseUrl = "http://192.168.0.112/"
        } else {
          // 部署
          baseUrl = "http://10.141.11.11/"
          baseUrl = "http://47.217.32.232:80/"
        }
        // 小区名称类型地址
@@ -1592,14 +1592,14 @@
                item.name = item.place_name
                item.x = item.lng
                item.y = item.lat
                item.picUrl = 'http://10.141.11.11' + item.url
                item.picUrl = 'http://47.217.32.232:80' + item.url
                sCData.push(item)
              }
              if (sCAoiId == '6E513C5E5D1611EAB6183C15FB00027B' && item.aoi_id == 'A425AEC8D3FE4C85937FE36B4F996437') {//万达晶座并入万达广场
                item.name = item.place_name
                item.x = item.lng
                item.y = item.lat
                item.picUrl = 'http://10.141.11.11' + item.url
                item.picUrl = 'http://47.217.32.232:80' + item.url
                sCData.push(item)
              }
            })
src/views/intelligentSearch/index.vue
@@ -54,11 +54,47 @@
</template>
<script>
let cylinderLayer = null
let DataSourcesArray = []
let circleLayer = null
let timer = []
let JQSmychart = null
let positionColor = [
  global.DC.Namespace.Cesium.Color.fromBytes(255, 97, 97, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(255, 142, 97, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(255, 192, 97, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(252, 58, 242, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(0, 185, 209, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(250, 84, 28, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(221, 255, 97, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(51, 255, 0, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(255, 97, 255, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(97, 255, 181, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(58, 181, 252, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(252, 129, 58, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(58, 252, 236, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(97, 184, 255, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(252, 58, 58, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(97, 113, 255, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(81, 252, 58, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(126, 97, 255, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(168, 252, 58, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(171, 97, 255, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(252, 249, 58, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(210, 97, 255, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(252, 174, 58, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(255, 226, 97, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(255, 97, 176, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(58, 252, 155, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(252, 58, 155, 20),
]
import { initMapPosition } from '@/utils/mapPositionInit'
import {
  getVillagePersonInfoBySearch,
} from "@/api/dept/index.js"
import { getPoliceStationTree } from "@/api/home/index.js"
let loading = null
export default {
@@ -78,6 +114,7 @@
        count: 0,
        currentPage: 1
      },
      policeStationOptions: []
    }
  },
@@ -88,6 +125,7 @@
      initMapPosition()
      that.searchBtn()
    })
    this.getPoliceStationTree(1)
  },
  mounted () {
@@ -125,6 +163,67 @@
  },
  methods: {
    // 加载首页下拉列表数据
    getPoliceStationTree (type, id = '') {
      var that = this
      getPoliceStationTree(type, id).then(res => {
        if (type == 1) {
          this.policeStationOptions = res.data.data
          this.policeStationOptions.unshift({
            name: '全部',
            id: 1
          })
          this.initPoliceStationLayer()
        }
      })
    },
    // 加载面数据的方法
    initPoliceStationLayer () {
      const that = this
      cylinderLayer = new global.DC.PrimitiveLayer('cylinderLayer')
      global.viewer.addLayer(cylinderLayer)
      DataSourcesArray.forEach(item => {
        global.viewer.dataSources.remove(item, true)
      })
      this.policeStationOptions.forEach((item, index) => {
        if (item.position && item.position.length > 0) {
          item.position.forEach((sourceItem, sourceIndex) => {
            const Json = { ...JSON.parse(sourceItem) }
            global.DC.Namespace.Cesium.GeoJsonDataSource.load(Json, {
              stroke: positionColor[index],
              fill: positionColor[index], //注意:颜色必须大写,即不能为blue
              strokeWidth: 0,
              clampToGround: false
            }).then(function (dataSource) {
              let entities = dataSource.entities.values
              //修改entity样式
              for (let i = 0; i < entities.length; i++) {
                let entity = entities[i]
                entity.polyline = {
                  positions: entity.polygon.hierarchy._value.positions,
                  width: 2,
                  material: global.DC.Namespace.Cesium.Color.fromCssColorString('#ED7C2F'),
                  clampToGround: true
                }
              }
              DataSourcesArray.push(dataSource)
              dataSource.show = true
              global.viewer.dataSources.add(dataSource)
            })
          })
        }
      })
    },
    // 获取选中数据--暂时为测试数据
    getRowData (row) {
      let data = [
@@ -161,7 +260,8 @@
        {
          label: '新地址',
          prop: 'reAddress',
          value: row.reAddress.replace('江西省上饶市', ''),
          // value: row.reAddress.replace('江西省上饶', ''),
          value: row.reAddress,
          type: 'detail'
        },
        {
@@ -321,6 +421,17 @@
  },
  destroyed () {
    DataSourcesArray.forEach(item => {
      global.viewer.dataSources.remove(item, true)
    })
    DataSourcesArray = []
    if (cylinderLayer != null) {
      cylinderLayer.remove()
      cylinderLayer = null
    }
    loading && loading.close()
    window.removeEventListener('resize', this.setTableHeight)
src/views/rentalInfo/components/detailDialog.vue
@@ -18,8 +18,7 @@
                    :header-cell-style="{ 'text-align': 'center', 'background-color': '#203c60', 'borderColor': '#324e75' }"
                    :cell-style="{ 'text-align': 'center', 'borderColor': '#324e75', 'cursor': 'default' }"
                    :row-class-name="tableRowClassName" class="police-infor-table">
                    <el-table-column prop="name" :show-overflow-tooltip="true" label="名称"
                        :key="Math.random()"></el-table-column>
          <el-table-column prop="name" :show-overflow-tooltip="true" label="名称" :key="Math.random()"></el-table-column>
                    <el-table-column prop="idCard" :show-overflow-tooltip="true" label="身份证号"
                        :key="Math.random()"></el-table-column>
                    <el-table-column prop="phoneNumber" :show-overflow-tooltip="true" label="手机号"
@@ -72,7 +71,7 @@
        getImgUrls (imageUrls) {
            if (imageUrls && imageUrls != '' && imageUrls.length > 0) {
                imageUrls = imageUrls.split(',').filter(ele => ele != '').map(ele => {
                    return 'http://10.141.11.11/place/' + ele
          return 'http://47.217.32.232:80/place/' + ele
                    // return 'https://srgdjczzxtpt.com:2080/gminio/jczz/' + ele
                })
            }
src/views/site/index.vue
@@ -91,9 +91,45 @@
</template>
<script>
let cylinderLayer = null
let DataSourcesArray = []
let circleLayer = null
let timer = []
let JQSmychart = null
let positionColor = [
  global.DC.Namespace.Cesium.Color.fromBytes(255, 97, 97, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(255, 142, 97, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(255, 192, 97, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(252, 58, 242, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(0, 185, 209, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(250, 84, 28, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(221, 255, 97, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(51, 255, 0, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(255, 97, 255, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(97, 255, 181, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(58, 181, 252, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(252, 129, 58, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(58, 252, 236, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(97, 184, 255, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(252, 58, 58, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(97, 113, 255, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(81, 252, 58, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(126, 97, 255, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(168, 252, 58, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(171, 97, 255, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(252, 249, 58, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(210, 97, 255, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(252, 174, 58, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(255, 226, 97, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(255, 97, 176, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(58, 252, 155, 20),
  global.DC.Namespace.Cesium.Color.fromBytes(252, 58, 155, 20),
]
import { initMapPosition } from '@/utils/mapPositionInit'
import { getNineTypeTree, getNinePage, getNineStatisticsNum } from "@/api/site/index.js"
import { getPoliceStationTree } from "@/api/home/index.js"
let loading = null
export default {
@@ -120,6 +156,7 @@
        total: 0,
        count: 0,
      },
      policeStationOptions: []
    }
  },
@@ -133,6 +170,7 @@
    that.$nextTick(() => {
      initMapPosition()
    })
    this.getPoliceStationTree(1)
  },
  mounted () {
@@ -166,6 +204,67 @@
  },
  methods: {
    // 加载首页下拉列表数据
    getPoliceStationTree (type, id = '') {
      var that = this
      getPoliceStationTree(type, id).then(res => {
        if (type == 1) {
          this.policeStationOptions = res.data.data
          this.policeStationOptions.unshift({
            name: '全部',
            id: 1
          })
          this.initPoliceStationLayer()
        }
      })
    },
    // 加载面数据的方法
    initPoliceStationLayer () {
      const that = this
      cylinderLayer = new global.DC.PrimitiveLayer('cylinderLayer')
      global.viewer.addLayer(cylinderLayer)
      DataSourcesArray.forEach(item => {
        global.viewer.dataSources.remove(item, true)
      })
      this.policeStationOptions.forEach((item, index) => {
        if (item.position && item.position.length > 0) {
          item.position.forEach((sourceItem, sourceIndex) => {
            const Json = { ...JSON.parse(sourceItem) }
            global.DC.Namespace.Cesium.GeoJsonDataSource.load(Json, {
              stroke: positionColor[index],
              fill: positionColor[index], //注意:颜色必须大写,即不能为blue
              strokeWidth: 0,
              clampToGround: false
            }).then(function (dataSource) {
              let entities = dataSource.entities.values
              //修改entity样式
              for (let i = 0; i < entities.length; i++) {
                let entity = entities[i]
                entity.polyline = {
                  positions: entity.polygon.hierarchy._value.positions,
                  width: 2,
                  material: global.DC.Namespace.Cesium.Color.fromCssColorString('#ED7C2F'),
                  clampToGround: true
                }
              }
              DataSourcesArray.push(dataSource)
              dataSource.show = true
              global.viewer.dataSources.add(dataSource)
            })
          })
        }
      })
    },
    // 是否有隐患
    filterBtn (isDanger) {
      this.isDanger = isDanger
@@ -320,6 +419,17 @@
  },
  destroyed () {
    DataSourcesArray.forEach(item => {
      global.viewer.dataSources.remove(item, true)
    })
    DataSourcesArray = []
    if (cylinderLayer != null) {
      cylinderLayer.remove()
      cylinderLayer = null
    }
    loading && loading.close()
    this.$parent.$parent.resize('0px')
vue.config.js
@@ -199,7 +199,7 @@
        // target: "http://192.168.1.170:82",
        // target: "http://124.221.125.71:9529",//开发调试
        // target: "http://172.16.13.150:82",
        // target: "http://10.141.11.11:8081/api",
        // target: "http://47.217.32.232:80:8081/api",
        // ws: true, //启用webSocket6566
        changeOrigin: true, //开启代理跨域
        pathRewrite: {