elink-star
/
yifeng_integration
16
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

代码提交

master
juwei001 1 year ago
parent
07fa241cda
commit
5ddb634c06
4 changed files with 4998 additions and 106 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 184
      src/views/next/dialog-module/hsyf-left/partyCommittee/xincun.vue
  2. 4886
      src/views/next/dialog-module/hsyf-left/partyCommittee/zrc.json
  3. 4
      src/views/next/dialog-module/hsyf-right/djhdModal.vue
  4. 30
      src/views/next/screen-content-map/cpt/zdyf-map.vue

184
src/views/next/dialog-module/hsyf-left/partyCommittee/xincun.vue
View File

@ -28,10 +28,10 @@
>
<td
class="list_row_item"
:rowspan="getRowSpan(dataList, index, 'orgPidName')"
v-if="getRowSpan(dataList, index, 'orgPidName') !== 0"
:rowspan="getRowSpan(dataList, index, 'orgName')"
v-if="getRowSpan(dataList, index, 'orgName') !== 0"
>
{{ item.orgPidName }}
{{ item.orgName }}
</td>
<td class="list_row_item">{{ item.name }}</td>
<td class="list_row_item">{{ item.position }}</td>
@ -56,95 +56,95 @@ export default {
dialogTitle: '移风店镇新村党委班子成员',
loading: false,
dataList: [
{ orgPidName: '移风村', name: '袁永法', position: '书记' },
{ orgPidName: '移风村', name: '谭德利', position: '副书记' },
{ orgPidName: '移风村', name: '刘世官', position: '委员' },
{ orgPidName: '移风村', name: '谭启爱', position: '委员' },
{ orgPidName: '移风村', name: '王春先', position: '委员' },
{ orgPidName: '移风村', name: '程培栋', position: '委员' },
{ orgPidName: '移风村', name: '王山先', position: '委员' },
{ orgPidName: '移风村', name: '张和洋', position: '委员' },
{ orgPidName: '移风村', name: '张新贵', position: '委员' },
{ orgPidName: '沽河村', name: '王修松', position: '书记' },
{ orgPidName: '沽河村', name: '李作慧', position: '委员' },
{ orgPidName: '沽河村', name: '王作金', position: '委员' },
{ orgPidName: '沽河村', name: '宋修池', position: '委员' },
{ orgPidName: '沽河村', name: '王向令', position: '委员' },
{ orgPidName: '沽河村', name: '范锡旭', position: '委员' },
{ orgPidName: '沽河村', name: '王维绒', position: '委员' },
{ orgPidName: '沽河村', name: '魏延山', position: '委员' },
{ orgPidName: '沽河村', name: '宗成训', position: '委员' },
{ orgPidName: '大坝新村', name: '徐崇岫', position: '书记' },
{ orgPidName: '大坝新村', name: '韩泽兵', position: '副书记' },
{ orgPidName: '大坝新村', name: '郝文贞', position: '委员' },
{ orgPidName: '大坝新村', name: '韩德国', position: '委员' },
{ orgPidName: '大坝新村', name: '傅积业', position: '委员' },
{ orgPidName: '大坝新村', name: '张林', position: '委员' },
{ orgPidName: '大坝新村', name: '朱充森', position: '委员' },
{ orgPidName: '大坝新村', name: '高国强', position: '委员' },
{ orgPidName: '大坝新村', name: '张充显', position: '委员' },
{ orgPidName: '滨河村', name: '张先刚', position: '书记' },
{ orgPidName: '滨河村', name: '李成秋', position: '副书记' },
{ orgPidName: '滨河村', name: '金福善', position: '委员' },
{ orgPidName: '滨河村', name: '乔守荣', position: '委员' },
{ orgPidName: '滨河村', name: '马丕远', position: '委员' },
{ orgPidName: '滨河村', name: '王光锋', position: '委员' },
{ orgPidName: '滨河村', name: '康心云', position: '委员' },
{ orgPidName: '滨河村', name: '乔团先', position: '委员' },
{ orgPidName: '滨河村', name: '王玉芹', position: '委员' },
{ orgPidName: '双塔村', name: '张华卫', position: '书记' },
{ orgPidName: '双塔村', name: '李瑞章', position: '副书记' },
{ orgPidName: '双塔村', name: '朱丰波', position: '副书记' },
{ orgPidName: '双塔村', name: '辛华玉', position: '委员' },
{ orgPidName: '双塔村', name: '胡绪功', position: '委员' },
{ orgPidName: '双塔村', name: '朱鹏', position: '委员' },
{ orgPidName: '双塔村', name: '乔宪章', position: '委员' },
{ orgPidName: '双塔村', name: '吴希同', position: '委员' },
{ orgPidName: '双塔村', name: '迟明海', position: '委员' },
{ orgPidName: '七级村', name: '丁云雪', position: '书记' },
{ orgPidName: '七级村', name: '吴子旭', position: '副书记' },
{ orgPidName: '七级村', name: '张科大', position: '委员' },
{ orgPidName: '七级村', name: '张晓先', position: '委员' },
{ orgPidName: '七级村', name: '邢燕', position: '委员' },
{ orgPidName: '七级村', name: '丁鹏思', position: '委员' },
{ orgPidName: '七级村', name: '吴希剑', position: '委员' },
{ orgPidName: '七级村', name: '孙正国', position: '委员' },
{ orgPidName: '七级村', name: '杨风刚', position: '委员' },
{ orgPidName: '湍湾新村', name: '李显贞', position: '书记' },
{ orgPidName: '湍湾新村', name: '张文君', position: '副书记' },
{ orgPidName: '湍湾新村', name: '徐文雷', position: '委员' },
{ orgPidName: '湍湾新村', name: '谭德智', position: '委员' },
{ orgPidName: '湍湾新村', name: '王友川', position: '委员' },
{ orgPidName: '湍湾新村', name: '王人福', position: '委员' },
{ orgPidName: '湍湾新村', name: '姜中清', position: '委员' },
{ orgPidName: '湍湾新村', name: '巩合峰', position: '委员' },
{ orgPidName: '湍湾新村', name: '王言杰', position: '委员' },
{ orgPidName: '太祉庄村', name: '王明典', position: '书记' },
{ orgPidName: '太祉庄村', name: '孙贵瑚', position: '副书记' },
{ orgPidName: '太祉庄村', name: '国德松', position: '副书记' },
{ orgPidName: '太祉庄村', name: '高人昌', position: '委员' },
{ orgPidName: '太祉庄村', name: '于恒杰', position: '委员' },
{ orgPidName: '太祉庄村', name: '李信波', position: '委员' },
{ orgPidName: '太祉庄村', name: '胡崇卫', position: '委员' },
{ orgPidName: '太祉庄村', name: '朱祥青', position: '委员' },
{ orgPidName: '太祉庄村', name: '徐成国', position: '委员' },
{ orgPidName: '河流新村', name: '孙丰祖', position: '书记' },
{ orgPidName: '河流新村', name: '乔叶先', position: '副书记' },
{ orgPidName: '河流新村', name: '王丰业', position: '副书记' },
{ orgPidName: '河流新村', name: '于承德', position: '委员' },
{ orgPidName: '河流新村', name: '周衍国', position: '委员' },
{ orgPidName: '河流新村', name: '王运业', position: '委员' },
{ orgPidName: '河流新村', name: '窦德章', position: '委员' },
{ orgPidName: '河流新村', name: '管义波', position: '委员' },
{ orgPidName: '河流新村', name: '陈正保', position: '委员' },
{ orgPidName: '上泊新村', name: '黑发寿', position: '书记' },
{ orgPidName: '上泊新村', name: '姜可功', position: '副书记' },
{ orgPidName: '上泊新村', name: '张孝强', position: '委员' },
{ orgPidName: '上泊新村', name: '王玉林', position: '委员' },
{ orgPidName: '上泊新村', name: '马承金', position: '委员' },
{ orgPidName: '上泊新村', name: '隋思雨', position: '委员' },
{ orgPidName: '上泊新村', name: '张吉前', position: '委员' },
{ orgPidName: '上泊新村', name: '王永正', position: '委员 ' }
{ orgName: '移风村', name: '袁永法', position: '书记' },
{ orgName: '移风村', name: '谭德利', position: '副书记' },
{ orgName: '移风村', name: '刘世官', position: '委员' },
{ orgName: '移风村', name: '谭启爱', position: '委员' },
{ orgName: '移风村', name: '王春先', position: '委员' },
{ orgName: '移风村', name: '程培栋', position: '委员' },
{ orgName: '移风村', name: '王山先', position: '委员' },
{ orgName: '移风村', name: '张和洋', position: '委员' },
{ orgName: '移风村', name: '张新贵', position: '委员' },
{ orgName: '沽河村', name: '王修松', position: '书记' },
{ orgName: '沽河村', name: '李作慧', position: '委员' },
{ orgName: '沽河村', name: '王作金', position: '委员' },
{ orgName: '沽河村', name: '宋修池', position: '委员' },
{ orgName: '沽河村', name: '王向令', position: '委员' },
{ orgName: '沽河村', name: '范锡旭', position: '委员' },
{ orgName: '沽河村', name: '王维绒', position: '委员' },
{ orgName: '沽河村', name: '魏延山', position: '委员' },
{ orgName: '沽河村', name: '宗成训', position: '委员' },
{ orgName: '大坝新村', name: '徐崇岫', position: '书记' },
{ orgName: '大坝新村', name: '韩泽兵', position: '副书记' },
{ orgName: '大坝新村', name: '郝文贞', position: '委员' },
{ orgName: '大坝新村', name: '韩德国', position: '委员' },
{ orgName: '大坝新村', name: '傅积业', position: '委员' },
{ orgName: '大坝新村', name: '张林', position: '委员' },
{ orgName: '大坝新村', name: '朱充森', position: '委员' },
{ orgName: '大坝新村', name: '高国强', position: '委员' },
{ orgName: '大坝新村', name: '张充显', position: '委员' },
{ orgName: '滨河村', name: '张先刚', position: '书记' },
{ orgName: '滨河村', name: '李成秋', position: '副书记' },
{ orgName: '滨河村', name: '金福善', position: '委员' },
{ orgName: '滨河村', name: '乔守荣', position: '委员' },
{ orgName: '滨河村', name: '马丕远', position: '委员' },
{ orgName: '滨河村', name: '王光锋', position: '委员' },
{ orgName: '滨河村', name: '康心云', position: '委员' },
{ orgName: '滨河村', name: '乔团先', position: '委员' },
{ orgName: '滨河村', name: '王玉芹', position: '委员' },
{ orgName: '双塔村', name: '张华卫', position: '书记' },
{ orgName: '双塔村', name: '李瑞章', position: '副书记' },
{ orgName: '双塔村', name: '朱丰波', position: '副书记' },
{ orgName: '双塔村', name: '辛华玉', position: '委员' },
{ orgName: '双塔村', name: '胡绪功', position: '委员' },
{ orgName: '双塔村', name: '朱鹏', position: '委员' },
{ orgName: '双塔村', name: '乔宪章', position: '委员' },
{ orgName: '双塔村', name: '吴希同', position: '委员' },
{ orgName: '双塔村', name: '迟明海', position: '委员' },
{ orgName: '七级村', name: '丁云雪', position: '书记' },
{ orgName: '七级村', name: '吴子旭', position: '副书记' },
{ orgName: '七级村', name: '张科大', position: '委员' },
{ orgName: '七级村', name: '张晓先', position: '委员' },
{ orgName: '七级村', name: '邢燕', position: '委员' },
{ orgName: '七级村', name: '丁鹏思', position: '委员' },
{ orgName: '七级村', name: '吴希剑', position: '委员' },
{ orgName: '七级村', name: '孙正国', position: '委员' },
{ orgName: '七级村', name: '杨风刚', position: '委员' },
{ orgName: '湍湾新村', name: '李显贞', position: '书记' },
{ orgName: '湍湾新村', name: '张文君', position: '副书记' },
{ orgName: '湍湾新村', name: '徐文雷', position: '委员' },
{ orgName: '湍湾新村', name: '谭德智', position: '委员' },
{ orgName: '湍湾新村', name: '王友川', position: '委员' },
{ orgName: '湍湾新村', name: '王人福', position: '委员' },
{ orgName: '湍湾新村', name: '姜中清', position: '委员' },
{ orgName: '湍湾新村', name: '巩合峰', position: '委员' },
{ orgName: '湍湾新村', name: '王言杰', position: '委员' },
{ orgName: '太祉庄村', name: '王明典', position: '书记' },
{ orgName: '太祉庄村', name: '孙贵瑚', position: '副书记' },
{ orgName: '太祉庄村', name: '国德松', position: '副书记' },
{ orgName: '太祉庄村', name: '高人昌', position: '委员' },
{ orgName: '太祉庄村', name: '于恒杰', position: '委员' },
{ orgName: '太祉庄村', name: '李信波', position: '委员' },
{ orgName: '太祉庄村', name: '胡崇卫', position: '委员' },
{ orgName: '太祉庄村', name: '朱祥青', position: '委员' },
{ orgName: '太祉庄村', name: '徐成国', position: '委员' },
{ orgName: '河流新村', name: '孙丰祖', position: '书记' },
{ orgName: '河流新村', name: '乔叶先', position: '副书记' },
{ orgName: '河流新村', name: '王丰业', position: '副书记' },
{ orgName: '河流新村', name: '于承德', position: '委员' },
{ orgName: '河流新村', name: '周衍国', position: '委员' },
{ orgName: '河流新村', name: '王运业', position: '委员' },
{ orgName: '河流新村', name: '窦德章', position: '委员' },
{ orgName: '河流新村', name: '管义波', position: '委员' },
{ orgName: '河流新村', name: '陈正保', position: '委员' },
{ orgName: '上泊新村', name: '黑发寿', position: '书记' },
{ orgName: '上泊新村', name: '姜可功', position: '副书记' },
{ orgName: '上泊新村', name: '张孝强', position: '委员' },
{ orgName: '上泊新村', name: '王玉林', position: '委员' },
{ orgName: '上泊新村', name: '马承金', position: '委员' },
{ orgName: '上泊新村', name: '隋思雨', position: '委员' },
{ orgName: '上泊新村', name: '张吉前', position: '委员' },
{ orgName: '上泊新村', name: '王永正', position: '委员 ' }
]
}
},

