zhangzl
/
nsgk_mobile
2
0
Förgrening 0
Kod Ärenden 0 Pull-förfrågningar 0 Släpp 0 Wiki Aktiviteter
Bläddra i källkod

大托管问题修改

wulanhaote
庞东旭 2 år sedan
förälder
d43e459156
incheckning
4a462ce8ae
14 ändrade filer med 689 tillägg och 101 borttagningar
Delad Vy
Diff Options
Show Stats Download Patch File Download Diff File
  1. +422
    -0
      src/components/Map/MapGisTagDTG.vue
  2. +1
    -1
      src/views/agriculturalTrusteeship/buyer/allBill.vue
  3. +22
    -5
      src/views/agriculturalTrusteeship/buyer/index.vue
  4. +63
    -46
      src/views/agriculturalTrusteeship/index.vue
  5. +17
    -1
      src/views/agriculturalTrusteeship/insurance/insuranceList.vue
  6. +4
    -1
      src/views/agriculturalTrusteeship/insurance/insuranceProjectDetail.vue
  7. +35
    -1
      src/views/agriculturalTrusteeship/login.vue
  8. +16
    -6
      src/views/agriculturalTrusteeship/socialization/projectDetail.vue
  9. +18
    -4
      src/views/agriculturalTrusteeship/socialization/projectEdit.vue
  10. +18
    -4
      src/views/agriculturalTrusteeship/socialization/release.vue
  11. +27
    -6
      src/views/agriculturalTrusteeship/socialization/user.vue
  12. +28
    -6
      src/views/agriculturalTrusteeship/socialization/userEdit.vue
  13. +4
    -0
      src/views/agriculturalTrusteeship/society/societyList.vue
  14. +14
    -20
      src/views/agriculturalTrusteeship/society/societyProjectDetail.vue

+ 422
- 0
src/components/Map/MapGisTagDTG.vue Visa fil

@@ -0,0 +1,422 @@
<template>
<div>
<div id="full-screen-acceptance" style="width: 100%;height:25vh;">
<div :id=this.uuidMap style="width: 100%;height: 100%"></div>
<div id='land-btn-wrap' v-show="showBtn">
<input :id="this.drawPolygonMap" class="ant-btn ant-btn-red" type="button" value="标记"/>&nbsp;&nbsp;
<!--<input id="drawRemove" type="button" class="ant-btn ant-btn-red" value="取消"/>&nbsp;&nbsp;-->
<input :id="this.drawResetMap" type="button" class="ant-btn ant-btn-red" value="重置标记"/>
</div>
</div>
<div id="info" style="display: none"></div>
</div>
</template>

<script>
import $ from "jquery";
import {entityGet, treeselect} from "@/api/agriculturalTrusteeship";
import Cookies from "js-cookie";

