Web/daimp-front
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev

Browse Source
This commit is contained in:
李想 2025-04-30 08:56:11 +08:00
commit 5fc7e3a76b
4 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sub-government-affairs-service/src/views/plantingAndBreeding/base/index.vue
View File

@ -135,7 +135,7 @@ const state = reactive({
width: 200,
overHidden: true,
disabled: true,
labelTip: '请先选择地块！',
// labelTip: '请先选择地块！',
},
{
label: '区域面积',
@ -143,7 +143,7 @@ const state = reactive({
width: 150,
overHidden: true,
disabled: true,
labelTip: '请先选择地块！',
// labelTip: '请先选择地块！',
formatter: (row) => {
// const item = state.unitList.find((v) => v.dictValue == row.unit);
// return row.area + (!isEmpty(item) ? item.dictLabel : '平方米');

5
sub-government-affairs-service/src/views/productOperateMain/businessEntity/index.vue
View File

@ -43,6 +43,11 @@
<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>
</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">
<custom-table-operate :actions="state.options.actions" :data="scope" />
</template>

2
sub-government-affairs-service/src/views/productOperateMain/home/index.vue
View File

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

38
sub-government-screen-service/src/components/centerMap.vue
View File

@ -1,6 +1,6 @@
<template>
<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">
<custom-echart-maps :chart-data="chartsData.valData" height="100%" :option="chartsData.option" :geo="geoData" :name="mapName" />
</div>
@ -60,24 +60,24 @@ const chartsData = reactive({
},
},
series: [
// {
// name: '镇边界',
// type: 'map',
// mapType: mapName.value,
// roam: true,
// zoom: 1.2,
// itemStyle: {
// normal: {
// borderColor: '#000', // 设置镇边界的颜色
// borderWidth: 1, // 设置镇边界的宽度
// areaColor: 'transparent', // 设置背景透明，只显示边界
// },
// emphasis: {
// borderColor: '#fff',
// borderWidth: 2,
// },
// },
// },
{
name: '镇边界',
type: 'map',
mapType: mapName.value,
roam: true,
zoom: 1.2,
itemStyle: {
normal: {
borderColor: '#000', // 设置镇边界的颜色
borderWidth: 1, // 设置镇边界的宽度
areaColor: 'transparent', // 设置背景透明，只显示边界
},
emphasis: {
borderColor: '#fff',
borderWidth: 2,
},
},
},
// 闪烁散点图系列
{
name: '闪烁散点',