src/views/screen/components/map3.vue

@@ -23,80 +23,80 @@
    return {
      myChart: null, // ECharts 实例
      big: 130,
      dotData: [
        {
          name: '自流井区',
          value: [104.665471408, 29.23008885, 300],
          platformOnline: true
        },
        {
          name: '高新区',
          value: [104.805193, 29.3, 300],
          platformOnline: true
        },
        {
          name: '大安区',
          value: [104.90805, 29.345946, 300],
          platformOnline: true
        },
        {
          name: '沿滩区',
          value: [104.80804, 29.200594, 300],
          platformOnline: true
        },
        {
          name: '贡井区',
          value: [104.579106, 29.241427, 300],
          platformOnline: true
        },
        {
          name: '荣县',
          value: [104.3534, 29.3538, 300],
          platformOnline: true
        },
        {
          name: '富顺县',
          value: [104.96, 29.08, 300],
          platformOnline: true
        }
      ],
      markData: [
        {
          name: '自流井区',
          number: '0',
          value: [104.616237686031, 29.081, 300]
        },
        {
          name: '高新区',
          number: '0',
          value: [104.84, 29.405, 300]
        },
        {
          name: '大安区',
          number: '0',
          value: [105.136, 29.30548885792289, 300]
        },
        {
          name: '沿滩区',
          number: '0',
          value: [104.956237686031, 29.2, 300]
        },
        {
          name: '贡井区',
          number: '0',
          value: [104.436237686031, 29.16048885792289, 300]
        },
        {
          name: '荣县',
          number: '0',
          value: [104.480237686031, 29.40048885792289, 300]
        },
        {
          name: '富顺县',
          number: '0',
          value: [105.12, 29.076, 300]
        }
      ],
      // dotData: [
      //   {
      //     name: '自流井区',
      //     value: [104.645471408, 29.150000, 300],
      //     platformOnline: true
      //   },
      //   {
      //     name: '高新区',
      //     value: [104.780000, 29.22, 300],
      //     platformOnline: true
      //   },
      //   {
      //     name: '大安区',
      //     value: [104.90805, 29.275946, 300],
      //     platformOnline: true
      //   },
      //   {
      //     name: '沿滩区',
      //     value: [104.78804, 29.130594, 300],
      //     platformOnline: true
      //   },
      //   {
      //     name: '贡井区',
      //     value: [104.559106, 29.161427, 300],
      //     platformOnline: true
      //   },
      //   {
      //     name: '荣县',
      //     value: [104.3234, 29.2838, 300],
      //     platformOnline: true
      //   },
      //   {
      //     name: '富顺县',
      //     value: [104.950000, 29.04, 300],
      //     platformOnline: true
      //   }
      // ],
      // markData: [
      //   {
      //     name: '自流井区',
      //     number: '0',
      //     value: [104.490471408, 28.960000, 300]
      //   },
      //   {
      //     name: '高新区',
      //     number: '0',
      //     value: [104.86, 29.405, 300]
      //   },
      //   {
      //     name: '大安区',
      //     number: '0',
      //     value: [105.236, 29.30548885792289, 300]
      //   },
      //   {
      //     name: '沿滩区',
      //     number: '0',
      //     value: [104.760237686031, 28.8500000, 300]
      //   },
      //   {
      //     name: '贡井区',
      //     number: '0',
      //     value: [104.322237686031, 29.00048885792289, 300]
      //   },
      //   {
      //     name: '荣县',
      //     number: '0',
      //     value: [104.466237686031, 29.44048885792289, 300]
      //   },
      //   {
      //     name: '富顺县',
      //     number: '0',
      //     value: [105.18, 29.000000, 300]
      //   }
      // ],
    }
  },
  mounted() {
@@ -109,7 +109,7 @@
  },
  methods: {
    initializeMap() {
      this.updateMapData()
      // this.updateMapData()
      this.getChinData('自贡市', chinaJson)
    },
    updateMapData() {
@@ -122,7 +122,6 @@
      }
      if (this.platformData) {
        this.dotData.forEach(item => {
          console.log('更新数据', this.platformData)
          if (this.platformData[item.name]) {
            item.platformOnline = this.platformData[item.name].platformOnline
          }
@@ -161,9 +160,9 @@
          map: name,
          left: '-5%',
          top: '5%',
          boxWidth: 100,
          regionHeight: 2,
          zlevel: 5,
          boxWidth: 80,
          regionHeight: 0.5,
          zlevel: 10,

          tooltip: {
            show: true,
@@ -178,7 +177,7 @@
          },

          label: {
            show: true, // (地图上的城市名称)是否显示标签
            show: false, // (地图上的城市名称)是否显示标签
            distance: 5,
            formatter: function (params) {
              return params.name ? params.name : ' '
@@ -191,7 +190,7 @@

          emphasis: {
            label: {
              show: true,
              show: false,
              textStyle: {
                color: '#ffffff' // 高亮文字为亮蓝色
              }
@@ -219,7 +218,7 @@
            zoomSensitivity: 0, // 缩放
            panSensitivity: 0, // 平移
            center: [0, 0, 0],
            alpha: 70, // 倾斜角度
            alpha: 30, // 倾斜角度
            animationDurationUpdate: 1000, // 过渡动画的时长
            animationEasingUpdate: 'cubicInOut' // 过渡动画的缓动效果
          },
@@ -252,11 +251,11 @@
            name: name,
            type: 'map3D',
            map: name,
            boxWidth: 100,
            regionHeight: 2,
            boxWidth: 80,
            regionHeight: 0.5,
            left: '-5%',
            top: '5%',
            zlevel: 10,
            zlevel: 5,

            // tooltip: {
            //   show: true,
@@ -293,7 +292,7 @@
              zoomSensitivity: 0, // 缩放
              panSensitivity: 0, // 平移
              center: [0, 0, 0],
              alpha: 70 // 倾斜角度
              alpha: 30 // 倾斜角度
            }
          },
          {
@@ -328,48 +327,48 @@
              opacity: 1
            },
            data: [
              {
                coords: [
                  [104.665471408, 29.23008885, 300],
                  [104.6, 29.125, 430]
                ]
              },
              {
                coords: [
                  [104.805193, 29.30148885792289, 300],
                  [104.780237686031, 29.39548885792289, 430]
                ]
              },
              {
                coords: [
                  [104.90805, 29.345946, 300],
                  [105.056237686031, 29.33548885792289, 430]
                ]
              },
              {
                coords: [
                  [104.80804, 29.200594, 300],
                  [104.906237686031, 29.20048885792289, 430]
                ]
              },
              {
                coords: [
                  [104.579106, 29.241427, 300],
                  [104.486237686031, 29.19048885792289, 430]
                ]
              },
              {
                coords: [
                  [104.3534, 29.3538, 300],
                  [104.456237686031, 29.39048885792289, 430]
                ]
              },
              {
                coords: [
                  [104.96, 29.08, 300],
                  [105.05, 29.083, 430]
                ]
              }
              // {
              //   coords: [
              //     [104.645471408, 29.150000, 300],
              //     [104.525471408, 28.960000, 430]
              //   ]
              // },
              // {
              //   coords: [
              //     [104.779193, 29.22148885792289, 300],
              //     [104.780237686031, 29.39548885792289, 430]
              //   ]
              // },
              // {
              //   coords: [
              //     [104.90805, 29.275946, 300],
              //     [105.106237686031, 29.22948885792289, 430]
              //   ]
              // },
              // {
              //   coords: [
              //     [104.78804, 29.130594, 300],
              //     [104.776237686031, 28.85048885792289, 430]
              //   ]
              // },
              // {
              //   coords: [
              //     [104.559106, 29.161427, 300],
              //     [104.356237686031, 29.00048885792289, 430]
              //   ]
              // },
              // {
              //   coords: [
              //     [104.3234, 29.2838, 300],
              //     [104.456237686031, 29.39048885792289, 430]
              //   ]
              // },
              // {
              //   coords: [
              //     [104.950000, 29.04, 300],
              //     [105.05, 28.983, 430]
              //   ]
              // }
            ],
            effect: {
              show: true,

 src/views/system/data-manage/data-detail/index.vue

@@ -84,6 +84,7 @@
            v-model="queryParams.timeRange"
            type="daterange"
            range-separator="至"
            value-format="yyyy-MM-dd"
            start-placeholder="开始日期"
            end-placeholder="结束日期">
          </el-date-picker>

 src/views/system/work-order/index.vue

@@ -24,6 +24,16 @@
          <el-option label="审核未通过" value="AUDITING_FAIL"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="时间范围" prop="timeRange">
        <el-date-picker
          v-model="queryParams.timeRange"
          type="daterange"
          range-separator="至"
          value-format="yyyy-MM-dd"
          start-placeholder="开始日期"
          end-placeholder="结束日期">
        </el-date-picker>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
@@ -88,7 +98,7 @@
                    <el-col :span="24" class="time">故障时间：{{ item.createTime }}</el-col>
                  </el-row>
                  <el-row class="work-order-item">
                    <el-col class="time" :span="24"><div>故障点位：</div><div>{{ item.source }}</div></el-col>
                    <el-col class="time" :span="24"><div>国标码：{{ item.serialNumber }}</div><div>{{ item.source }}</div></el-col>
                  </el-row>
                  <el-row style="position: absolute;bottom: 10px">
                    <el-button
@@ -769,8 +779,10 @@
      this.empty = false;
      this.loading = true
      this.queryParams.params = {}
      this.queryParams['start'] = this.daterangeYwHandleTime ? this.daterangeYwHandleTime[0] : null
      this.queryParams['end'] = this.daterangeYwHandleTime ? this.daterangeYwHandleTime[1] : null
      if (this.queryParams.timeRange && this.queryParams.timeRange.length > 0) {
        this.queryParams.start = this.queryParams.timeRange[0]
        this.queryParams.end = this.queryParams.timeRange[1]
      }

      listWorkOrder(this.queryParams).then(response => {
        response.data.forEach(item => {

 src/views/system/work-order/threshold/index.vue

@@ -13,8 +13,8 @@
    <!--        </el-button>-->
    <!--      </el-col>-->
    <!--    </el-row>-->
    <div style="display: flex;overflow-x: auto;" >
      <div>
    <el-row>
      <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="8">
        <el-card style="margin-bottom: 20px; height: 350px; margin-right: 20px;color: #656565;">
          <div style="display: flex; justify-content: space-between">
            <div class="header—text">视频</div>
@@ -102,8 +102,8 @@
            </div>
          </div>
        </el-card>
      </div>
      <div>
      </el-col>
      <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="8">
        <el-card style="margin-bottom: 20px; height: 350px; margin-right: 20px;color: #656565;">
          <div style="display: flex; justify-content: space-between">
            <div class="header—text">人脸</div>
@@ -191,9 +191,9 @@
              </div>
            </div>
          </div>
        </el-card></div
        </el-card></el-col
      >
      <div>
      <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="8">
        <el-card style="margin-bottom: 20px; height: 350px; margin-right: 20px;color: #656565;">
          <div style="display: flex; justify-content: space-between">
            <div class="header—text">车辆</div>
@@ -280,8 +280,9 @@
              </div>
            </div>
          </div>
        </el-card></div>
    </div>
        </el-card></el-col
      >
    </el-row>
  </div>
</template>