export default {
data() {
return {
closeMoule: null,
reduction: null,
uuidMap: this.guidProduct(),
drawPolygonMap: this.guidProduct(),
drawResetMap: this.guidProduct(),
};
},
props: ['theGeom','message','showBtn'],
methods: {
//地图加载
formSubmit(){
//父组件监听的名字必须是formSubmit
// 子组件调用父组件的方法并传参
if(this.closeMoule =="" || this.closeMoule == null){
this.$emit('formSubmit', null);
}else{
this.$emit('formSubmit', JSON.stringify(this.closeMoule));
}
},
guidProduct(){
return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
var r = Math.random() * 16 | 0,
v = c == 'x' ? r : (r & 0x3 | 0x8);
return v.toString(16);
});
},
//地图查看
pointPaceCountryDarw() {
//加载地图编辑
var that = this;
var map;
//var hc_land;
var draw; // global so we can remove it later
var vector_drawing;
//矢量标注样式设置函数，设置image为图标ol.style.Icon
function createLabelStyle() {
return new ol.style.Style({
image: new ol.style.Icon({
//设置图标偏移
anchor: [0.5, 1],
//标注样式的起点位置
anchorOrigin: "top-right",
//X方向单位：分数
anchorXUnits: "fraction",
//Y方向单位：像素
anchorYUnits: "pixels",
//偏移起点位置的方向
offsetOrigin: "top-right",
//透明度
opacity: 0.9,
//图片路径
src: require("../../assets/images/housesteadSurvey/mark.png"),
}),
text: new ol.style.Text({
textAlign: "center", //位置
textBaseline: "middle", //基准线
font: "normal 12px 微软雅黑", //文字样式
//text: "标注点", //文本内容
fill: new ol.style.Fill({
//文本填充样式（即文字颜色)
color: "#ff0000",
}),
}),
zIndex: 9999,
});
}
if (that.message != null && that.message != ""
&& that.message != undefined) {
this.closeMoule = null;
document.getElementById(that.uuidMap).innerHTML = '';
var hc_land;
var draw; // global so we can remove it later
var vector_drawing;
var projection = new ol.proj.Projection({
//地图投影类型
code: "EPSG:3857",
units: "degrees",
//extent:extent
});

var aerial = new ol.layer.Tile({
source: new ol.source.XYZ({
url: "http://t0.tianditu.gov.cn/img_w/wmts?" +
"SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles" +
"&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=cc4aba6e967096098249efa069733067",
}),
isGroup: true,
name: "卫星影像图",
});

var yingxzi = new ol.layer.Tile({
source: new ol.source.XYZ({
url: "https://t0.tianditu.gov.cn/DataServer?T=cia_w&x={x}&y={y}&l={z}&tk=cc4aba6e967096098249efa069733067",
}),
isGroup: true,
name: "天地图文字标注--卫星影像图",
});
//加载地图
map = new ol.Map({
controls: ol.control.defaults({attribution: false, zoom: false, rotate: false}).extend([]), //隐藏放大缩小按钮
layers: [aerial, yingxzi],
projection: projection,
target: that.uuidMap,
view: new ol.View({
//center: ol.proj.fromLonLat([115.452752, 31.789033]),
zoom: 15.9,
minZoom: 5, //地图缩小限制
maxZoom: 18.3, //地图放大限制
}),
});
//图层查询定位开始 ---------start
if(this.message.substring(0,1) =="{"){
var theGeomMap =this.message.replace("Point", "MultiPolygon");
var pointLeft = theGeomMap.replace("[", "[[[[");
var pointRight = pointLeft.replace("]", "]]]]");
hc_land = new ol.layer.Vector({
title: "add Layer",
source: new ol.source.Vector({
projection: projection,
features: new ol.format.GeoJSON().readFeatures("{\n" +
" \"type\": \"Feature\",\n" +
" \"geometry\":" + pointRight + "}"),
}),
style: new ol.style.Style({
fill: new ol.style.Fill({
//矢量图层填充颜色，以及透明度
color: "rgba(204, 255, 204,0.3)",
}),
stroke: new ol.style.Stroke({
//边界样式
color: "#47c68f",
width: 3,
}),
}),
});
}
if(this.message.substring(0,1) =="["){
var zbNew = JSON.stringify({"type": "MultiPolygon", "coordinates": [[[this.message.replaceAll("\"","")]]]});
var leftJoin = zbNew.replace("\"[","[");
var rightJoin = leftJoin.replace("\"]","]");
hc_land = new ol.layer.Vector({
title: "add Layer",
source: new ol.source.Vector({
projection: projection,
features: new ol.format.GeoJSON().readFeatures("{\n" +
" \"type\": \"Feature\",\n" +
" \"geometry\":" + rightJoin + "}"),
}),
style: new ol.style.Style({
fill: new ol.style.Fill({
//矢量图层填充颜色，以及透明度
color: "rgba(204, 255, 204,0.3)",
}),
stroke: new ol.style.Stroke({
//边界样式
color: "#47c68f",
width: 3,
}),
}),
});
}
map.addLayer(hc_land);
var maxXMap = hc_land.values_.source.featuresRtree_.rbush_.data.maxX;
var maxYMap = hc_land.values_.source.featuresRtree_.rbush_.data.maxY;
var minXMap = hc_land.values_.source.featuresRtree_.rbush_.data.minX;
var minYMap = hc_land.values_.source.featuresRtree_.rbush_.data.minY;
//定位查询位置
var center = ol.extent.getCenter([maxXMap, maxYMap, minXMap, minYMap]); //获取边界区域的中心位置
var newcenterFeature = new ol.Feature({
geometry: new ol.geom.Point(center), //几何信息
name: "标注点",
});
var sourceMapLook = new ol.source.Vector({wrapX: false});
vector_drawing = new ol.layer.Vector({
source: sourceMapLook,
});
map.addLayer(vector_drawing);
newcenterFeature.setStyle(createLabelStyle()); //设置要素样式
sourceMapLook.addFeature(newcenterFeature);
map.getView().animate({
// 只设置需要的属性即可
center: center, // 中心点
zoom: 15.9, // 缩放级别
rotation: undefined, // 缩放完成view视图旋转弧度
duration: 1000, // 缩放持续时间，默认不需要设置
});
//图层查询定位结束 ---------end
//开始绘制地图
$("#"+this.drawPolygonMap).click(function () {
map.removeLayer(hc_land);
map.removeLayer(vector_drawing);
that.closeMoule = null;
var source = new ol.source.Vector({wrapX: false});
vector_drawing = new ol.layer.Vector({
source: source,
});
map.addLayer(vector_drawing);

function addInteraction() {
draw = new ol.interaction.Draw({
source: vector_drawing.getSource(),
type: "Point",
});
draw.on('drawend', function (evt) {
map.removeInteraction(draw);
var feature = evt.feature;
var geometry = feature.getGeometry();
var coordinate = geometry.getCoordinates();
var newFeature = new ol.Feature({
geometry: new ol.geom.Point(coordinate), //几何信息
//name: "标注点",
});
newFeature.setStyle(createLabelStyle()); //设置要素样式
source.addFeature(newFeature);
that.closeMoule = coordinate;
that.reduction = coordinate;
that.formSubmit();
});
map.addInteraction(draw);
}
addInteraction();
});
//清除画图鼠标点击事件
// $("#drawRemove").click(function () {
// //map.addLayer(hc_land);
// map.removeInteraction(draw);
// //map.removeLayer(vector_drawing);
// });
//还原之前图层
$("#" + this.drawResetMap).click(function () {
if(that.reduction !=null) {
map.removeInteraction(draw);
map.removeLayer(vector_drawing);
map.addLayer(hc_land);
newcenterFeature = new ol.Feature({
geometry: new ol.geom.Point(center), //几何信息
//name: "标注点",
});
sourceMapLook = new ol.source.Vector({wrapX: false});
vector_drawing = new ol.layer.Vector({
source: sourceMapLook,
});
map.addLayer(vector_drawing);
newcenterFeature.setStyle(createLabelStyle()); //设置要素样式
sourceMapLook.addFeature(newcenterFeature);
that.closeMoule = null;
that.formSubmit();
}
});
}
else{
this.closeMoule = null;
document.getElementById(that.uuidMap).innerHTML = '';
var projection = new ol.proj.Projection({
//地图投影类型
code: "EPSG:3857",
units: "degrees",
//extent:extent
});

var aerial = new ol.layer.Tile({
source: new ol.source.XYZ({
url: "http://t0.tianditu.gov.cn/img_w/wmts?" +
"SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles" +
"&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=cc4aba6e967096098249efa069733067",
}),
isGroup: true,
name: "卫星影像图",
});

var yingxzi = new ol.layer.Tile({
source: new ol.source.XYZ({
url: "https://t0.tianditu.gov.cn/DataServer?T=cia_w&x={x}&y={y}&l={z}&tk=cc4aba6e967096098249efa069733067",
}),
isGroup: true,
name: "天地图文字标注--卫星影像图",
});
//获取坐标是否存在
var Zb;
var latitude;
var longitude;
//开始定位当前位置
navigator.geolocation.getCurrentPosition(function(position) {
latitude = position.coords.latitude;// 获取纬度
longitude = position.coords.longitude;// 获取经度
});
treeselect().then(res=>{
if (res.code == 200) {
Zb = [res.data[0].lng,res.data[0].lat]
//加载地图
map = new ol.Map({
controls: ol.control.defaults({attribution: false, zoom: false, rotate: false}).extend([]), //隐藏放大缩小按钮
layers: [aerial, yingxzi],
projection: projection,
logo: 'false',
target: that.uuidMap,
view: new ol.View({
center: ol.proj.fromLonLat(Zb),
//center: ol.proj.fromLonLat([115.452752, 31.789033]),
zoom: 15.9,
minZoom: 5, //地图缩小限制
maxZoom: 18, //地图放大限制
}),
});
}
})

//图层查询定位结束 ---------end
//开始绘制地图
$("#"+this.drawPolygonMap).click(function () {
//map.removeLayer(hc_land);
map.removeLayer(vector_drawing);
that.closeMoule = null;
map.removeInteraction(draw);
var sourceMap = new ol.source.Vector({wrapX: false});
vector_drawing = new ol.layer.Vector({
source: sourceMap,
});
map.addLayer(vector_drawing);

function addInteraction() {
draw = new ol.interaction.Draw({
source: vector_drawing.getSource(),
type: "Point",
});
draw.on('drawend', function (evt) {
map.removeInteraction(draw);
$("#drawRemove").trigger('click');
var feature = evt.feature;
var geometry = feature.getGeometry();
var coordinate = geometry.getCoordinates();
var newFeature = new ol.Feature({
geometry: new ol.geom.Point(coordinate), //几何信息
//name: "标注点",
});
newFeature.setStyle(createLabelStyle()); //设置要素样式
sourceMap.addFeature(newFeature);
that.closeMoule = coordinate;
that.formSubmit();
});
map.addInteraction(draw);
}
addInteraction();

});
//清除画图鼠标点击事件
// $("#drawRemove").click(function () {
// //map.addLayer(hc_land);
// map.removeInteraction(draw);
// //map.removeLayer(vector_drawing);
// });
//还原之前图层
$("#" + this.drawResetMap).click(function () {
map.removeInteraction(draw);
map.removeLayer(vector_drawing);
//map.addLayer(hc_land);
that.closeMoule = null;
that.formSubmit();
});
}
},
},
watch: {},
};
</script>

