Commit 9343e4cc authored by xinzhedeai's avatar xinzhedeai

问题处理

parent e71eb6b9
......@@ -490,7 +490,7 @@ var reqApis = function(){
baseInfo: {
// "incubatorId": {name:"孵化器名称", must:true, 'type':'select', val:'id', key:'name',},
"year": {
name:"年度", must:true, 'type':'date', 'datetype':'year','format':'yyyy',
name:"年度", must:true, 'type':'date', 'datetype':'year','format':'yyyy', table:0
},
"totalRevenue": {name:"孵化器总收入(万元)", must:true },
"serviceRevenue": {name:"综合服务收入(万元)", },
......@@ -539,11 +539,11 @@ var reqApis = function(){
rightBtn: [
],
search: [
{
'type': 'string', 'name': '孵化器名称', 'word': 'incubatorName', 'mode': 0, 'width': '180px', 'clear': function () {
this.loadData()
}
},
// {
// 'type': 'string', 'name': '孵化器名称', 'word': 'incubatorName', 'mode': 0, 'width': '180px', 'clear': function () {
// this.loadData()
// }
// },
{
'type': 'date', 'datetype':'year','defaultTime': ['2024'], 'name': '年度', 'word': 'year', 'mode': 0, 'width':'140px',
'change': function(a, b){
......@@ -645,7 +645,7 @@ var reqApis = function(){
"occupiedArea": {name:"占用孵化场地面积", table:0 },
"principal": {name:"企业负责人", must:true },
"contactPhone": {name:"联系方式", must:true },
"intellectualProperty": {name:"知识产权", table:0, 'type':'select', key:'name',},
// "intellectualProperty": {name:"知识产权", table:0, 'type':'select', key:'name',},
"totalFunding": {name:"累计获得融资总额(万元)", table:0},
"incubationStatus": {name:"企业孵化状态", 'type':'select',
change: function (val){
......
......@@ -54,14 +54,14 @@ export const constantRouterMap = [
]
},
{
path: "/home/enterprise",
path: "/home",
//component: Layout,
component: HomeLayout,
redirect: "noredirect",
hidden:false,
children: [
{
path: "center",
path: "enterprise",
component: resolve => require(["@/views/system/home/enterprise"], resolve),
name: "首页-企业",
meta: { title: "首页", affix:true , icon: "index"}
......
......@@ -28,7 +28,7 @@
</ul>
</div> -->
<div class="go-back">
<a href="/home/enterpriseHome">进入后台</a>
<a href="/home/enterprise">进入后台</a>
</div>
</header>
</div>
......
......@@ -27,7 +27,12 @@
style="width: 320px"
size="middle"
>
<el-option :label="item.name" :value="item.value" v-for="item in companyLevelList" :key="item.name"></el-option>
<el-option
:label="item.name"
:value="item.value"
v-for="item in companyLevelList"
:key="item.name"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="联系人">
......@@ -140,7 +145,6 @@ import crudOperation from "@crud/CRUD.operation";
import udOperation from "@crud/UD.operation";
import DateRangePicker from "@/components/DateRangePicker";
import dic from "@/api/system/dict";
import cuAmap from "@/components/AMap";
......@@ -223,8 +227,8 @@ export default {
mounted() {
// this.getData();
dic.getCompanyDicts().then((res) => {
console.log(res)
this.companyLevelList = res.body.companyLevel || []
console.log(res);
this.companyLevelList = res.body.incubatorLevel || [];
});
},
methods: {
......@@ -273,7 +277,6 @@ export default {
//showLabel: true,
//pitch: 40,
onload: function (cmap) {
// debugger
VUE.cmap = cmap;
var center = cmap.options.center;
......@@ -288,13 +291,14 @@ export default {
title: "",
draggable: true,
dragend: function (e) {
var lnglat = e.lnglat;
cmap.deGeocode([lnglat.lng, lnglat.lat], function (addr) {
form.address = addr;
form.longitude = lnglat.lng;
form.latitude = lnglat.lat;
self.$forceUpdate();
});
// var lnglat = e.lnglat;
// cmap.deGeocode([lnglat.lng, lnglat.lat], function (addr) {
// form.address = addr;
// form.longitude = lnglat.lng;
// form.latitude = lnglat.lat;
// self.$forceUpdate();
// });
VUE.getAddrPlus(e, cmap)
},
});
}
......@@ -302,38 +306,72 @@ export default {
VUE.getData(function () {});
},
click: function (e, cmap) {
var lnglat = e.lnglat;
cmap.deGeocode([lnglat.lng, lnglat.lat], function (addr) {
form.address = addr;
form.longitude = lnglat.lng;
form.latitude = lnglat.lat;
});
// 经纬度坐标
VUE.getAddrPlus(e, cmap);
// var lnglat = e.lnglat;
// cmap.deGeocode([lnglat.lng, lnglat.lat], function (addr) {
// form.address = addr;
// form.longitude = lnglat.lng;
// form.latitude = lnglat.lat;
// });
cmap.marker && cmap.removeMarker();
// 添加标记
cmap.addMarker({
lnglat: [lnglat.lng, lnglat.lat],
lnglat: [e.lnglat.lng, e.lnglat.lat],
title: "",
draggable: true,
dragend: function (e) {
var lnglat = e.lnglat;
cmap.deGeocode([lnglat.lng, lnglat.lat], function (addr) {
form.address = addr;
form.longitude = lnglat.lng;
form.latitude = lnglat.lat;
});
// var lnglat = e.lnglat;
// cmap.deGeocode([lnglat.lng, lnglat.lat], function (addr) {
// form.address = addr;
// form.longitude = lnglat.lng;
// form.latitude = lnglat.lat;
// });
VUE.getAddrPlus(e, cmap, form);
},
});
},
};
},
getAddrPlus(e, cmap, form) {
var lnglat = e.lnglat;
let longitude = lnglat.lng;
let latitude = lnglat.lat;
// 创建逆地理编码对象
let geocoder;
AMap.plugin("AMap.Geocoder", () => {
geocoder = new AMap.Geocoder({
radius: 1000,
extensions: "all",
});
console.log();
// 根据经纬度进行逆地理编码查询
geocoder.getAddress([longitude, latitude], (status, result) => {
if (status === "complete" && result.info === "OK") {
if (result.regeocode && result.regeocode.formattedAddress) {
let address = result.regeocode.formattedAddress;
this.formInline.address = address;
this.formInline.longitude = longitude;
this.formInline.latitude = latitude;
this.$forceUpdate();
console.log("精确地址获取", address);
}
} else {
console.error("获取地址失败");
}
});
});
},
onSubmit() {
console.log("submit!");
},
edit() {
crudHome.edit(this.formInline).then((res) => {
if (res && res.code === 200) {
this.$message.success('保存成功'); // res.msg
this.$message.success("保存成功"); // res.msg
}
});
},
......@@ -341,8 +379,8 @@ export default {
crudHome.getData().then((res) => {
this.formInline = res.body;
this.formInline.incubatorImage = res.body.incubatorImage;
const lat = this.formInline.latitude
const lng = this.formInline.longitude
const lat = this.formInline.latitude;
const lng = this.formInline.longitude;
// this.$refs.amap.init(amapOptions());
const center = [lng, lat];
// setTimeout(() => {
......@@ -350,13 +388,10 @@ export default {
this.$refs.amap.setCenter(center);
console.log("map", this.cmap);
// 定位marker设置
this.cmap.marker.setPosition(
new AMap.LngLat(lng, lat)
);
this.cmap.marker.setPosition(new AMap.LngLat(lng, lat));
// }, 3000);
console.log();
fn && fn()
fn && fn();
});
},
// 选中图标
......@@ -372,7 +407,7 @@ export default {
} */
</style>
<style rel="stylesheet/scss" lang="scss" scoped>
.app-container{
.app-container {
background-color: #f5f6fb;
}
.header {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment