Compare commits

..

No commits in common. "51ce76786cb6afc9ca965b5305fb26bee2d3437e" and "33fe7a8436cabb970451321652df919ee0ebf587" have entirely different histories.

3 changed files with 20 additions and 25 deletions

View File

@ -43,11 +43,6 @@
<el-tag v-if="row.status == '1'" type="success" size="small">通过</el-tag> <el-tag v-if="row.status == '1'" type="success" size="small">通过</el-tag>
<el-tag v-if="row.status == '2'" type="danger" size="small">拒绝</el-tag> <el-tag v-if="row.status == '2'" type="danger" size="small">拒绝</el-tag>
</template> </template>
<template #idCard="{ row }">
<span v-if="row.businessType == 2 || row.businessType == 3">{{ row.unifiedSocialCreditCode }}</span>
<span v-else>{{ row.idCard }}</span>
</template>
<template #menu="scope"> <template #menu="scope">
<custom-table-operate :actions="state.options.actions" :data="scope" /> <custom-table-operate :actions="state.options.actions" :data="scope" />
</template> </template>

View File

@ -7,7 +7,7 @@
<script setup> <script setup>
import { reactive, ref } from 'vue'; import { reactive, ref } from 'vue';
import mapSplashed from '../home/components/mapSplashed.vue'; import mapSplashed from '../home/components/mapSplashed.vue';
const iframeUrl = ref('http://192.168.1.214:9000/v2/entities'); const iframeUrl = ref('http://192.168.18.41:9000/v2/entities');
const iframeStyle = ref({ width: '100%', height: ' calc(100vh - 120px)' }); const iframeStyle = ref({ width: '100%', height: ' calc(100vh - 120px)' });
</script> </script>

View File

@ -1,6 +1,6 @@
<template> <template>
<div class="map-center-warp"> <div class="map-center-warp">
<!-- <img :src="getAssetsFile('images/vsualized/gmmap.png')" class="map-img" /> --> <img :src="getAssetsFile('images/vsualized/gmmap.png')" class="map-img" />
<div class="map-pos"> <div class="map-pos">
<custom-echart-maps :chart-data="chartsData.valData" height="100%" :option="chartsData.option" :geo="geoData" :name="mapName" /> <custom-echart-maps :chart-data="chartsData.valData" height="100%" :option="chartsData.option" :geo="geoData" :name="mapName" />
</div> </div>
@ -60,24 +60,24 @@ const chartsData = reactive({
}, },
}, },
series: [ series: [
{ // {
name: '镇边界', // name: '',
type: 'map', // type: 'map',
mapType: mapName.value, // mapType: mapName.value,
roam: true, // roam: true,
zoom: 1.2, // zoom: 1.2,
itemStyle: { // itemStyle: {
normal: { // normal: {
borderColor: '#000', // // borderColor: '#000', //
borderWidth: 1, // // borderWidth: 1, //
areaColor: 'transparent', // // areaColor: 'transparent', //
}, // },
emphasis: { // emphasis: {
borderColor: '#fff', // borderColor: '#fff',
borderWidth: 2, // borderWidth: 2,
}, // },
}, // },
}, // },
// //
{ {
name: '闪烁散点', name: '闪烁散点',