4886
src/views/next/dialog-module/hsyf-left/partyCommittee/zrc.json
View File

File diff suppressed because it is too large

4
src/views/next/dialog-module/hsyf-right/djhdModal.vue
View File

@ -42,11 +42,11 @@
{{ info.introduce }}
</div>
</div>
<div class="content-imgs" v-if="info.attachmentList&&info.attachmentList.length>0">
<!-- <div class="content-imgs" v-if="info.attachmentList&&info.attachmentList.length>0">
<div class="content-imgs-item" v-for="item in info.attachmentList" :key="item">
<img :src="item" />
</div>
</div>
</div> -->
</div>
</div>
</div>

30
src/views/next/screen-content-map/cpt/zdyf-map.vue
View File

@ -202,12 +202,16 @@ export default {
},
initCircle () {
circleLayerSmall = new ImageLayer({})
circleLayerSmall.source(`${process.env.VUE_APP_MAP_IMG}/circle1.png`, {
parser: {
type: 'image',
extent: [121.0819, 35.8908, 119.2372, 37.2278]
circleLayerSmall.source(
'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/yifeng/2024-02-03/circle.png',
{
// circleLayerSmall.source(`${process.env.VUE_APP_MAP_IMG}/circle1.png`, {
parser: {
type: 'image',
extent: [121.0819, 35.8908, 119.2372, 37.2278]
}
}
})
)
scene.addLayer(circleLayerSmall)
const data = jdbandaoJson
// 画区域面积
@ -243,12 +247,15 @@ export default {
}
scene.setZoom(10)
roadLayer = new ImageLayer({})
roadLayer.source(`${process.env.VUE_APP_MAP_IMG}/road1.png`, {
parser: {
type: 'image',
extent: [119.7829, 36.7398, 120.5205, 36.2552]
}
})
roadLayer.source(
'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/yifeng/2024-02-03/road.png',
{
// roadLayer.source(`${process.env.VUE_APP_MAP_IMG}/road1.png`, {
parser: {
type: 'image',
extent: [119.7829, 36.7398, 120.5205, 36.2552]
}
})
scene.addLayer(roadLayer)
const that = this
roadLayer.on('click', (ev) => {
@ -364,7 +371,6 @@ export default {
polygonLayer.on('click', (e) => {})
},
initDot (data) {
console.log(data, '点位数据')
scene.addImage('dotBto', require('@/assets/images/map/dot.png'))
scene.addImage('textBg', require('@/assets/images/map/textBg.png'))
// textOffset改为动态的 this.buttonIndex == 3 [10,60] 否则就是 [-30 60]

Write Preview
Loading…
Cancel
Save