<style scoped>
#peaceCountryMap {
width: 100%;
height: 100%;
}
.fuTitle {
border-top: 1px solid #e9e9e9;
text-align: center;
padding: 10px 0px 0px 0px;
font-size: 18px;
color: #999;
}
.ant-btn-red {
position: relative;
display: inline-block;
background: #D0EEFF;
border: 1px solid #99D3F5;
border-radius: 4px;
padding: 4px 12px;
overflow: hidden;
color: #1E88C7;
text-decoration: none;
text-indent: 0;
line-height: 20px;
}
#land-btn-wrap{
position: relative;
width: 25%;
left: 75%;
bottom: 100%;
z-index: 2000;
padding-top: 5%;
}
</style>

+ 1
- 1
src/views/agriculturalTrusteeship/buyer/allBill.vue Visa fil

@@ -205,10 +205,10 @@
res.supplyDemand.supplyMasterMap = '/api'+supplyMasterMap[0]
}
res.cropType = this.selectDictLabel(this.cropTypeOptions, res.cropType);
res.orderStatus = this.selectDictLabel(this.orderStatusOptions, res.orderStatus);
var that = this ;
setTimeout(function () {
res.productType = that.productList.filter(function (e) { return e.id == res.productType; })[0].dictName;
res.orderStatus = that.selectDictLabel(that.orderStatusOptions, res.orderStatus);
},1000)

res.countMoney = res.unitPrice*res.serviceNum;


+ 22
- 5
src/views/agriculturalTrusteeship/buyer/index.vue Visa fil

@@ -1,13 +1,14 @@
<template>
<div class="home_wrapper">
<div id="topMain" class="topMain">
<template v-if="showHead">
<!-- 头部开始 -->
<div class="header">
<!-- <img :src="avatar">-->
<img v-if="avatar" :src="avatar" style="width: 50px;height: 50px;">
<img v-else src="../../../../static/images/agriculturalTrusteeship/index/header.png" style="width: 50px;height: 50px;">
<div class="header_box" @click="$router.push({name:'agriculturalTrusteeshipLogin'})">
<p>{{nickName}}<span>{{phonenumber}}</span><img src="../../../../static/images/agriculturalTrusteeship/buyer/buyer_icon_01.png" alt=""></p>
<p>{{nickName}}<span>{{phonenumber}}</span></p>
<!-- <img src="../../../../static/images/agriculturalTrusteeship/buyer/buyer_icon_01.png" alt="">-->
<p>{{allDeptName}}</p>
</div>
</div>
@@ -50,7 +51,8 @@
</div>
</div>
<!-- 导航结束 -->
</div>
</template>
<div v-if="!showHead" style="height: 1vh;background-color: #ffffff;"></div>
<!-- 内容开始 -->
<div class="main">
<div class="main_header">
@@ -74,7 +76,7 @@
<img src="../../../../static/images/agriculturalTrusteeship/index/search_icon_02.png" @click="goSearch" />
</div>

<div class="main_content">
<div :style="{'height':height}" class="main_content">
<div class="main_content_left">
<van-sidebar v-model="activeKey" @change="onChangeIn">
<van-sidebar-item title="全套服务" />
@@ -97,6 +99,7 @@
v-model="loading"
:finished="finished"
finished-text="没有更多了"
:immediate-check="false"
@load="getList"
>
<!-- @load="onLoad" @click="$router.push({name:'agriculturalTrusteeshipPlaceOrder'})"-->
@@ -120,7 +123,8 @@
</div>
<!-- 内容结束 -->

