|
|
@@ -174,7 +174,7 @@
|
|
|
<!-- </a-form-model-item>-->
|
|
|
<!-- </a-col>-->
|
|
|
<a-col :span="10">
|
|
|
- <a-form-model-item label="运营商类型" :labelCol="{ span:9 }"
|
|
|
+ <a-form-model-item label="客户现用号码一证通查结果" :labelCol="{ span:9 }"
|
|
|
:wrapperCol="{ span: 13}" prop="operatorType" style="margin: 0px 0px">
|
|
|
<a-radio-group v-model="model.operatorType" button-style="solid" @change="showCheck0('operatorType')" :disabled="isDisabled">
|
|
|
|
|
|
@@ -196,7 +196,7 @@
|
|
|
<!-- <span v-if="this.model.qita>5 " style="color: red">[{{ this.model.qita }}]</span><span-->
|
|
|
<!-- v-if="this.model.qita<5 " style="color: green">[{{ this.model.qita }}]</span>-->
|
|
|
</a-radio-group>
|
|
|
- <div v-if="operatorTypeNull" style="color: red">请选择运营商类型</div>
|
|
|
+ <div v-if="operatorTypeNull" style="color: red">请选择客户现用号码一证通查结果</div>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
</a-row>
|
|
|
@@ -246,16 +246,16 @@
|
|
|
|
|
|
|
|
|
</a-col>
|
|
|
- <a-col :span="9">
|
|
|
- <a-form-model-item label="客户现用号码一证通查结果" prop="modelOperator" :labelCol="{ span:10 }"
|
|
|
- :wrapperCol="{ span: 13}" style="margin: 0px 0px">
|
|
|
- <a-radio-group v-model="model.operator" button-style="solid" id="operator" @change="showCheck0('operator')" v-bind:disabled="isDisabled">
|
|
|
- <a-radio value="1" >本地运营商</a-radio>
|
|
|
- <a-radio value="2" >异地运营商</a-radio>
|
|
|
- </a-radio-group>
|
|
|
- <div v-if="operatorNull" style="color: red">请选择客户现用号码一证通查结果</div>
|
|
|
- </a-form-model-item>
|
|
|
- </a-col>
|
|
|
+<!-- <a-col :span="9">-->
|
|
|
+<!-- <a-form-model-item label="客户现用号码一证通查结果" prop="modelOperator" :labelCol="{ span:10 }"-->
|
|
|
+<!-- :wrapperCol="{ span: 13}" style="margin: 0px 0px">-->
|
|
|
+<!-- <a-radio-group v-model="model.operator" button-style="solid" id="operator" @change="showCheck0('operator')" v-bind:disabled="isDisabled">-->
|
|
|
+<!-- <a-radio value="1" >本地运营商</a-radio>-->
|
|
|
+<!-- <a-radio value="2" >异地运营商</a-radio>-->
|
|
|
+<!-- </a-radio-group>-->
|
|
|
+<!-- <div v-if="operatorNull" style="color: red">请选择客户现用号码一证通查结果</div>-->
|
|
|
+<!-- </a-form-model-item>-->
|
|
|
+<!-- </a-col>-->
|
|
|
|
|
|
|
|
|
</a-row>
|
|
|
@@ -653,7 +653,7 @@
|
|
|
<a-col :span="10">
|
|
|
<a-select placeholder="请选择营业厅地址" v-model="model.sysBusinessHall" style="margin: 0px 0px;width: 200px" :disabled="isDisabled">
|
|
|
<a-select-option v-for="item in sysBusinessHallList" :key="item.id" :value="item.id"
|
|
|
- @click="searchKeyWordsysBusinessHall('中国电信'+item.name,'businessAddress')">
|
|
|
+ @click="searchKeyWordsysBusinessHall('中国电信'+item.name +'coordinate'+ item.coordinate,'businessAddress')">
|
|
|
{{ item.name }}
|
|
|
</a-select-option>
|
|
|
</a-select>
|
|
|
@@ -876,6 +876,7 @@ export default {
|
|
|
calltestResultsName: '',
|
|
|
companyName: '',
|
|
|
hallName: '',
|
|
|
+ coordinate:'',
|
|
|
sysCompany: [],
|
|
|
sysBusinessHallList: "",
|
|
|
cities: "",
|
|
|
@@ -892,6 +893,7 @@ export default {
|
|
|
lnglats: [],
|
|
|
map: null,
|
|
|
lnglatMaps: new Map(),
|
|
|
+ lnglatTestList:[],
|
|
|
zoom: 18,
|
|
|
center: [118.02, 24.48],
|
|
|
searchOption: {
|
|
|
@@ -1717,21 +1719,51 @@ export default {
|
|
|
this.showCheck0('sysBusinessHall');
|
|
|
}
|
|
|
let that = this
|
|
|
- that.placeSearchComponent.search(data, function (status, result) {
|
|
|
- if (status === 'complete' && result.info === "OK") {
|
|
|
- that.showsearchResultBusinessAddress = true
|
|
|
- that.showsearchResult = false
|
|
|
- that.showsearchcurrentAddress = false
|
|
|
- that.poiList = result.poiList.pois
|
|
|
- that.markerResult(that.poiList[0], nameType)
|
|
|
- } else {
|
|
|
- that.showsearchResultBusinessAddress = false
|
|
|
- that.showsearchResult = false
|
|
|
- that.showsearchcurrentAddress = false
|
|
|
- that.poiList = []
|
|
|
- //that.$message.warning("没有查到结果");
|
|
|
- }
|
|
|
- })
|
|
|
+ if (nameType==='businessAddress'){
|
|
|
+
|
|
|
+ var index = data.lastIndexOf("coordinate")
|
|
|
+ var res = data.substring(index+10, data.length)
|
|
|
+ var search = data.substring(0, index)
|
|
|
+ var list =res.split(',');
|
|
|
+ if (nameType==='businessAddress'){
|
|
|
+ data=search;
|
|
|
+ }
|
|
|
+ that.showsearchResultBusinessAddress = true
|
|
|
+ that.showsearchResult = false
|
|
|
+ that.showsearchcurrentAddress = false;
|
|
|
+ var poiList={
|
|
|
+ location: {
|
|
|
+ lng:'',
|
|
|
+ lat:''
|
|
|
+ },
|
|
|
+ name:''
|
|
|
+ };
|
|
|
+ poiList.location.lng=list[0];
|
|
|
+ poiList.location.lat=list[1];
|
|
|
+ poiList.name=search
|
|
|
+ that.markerResult(poiList, nameType)
|
|
|
+ }else {
|
|
|
+ that.placeSearchComponent.search(data, function (status, result) {
|
|
|
+ if (status === 'complete' && result.info === "OK") {
|
|
|
+ that.showsearchResultBusinessAddress = true
|
|
|
+ that.showsearchResult = false
|
|
|
+ that.showsearchcurrentAddress = false
|
|
|
+ that.poiList = result.poiList.pois
|
|
|
+ if (nameType==='businessAddress'){
|
|
|
+
|
|
|
+ that.poiList[0].location.lng=list[0];
|
|
|
+ that.poiList[0].location.lat=list[1];
|
|
|
+ }
|
|
|
+ that.markerResult(that.poiList[0], nameType)
|
|
|
+ } else {
|
|
|
+ that.showsearchResultBusinessAddress = false
|
|
|
+ that.showsearchResult = false
|
|
|
+ that.showsearchcurrentAddress = false
|
|
|
+ that.poiList = []
|
|
|
+ //that.$message.warning("没有查到结果");
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
|
|
|
},
|
|
|
|
|
|
@@ -1852,6 +1884,7 @@ export default {
|
|
|
marker.content = data.get(key + 'name');
|
|
|
marker.on('click', markerClick);
|
|
|
marker.emit('click', {target: marker});//默认初始化不出现信息窗体,打开初始化就出现信息窗体
|
|
|
+ this.lnglatTestList.push(marker)
|
|
|
}
|
|
|
})
|
|
|
|
|
|
@@ -2193,6 +2226,7 @@ export default {
|
|
|
for (var it of item.sysBusinessHallList) {
|
|
|
if (it.id === this.model.sysBusinessHall) {
|
|
|
this.hallName = it.name;
|
|
|
+ this.coordinate=it.coordinate;
|
|
|
this.model.sysBusinessHall=it.id
|
|
|
}
|
|
|
}
|
|
|
@@ -2204,7 +2238,7 @@ export default {
|
|
|
}
|
|
|
|
|
|
if (this.hallName!=='' && this.hallName!==null){
|
|
|
- this.searchKeyWordsysBusinessHall('中国电信'+this.hallName,'businessAddress');
|
|
|
+ this.searchKeyWordsysBusinessHall('中国电信'+this.hallName+'coordinate'+ this.coordinate,'businessAddress');
|
|
|
}
|
|
|
if (this.model.currentAddress!=='' && this.model.currentAddress!==null){
|
|
|
this.searchKeyWordsysBusinessHall(this.model.currentAddress,'currentAddress');
|
|
|
@@ -2378,13 +2412,13 @@ export default {
|
|
|
this.judgmentResearchNull=false;
|
|
|
}
|
|
|
}
|
|
|
- if (data==='all' || data==="operator"){ if (this.model.operator==='' || this.model.operator===null){
|
|
|
- this.operatorNull=true;
|
|
|
- info=false;
|
|
|
- }else {
|
|
|
- this.operatorNull=false;
|
|
|
- }
|
|
|
- }
|
|
|
+ // if (data==='all' || data==="operator"){ if (this.model.operator==='' || this.model.operator===null){
|
|
|
+ // this.operatorNull=true;
|
|
|
+ // info=false;
|
|
|
+ // }else {
|
|
|
+ // this.operatorNull=false;
|
|
|
+ // }
|
|
|
+ // }
|
|
|
if (data==='all' || data==="company"||data==='all' || data==="operatorType" ){
|
|
|
if (this.model.operatorType==='' || this.model.operatorType===null){
|
|
|
this.operatorTypeNull=true;
|
sunyize