master
jevononlie 5 months ago
commit ec8aecf93e

@ -5,11 +5,11 @@ import jnpf.entity.StationAreaEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* nx_station_area
*
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-05-15
* 2024-05-20
*/
public interface StationAreaMapper extends BaseMapper<StationAreaEntity> {

@ -1,18 +1,17 @@
package jnpf.service;
import jnpf.entity.StationAreaEntity;
import jnpf.model.stationarea.*;
import jnpf.entity.*;
import java.util.*;
import com.baomidou.mybatisplus.extension.service.IService;
import jnpf.model.stationarea.StationAreaForm;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
/**
* stationArea
*
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-05-15
* 2024-05-20
*/
public interface StationAreaService extends IService<StationAreaEntity> {
List<StationAreaEntity> getList(StationAreaPagination stationAreaPagination);

@ -32,11 +32,11 @@ import jnpf.base.UserInfo;
import jnpf.permission.entity.UserEntity;
/**
*
* stationArea
*
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-05-15
* 2024-05-20
*/
@Service
public class StationAreaServiceImpl extends ServiceImpl<StationAreaMapper, StationAreaEntity> implements StationAreaService{
@ -144,32 +144,13 @@ public class StationAreaServiceImpl extends ServiceImpl<StationAreaMapper, Stati
}
}
if(isPc){
if(ObjectUtil.isNotEmpty(stationAreaPagination.getStationCode())){
if(ObjectUtil.isNotEmpty(stationAreaPagination.getAreaName())){
stationAreaNum++;
List<String> idList = new ArrayList<>();
try {
String[][] stationCode = JsonUtil.getJsonToBean(stationAreaPagination.getStationCode(),String[][].class);
for(int i=0;i<stationCode.length;i++){
if(stationCode[i].length>0){
idList.add(JsonUtil.getObjectToString(Arrays.asList(stationCode[i])));
}
}
}catch (Exception e1){
try {
List<String> stationCode = JsonUtil.getJsonToList(stationAreaPagination.getStationCode(),String.class);
if(stationCode.size()>0){
idList.addAll(stationCode);
}
}catch (Exception e2){
idList.add(String.valueOf(stationAreaPagination.getStationCode()));
}
}
stationAreaQueryWrapper.lambda().and(t->{
idList.forEach(tt->{
t.like(StationAreaEntity::getStationCode, tt).or();
});
});
String value = stationAreaPagination.getAreaName() instanceof List ?
JsonUtil.getObjectToString(stationAreaPagination.getAreaName()) :
String.valueOf(stationAreaPagination.getAreaName());
stationAreaQueryWrapper.lambda().like(StationAreaEntity::getAreaName,value);
}
@ -202,16 +183,6 @@ public class StationAreaServiceImpl extends ServiceImpl<StationAreaMapper, Stati
}
if(ObjectUtil.isNotEmpty(stationAreaPagination.getAreaName())){
stationAreaNum++;
String value = stationAreaPagination.getAreaName() instanceof List ?
JsonUtil.getObjectToString(stationAreaPagination.getAreaName()) :
String.valueOf(stationAreaPagination.getAreaName());
stationAreaQueryWrapper.lambda().like(StationAreaEntity::getAreaName,value);
}
if(ObjectUtil.isNotEmpty(stationAreaPagination.getStatus())){
stationAreaNum++;
@ -329,8 +300,16 @@ public class StationAreaServiceImpl extends ServiceImpl<StationAreaMapper, Stati
if(isSave){
String mainId = RandomUtil.uuId() ;
entity.setCreatorUserId(userInfo.getUserId());
entity.setDeleteTime(DateUtil.getNowDate());
entity.setLastModifyUserId(null);
entity.setLastModifyTime(null);
entity.setId(mainId);
}else{
entity.setCreatorUserId(userInfo.getUserId());
entity.setDeleteTime(DateUtil.getNowDate());
entity.setLastModifyUserId(null);
entity.setLastModifyTime(null);
}
this.saveOrUpdate(entity);

@ -30,15 +30,15 @@ import jnpf.exception.WorkFlowException;
import org.springframework.transaction.annotation.Transactional;
/**
*
*
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-05-16
* @ 2024-05-20
*/
@Slf4j
@RestController
@Tag(name = "回收站地图围栏" , description = "scm")
@Tag(name = "回收站电子围栏" , description = "scm")
@RequestMapping("/api/scm/StationArea")
public class StationAreaController {

@ -9,7 +9,7 @@ import java.util.Date;
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-05-16
* @ 2024-05-20
*/
@Data
@TableName("nx_station_area")

@ -6,11 +6,11 @@ import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
*
*
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-05-16
* @ 2024-05-20
*/
@Data
public class StationAreaForm {
@ -26,13 +26,25 @@ public class StationAreaForm {
/** 是否启用 **/
@JsonProperty("status")
private String status;
/** 所属回收站 **/
/** 点编号 **/
@JsonProperty("stationCode")
private Object stationCode;
private String stationCode;
/** 地图信息 **/
@JsonProperty("areaMapInfo")
private String areaMapInfo;
/** 区域描述 **/
@JsonProperty("areaDesc")
private String areaDesc;
/** 创建用户 **/
@JsonProperty("creatorUserId")
private String creatorUserId;
/** 删除时间 **/
@JsonProperty("deleteTime")
private String deleteTime;
/** 修改用户 **/
@JsonProperty("lastModifyUserId")
private String lastModifyUserId;
/** 修改时间 **/
@JsonProperty("lastModifyTime")
private String lastModifyTime;
}

@ -7,11 +7,11 @@ import java.util.List;
/**
*
*
*
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-05-16
* @ 2024-05-20
*/
@Data
public class StationAreaPagination extends Pagination {
@ -27,15 +27,12 @@ public class StationAreaPagination extends Pagination {
private String moduleId;
/** 菜单id */
private String menuId;
/** 所属回收站 */
@JsonProperty("stationCode")
private Object stationCode;
/** 区域类型 */
@JsonProperty("areaType")
private Object areaType;
/** 区域名称 */
@JsonProperty("areaName")
private Object areaName;
/** 区域类型 */
@JsonProperty("areaType")
private Object areaType;
/** 是否启用 */
@JsonProperty("status")
private Object status;

@ -29,13 +29,14 @@
"management-system"
],
"dependencies": {
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
"@babel/plugin-proposal-optional-chaining": "^7.18.9",
"@fullcalendar/core": "^6.1.4",
"@fullcalendar/daygrid": "^6.1.4",
"@fullcalendar/interaction": "^6.1.4",
"@fullcalendar/timegrid": "^6.1.4",
"@fullcalendar/vue": "^6.1.4",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
"@babel/plugin-proposal-optional-chaining": "^7.18.9",
"@map-component/vue-tmap": "^1.0.1",
"@tinymce/tinymce-vue": "^3.2.0",
"axios": "0.18.1",
"clipboard": "2.0.4",

@ -1,3 +1,11 @@
<!--
* @Author: jevononlie 728254585@qq.com
* @Date: 2024-05-17 17:34:18
* @LastEditors: jevononlie 728254585@qq.com
* @LastEditTime: 2024-05-20 17:09:53
* @FilePath: /jnpf-web/public/index.html
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<!DOCTYPE html>
<html>
@ -9,6 +17,8 @@
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title><%= webpackConfig.name %></title>
<script src="<%= BASE_URL %>cdn/echarts/echarts.min.js"></script>
<!-- 先在vue的index.html里面引入腾讯地图包 -->
<script charset="utf-8" src="https://map.qq.com/api/js?v=2.exp&key=U24BZ-7UECT-ZSNXI-L3GJD-GZD3E-3YFF6&libraries=drawing"></script>
<!-- <script type="text/javascript" src="//api.map.baidu.com/api?v=2.0&ak=nYAafE0e8IXpGM0ykV3BO2k7CVRHI79Y"></script> -->
</head>

@ -25,8 +25,8 @@
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="所属回收站"
prop="stationCode" >
<jnpf-form-tip-item label="点编号"
prop="stationCode" tip-label="绑定站点编码" >
<p>{{dataForm.stationCode}}</p>
</jnpf-form-tip-item>
</el-col>
@ -42,6 +42,18 @@
<p>{{dataForm.areaDesc}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="修改用户"
prop="lastModifyUserId" >
<p>{{dataForm.lastModifyUserId}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="修改时间"
prop="lastModifyTime" >
<p>{{dataForm.lastModifyTime}}</p>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row>
@ -70,15 +82,18 @@
dataForm: {
id :'',
areaName : '',
areaType : "1",
areaType : "",
status : "1",
stationCode : "",
areaMapInfo : '',
areaDesc : '',
creatorUserId : "",
deleteTime : "",
lastModifyUserId : "",
lastModifyTime : "",
},
areaTypeProps:{"label":"fullName","value":"enCode" },
statusProps:{"label":"fullName","value":"enCode" },
stationCodeProps:{"label":"fullName","value":"id" },
}
},

@ -1,43 +1,237 @@
<template>
<el-dialog title="电子围栏" :visible="true" top="20vh" width="50%" append-to-body modal-append-to-body
:before-close="handleClose" class="my-dialog">
<div class="cont">112</div>
</el-dialog>
<div class="cont">
<div id="mapFencecontainer" class="mapBox" style="width:100%;height:100%;position: absolute;">
<div class="mapBtn">
<!-- <el-button size="small" type="danger" @click="delpolygon()"></el-button> -->
<el-button size="small" type="danger" @click="clearOverlays()"></el-button>
<el-button size="small" type="primary" @click="sendLngLat"></el-button>
<el-button size="small" type="primary" @click="sendMsg"></el-button>
</div>
</div>
<!-- <p>给地图绑定了点击事件当点击地图时会在点击位置显示Marker</p> -->
</div>
</template>
<script>
import request from '@/utils/request'
import { mapGetters } from "vuex";
import { Notification } from 'element-ui';
let map, marker, polygon, drawingManager, lngLat; //
const markersArray = []; let overlaysArray = []; // ,
let path4 = [];//
//
let arr = [{ 'lat': 34.80506482194067, 'lng': 113.59760284423828 },
{ 'lat': 34.780394716350614, 'lng': 113.59365463256836 },
{ 'lat': 34.760794345237514, 'lng': 113.58541488647461 },
{ 'lat': 34.7330074293797, 'lng': 113.58455657958984 },
{ 'lat': 34.70281206762318, 'lng': 113.61854553222656 },
{ 'lat': 34.70027176815597, 'lng': 113.62884521484375 },
{ 'lat': 34.6987193245323, 'lng': 113.63296508789062 },
{ 'lat': 34.69914272113635, 'lng': 113.63880157470703 },
{ 'lat': 34.699001589175694, 'lng': 113.64498138427734 },
{ 'lat': 34.698578191849535, 'lng': 113.68309020996094 },
{ 'lat': 34.73907339121123, 'lng': 113.68206024169922 },
{ 'lat': 34.738932327388824, 'lng': 113.6920166015625 },
{ 'lat': 34.76319176276739, 'lng': 113.69218826293945 },
{ 'lat': 34.763050740134055, 'lng': 113.70386123657227 },
{ 'lat': 34.7864571976711, 'lng': 113.70214462280273 },
{ 'lat': 34.786739162702524, 'lng': 113.68206024169922 },
{ 'lat': 34.809997957307736, 'lng': 113.68223190307617 },
{ 'lat': 34.81098454894641, 'lng': 113.64789962768555 },
{ 'lat': 34.81366238099493, 'lng': 113.62936019897461 }]; //
export default {
components: {
},
props: [],
props: ['parentmsg'],
data() {
return {
visible: true,
loading: false,
longitude: '',
latitude: '',
lngLatData: [] //
};
},
mounted() {
this.init();
},
methods: {
// ()
sendMsg() {
// func: this.msg:
this.$emit('funcCancle', false);
},
// ()
sendLngLat() {
if (lngLat == undefined) {
lngLat = path4;
}
const h = this.$createElement;
},
computed: {
...mapGetters(['userInfo'])
//
init() {
map = new qq.maps.Map(document.getElementById('mapFencecontainer'), {
center: new qq.maps.LatLng(34.764152, 113.667636), //
zoom: 13
});
//
this.addMarker(new qq.maps.LatLng(30.925788712587014, 103.8922119140625)); //
this.markerOnly();
//
// 便
// path4 = [];
arr.forEach(item => {
path4.push(new qq.maps.LatLng(item.lat, item.lng));
});
console.log(path4);
this.showpolygon(path4);
//
this.addpolygon();
},
watch: {},
created() {
//
markerOnly() {
qq.maps.event.addListener(map, 'click', function (event) {
this.addMarker(event.latLng);
qq.maps.event.addListener(map, 'click', function (event) {
this.deleteOverlays(); //
marker = new qq.maps.Marker({
position: event.latLng,
map: map
});
});
var gps = event.latLng.getLat() + ',' + event.latLng.getLng(); // 便
});
},
mounted() { },
methods: {
handleClose() {
this.$emit('areaVisibleChange', false)
//
addMarker(location) {
this.deleteOverlays();
var marker = new qq.maps.Marker({
position: location,
map: map
});
markersArray.push(marker);
},
//
deleteOverlays() {
if (markersArray) {
// for (i in markersArray) {
for (var i = 0; i < markersArray.length; i++) {
markersArray[i].setMap(null);
}
markersArray.length = 0;
}
if (marker !== undefined) {
marker.setMap(null);
}
},
/**
* 多边形绘制
*/
//
addpolygon() {
drawingManager = new qq.maps.drawing.DrawingManager({
drawingMode: qq.maps.drawing.OverlayType.POLYGON, //
drawingControl: true,
drawingControlOptions: {
position: qq.maps.ControlPosition.TOP_CENTER,
// drawingModes: [
// qq.maps.drawing.OverlayType.POLYGON
// ]
//
drawingModes: [
qq.maps.drawing.OverlayType.MARKER,
qq.maps.drawing.OverlayType.CIRCLE,
qq.maps.drawing.OverlayType.POLYGON,
qq.maps.drawing.OverlayType.POLYLINE,
qq.maps.drawing.OverlayType.RECTANGLE
]
},
markerOptions: {
visible: false
},
//
polygonOptions: {
editable: true,
strokeColor: new qq.maps.Color(202, 67, 58, 0.8),
fillColor: new qq.maps.Color(202, 67, 58, 0.1),
clickable: false
},
//
circleOptions: {
fillColor: new qq.maps.Color(255, 208, 70, 0.3),
strokeColor: new qq.maps.Color(88, 88, 88, 1),
strokeWeight: 3,
clickable: false
}
});
drawingManager.setMap(map);
qq.maps.event.addListener(drawingManager, 'overlaycomplete', function (event) {
// clearOverlays(overlaysArray)
lngLat = [];
overlaysArray.push(event.overlay);
for (const item of event.overlay.getPath().elems) {
const lng = item.getLng();
const lat = item.getLat();
lngLat.push({
lat: lat,
lng: lng
});
}
console.log(lngLat); //
});
},
//
showpolygon(path3) {
polygon = new qq.maps.Polygon({
map: map,
editable: true,
strokeColor: new qq.maps.Color(202, 67, 58, 0.8),
fillColor: new qq.maps.Color(202, 67, 58, 0.1)
});
polygon.setPath(path3);
},
//
delpolygon() {
const a = [];
polygon.setPath(a);
},
//
clearOverlays() {
arr = []; //
path4 = [];
polygon.setPath(path4);
if (overlaysArray) { // ifvuefor in if0
// for (i in overlaysArray) {
for (var i = 0; i < overlaysArray.length; i++) {
overlaysArray[i].setMap(null);
}
}
overlaysArray = []; //
lngLat = [];
console.log(drawingManager);
this.init();
}
}
};
</script>
<style lang="scss" scoped>
.my-dialog {
<style scoped lang="scss">
.cont {
min-height: 600px;
width: 800px;
height: 400px;
}
.mapBox {
position: relative;
.mapBtn {
position: absolute;
bottom: 20px;
right: 20px;
z-index: 999;
}
}
</style>

File diff suppressed because one or more lines are too long

@ -2,13 +2,12 @@
<template>
<el-dialog :title="!dataForm.id ? '新建' :'编辑'" modal-append-to-body="false" :close-on-click-modal="false"
append-to-body :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="600px">
<el-dialog :title="!dataForm.id ? '新建' :'编辑'" :modal-append-to-body="false" :close-on-click-modal="false"
append-to-body :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1000px">
<el-row :gutter="15" class="">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
label-position="right">
<template v-if="!loading">
{{ areaVisible }}
<!-- 具体表单 -->
<el-col :span="24">
<jnpf-form-tip-item label="区域名称" tipLabel="围栏区域名称" prop="areaName">
@ -53,15 +52,12 @@
</JnpfTextarea>
</jnpf-form-tip-item>
</el-col>
<!-- <el-dialog title="登录" v-if="areaVisible" :visible="true" top="20vh" width="30%" append-to-body
modal-append-to-body>
</el-dialog> -->
<area-dialog v-if="areaVisible" @areaVisibleChange="handleAreaVisibleChange" ref="JNPFForm" />
<!-- 表单结束 -->
</template>
</el-form>
<SelectDialog v-if="1" :config="currTableConf" :formData="dataForm" ref="selectDialog" @select="addForSelect"
@close="selectDialogVisible=false" />
<!-- <SelectDialog v-if="1" :config="currTableConf" :formData="dataForm" ref="selectDialog" @select="addForSelect"
@close="selectDialogVisible=false" /> -->
</el-row>
<span slot="footer" class="dialog-footer">

@ -1,46 +1,40 @@
<template>
<div class="JNPF-common-layout">
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="所属回收站">
<JnpfSelect v-model="query.stationCode" placeholder="选择本组织回收站进行绑定" clearable :options="stationCodeOptions"
:props="stationCodeProps" multiple>
</JnpfSelect>
<el-form-item label="区域名称">
<el-input v-model="query.areaName" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="区域类型">
<JnpfSelect v-model="query.areaType" placeholder="请选择围栏类型" clearable :options="areaTypeOptions"
<JnpfSelect v-model="query.areaType" placeholder="请选择围栏类型" clearable
:options="areaTypeOptions"
:props="areaTypeProps" multiple >
</JnpfSelect>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="区域名称">
<el-input v-model="query.areaName" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<template v-if="showAll">
<el-col :span="6">
<el-form-item label="是否启用">
<JnpfSelect v-model="query.status" placeholder="请选择" clearable :options="statusOptions"
<JnpfSelect v-model="query.status" placeholder="请选择" clearable
:options="statusOptions"
:props="statusProps" >
</JnpfSelect>
</el-form-item>
</el-col>
</template>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()">{{ areaVisible }}</el-button>
<el-button type="primary" icon="el-icon-search" @click="search()"></el-button>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
展开
</el-button>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
收起
</el-button>
</el-form-item>
</el-col>
</el-form>
@ -57,47 +51,88 @@
@click="openSuperQuery()" />
</el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="initData()" />
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
</el-tooltip>
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' :span-method="arraySpanMethod">
<el-table-column prop="areaName" label="区域名称" align="left">
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod"
>
<el-table-column
prop="stationCode"
label="站点编号" align="center"
sortable="custom" >
</el-table-column>
<el-table-column
prop="areaName"
label="区域名称" align="center"
>
</el-table-column>
<el-table-column
prop="areaType"
label="区域类型" align="center"
>
</el-table-column>
<el-table-column
prop="status"
label="是否启用" align="center"
>
</el-table-column>
<el-table-column prop="areaType" label="区域类型" align="left">
<el-table-column
prop="areaMapInfo"
label="地图信息" align="center"
>
</el-table-column>
<el-table-column prop="stationCode" label="所属回收站" align="left">
<el-table-column
prop="areaDesc"
label="区域描述" align="center"
>
</el-table-column>
<el-table-column prop="status" label="是否启用" align="left">
<el-table-column
prop="creatorUserId"
label="创建用户" align="center"
>
</el-table-column>
<el-table-column prop="areaMapInfo" label="地图信息" align="left">
<el-table-column
prop="lastModifyUserId"
label="修改用户" align="center"
>
</el-table-column>
<el-table-column prop="areaDesc" label="区域描述" align="left">
<el-table-column
prop="lastModifyTime"
label="修改时间" align="center"
>
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<el-table-column label="操作"
fixed="right" width="150" >
<template slot-scope="scope" >
<el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">
<el-button type="text"
@click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'" >编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'" @click="handleDel(scope.row.id)">
</el-button>
<el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">
<el-button type="text" v-has="'btn_detail'"
@click="goDetail(scope.row.id)">详情
</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/>
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/>
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/>
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" @superQuery="superQuery" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
</div>
</template>
@ -138,15 +173,13 @@ export default {
exportList:[],
columnList,
showAll: false,
superQueryVisible: false,
superQueryJson,
uploadBoxVisible: false,
detailVisible: false,
query: {
stationCode: undefined,
areaType: undefined,
areaName:undefined,
areaType:undefined,
status:undefined,
},
treeProps: {
@ -175,9 +208,8 @@ export default {
areaTypeProps:{"label":"fullName","value":"enCode" },
statusOptions:[],
statusProps:{"label":"fullName","value":"enCode" },
stationCodeOptions: [],
stationCodeProps: { "label": "fullName", "value": "id" },
interfaceRes: {
stationCode:[] ,
},
}
},
@ -190,7 +222,6 @@ export default {
created() {
this.getColumnList(),
this.initSearchDataAndListData()
this.getstationCodeOptions();
this.getareaTypeOptions();
this.getstatusOptions();
this.queryData = JSON.parse(JSON.stringify(this.query))
@ -343,12 +374,6 @@ export default {
}
this.exportList = exportList
},
getstationCodeOptions() {
getDataInterfaceRes('520259300875047493').then(res => {
let data = res.data
this.stationCodeOptions = data
})
},
getareaTypeOptions() {
getDictionaryDataSelector('560423985691492677').then(res => {
this.areaTypeOptions = res.data.list
@ -482,7 +507,7 @@ export default {
colseFlow(isrRefresh) {
this.flowVisible = false
if (isrRefresh) this.reset()
}
},
}
}
</script>

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save