<img src="../../../../static/images/agriculturalTrusteeship/index/index_btn_icon_01.png" class="pc" @click="openMain"/>
<img v-if="showHead" src="../../../../static/images/agriculturalTrusteeship/index/index_btn_icon_01.png" class="pc" @click="pcOpen"/>
<img v-if="!showHead" src="../../../../static/images/agriculturalTrusteeship/index/index_btn_icon_02.png" class="pc" @click="pcClose"/>

<buyer></buyer>
</div>
@@ -138,6 +142,8 @@
},
data() {
return {
height:'',
showHead:true,
activeKey: 0,
active: 0,
loading: false,
@@ -190,6 +196,9 @@
this.deptOptions = res.data;
this.query.serviceDeptId = res.data[0].value;
this.deptName = res.data[0].label;
this.supplyDemandListYes = [];
this.supplyDemandList = [];
this.getList()
}
})
},
@@ -268,6 +277,14 @@
this.supplyDemandListYes = [];
this.getList();
},
pcOpen(){
this.showHead = false;
this.height = '88.3vh';
},
pcClose(){
this.showHead = true;
this.height = '';
},
},
}
</script>


+ 63
- 46
src/views/agriculturalTrusteeship/index.vue Visa fil

@@ -1,53 +1,55 @@
<template>
<div class="home_wrapper">
<!-- 头部开始 -->
<div class="header">
<img src="../../../static/images/agriculturalTrusteeship/index/header.png">
<div class="header_box" @click="$router.push({name:'agriculturalTrusteeshipLogin'})">
<p>点击登录</p>
<p>登录才能下单或发布产品哦</p>
<template v-if="showHead">
<!-- 头部开始 -->
<div class="header">
<img src="../../../static/images/agriculturalTrusteeship/index/header.png">
<div class="header_box" @click="$router.push({name:'agriculturalTrusteeshipLogin'})">
<p>点击登录</p>
<p>登录才能下单或发布产品哦</p>
</div>
</div>
</div>
<!-- 头部结束 -->
<!-- 头部结束 -->

<!-- 导航开始 -->
<div class="nav">
<van-grid :column-num="4" :border="false">
<van-grid-item :to="{name:'agriculturalTrusteeshipSocietyList'}">
<img src="../../../static/images/agriculturalTrusteeship/index/nav_01.png"/>
<p>社会化</p>
</van-grid-item>
<van-grid-item :to="{name:'agriculturalTrusteeshipInsuranceList',query:{type:3}}">
<img src="../../../static/images/agriculturalTrusteeship/index/nav_02.png"/>
<p>农担</p>
</van-grid-item>
<van-grid-item :to="{name:'agriculturalTrusteeshipInsuranceList',query:{type:1}}">
<img src="../../../static/images/agriculturalTrusteeship/index/nav_03.png"/>
<p>贷款</p>
</van-grid-item>
<van-grid-item :to="{name:'agriculturalTrusteeshipInsuranceList',query:{type:2}}">
<img src="../../../static/images/agriculturalTrusteeship/index/nav_04.png"/>
<p>保险</p>
</van-grid-item>
</van-grid>
<!-- 导航开始 -->
<div class="nav">
<van-grid :column-num="4" :border="false">
<van-grid-item :to="{name:'agriculturalTrusteeshipSocietyList'}">
<img src="../../../static/images/agriculturalTrusteeship/index/nav_01.png"/>
<p>社会化</p>
</van-grid-item>
<van-grid-item :to="{name:'agriculturalTrusteeshipInsuranceList',query:{type:3}}">
<img src="../../../static/images/agriculturalTrusteeship/index/nav_02.png"/>
<p>农担</p>
</van-grid-item>
<van-grid-item :to="{name:'agriculturalTrusteeshipInsuranceList',query:{type:1}}">
<img src="../../../static/images/agriculturalTrusteeship/index/nav_03.png"/>
<p>贷款</p>
</van-grid-item>
<van-grid-item :to="{name:'agriculturalTrusteeshipInsuranceList',query:{type:2}}">
<img src="../../../static/images/agriculturalTrusteeship/index/nav_04.png"/>
<p>保险</p>
</van-grid-item>
</van-grid>

<div class="nav_notice_box">
<van-notice-bar left-icon="../../../static/images/agriculturalTrusteeship/index/notice_icon.png" mode="link" :scrollable="false" background="#E2E9FD" color="#334281">
<van-swipe
vertical
class="notice-swipe"
:autoplay="3000"
:show-indicators="false"
>
<van-swipe-item>12.0版本上线啦！点击查看更改内容~</van-swipe-item>
<van-swipe-item>12.1版本上线啦！点击查看更改内容~</van-swipe-item>
<van-swipe-item>12.2版本上线啦！点击查看更改内容~</van-swipe-item>
</van-swipe>
</van-notice-bar>
<div class="nav_notice_box">
<van-notice-bar left-icon="../../../static/images/agriculturalTrusteeship/index/notice_icon.png" mode="link" :scrollable="false" background="#E2E9FD" color="#334281">
<van-swipe
vertical
class="notice-swipe"
:autoplay="3000"
:show-indicators="false"
>
<van-swipe-item>12.0版本上线啦！点击查看更改内容~</van-swipe-item>
<van-swipe-item>12.1版本上线啦！点击查看更改内容~</van-swipe-item>
<van-swipe-item>12.2版本上线啦！点击查看更改内容~</van-swipe-item>
</van-swipe>
</van-notice-bar>
</div>
</div>
</div>
<!-- 导航结束 -->
<!-- 导航结束 -->
</template>
<div v-if="!showHead" style="height: 1vh;background-color: #ffffff;"></div>
<!-- 内容开始 -->
<div class="main">
<div class="main_header">
@@ -71,7 +73,7 @@
<img src="../../../static/images/agriculturalTrusteeship/index/search_icon_02.png" @click="goSearch" />
</div>

