Skip to content

卡
卡车调度系统
Commit 2bbf1993 authored by caicaicai's avatar caicaicai
Browse files
Options

修改

parent 2128f067
Hide whitespace changes
Inline Side-by-side
Showing with 287 additions and 284 deletions
public/config/config.json
View file @ 2bbf1993
{ {
"map3d": { "map3d": {
"scene": { "scene": {
"center": {"lat":39.276448,"lng":115.358833,"alt":2784,"heading":360,"pitch":-90}, "center": {"lat":37.52,"lng":122.12,"alt":2784,"heading":360,"pitch":-90},
"scene3DOnly": false, "scene3DOnly": false,
"shadows": false, "shadows": false,
"removeDblClick": true, "removeDblClick": true,
......
src/components/mars3d/Map.vue
View file @ 2bbf1993
...@@ -43,50 +43,50 @@ export default { ...@@ -43,50 +43,50 @@ export default {
data(){ data(){
return{ return{
persons:[ persons:[
["115.358833", "39.276448", "500"], ["122.128833", "37.526448", "500"],
["115.358638", "39.272818", "500"], ["122.128638", "37.522818", "500"],
["115.368738", "39.272818", "500"], ["122.128738", "37.522818", "500"],
["115.368638", "39.278518", "500"], ["122.128638", "37.528518", "500"],
["115.358538", "39.278818", "500"], ["122.128538", "37.528818", "500"],
["115.348538", "39.275818", "500"], ["122.128538", "37.525818", "500"],
["115.351538", "39.273318", "500"], ["122.121538", "37.523318", "500"],
["115.357833", "39.275448", "500"], ["122.127833", "37.525448", "500"],
["115.358833", "39.276448", "500"], ["122.128833", "37.526448", "500"],
["115.358638", "39.272818", "500"], ["122.128638", "37.522818", "500"],
["115.368738", "39.272818", "500"], ["122.128738", "37.522818", "500"],
["115.368638", "39.278518", "500"], ["122.128638", "37.528518", "500"],
["115.358538", "39.278818", "500"], ["122.128538", "37.528818", "500"],
["115.348538", "39.275818", "500"], ["122.128538", "37.525818", "500"],
["115.351538", "39.273318", "500"], ["122.121538", "37.523318", "500"],
["115.357833", "39.275448", "500"], ["122.127833", "37.525448", "500"],
["115.358833", "39.276448", "500"], ["122.128833", "37.526448", "500"],
["115.358638", "39.272818", "500"], ["122.128638", "37.522818", "500"],
["115.368738", "39.272818", "500"], ["122.128738", "37.522818", "500"],
["115.368638", "39.278518", "500"], ["122.128638", "37.528518", "500"],
["115.358538", "39.278818", "500"], ["122.128538", "37.528818", "500"],
["115.348538", "39.275818", "500"], ["122.128538", "37.525818", "500"],
["115.351538", "39.273318", "500"], ["122.121538", "37.523318", "500"],
["115.357833", "39.275448", "500"], ["122.127833", "37.525448", "500"],
["115.358833", "39.276448", "500"], ["122.128833", "37.526448", "500"],
["115.358638", "39.272818", "500"], ["122.128638", "37.522818", "500"],
["115.368738", "39.272818", "500"], ["122.128738", "37.522818", "500"],
["115.368638", "39.278518", "500"], ["122.128638", "37.528518", "500"],
["115.358538", "39.278818", "500"], ["122.128538", "37.528818", "500"],
["115.348538", "39.275818", "500"], ["122.128538", "37.525818", "500"],
["115.351538", "39.273318", "500"], ["122.121538", "37.523318", "500"],
["115.357833", "39.275448", "500"], ["122.127833", "37.525448", "500"],
["115.358833", "39.276448", "500"], ["122.128833", "37.526448", "500"],
["115.358638", "39.272818", "500"], ["122.128638", "37.522818", "500"],
["115.368738", "39.272818", "500"], ["122.128738", "37.522818", "500"],
["115.368638", "39.278518", "500"], ["122.128638", "37.528518", "500"],
["115.358538", "39.278818", "500"], ["122.128538", "37.528818", "500"],
["115.348538", "39.275818", "500"], ["122.128538", "37.525818", "500"],
["115.351538", "39.273318", "500"], ["122.121538", "37.523318", "500"],
["115.357833", "39.275448", "500"], ["122.127833", "37.525448", "500"],
], ],
zuobianData:[], zuobianData:[],
......
src/components/mars3d/Map2.vue
View file @ 2bbf1993
...@@ -43,50 +43,50 @@ export default { ...@@ -43,50 +43,50 @@ export default {
data(){ data(){
return{ return{
persons:[ persons:[
["115.358833", "39.276448", "500"], ["122.128833", "37.526448", "500"],
["115.358638", "39.272818", "500"], ["122.128638", "37.522818", "500"],
["115.368738", "39.272818", "500"], ["122.128738", "37.522818", "500"],
["115.368638", "39.278518", "500"], ["122.128638", "37.528518", "500"],
["115.358538", "39.278818", "500"], ["122.128538", "37.528818", "500"],
["115.348538", "39.275818", "500"], ["122.128538", "37.525818", "500"],
["115.351538", "39.273318", "500"], ["122.121538", "37.523318", "500"],
["115.357833", "39.275448", "500"], ["122.127833", "37.525448", "500"],
["115.358833", "39.276448", "500"], ["122.128833", "37.526448", "500"],
["115.358638", "39.272818", "500"], ["122.128638", "37.522818", "500"],
["115.368738", "39.272818", "500"], ["122.128738", "37.522818", "500"],
["115.368638", "39.278518", "500"], ["122.128638", "37.528518", "500"],
["115.358538", "39.278818", "500"], ["122.128538", "37.528818", "500"],
["115.348538", "39.275818", "500"], ["122.128538", "37.525818", "500"],
["115.351538", "39.273318", "500"], ["122.121538", "37.523318", "500"],
["115.357833", "39.275448", "500"], ["122.127833", "37.525448", "500"],
["115.358833", "39.276448", "500"], ["122.128833", "37.526448", "500"],
["115.358638", "39.272818", "500"], ["122.128638", "37.522818", "500"],
["115.368738", "39.272818", "500"], ["122.128738", "37.522818", "500"],
["115.368638", "39.278518", "500"], ["122.128638", "37.528518", "500"],
["115.358538", "39.278818", "500"], ["122.128538", "37.528818", "500"],
["115.348538", "39.275818", "500"], ["122.128538", "37.525818", "500"],
["115.351538", "39.273318", "500"], ["122.121538", "37.523318", "500"],
["115.357833", "39.275448", "500"], ["122.127833", "37.525448", "500"],
["115.358833", "39.276448", "500"], ["122.128833", "37.526448", "500"],
["115.358638", "39.272818", "500"], ["122.128638", "37.522818", "500"],
["115.368738", "39.272818", "500"], ["122.128738", "37.522818", "500"],
["115.368638", "39.278518", "500"], ["122.128638", "37.528518", "500"],
["115.358538", "39.278818", "500"], ["122.128538", "37.528818", "500"],
["115.348538", "39.275818", "500"], ["122.128538", "37.525818", "500"],
["115.351538", "39.273318", "500"], ["122.121538", "37.523318", "500"],
["115.357833", "39.275448", "500"], ["122.127833", "37.525448", "500"],
["115.358833", "39.276448", "500"], ["122.128833", "37.526448", "500"],
["115.358638", "39.272818", "500"], ["122.128638", "37.522818", "500"],
["115.368738", "39.272818", "500"], ["122.128738", "37.522818", "500"],
["115.368638", "39.278518", "500"], ["122.128638", "37.528518", "500"],
["115.358538", "39.278818", "500"], ["122.128538", "37.528818", "500"],
["115.348538", "39.275818", "500"], ["122.128538", "37.525818", "500"],
["115.351538", "39.273318", "500"], ["122.121538", "37.523318", "500"],
["115.357833", "39.275448", "500"], ["122.127833", "37.525448", "500"],
], ],
zuobianData:[], zuobianData:[],
...@@ -136,25 +136,25 @@ export default { ...@@ -136,25 +136,25 @@ export default {
//后台获取数据 //后台获取数据
getCoordinate() { getCoordinate() {
let that = this; let that = this;
// HttpReq.truckDispatching.screenMapSetUpQuery({size:9999}).then((res) => { HttpReq.truckDispatching.screenMapSetUpQuery({size:9999}).then((res) => {
// if(true){; if(true){;
// //console.log(res); //console.log(res);
// let data1 = []; let data1 = [];
// for(let key in res){ for(let key in res){
// that.weilanName.push(key); that.weilanName.push(key);
// let arrays = []; let arrays = [];
// res[key].forEach(function(item){ res[key].forEach(function(item){
// var arr = []; var arr = [];
// arr[0] = item.lon; arr[0] = item.lon;
// arr[1] = item.lat; arr[1] = item.lat;
// arr[2] = "500"; arr[2] = "500";
// arrays.push(arr); arrays.push(arr);
// }) })
// data1.push(arrays) data1.push(arrays)
// } }
// that.zuobianData = data1 that.zuobianData = data1
//console.log("zuobianData",that.zuobianData); console.log("zuobianData",that.zuobianData);
//console.log("weilanName",that.weilanName); console.log("weilanName",that.weilanName);
if (this.appendToBody) { if (this.appendToBody) {
document.body.appendChild(this.$el) document.body.appendChild(this.$el)
...@@ -167,8 +167,8 @@ export default { ...@@ -167,8 +167,8 @@ export default {
this.initMars3d(data.map3d)// 构建地图 this.initMars3d(data.map3d)// 构建地图
}) })
} }
// } }
// }) })
}, },
//上传围栏数据 //上传围栏数据
uploaded(){ uploaded(){
......
src/components/mars3d/Map3.vue
View file @ 2bbf1993
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<div class="infoview"> <div class="infoview">
<el-button type="primary" @click="btnStartDraw()">设置围栏</el-button> <el-button type="primary" @click="btnStartDraw()">设置围栏</el-button>
<el-button type="primary" @click="uploaded()">上传围栏</el-button> <!-- <el-button type="primary" @click="uploaded()">上传围栏</el-button> -->
<div style="display: inline-block;color:red;font-weight:bolder;">每次只允许上传一个围栏，并且围栏必须是封闭图形</div> <div style="display: inline-block;color:red;font-weight:bolder;">每次只允许上传一个围栏，并且围栏必须是封闭图形</div>
</div> </div>
...@@ -43,50 +43,50 @@ export default { ...@@ -43,50 +43,50 @@ export default {
data(){ data(){
return{ return{
persons:[ persons:[
["115.358833", "39.276448", "500"], ["122.128833", "37.526448", "500"],
["115.358638", "39.272818", "500"], ["122.128638", "37.522818", "500"],
["115.368738", "39.272818", "500"], ["122.128738", "37.522818", "500"],
["115.368638", "39.278518", "500"], ["122.128638", "37.528518", "500"],
["115.358538", "39.278818", "500"], ["122.128538", "37.528818", "500"],
["115.348538", "39.275818", "500"], ["122.128538", "37.525818", "500"],
["115.351538", "39.273318", "500"], ["122.121538", "37.523318", "500"],
["115.357833", "39.275448", "500"], ["122.127833", "37.525448", "500"],
["115.358833", "39.276448", "500"], ["122.128833", "37.526448", "500"],
["115.358638", "39.272818", "500"], ["122.128638", "37.522818", "500"],
["115.368738", "39.272818", "500"], ["122.128738", "37.522818", "500"],
["115.368638", "39.278518", "500"], ["122.128638", "37.528518", "500"],
["115.358538", "39.278818", "500"], ["122.128538", "37.528818", "500"],
["115.348538", "39.275818", "500"], ["122.128538", "37.525818", "500"],
["115.351538", "39.273318", "500"], ["122.121538", "37.523318", "500"],
["115.357833", "39.275448", "500"], ["122.127833", "37.525448", "500"],
["115.358833", "39.276448", "500"], ["122.128833", "37.526448", "500"],
["115.358638", "39.272818", "500"], ["122.128638", "37.522818", "500"],
["115.368738", "39.272818", "500"], ["122.128738", "37.522818", "500"],
["115.368638", "39.278518", "500"], ["122.128638", "37.528518", "500"],
["115.358538", "39.278818", "500"], ["122.128538", "37.528818", "500"],
["115.348538", "39.275818", "500"], ["122.128538", "37.525818", "500"],
["115.351538", "39.273318", "500"], ["122.121538", "37.523318", "500"],
["115.357833", "39.275448", "500"], ["122.127833", "37.525448", "500"],
["115.358833", "39.276448", "500"], ["122.128833", "37.526448", "500"],
["115.358638", "39.272818", "500"], ["122.128638", "37.522818", "500"],
["115.368738", "39.272818", "500"], ["122.128738", "37.522818", "500"],
["115.368638", "39.278518", "500"], ["122.128638", "37.528518", "500"],
["115.358538", "39.278818", "500"], ["122.128538", "37.528818", "500"],
["115.348538", "39.275818", "500"], ["122.128538", "37.525818", "500"],
["115.351538", "39.273318", "500"], ["122.121538", "37.523318", "500"],
["115.357833", "39.275448", "500"], ["122.127833", "37.525448", "500"],
["115.358833", "39.276448", "500"], ["122.128833", "37.526448", "500"],
["115.358638", "39.272818", "500"], ["122.128638", "37.522818", "500"],
["115.368738", "39.272818", "500"], ["122.128738", "37.522818", "500"],
["115.368638", "39.278518", "500"], ["122.128638", "37.528518", "500"],
["115.358538", "39.278818", "500"], ["122.128538", "37.528818", "500"],
["115.348538", "39.275818", "500"], ["122.128538", "37.525818", "500"],
["115.351538", "39.273318", "500"], ["122.121538", "37.523318", "500"],
["115.357833", "39.275448", "500"], ["122.127833", "37.525448", "500"],
], ],
zuobianData:[], zuobianData:[],
...@@ -171,54 +171,32 @@ export default { ...@@ -171,54 +171,32 @@ export default {
// }) // })
}, },
//上传围栏数据 //上传围栏数据
uploaded(){ uploaded(text){
let newData = [...this.toJavaCoordinates]; let newData = [...this.toJavaCoordinates];
newData.pop(); newData.pop();
if(this.toJavaCoordinates.length == 0){ // if(this.toJavaCoordinates.length == 0){
this.$message({ // this.$message({
type: 'warning', // type: 'warning',
message: '请绘制电子围栏' // message: '请绘制电子围栏'
}); // });
}else{ // }else{
this.$prompt('电子围栏名称不得为空且不能与之前围栏名称重复', '请输入电子围栏名称', { let allObj = {};
confirmButtonText: '确定', allObj.name = text;
cancelButtonText: '取消', allObj.zuobiao = newData;
inputErrorMessage: '输入不能为空', this.toJavaCoordinates = [];
inputValidator: (value) => { // 点击按钮时，对文本框里面的值进行验证 //console.log(allObj);
if(!value) { //发送添加电子围栏请求
return '输入不能为空'; HttpReq.truckDispatching.screenMapSetUpAdd(allObj).then((res) => {
} this.$notify({
}, title: '区域信息上传成功，即将重新加载！',
}).then(({ value }) => { type: 'success',
let allObj = {}; duration: 2500
allObj.name = value; });
allObj.zuobiao = newData; setTimeout(function (){
this.toJavaCoordinates = []; window.location.reload();
console.log(allObj); },2000);
//发送添加电子围栏请求 }).catch(function(error) { });
HttpReq.truckDispatching.screenMapSetUpAdd(allObj).then((res) => { //}
if(res.code == 200){
this.$notify({
title: '上传电子围栏成功！',
type: 'success',
duration: 2500
});
}else{
this.$notify({
title: res.msg,
type: 'error',
duration: 2500
})
}
}).catch(function(error) { });
}).catch(() => {
this.$message({
type: 'info',
message: '取消输入'
});
});
}
}, },
//创建地图 //创建地图
initMars3d(options) { initMars3d(options) {
...@@ -238,25 +216,25 @@ export default { ...@@ -238,25 +216,25 @@ export default {
this[`map${this.mapKey}`] = map this[`map${this.mapKey}`] = map
//围栏回显 //围栏回显
that.zuobianData.forEach(function(item,index){ // that.zuobianData.forEach(function(item,index){
var graphicLayer = new mars3d.layer.GraphicLayer(); // var graphicLayer = new mars3d.layer.GraphicLayer();
map.addLayer(graphicLayer); // map.addLayer(graphicLayer);
initLayerManager(graphicLayer,that.weilanName[index]); // initLayerManager(graphicLayer,that.weilanName[index]);
that.addGraphic_01(graphicLayer,item,that.weilanName[index]); // that.addGraphic_01(graphicLayer,item,that.weilanName[index]);
}) // })
//创建矢量数据图层2 //创建矢量数据图层2
var graphicLayer1 = new mars3d.layer.GraphicLayer(); // var graphicLayer1 = new mars3d.layer.GraphicLayer();
map.addLayer(graphicLayer1); // map.addLayer(graphicLayer1);
var item = `<table style="width: auto;"> // var item = `<table style="width: auto;">
<tr> // <tr>
<th scope="col" colspan="2" style="text-align:center;font-size:15px;">卡车号码：鲁K12345</th> // <th scope="col" colspan="2" style="text-align:center;font-size:15px;">卡车号码：鲁K12345</th>
</tr> // </tr>
<tr> // <tr>
<td>名称：卡车一</td> // <td>名称：卡车一</td>
</tr> // </tr>
</table>`; // </table>`;
initGraphicManager(graphicLayer1,item); // initGraphicManager(graphicLayer1,item);
//this.addGraphic_02(graphicLayer1,this.persons); //this.addGraphic_02(graphicLayer1,this.persons);
// 抛出事件 // 抛出事件
......
src/components/mars3d/js/graphicManager.js
View file @ 2bbf1993
...@@ -225,42 +225,42 @@ import $ from 'jquery' ...@@ -225,42 +225,42 @@ import $ from 'jquery'
// } // }
// }, // },
// }, // },
{ // {
text: "删除对象", // text: "删除对象",
iconCls: "fa fa-trash-o", // iconCls: "fa fa-trash-o",
show: (event) => { // show: (event) => {
let graphic = event.graphic; // let graphic = event.graphic;
if (!graphic || graphic.isDestroy) { // if (!graphic || graphic.isDestroy) {
return false; // return false;
} else { // } else {
return true; // return true;
} // }
}, // },
callback: function (e) { // callback: function (e) {
console.log(e); // console.log(e);
let graphic = e.graphic; // let graphic = e.graphic;
if (!graphic) { // if (!graphic) {
return; // return;
} // }
//console.log(rowNameId); // //console.log(rowNameId);
HttpReq.truckDispatching.screenMapSetUpDel([rowNameId]).then((res) => { // HttpReq.truckDispatching.screenMapSetUpDel([rowNameId]).then((res) => {
if(res.status == 400){ // if(res.status == 400){
this.$notify({ // this.$notify({
title: res.msg, // title: res.msg,
type: 'error', // type: 'error',
duration: 2500 // duration: 2500
}) // })
}else{ // }else{
this.$notify({ // this.$notify({
title: '删除成功！', // title: '删除成功！',
type: 'success', // type: 'success',
duration: 2500 // duration: 2500
}); // });
} // }
}) // })
graphicLayer.removeGraphic(graphic); // graphicLayer.removeGraphic(graphic);
}, // },
}, // },
// { // {
// text: "计算长度", // text: "计算长度",
// iconCls: "fa fa-medium", // iconCls: "fa fa-medium",
......
src/views/DeviceManage/index.vue
View file @ 2bbf1993
...@@ -805,7 +805,7 @@ export default { ...@@ -805,7 +805,7 @@ export default {
let formData1 = new FormData(); let formData1 = new FormData();
formData1.append("avatar", file); formData1.append("avatar", file);
Axios({ Axios({
url: process.env.VUE_APP_LOCAL_API2 + '/api/wEquipment/updateAvatar', url: process.env.VUE_APP_LOCAL_API2 + '/api/Area/updateAvatar',
method: "post", method: "post",
data: formData1, data: formData1,
}).then( }).then(
......
src/views/carManagement/carType/index.vue
View file @ 2bbf1993
...@@ -263,7 +263,7 @@ export default { ...@@ -263,7 +263,7 @@ export default {
let formData1 = new FormData(); let formData1 = new FormData();
formData1.append("avatar", file); formData1.append("avatar", file);
Axios({ Axios({
url: process.env.VUE_APP_LOCAL_API2 + '/api/wEquipment/updateAvatar', url: process.env.VUE_APP_LOCAL_API2 + '/api/Area/updateAvatar',
method: "post", method: "post",
data: formData1, data: formData1,
}).then( }).then(
......
src/views/login.vue
View file @ 2bbf1993
...@@ -30,7 +30,8 @@ ...@@ -30,7 +30,8 @@
<el-checkbox v-model="loginForm.rememberMe" style="margin:0 0 25px 0;">记住我</el-checkbox> <el-checkbox v-model="loginForm.rememberMe" style="margin:0 0 25px 0;">记住我</el-checkbox>
</div> </div>
<div style="flex:1;text-align:right;color:#01d6fe;"> <div style="flex:1;text-align:right;color:#01d6fe;">
<a href="/register">去注册</a> <!-- <a href="/register">去注册</a> -->
<router-link :to="{path:'/register'}">去注册</router-link>
</div> </div>
</div> </div>
<el-form-item style="width:100%;"> <el-form-item style="width:100%;">
......
src/views/regionalManagement/regionalGrade/index.vue
View file @ 2bbf1993
...@@ -805,7 +805,7 @@ export default { ...@@ -805,7 +805,7 @@ export default {
let formData1 = new FormData(); let formData1 = new FormData();
formData1.append("avatar", file); formData1.append("avatar", file);
Axios({ Axios({
url: process.env.VUE_APP_LOCAL_API2 + '/api/wEquipment/updateAvatar', url: process.env.VUE_APP_LOCAL_API2 + '/api/Area/updateAvatar',
method: "post", method: "post",
data: formData1, data: formData1,
}).then( }).then(
......
src/views/regionalManagement/regionalInformation/index.vue
View file @ 2bbf1993
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<el-table-column prop="name" label="区域名称" align="center"></el-table-column> <el-table-column prop="name" label="区域名称" align="center"></el-table-column>
<el-table-column prop="areaclass" label="所属类别" align="center"></el-table-column> <el-table-column prop="areaclass" label="所属类别" align="center"></el-table-column>
<!-- <el-table-column prop="coordinate" label="中心坐标" align="center"></el-table-column> --> <!-- <el-table-column prop="coordinate" label="中心坐标" align="center"></el-table-column> -->
<el-table-column prop="card" label="车辆标识图" align="center"> <el-table-column prop="card" label="区域标识图" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<img :src="imgSrcStart + '/avatar/' + scope.row.card" width="40" height="40"/> <img :src="imgSrcStart + '/avatar/' + scope.row.card" width="40" height="40"/>
</template> </template>
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
<el-table-column prop="createTime" label="日期" align="center"></el-table-column> <el-table-column prop="createTime" label="日期" align="center"></el-table-column>
<el-table-column label="操作" align="center" fixed="right"> <el-table-column label="操作" align="center" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="primary" icon="el-icon-edit" @click="toEdit(scope.row)"></el-button> <el-button size="mini" type="primary" icon="el-icon-view" @click="toEdit(scope.row)"></el-button>
<el-button size="mini" type="danger" icon="el-icon-delete" @click="toDelete(scope.row)"></el-button> <el-button size="mini" type="danger" icon="el-icon-delete" @click="toDelete(scope.row)"></el-button>
<el-button size="mini" type="success" icon="el-icon-view" v-show="scope.row.areaore == '是'" @click="showGradeTable(scope.row)"></el-button> <el-button size="mini" type="success" icon="el-icon-edit" v-show="scope.row.areaore == '是'" @click="showGradeTable(scope.row)"></el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -43,55 +43,55 @@ ...@@ -43,55 +43,55 @@
<el-dialog append-to-body :close-on-click-modal="true" :before-close="cancelForm" :visible.sync="form.visible" :title="form.title" width="800px"> <el-dialog append-to-body :close-on-click-modal="true" :before-close="cancelForm" :visible.sync="form.visible" :title="form.title" width="800px">
<el-form :model="form.item" :rules="rules" ref="form1" :inline="true" size="small" label-width="150px"> <el-form :model="form.item" :rules="rules" ref="form1" :inline="true" size="small" label-width="150px">
<el-form-item label="编码" prop="code"> <el-form-item label="编码" prop="code">
<el-input v-model="form.item.code" style="width:160px;" placeholder="请输入编码"/> <el-input v-model="form.item.code" style="width:160px;" placeholder="" :disabled="form.reqType == 'edit'"/>
</el-form-item> </el-form-item>
<el-form-item label="所属类别" prop="areaclass"> <el-form-item label="所属类别" prop="areaclass">
<el-select v-model="form.item.areaclass" placeholder="请选择所属类别" size="small" style="width:160px;"> <el-select v-model="form.item.areaclass" placeholder="" size="small" style="width:160px;" :disabled="form.reqType == 'edit'">
<el-option v-for="(obj,index) in RegionalTypeData" :label="obj.classname" :value="obj.classname" :key="index"></el-option> <el-option v-for="(obj,index) in RegionalTypeData" :label="obj.classname" :value="obj.classname" :key="index"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="区域名称" prop="name"> <el-form-item label="区域名称" prop="name">
<el-input v-model="form.item.name" style="width:160px;" placeholder="请输入区域名称"/> <el-input v-model="form.item.name" style="width:160px;" placeholder="" :disabled="form.reqType == 'edit'"/>
</el-form-item> </el-form-item>
<el-form-item label="是否需要遮罩层" prop="shadow"> <el-form-item label="是否需要遮罩层" prop="shadow">
<el-select v-model="form.item.shadow" placeholder="请选择是否需要遮罩层" style="width:160px;"> <el-select v-model="form.item.shadow" placeholder="" style="width:160px;" :disabled="form.reqType == 'edit'">
<el-option label="是" value="是"></el-option> <el-option label="是" value="是"></el-option>
<el-option label="否" value="否"></el-option> <el-option label="否" value="否"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="最大承接车辆数" prop="max"> <el-form-item label="最大承接车辆数" prop="max">
<el-input v-model="form.item.max" style="width:160px;" placeholder="请输入最大承接车辆数"/> <el-input v-model="form.item.max" style="width:160px;" placeholder="" :disabled="form.reqType == 'edit'"/>
</el-form-item> </el-form-item>
<!-- <el-form-item label="区域中心坐标点" prop="coordinate"> <!-- <el-form-item label="区域中心坐标点" prop="coordinate">
<el-input v-model="form.item.coordinate" style="width:160px;" placeholder="请输入区域中心坐标点"/> <el-input v-model="form.item.coordinate" style="width:160px;" placeholder="请输入区域中心坐标点"/>
</el-form-item> --> </el-form-item> -->
<el-form-item label="区域标记"> <el-form-item label="区域标记">
<el-input v-model="picFileName" style="width:160px;" placeholder="请上传区域标记" disabled /> <el-input v-model="picFileName" style="width:160px;" placeholder="" disabled />
<input type="file" name="image" @change="excelImport($event)" /> <input type="file" name="image" @change="excelImport($event)" v-show="form.reqType == 'add'" />
</el-form-item> </el-form-item>
<!-- <el-form-item label="区域范围或直径" prop="arearange"> <!-- <el-form-item label="区域范围或直径" prop="arearange">
<el-input v-model="form.item.arearange" style="width:160px;" placeholder="请输入区域范围或直径"/> <el-input v-model="form.item.arearange" style="width:160px;" placeholder="请输入区域范围或直径"/>
</el-form-item> --> </el-form-item> -->
<el-form-item label="电铲名称" prop="areashovel"> <el-form-item label="电铲名称" prop="areashovel">
<el-input v-model="form.item.areashovel" style="width:160px;" placeholder="请输入电铲名称"/> <el-input v-model="form.item.areashovel" style="width:160px;" placeholder="" :disabled="form.reqType == 'edit'"/>
</el-form-item> </el-form-item>
<el-form-item label="矿种" prop="arearesources"> <el-form-item label="矿种" prop="arearesources">
<el-select v-model="form.item.arearesources" placeholder="请选择矿种" style="width:160px;"> <el-select v-model="form.item.arearesources" placeholder="" style="width:160px;" :disabled="form.reqType == 'edit'">
<el-option label="废石" value="废石"></el-option> <el-option label="废石" value="废石"></el-option>
<el-option label="矿石" value="矿石"></el-option> <el-option label="矿石" value="矿石"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="是否配矿" prop="areaore"> <el-form-item label="是否配矿" prop="areaore">
<el-select v-model="form.item.areaore" placeholder="请选择是否配矿" style="width:160px;"> <el-select v-model="form.item.areaore" placeholder="" style="width:160px;" :disabled="form.reqType == 'edit'">
<el-option label="是" value="是"></el-option> <el-option label="是" value="是"></el-option>
<el-option label="否" value="否"></el-option> <el-option label="否" value="否"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="优先级" prop="areapriority"> <el-form-item label="优先级" prop="areapriority">
<el-input-number v-model="form.item.areapriority" :min="1" :max="10" label="请选择优先级"></el-input-number> <el-input-number v-model="form.item.areapriority" :min="1" :max="10" label="" :disabled="form.reqType == 'edit'"></el-input-number>
</el-form-item> </el-form-item>
<div id="centerDiv" class="mapcontainer"> <div id="centerDiv" class="mapcontainer" v-show="form.reqType == 'add'">
<mars3dViewerMap :url="configUrl" @onload="onMapload"/> <mars3dViewerMap :url="configUrl" @onload="onMapload" ref="mars3dViewerMapMethod"/>
</div> </div>
...@@ -99,15 +99,17 @@ ...@@ -99,15 +99,17 @@
<el-form-item label="启用时间段" v-show="form.item.areaclass == '电子围栏'"> <el-form-item label="启用时间段" v-show="form.item.areaclass == '电子围栏'">
<el-time-picker <el-time-picker
v-model="form.item.startTime" v-model="form.item.startTime"
placeholder="开始时间"> placeholder="开始时间"
:disabled="form.reqType == 'edit'">
</el-time-picker> </el-time-picker>
<el-time-picker <el-time-picker
v-model="form.item.endTime" v-model="form.item.endTime"
placeholder="结束时间"> placeholder="结束时间"
:disabled="form.reqType == 'edit'">
</el-time-picker> </el-time-picker>
</el-form-item> </el-form-item>
<el-form-item label="限制类型" prop="limitclass" v-show="form.item.areaclass == '电子围栏'"> <el-form-item label="限制类型" prop="limitclass" v-show="form.item.areaclass == '电子围栏'">
<el-select v-model="form.item.limitclass" placeholder="请选择限制类型" style="width:160px;"> <el-select v-model="form.item.limitclass" placeholder="" style="width:160px;" :disabled="form.reqType == 'edit'">
<el-option label="限入" value="限入"></el-option> <el-option label="限入" value="限入"></el-option>
<el-option label="限出" value="限出"></el-option> <el-option label="限出" value="限出"></el-option>
</el-select> </el-select>
...@@ -115,20 +117,20 @@ ...@@ -115,20 +117,20 @@
<br/> <br/>
<el-form-item label="选择车辆" prop="cars" v-show="form.item.areaclass == '电子围栏'"> <el-form-item label="选择车辆" prop="cars" v-show="form.item.areaclass == '电子围栏'">
<div class="checkboxViews"> <div class="checkboxViews">
<el-checkbox-group v-model="checkDataList" style="width:480px;"> <el-checkbox-group v-model="checkDataList" style="width:480px;" :disabled="form.reqType == 'edit'">
<el-checkbox v-for="(obj,index) in carInformationData" :label="obj.name + '/' + obj.number" :key="index">{{obj.name + '/' + obj.number}}</el-checkbox> <el-checkbox v-for="(obj,index) in carInformationData" :label="obj.name + '/' + obj.number" :key="index">{{obj.name + '/' + obj.number}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="启停状态" prop="status" v-show="form.item.areaclass == '电子围栏'"> <el-form-item label="启停状态" prop="status" v-show="form.item.areaclass == '电子围栏'">
<el-select v-model="form.item.status" placeholder="请选择启停状态" style="width:160px;"> <el-select v-model="form.item.status" placeholder="" style="width:160px;" :disabled="form.reqType == 'edit'">
<el-option label="启用" value="启用"></el-option> <el-option label="启用" value="启用"></el-option>
<el-option label="停用" value="停用"></el-option> <el-option label="停用" value="停用"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer" v-show="form.reqType == 'add'">
<el-button type="text" @click="cancelForm">取消</el-button> <el-button type="text" @click="cancelForm">取消</el-button>
<el-button :loading="form.status.cu === 2" type="primary" @click="submitForm('form1', form.item)">确认</el-button> <el-button :loading="form.status.cu === 2" type="primary" @click="submitForm('form1', form.item)">确认</el-button>
</div> </div>
...@@ -211,9 +213,9 @@ export default { ...@@ -211,9 +213,9 @@ export default {
item:{}, item:{},
}, },
rules: { rules: {
// time: [ name: [
// {required: true, message: '请输入区域信息', trigger: 'blur' } {required: true, message: '请输入区域名称', trigger: 'blur' }
// ], ],
}, },
...@@ -294,7 +296,7 @@ export default { ...@@ -294,7 +296,7 @@ export default {
toEdit(item) { toEdit(item) {
// 请除表单验证 // 请除表单验证
this.$refs['form1'] && this.$refs['form1'].clearValidate(); this.$refs['form1'] && this.$refs['form1'].clearValidate();
this.form.title = '修改区域信息'; this.form.title = '查看区域信息';
this.form.status.cu = 0; this.form.status.cu = 0;
this.form.visible = true; this.form.visible = true;
this.form.item = {...item}; this.form.item = {...item};
...@@ -315,12 +317,13 @@ export default { ...@@ -315,12 +317,13 @@ export default {
}, },
toDelete(item) { toDelete(item) {
var id = item.id; var id = item.id;
var weilanName = item.name;
this.$confirm('确认删除该条数据吗?', '提示', { this.$confirm('确认删除该条数据吗?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then((e) => { }).then((e) => {
this.reqRemoveProject([id]) this.reqRemoveProject([id],[weilanName])
}).catch((e) => {}) }).catch((e) => {})
}, },
pageChange(e) { pageChange(e) {
...@@ -352,15 +355,19 @@ export default { ...@@ -352,15 +355,19 @@ export default {
reqAddItem(form, item){ reqAddItem(form, item){
let lastData = {...item}; let lastData = {...item};
lastData.card = this.picFileName; lastData.card = this.picFileName;
this.$refs.mars3dViewerMapMethod.uploaded(lastData.name);
HttpReq.truckDispatching.RegionalInformationAdd(lastData).then((res) => { HttpReq.truckDispatching.RegionalInformationAdd(lastData).then((res) => {
form.visible = false; form.visible = false;
if(res.code == 200){ if(res.code == 200){
this.$notify({ this.$notify({
title: '区域信息新增成功！', title: '区域信息上传中，请稍等！',
type: 'success', type: 'success',
duration: 2500 duration: 2500
}); });
this.loadData() this.loadData();
this.$nextTick(()=>{
this.$refs.mars3dViewerMapMethod.uploaded(lastData.name);
})
}else{ }else{
this.$notify({ this.$notify({
title: res.msg, title: res.msg,
...@@ -434,7 +441,7 @@ export default { ...@@ -434,7 +441,7 @@ export default {
}) })
}, },
//删除区域信息 //删除区域信息
reqRemoveProject(item){ reqRemoveProject(item,weilanName){
HttpReq.truckDispatching.RegionalInformationDel(item).then((res) => { HttpReq.truckDispatching.RegionalInformationDel(item).then((res) => {
if(res.status == 400){ if(res.status == 400){
this.$notify({ this.$notify({
...@@ -451,6 +458,21 @@ export default { ...@@ -451,6 +458,21 @@ export default {
} }
this.loadData(); this.loadData();
}) })
HttpReq.truckDispatching.screenMapSetUpDel(weilanName).then((res) => {
// if(res.status == 400){
// this.$notify({
// title: res.msg,
// type: 'error',
// duration: 2500
// })
// }else{
// this.$notify({
// title: '删除成功！',
// type: 'success',
// duration: 2500
// });
// }
})
}, },
//图片上传 //图片上传
excelImport(event) { excelImport(event) {
...@@ -459,7 +481,7 @@ export default { ...@@ -459,7 +481,7 @@ export default {
let formData1 = new FormData(); let formData1 = new FormData();
formData1.append("avatar", file); formData1.append("avatar", file);
Axios({ Axios({
url: process.env.VUE_APP_LOCAL_API2 + '/api/wEquipment/updateAvatar', url: process.env.VUE_APP_LOCAL_API2 + '/api/Area/updateAvatar',
method: "post", method: "post",
data: formData1, data: formData1,
}).then( }).then(
...@@ -684,6 +706,7 @@ export default { ...@@ -684,6 +706,7 @@ export default {
height: 50vh; height: 50vh;
width: 750px; width: 750px;
overflow: hidden; overflow: hidden;
margin-bottom: 10px;
} }
.checkboxViews{ .checkboxViews{
padding-left: 10px; padding-left: 10px;
......
src/views/system/user/register.vue
View file @ 2bbf1993
...@@ -42,7 +42,8 @@ ...@@ -42,7 +42,8 @@
</div> </div>
</el-form-item> </el-form-item>
<div style="text-align:right;font-size:13px;color:#46A6FF;"> <div style="text-align:right;font-size:13px;color:#46A6FF;">
<a href="/login">去登录</a> <!-- <a href="/login">去登录</a> -->
<router-link :to="{path:'/login'}">去登录</router-link>
</div> </div>
<el-form-item style="width:100%;" class="item-login"> <el-form-item style="width:100%;" class="item-login">
<el-button :loading="loading" size="medium" type="primary" style="width:100%;" @click.native.prevent="handleLogin()"> <el-button :loading="loading" size="medium" type="primary" style="width:100%;" @click.native.prevent="handleLogin()">
......
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