<div class="main_content">
<div :style="{'height':height}" class="main_content">
<div class="main_content_left">
<van-sidebar v-model="activeKey" @change="onChangeIn">
<van-sidebar-item title="全套服务" />
@@ -94,6 +96,7 @@
v-model="loading"
:finished="finished"
finished-text="没有更多了"
:immediate-check="false"
@load="getList"
>
<!-- @load="onLoad" @click="$router.push({name:'agriculturalTrusteeshipPlaceOrder'})"-->
@@ -117,7 +120,8 @@
</div>
<!-- 内容结束 -->

<img src="../../../static/images/agriculturalTrusteeship/index/index_btn_icon_01.png" class="pc"/>
<img v-if="showHead" src="../../../static/images/agriculturalTrusteeship/index/index_btn_icon_01.png" class="pc" @click="pcOpen"/>
<img v-if="!showHead" src="../../../static/images/agriculturalTrusteeship/index/index_btn_icon_02.png" class="pc" @click="pcClose"/>

</div>
</template>
@@ -128,6 +132,8 @@
name: "agriculturalTrusteeshipIndex",
data() {
return {
height:'',
showHead:true,
activeKey: 0,
active: 0,
loading: false,
@@ -168,6 +174,9 @@
this.deptOptions = res.data;
this.query.serviceDeptId = res.data[0].value;
this.deptName = res.data[0].label;
this.supplyDemandListYes = [];
this.supplyDemandList = [];
this.getList()
}
})
},
@@ -241,6 +250,14 @@
this.supplyDemandListYes = [];
this.getList();
},
pcOpen(){
this.showHead = false;
this.height = '88.3vh';
},
pcClose(){
this.showHead = true;
this.height = '';
},
},
}
</script>


+ 17
- 1
src/views/agriculturalTrusteeship/insurance/insuranceList.vue Visa fil

@@ -72,7 +72,7 @@
@load="getList"
>
<!-- @load="onLoad"-->
<div class="main_content_right_list" v-for="(item,index) in productListYes" :key="index" @click="$router.push({name:'agriculturalTrusteeshipSocietyProjectDetail',query:{id:item.id}})">
<div class="main_content_right_list" v-for="(item,index) in productListYes" :key="index" @click="$router.push({name:'agriculturalTrusteeshipInsuranceProjectDetail',query:{id:item.id}})">
<img v-if="item.mainImg" :src="item.mainImg" style="width: 18vw;height: 18vw;">
<img v-else src="../../../../static/images/agriculturalTrusteeship/zwtp.png" style="width: 18vw;height: 18vw;">
<div class="main_content_right_list_content">
@@ -156,6 +156,22 @@
}
})
},
beforeRouteEnter (to, from, next) {
/*
to:获取你要跳转的路由信息
from: 获取你从哪个路由来的信息
next: （放行函数）
// 第一种写法
next(); // 直接放行
// 第二种
next('/url') //放行到指定的路由
*/
next(vm => {
if (from.path === '/agriculturalTrusteeship/buyerIndex'){
location.reload()
}
})
},
methods: {
getServiceList(){
serviceList(this.query).then(response => {


+ 4
- 1
src/views/agriculturalTrusteeship/insurance/insuranceProjectDetail.vue Visa fil

@@ -59,8 +59,8 @@
methods: {
getDetail(){
productGet(this.$route.query.id).then(response => {
response.data.mainImgList = [];
if (response.data.mainImg){
response.data.mainImgList = [];
var attachement = response.data.mainImg.split( "," );
attachement.forEach(responseAttach=>{
response.data.mainImgList.push({
@@ -68,6 +68,8 @@
isImage: true
});
})
}else{
response.data.mainImgList.push('../../../../static/images/agriculturalTrusteeship/zwtp.png')
}
var that = this ;
that.product = response.data;
@@ -79,6 +81,7 @@
<style scoped lang="scss">
.home_wrapper{

background-color: #F9F9F9;
}
/*头部*/
.header{


+ 35
- 1
src/views/agriculturalTrusteeship/login.vue Visa fil

@@ -164,7 +164,7 @@

<div style="height: 20PX"></div>
<van-uploader v-model="mainImgUploader" :after-read="afterReadEvidenceForm" :before-delete="deleteFileEvidenceForm" />
<MapGisTag ref="clickLoading" :showBtn="true" :message="serviceForm.theGeom" v-on:formSubmit="MapTag"></MapGisTag>
</template>
<template v-if="loginType == 'fwzz'">
<van-field v-model="entityForm.entityName" required :rules="[{ required: true }]" center :border="false" placeholder="请输入主体名称" >
@@ -341,6 +341,8 @@
<div style="height: 20PX"></div>
<van-uploader v-model="mainImgUploader2" :after-read="afterReadEvidenceEntityForm" :before-delete="deleteFileEvidenceEntityForm" />


<MapGisTag ref="clickLoading1" :showBtn="true" :message="entityForm.theGeom" v-on:formSubmit="MapTag1"></MapGisTag>
</template>
<p class="submit_btn" @click="$refs.formData.submit()">提交审核</p>
</van-form>
@@ -356,8 +358,12 @@
import {getCodeImg, getRegisterSmsCode, registerCheck, registerOn} from "@/api/login";
import {decrypt, encrypt} from "@/utils/jsencrypt";
import {serviceLogin, entityLogin, commonUpload , serviceRegister , entityRegister , treeselect} from "@/api/agriculturalTrusteeship";
import MapGisTag from "@/components/Map/MapGisTagDTG";
export default {
name: "agriculturalTrusteeshipLogin",
components: {
MapGisTag
},
data() {
return {
active:0,
@@ -447,8 +453,31 @@

this.getCode();
this.getCookie();

},
methods: {
//获取自己返回值
/** 查找地图中定位点 */
MapTag: function (data) {
this.serviceForm.theGeom = data;
},
//每个查看修改，新增 方法下引用下面方法
mapClickLoading(){
setTimeout(() => {
this.$refs.clickLoading.pointPaceCountryDarw();
}, 500);
},
//获取自己返回值
/** 查找地图中定位点 */
MapTag1: function (data) {
this.entityForm.theGeom = data;
},
//每个查看修改，新增 方法下引用下面方法
mapClickLoading1(){
setTimeout(() => {
this.$refs.clickLoading1.pointPaceCountryDarw();
}, 500);
},
goLogin(){
console.log(this.formData)
if (this.loginType == 'bxjg' || this.loginType == 'dkjg' || this.loginType == 'ndjg' ){
@@ -493,6 +522,11 @@
this.top = '40px';
this.transform = 'none';
this.left = '0';
if (this.loginType == 'bxjg' || this.loginType == 'dkjg' || this.loginType == 'ndjg'){
this.mapClickLoading()
}else if(this.loginType == 'fwzz'){
this.mapClickLoading1()
}
}else if( name == 'login'){
this.position = 'absolute';
this.top = '50%';


+ 16
- 6
src/views/agriculturalTrusteeship/socialization/projectDetail.vue Visa fil

@@ -40,13 +40,10 @@
<van-cell title="联系方式" :border="false" :value="supplyDemand.supplyDemandTal" />
</div>

<div class="main_box" style="padding: 0;">
<baidu-map :center="center" panBy="[50,50]" :zoom="zoom" :scroll-wheel-zoom="true" :pinch-to-zoom="true" map-type="BMAP_NORMAL_MAP" style="height:25vh" >
<!-- 必须给容器指高度，不然地图将显示在一个高度为0的容器中，看不到 -->
<bm-geolocation anchor="BMAP_ANCHOR_BOTTOM_RIGHT" :showAddressBar="true" :autoLocation="true"></bm-geolocation>
<bm-marker :position="center" :dragging="true" animation="BMAP_ANIMATION_BOUNCE" :icon="{url: '../../../../static/images/lawEnforcement/new/address.gif', size: {width: 50, height: 50}}"></bm-marker>
</baidu-map>
<div class="main_box" style="padding: 0;" v-if="supplyDemand.theGeom">
<MapGisTag ref="clickLoading" :showBtn="false" :message="supplyDemand.theGeom"></MapGisTag>
</div>

</div>
<!-- 内容结束 -->

@@ -60,8 +57,12 @@
<script>
import Cookies from "js-cookie";
import {productTypes, supplyDemandGet} from "@/api/agriculturalTrusteeship";
import MapGisTag from "@/components/Map/MapGisTagDTG";
export default {
name: "agriculturalTrusteeshipInsuranceDetail",
components: {
MapGisTag
},
data() {
return {
activeKey: 0,
@@ -104,6 +105,12 @@
this.getDetail();
},
methods: {
//每个查看修改，新增 方法下引用下面方法
mapClickLoading(){
setTimeout(() => {
this.$refs.clickLoading.pointPaceCountryDarw();
}, 500);
},
getDetail(){
supplyDemandGet(this.$route.query.id).then(response => {
response.data.bodyType = this.selectDictLabel(this.bodyTypeOptions, response.data.bodyType);
@@ -121,6 +128,9 @@
})
}
this.supplyDemand = response.data;
if (response.data.theGeom){
this.mapClickLoading();
}
});
},
},


+ 18
- 4
src/views/agriculturalTrusteeship/socialization/projectEdit.vue Visa fil

@@ -104,10 +104,7 @@
</div>

<div class="main">
<baidu-map :center="center" panBy="[50,50]" :zoom="zoom" :scroll-wheel-zoom="true" :pinch-to-zoom="true" map-type="BMAP_NORMAL_MAP" style="height:25vh" >
<!-- 必须给容器指高度，不然地图将显示在一个高度为0的容器中，看不到 -->
<bm-marker :position="center" :dragging="true" animation="BMAP_ANIMATION_BOUNCE" :icon="{url: '../../../../static/images/lawEnforcement/new/address.gif', size: {width: 50, height: 50}}"></bm-marker>
</baidu-map>
<MapGisTag ref="clickLoading" :showBtn="true" :message="supplyDemand.theGeom" v-on:formSubmit="MapTag"></MapGisTag>
</div>

<div class="main_btn">
@@ -120,6 +117,7 @@
</template>
<script>
import Cookies from "js-cookie";
import MapGisTag from "@/components/Map/MapGisTagDTG";
import {
supplyDemandGet,
productTypes,
@@ -129,6 +127,9 @@
} from "@/api/agriculturalTrusteeship";
export default {
name: "agriculturalTrusteeshipSocializationRelease",
components: {
MapGisTag
},
data() {
return {
activeKey: 0,
@@ -187,6 +188,17 @@
this.getDetail();
},
methods: {
//获取自己返回值
/** 查找地图中定位点 */
MapTag: function (data) {
this.supplyDemand.theGeom = data;
},
//每个查看修改，新增 方法下引用下面方法
mapClickLoading(){
setTimeout(() => {
this.$refs.clickLoading.pointPaceCountryDarw();
}, 500);
},
getDetail(){
supplyDemandGet(this.$route.query.id).then(response => {
this.bodyType = this.selectDictLabel(this.bodyTypeOptions, response.data.bodyType);
@@ -206,6 +218,8 @@
})
}
this.supplyDemand = response.data;

this.mapClickLoading();
});
},
onConfirmProductType({ selectedOptions }){


+ 18
- 4
src/views/agriculturalTrusteeship/socialization/release.vue Visa fil

@@ -111,10 +111,7 @@
</div>

<div class="main">
<baidu-map :center="center" panBy="[50,50]" :zoom="zoom" :scroll-wheel-zoom="true" :pinch-to-zoom="true" map-type="BMAP_NORMAL_MAP" style="height:25vh" >
<!-- 必须给容器指高度，不然地图将显示在一个高度为0的容器中，看不到 -->
<bm-marker :position="center" :dragging="true" animation="BMAP_ANIMATION_BOUNCE" :icon="{url: '../../../../static/images/lawEnforcement/new/address.gif', size: {width: 50, height: 50}}"></bm-marker>
</baidu-map>
<MapGisTag ref="clickLoading" :showBtn="true" :message="supplyDemand.theGeom" v-on:formSubmit="MapTag"></MapGisTag>
</div>

<div class="main_btn">
@@ -128,8 +125,12 @@
<script>
import Cookies from "js-cookie";
import {commonUpload, productTypes, supplyDemandAdd, treeselect,detailList} from "@/api/agriculturalTrusteeship";
import MapGisTag from "@/components/Map/MapGisTagDTG";
export default {
name: "agriculturalTrusteeshipSocializationRelease",
components: {
MapGisTag
},
data() {
return {
activeKey: 0,
@@ -144,6 +145,7 @@
supplyDemand:{
entityName:JSON.parse(Cookies.get("ServiceInformation")).entityName,
entityId:Cookies.get("ACCESS-SESSION-ID"),
theGeom:''
},
productType:'',
bodyType:'',
@@ -208,8 +210,20 @@
this.detailListOptions = res.rows;
}
})
this.mapClickLoading();
},
methods: {
//获取自己返回值
/** 查找地图中定位点 */
MapTag: function (data) {
this.supplyDemand.theGeom = data;
},
//每个查看修改，新增 方法下引用下面方法
mapClickLoading(){
setTimeout(() => {
this.$refs.clickLoading.pointPaceCountryDarw();
}, 500);
},
onConfirmProductType({ selectedOptions }){
this.supplyDemand.productType = selectedOptions[selectedOptions.length-1].id;
this.productType = selectedOptions.map((option) => option.dictName).join('/');


+ 27
- 6
src/views/agriculturalTrusteeship/socialization/user.vue Visa fil

@@ -58,11 +58,8 @@
<van-field label="联系电话" v-model="entityForm.tal" left-icon="../../../../static/images/agriculturalTrusteeship/socialization/user_icon_07.png" :border="false" input-align="right" value="内容" />
</div>

<div class="main_box">
<baidu-map :center="center" panBy="[50,50]" :zoom="zoom" :scroll-wheel-zoom="true" :pinch-to-zoom="true" map-type="BMAP_NORMAL_MAP" style="height:25vh" >
<!-- 必须给容器指高度，不然地图将显示在一个高度为0的容器中，看不到 -->
<bm-marker :position="center" :dragging="true" animation="BMAP_ANIMATION_BOUNCE" :icon="{url: '../../../../static/images/lawEnforcement/new/address.gif', size: {width: 50, height: 50}}"></bm-marker>
</baidu-map>
<div class="main_box" v-show="entityForm.theGeom">
<MapGisTag ref="clickLoading" :showBtn="false" :message="entityForm.theGeom"></MapGisTag>
</div>
</div>
</div>
@@ -79,11 +76,15 @@
import agr from "@/components/common/agr_footer";
import dialogClose from "@/components/agriculturalTrusteeship/dialog";
import {entityGet, orderStatistics} from "@/api/agriculturalTrusteeship";
import MapGisTag from "@/components/Map/MapGisTagDTG";
let map ;
let myGeo ;
export default {
name: "agriculturalTrusteeshipInsuranceList",
components: {
agr,
dialogClose
dialogClose,
MapGisTag
},
data() {
return {
@@ -117,12 +118,27 @@
this.getUser();
},
methods: {
//每个查看修改，新增 方法下引用下面方法
mapClickLoading(){
setTimeout(() => {
this.$refs.clickLoading.pointPaceCountryDarw();
}, 500);
},
getUser(){
entityGet(Cookies.get('ACCESS-SESSION-ID')).then(res=>{
res.data.statisticsTypeId = this.selectDictLabel(this.statisticsTypeIdOptions, res.data.statisticsTypeId);
res.data.industryClassificationType = this.selectDictLabel(this.industryClassificationTypeOptions, res.data.industryClassificationType);
res.data.modelSocietyType = this.selectDictLabel(this.modelSocietyTypeOptions, res.data.modelSocietyType);
if (res.data.theGeom){

var m_center=JSON.parse(res.data.theGeom).coordinates;//地图中心点-经纬度坐标 //经纬度转至
var m_center1 = ol.proj.transform(m_center,'EPSG:3857', 'EPSG:4326');

this.center.lng = m_center1[0];
this.center.lat = m_center1[1];
}
this.entityForm = res.data;
this.mapClickLoading();
})
},
openDialog(val){
@@ -132,6 +148,11 @@
}
</script>
<style scoped lang="scss">
#container{
width: 100%;
height: 25vh;
overflow: hidden;
}
.home_wrapper{
background: #ffffff;
min-height: 100vh;


+ 28
- 6
src/views/agriculturalTrusteeship/socialization/userEdit.vue Visa fil

@@ -138,7 +138,7 @@
title="请选择服务区域"
:options="deptOptions"
@close="showDeptId = false"
@finish="onConfirmDept"
@change="onConfirmDept"
active-color="#1989fa"
:field-names="hcAreaInfoFieldName"
/>
@@ -151,12 +151,10 @@
</div>

<div class="main">
<baidu-map :center="center" panBy="[50,50]" :zoom="zoom" :scroll-wheel-zoom="true" :pinch-to-zoom="true" map-type="BMAP_NORMAL_MAP" style="height:25vh" >
<!-- 必须给容器指高度，不然地图将显示在一个高度为0的容器中，看不到 -->
<bm-marker :position="center" :dragging="true" animation="BMAP_ANIMATION_BOUNCE" :icon="{url: '../../../../static/images/lawEnforcement/new/address.gif', size: {width: 50, height: 50}}"></bm-marker>
</baidu-map>
<MapGisTag ref="clickLoading" :showBtn="true" :message="entityForm.theGeom" v-on:formSubmit="MapTag"></MapGisTag>
</div>


<div class="main_btn">
<p @click="submitForm">保存</p>
</div>
@@ -166,8 +164,14 @@
<script>
import Cookies from "js-cookie";
import {commonUpload, entityGet, treeselect,entityEdit} from "@/api/agriculturalTrusteeship";
import MapGisTag from "@/components/Map/MapGisTagDTG";
let map ;
let myGeo ;
export default {
name: "agriculturalTrusteeshipSocializationRelease",
components: {
MapGisTag
},
data() {
return {
activeKey: 0,
@@ -235,6 +239,17 @@
this.getUser();
},
methods: {
//获取自己返回值
/** 查找地图中定位点 */
MapTag: function (data) {
this.entityForm.theGeom = data;
},
//每个查看修改，新增 方法下引用下面方法
mapClickLoading(){
setTimeout(() => {
this.$refs.clickLoading.pointPaceCountryDarw();
}, 500);
},
getUser(){
entityGet(Cookies.get('ACCESS-SESSION-ID')).then(res=>{
this.statisticsTypeId = this.selectDictLabel(this.statisticsTypeIdOptions2, res.data.statisticsTypeId);
@@ -252,6 +267,7 @@
})
}
this.entityForm = res.data;
this.mapClickLoading();
})
},
afterReadEvidenceEntityForm(file){
@@ -288,10 +304,11 @@
},
//选择案件属地
onConfirmDept({ selectedOptions }){
console.log(selectedOptions.map((option) => option.label))
this.entityForm.serviceDeptName = selectedOptions[selectedOptions.length-1].label;
this.entityForm.serviceDeptId = selectedOptions[selectedOptions.length-1].value;
this.deptName = selectedOptions[selectedOptions.length-1].label;
this.showDeptId = false
// this.showDeptId = false
},
submitForm(){
this.entityForm.masterMap = this.mainImgArrEntity.join(',')
@@ -306,6 +323,11 @@
}
</script>
<style scoped lang="scss">
#container{
width: 100%;
height: 25vh;
overflow: hidden;
}
.home_wrapper{
background: #F6F6F6;
min-height: 100vh;


+ 4
- 0
src/views/agriculturalTrusteeship/society/societyList.vue Visa fil

@@ -109,6 +109,7 @@
v-model="loading"
:finished="finished"
finished-text="没有更多了"
:immediate-check="false"
@load="getList"
>
<!-- @load="onLoad" agriculturalTrusteeshipSocializationProjectDetail-->
@@ -204,7 +205,10 @@
this.query2.serviceDeptId = res.data[0].value;
this.deptName = res.data[0].label;
this.serviceList = [];
this.supplyDemandListYes = [];
this.supplyDemandList = [];
this.getServiceList();
this.getList();
}
})
},


+ 14
- 20
src/views/agriculturalTrusteeship/society/societyProjectDetail.vue Visa fil

@@ -39,19 +39,8 @@
<van-cell title="联系人" :border="false" :value="supplyDemand.linker" />
<van-cell title="联系方式" :border="false" :value="supplyDemand.supplyDemandTal" />
</div>

<div class="main_box" style="padding: 0;">
<baidu-map
:center="center"
panBy="[50,50]"
:zoom="zoom"
:scroll-wheel-zoom="true"
:pinch-to-zoom="true"
map-type="BMAP_NORMAL_MAP"
style="height:25vh" >
<!-- 必须给容器指高度，不然地图将显示在一个高度为0的容器中，看不到 -->
<bm-marker :position="center" :dragging="true" animation="BMAP_ANIMATION_BOUNCE" :icon="{url: '../../../../static/images/lawEnforcement/new/address.gif', size: {width: 50, height: 50}}"></bm-marker>
</baidu-map>
<div class="main_box" style="padding: 0;" v-show="supplyDemand.theGeom">
<MapGisTag ref="clickLoading" :showBtn="false" :message="supplyDemand.theGeom"></MapGisTag>
</div>
</div>
<!-- 内容结束 -->
@@ -66,8 +55,12 @@
<script>
import Cookies from "js-cookie";
import {productTypes, supplyDemandGet} from "@/api/agriculturalTrusteeship";
import MapGisTag from "@/components/Map/MapGisTagDTG";
export default {
name: "agriculturalTrusteeshipInsuranceDetail",
components: {
MapGisTag
},
data() {
return {
activeKey: 0,
@@ -78,7 +71,7 @@
lng :'',
lat :'',
}, //经纬度
zoom: 1, //地图展示级别
zoom: 15, //地图展示级别
showDialog:false,
supplyDemand:{},
productType:'',
@@ -114,6 +107,12 @@
this.getDetail();
},
methods: {
//每个查看修改，新增 方法下引用下面方法
mapClickLoading(){
setTimeout(() => {
this.$refs.clickLoading.pointPaceCountryDarw();
}, 500);
},
getDetail(){
supplyDemandGet(this.$route.query.id).then(response => {
response.data.bodyType = this.selectDictLabel(this.bodyTypeOptions, response.data.bodyType);
@@ -123,12 +122,6 @@
},1000)
response.data.createTime = response.data.createTime.substr(0,10);
response.data.supplyMasterMapList = [];
if (response.data.theGeom){
console.log(JSON.parse(response.data.theGeom).coordinates[0])
console.log(JSON.parse(response.data.theGeom).coordinates[1])
this.center.lng = JSON.parse(response.data.theGeom).coordinates[0];
this.center.lat = JSON.parse(response.data.theGeom).coordinates[1];
}
if (response.data.supplyMasterMap){
var attachement = response.data.supplyMasterMap.split( "," );
this.supplyMasterMapArr = response.data.supplyMasterMap.split( "," );
@@ -139,6 +132,7 @@
response.data.supplyMasterMapList.push('../../../../static/images/agriculturalTrusteeship/zwtp.png')
}
this.supplyDemand = response.data;
this.mapClickLoading();
});
},
},


Skriv Förhandsgranska
Laddar…
Avbryt
Spara