Merge remote-tracking branch 'origin/master' into feixian
commit
1d8bd6a7db
3
.env.dev
3
.env.dev
|
|
@ -3,6 +3,9 @@ NODE_ENV = development
|
|||
# 正式服务器
|
||||
VUE_APP_BASE_API =http://221.2.83.254:9001/api
|
||||
VUE_APP_BASE_IMG_URL =http://221.2.83.254:9001
|
||||
VUE_APP_WEBSOCKET_URL = ws://221.2.83.254:9002/ws
|
||||
|
||||
|
||||
# 测试服务区
|
||||
#VUE_APP_BASE_API = http://123.132.248.154:9224/api
|
||||
#VUE_APP_BASE_IMG_URL = http://123.132.248.154:9224
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@ NODE_ENV = production
|
|||
# 正式服务器
|
||||
VUE_APP_BASE_API =http://221.2.83.254:9001/api
|
||||
VUE_APP_BASE_IMG_URL =http://221.2.83.254:9001
|
||||
VUE_APP_WEBSOCKET_URL = ws://221.2.83.254:9002/ws
|
||||
|
||||
# 测试服务区
|
||||
# VUE_APP_BASE_API = http://123.132.248.154:9224/api
|
||||
# VUE_APP_BASE_IMG_URL = http://123.132.248.154:9224
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@
|
|||
"vue-json-excel": "^0.2.98",
|
||||
"vue-layer": "^0.9.14",
|
||||
"vue-multiselect": "^2.1.6",
|
||||
"vue-qr": "^4.0.9",
|
||||
"vue-router": "3.0.1",
|
||||
"vue-video-player": "^5.0.2",
|
||||
"vuedraggable": "^2.23.2",
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 8.0 KiB |
|
|
@ -303,6 +303,7 @@ import search from "./widget/search.vue";
|
|||
import drag from "../../utils/draged";
|
||||
import Onebuttoncall from "./widget/onebuttoncall.vue";
|
||||
import Onlineuserbox from "./widget/onlineuserbox.vue";
|
||||
import { getMethodCommon, postMethodCommon } from '../../api/common';
|
||||
let BASE_URL = process.env.VUE_APP_BASE_API;
|
||||
const areaName = localStorage.getItem("areaName");
|
||||
export default {
|
||||
|
|
@ -390,14 +391,20 @@ export default {
|
|||
oneButtonCallShow: false,
|
||||
finishLoadMap: false, // 地图加载完成
|
||||
firePopupClosed: false,
|
||||
taskGraphicLayer:null,
|
||||
taskList:[],
|
||||
};
|
||||
},
|
||||
|
||||
mounted() { },
|
||||
mounted() {
|
||||
|
||||
|
||||
},
|
||||
|
||||
created() {
|
||||
let _this = this;
|
||||
window.AppConfig = AppConfigInfo[areaName];
|
||||
window.delTaskPoint = this.delTaskPoint;
|
||||
this.appName = AppConfig.appname;
|
||||
this.appTools = AppConfig.tools;
|
||||
|
||||
|
|
@ -478,7 +485,105 @@ export default {
|
|||
this.rightType = 3;
|
||||
this.setVisibleShow = true;
|
||||
},
|
||||
getTaskList() { },
|
||||
getTaskList() {
|
||||
getMethodCommon("/FireManagement/LoadAllTask",{
|
||||
pageIndex:1,
|
||||
pageSize:999,
|
||||
}).then(res=>{
|
||||
if(res.code == 200){
|
||||
this.taskList = res.data;
|
||||
this.drawTaskPoint();
|
||||
}
|
||||
})
|
||||
},
|
||||
// 绘制任务点图标
|
||||
drawTaskPoint(){
|
||||
if(this.taskGraphicLayer){
|
||||
this.taskGraphicLayer.clear();
|
||||
}else{
|
||||
this.taskGraphicLayer = new this.mars3d.layer.GraphicLayer();
|
||||
window.globalmap.addLayer(this.taskGraphicLayer);
|
||||
}
|
||||
this.taskList.forEach((item,index)=>{
|
||||
let graphic = new mars3d.graphic.BillboardEntity({
|
||||
position: [parseFloat(item.lng),parseFloat(item.lat)],
|
||||
style: {
|
||||
image: "/img/marktask.png",
|
||||
horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
|
||||
verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
|
||||
clampToGround:true,
|
||||
scale:0.4,
|
||||
label: {
|
||||
text: "任务点",
|
||||
font_size: 14,
|
||||
color: "#ffffff",
|
||||
pixelOffsetY: 10,
|
||||
distanceDisplayCondition: true,
|
||||
distanceDisplayCondition_far: 500000,
|
||||
distanceDisplayCondition_near: 0
|
||||
}
|
||||
},
|
||||
"popup": `<div class="marsTiltPanel marsTiltPanel-theme-blue" style="font-size:12px;">
|
||||
<div class="marsTiltPanel-wrap">
|
||||
<div class="area">
|
||||
<div class="arrow-lt"></div>
|
||||
<div class="b-t"></div>
|
||||
<div class="b-r"></div>
|
||||
<div class="b-b"></div>
|
||||
<div class="b-l"></div>
|
||||
<div class="arrow-rb"></div>
|
||||
<div class="label-wrap">
|
||||
<div class="title">任务信息</div>
|
||||
<div class="label-content">
|
||||
<div class="data-li">
|
||||
<div class="data-label">任务内容：${item.content? item.content:'暂无任务内容'}</div>
|
||||
</div>
|
||||
<div class="data-li">
|
||||
<div class="data-label">任务地点：</div>
|
||||
<div class="data-value"><span id="lablYeWei" class="label-num">${item.lng},${item.lat}</span><span class="label-unit"></span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="data-li">
|
||||
<div class="data-label">任务创建时间：</div>
|
||||
<div class="data-value"><span id="lablYeWei" class="label-num">${item.taskTime}</span><span class="label-unit"></span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="data-li">
|
||||
<div class="data-value">
|
||||
<span id="lablCSFM2" onclick="delTaskPoint(${item.id})" class="label-tag data-value-status-3" title="删除任务点">删除任务点</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="b-t-l"></div>
|
||||
<div class="b-b-r"></div>
|
||||
</div>
|
||||
<div class="arrow" ></div>
|
||||
</div>`,
|
||||
"popupOptions":{
|
||||
"offsetY":-30,
|
||||
"template":"{content}",
|
||||
"horizontalOrigin":"Cesium.HorizontalOrigin.LEFT",
|
||||
"verticalOrigin":"Cesium.VerticalOrigin.CENTER"
|
||||
},
|
||||
attr: { remark: "火点"}
|
||||
})
|
||||
this.taskGraphicLayer.addGraphic(graphic) // 还可以另外一种写法: graphic.addTo(graphicLayer)
|
||||
})
|
||||
},
|
||||
delTaskPoint(id){
|
||||
postMethodCommon("/FireManagement/DeleteFireTask",[id]).then(res=>{
|
||||
if(res.code==200){
|
||||
this.$message({
|
||||
type:"success",
|
||||
message:"删除成功"
|
||||
})
|
||||
this.getTaskList();
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
// 一件呼叫
|
||||
callUser() {
|
||||
this.oneButtonCallShow = true;
|
||||
|
|
@ -521,6 +626,7 @@ export default {
|
|||
this.videoCallShow = false;
|
||||
},
|
||||
closeTask() {
|
||||
this.getTaskList();
|
||||
this.taskDeliveryShow = false;
|
||||
},
|
||||
mergeSuccess() {
|
||||
|
|
@ -895,6 +1001,8 @@ export default {
|
|||
|
||||
// 查询火点
|
||||
_self.getFirePointList();
|
||||
// 查询任务点
|
||||
_self.getTaskList();
|
||||
},
|
||||
//监听点击图层事件
|
||||
handlerlistenPopup(map) {
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
</div>
|
||||
<div class="call-line"></div>
|
||||
<div class="call-content flex column">
|
||||
<el-carousel height="150px" indicator-position="outside">
|
||||
<el-carousel height="180px" indicator-position="outside">
|
||||
<el-carousel-item v-for="(item, index) in BannersArr" :key="index">
|
||||
|
||||
<div class="content-li flex">
|
||||
|
|
@ -54,12 +54,12 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="content-li flex">
|
||||
<div class="content-li flex" style="height:50px;background-image:url(/img/call-center-bar-bottom.png);background-size:115% 100%;">
|
||||
<div class="content-title flex ai-c">
|
||||
<span class="content-title-span"></span>
|
||||
<span class="fz-14 fw-b fc-w">县级包保领导</span>
|
||||
<span class="fz-14 fw-b fc-w">县级包保领导 </span>
|
||||
</div>
|
||||
<div class="flex-1 fz-14 fc-w" style="line-height: 28px">
|
||||
<div class=" fz-14 fc-w" style="line-height:22px;padding-top:4px;width:250px!important;">
|
||||
<span v-for="(it,idx) in item.dcz" :key="'dcz1'+idx">{{it.name}} </span>
|
||||
<span v-for="(it,idx) in item.fdcz" :key="idx">{{it.name}} </span>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -14,6 +14,42 @@
|
|||
name: 'toolbox',
|
||||
data(){
|
||||
return {
|
||||
query:[
|
||||
{
|
||||
severName:"水库",
|
||||
tableRef:"shp_1686208472"
|
||||
},{
|
||||
severName:"蓄水池",
|
||||
tableRef:"shp_1686209056"
|
||||
},{
|
||||
severName:"塘坝",
|
||||
tableRef:"shp_1686208946"
|
||||
},{
|
||||
severName:"防火驿站",
|
||||
tableRef:"shp_1686204679"
|
||||
},{
|
||||
severName:"护林点",
|
||||
tableRef:"shp_1686204804"
|
||||
},{
|
||||
severName:"检查点",
|
||||
tableRef:"shp_1686204937"
|
||||
},{
|
||||
severName:"检查站",
|
||||
tableRef:"shp_1686205018"
|
||||
},{
|
||||
severName:"瞭望台",
|
||||
tableRef:"shp_1686205091"
|
||||
},{
|
||||
severName:"向导",
|
||||
tableRef:"shp_1686205251"
|
||||
},{
|
||||
severName:"物资储备",
|
||||
tableRef:"shp_1686205187"
|
||||
},{
|
||||
severName:"驻防队伍",
|
||||
tableRef:"shp_1692148217"
|
||||
}
|
||||
],
|
||||
list:[],
|
||||
listParams:{
|
||||
areaname:localStorage.getItem("areaName"),
|
||||
|
|
@ -28,15 +64,18 @@
|
|||
},
|
||||
methods:{
|
||||
getList(){
|
||||
let params= [];
|
||||
this.query.forEach((item,index)=>{
|
||||
params.push(item.tableRef);
|
||||
})
|
||||
axios({
|
||||
method:"get",
|
||||
url:BASE_URL+"/FirePrevention/GetTableListCount",
|
||||
params:this.listParams,
|
||||
method:"post",
|
||||
url:BASE_URL+"/FirePrevention/GetTableListCountByTableName",
|
||||
data:params,
|
||||
headers:{
|
||||
'X-Token':localStorage.getItem("X-Token")
|
||||
}
|
||||
}).then(res=>{
|
||||
// console.log('1111',res)
|
||||
let rel = res.data.data
|
||||
this.handleEcharts(rel)
|
||||
})
|
||||
|
|
@ -45,7 +84,10 @@
|
|||
let xData = []
|
||||
let yData = []
|
||||
data.forEach(item =>{
|
||||
xData.push(item.name)
|
||||
let obj = this.query.find((it,idx)=>{
|
||||
return it.tableRef == item.name;
|
||||
})
|
||||
xData.push(obj.severName)
|
||||
yData.push(item.value)
|
||||
})
|
||||
let option = {
|
||||
|
|
@ -161,7 +203,6 @@
|
|||
);
|
||||
myChart.setOption(option);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -30,7 +30,8 @@
|
|||
扫码下载 APP
|
||||
</div>
|
||||
<div class="code-image">
|
||||
<img src="/img/navigation/code.png" alt="">
|
||||
<!-- <img src="/img/navigation/code.png" alt=""> -->
|
||||
<vue-qr :text="QRCode" :size="400"></vue-qr>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -48,10 +49,16 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import VueQr from "vue-qr";
|
||||
import { getMethodCommon, postMethodCommon } from '../../api/common';
|
||||
export default {
|
||||
name: 'index',
|
||||
components:{
|
||||
VueQr
|
||||
},
|
||||
data(){
|
||||
return {
|
||||
QRCode: null,
|
||||
routerlist:[
|
||||
{
|
||||
lable:"防灭火沙盘",
|
||||
|
|
@ -82,7 +89,17 @@
|
|||
]
|
||||
}
|
||||
},
|
||||
created(){
|
||||
this.getAppUrl();
|
||||
},
|
||||
methods: {
|
||||
getAppUrl(){
|
||||
getMethodCommon("/FireCodeApp/GetUpdateFiles",{project:"feixian"}).then(res=>{
|
||||
if(res.code == 200){
|
||||
this.QRCode = process.env.VUE_APP_BASE_IMG_URL+'/'+ res.result.filepath;
|
||||
}
|
||||
})
|
||||
},
|
||||
goDetail(item) {
|
||||
if (item.lable == '数据中心') {
|
||||
window.open('http://223.99.16.253:9003/#/dashboard?id=' + localStorage.getItem("X-Token"), '_blank')
|
||||
|
|
|
|||
|
|
@ -0,0 +1,232 @@
|
|||
<template>
|
||||
<div style="padding:24px;overflow-y:hidden;">
|
||||
<el-tabs v-model="activeName">
|
||||
<el-tab-pane label="" name="zhifa">
|
||||
<div class="flex-column">
|
||||
|
||||
<el-row style="overflow-y: hidden;">
|
||||
|
||||
<el-col :span="12" style="padding: 20px;border: 1px silver solid;margin-left: 10px">
|
||||
|
||||
<el-form ref="form" :model="form" label-width="80px" size="mini">
|
||||
<el-form-item label="当前版本">
|
||||
<span style="font-size:15px;font-weight:bold;color:#000;">{{currentAppInfo.edition}}</span>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="版本号">
|
||||
<el-input v-model="form.edition"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="项目名称">
|
||||
<el-input v-model="form.project_name"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item size="mini">
|
||||
<el-upload
|
||||
size="mini"
|
||||
class="upload-demo"
|
||||
action="#"
|
||||
drag
|
||||
:limit="limit"
|
||||
:on-preview="handlePreview"
|
||||
:file-list="fileList"
|
||||
:auto-upload="false"
|
||||
:before-upload="beforeUpload"
|
||||
:on-remove="handleRemove"
|
||||
:on-exceed="handleExceed"
|
||||
:on-change="handleChange"
|
||||
:on-success="handleSuccess"
|
||||
:on-error="handleError"
|
||||
>
|
||||
<i class="el-icon-upload" style="font-size:60px;line-height:0px;"></i>
|
||||
<div class="el-upload__text">将APP文件拖到此处，或<em>点击上传</em></div>
|
||||
</el-upload>
|
||||
</el-form-item>
|
||||
<el-form-item label="描述信息">
|
||||
<el-input type="textarea" v-model="form.description"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="是否必须更新" label-width="120px">
|
||||
<el-radio-group v-model="form.must_update" size="medium">
|
||||
<el-radio border :label="1">是</el-radio>
|
||||
<el-radio border :label="0">否</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" @click="onSubmit">立即创建</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
</div>
|
||||
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
import {postMethodCommon,getMethodCommon} from "../../api/common";
|
||||
|
||||
export default {
|
||||
name: "version",
|
||||
data() {
|
||||
return {
|
||||
currentAppInfo:{},
|
||||
activeName:"zhifa",
|
||||
limit: 1,
|
||||
fileList: [],
|
||||
form: {
|
||||
edition: "",
|
||||
description: "",
|
||||
filepath: "",
|
||||
must_update: '',
|
||||
project_name: ''
|
||||
},
|
||||
flyControlForm: {
|
||||
edition: "",
|
||||
description: "",
|
||||
filepath: "",
|
||||
must_update: '',
|
||||
project_name: ''
|
||||
},
|
||||
}
|
||||
},
|
||||
mounted(){
|
||||
this.getAppInfo();
|
||||
},
|
||||
methods: {
|
||||
getAppInfo(){
|
||||
getMethodCommon("/FireCodeApp/GetUpdateFiles",{project:'feixian'}).then(res=>{
|
||||
if(res.code == 200){
|
||||
this.currentAppInfo = res.result;
|
||||
this.form.project_name = res.result.project_name;
|
||||
this.form.description = res.result.description;
|
||||
this.form.must_update = res.result.must_update;
|
||||
}
|
||||
})
|
||||
},
|
||||
//文件上传时的钩子
|
||||
handlePreview(file) {
|
||||
|
||||
},
|
||||
// 删除文件
|
||||
handleRemove(file, fileList) {
|
||||
this.fileList = fileList
|
||||
},
|
||||
// 文件上传成功
|
||||
handleSuccess(res, file, fileList) {
|
||||
this.$message.success('文件上传成功')
|
||||
},
|
||||
// 文件超出个数限制
|
||||
handleExceed(files, fileList) {
|
||||
this.$message.warning(`只能选择 ${this.limit} 个文件进行上传!!`)
|
||||
},
|
||||
// 文件状态改变
|
||||
handleChange(file, fileList) {
|
||||
this.form.name = file.name.split(".")[0]
|
||||
if (file) {
|
||||
this.fileList = fileList
|
||||
}
|
||||
},
|
||||
// 文件上传失败
|
||||
handleError(err, file, fileList) {
|
||||
this.$message.error('文件上传失败')
|
||||
},
|
||||
beforeUpload(file) {
|
||||
let extension = file.name.substring(file.name.lastIndexOf('.') + 1)
|
||||
let size = file.size / 1024 / 1024;
|
||||
if (extension !== 'apk') {
|
||||
|
||||
this.$message.warning('只能上传后缀是.apk的文件')
|
||||
return false
|
||||
}
|
||||
if (size > 100) {
|
||||
this.$message.warning('文件大小不得超过100M')
|
||||
return false
|
||||
}
|
||||
return true
|
||||
},
|
||||
onSubmit() {
|
||||
let _this = this
|
||||
let formData = new FormData();
|
||||
this.fileList.forEach(item => {
|
||||
formData.append("files", item.raw);
|
||||
});
|
||||
if (this.fileList.length === 0) {
|
||||
this.$message.warning(`请选择上传文件!!`)
|
||||
return
|
||||
}
|
||||
let url = `/Files/Upload`
|
||||
postMethodCommon(url, formData).then(res => {
|
||||
if (res.code === 200) {
|
||||
_this.form.filepath = res.result[0].filePath
|
||||
postMethodCommon('/FireCodeApp/AddAppFiles', _this.form).then(res2 => {
|
||||
if (res2.code === 200) {
|
||||
_this.$message.warning(`上传成功`)
|
||||
_this.form = {
|
||||
edition: "",
|
||||
description: "",
|
||||
filepath: "",
|
||||
must_update: '',
|
||||
project_name: ''
|
||||
}
|
||||
_this.fileList = []
|
||||
} else {
|
||||
_this.$message.warning(`接口错误!!`)
|
||||
}
|
||||
})
|
||||
} else {
|
||||
_this.$message.warning(`接口错误!!`)
|
||||
}
|
||||
})
|
||||
},
|
||||
onFlyControlSubmit() {
|
||||
let _this = this
|
||||
let formData = new FormData();
|
||||
this.fileList.forEach(item => {
|
||||
formData.append("files", item.raw);
|
||||
});
|
||||
if (this.fileList.length === 0) {
|
||||
this.$message.warning(`请选择上传文件!!`)
|
||||
return
|
||||
}
|
||||
let url = `/Files/Upload`
|
||||
postMethodCommon(url, formData).then(res => {
|
||||
if (res.code === 200) {
|
||||
_this.flyControlForm.filepath = res.result[0].filePath
|
||||
postMethodCommon('/TaxProductEquipment/AddAppFiles', _this.flyControlForm).then(res2 => {
|
||||
if (res2.code === 200) {
|
||||
_this.$message.warning(`上传成功`)
|
||||
_this.flyControlForm = {
|
||||
edition: "",
|
||||
description: "",
|
||||
filepath: "",
|
||||
must_update: '',
|
||||
project_name: ''
|
||||
}
|
||||
_this.fileList = []
|
||||
} else {
|
||||
_this.$message.warning(`接口错误!!`)
|
||||
}
|
||||
})
|
||||
} else {
|
||||
_this.$message.warning(`接口错误!!`)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
/deep/.el-upload-dragger{
|
||||
height:100px;
|
||||
line-height: 20px;
|
||||
}
|
||||
/deep/ .el-icon-upload{
|
||||
|
||||
}
|
||||
/deep/.el-upload__text{
|
||||
|
||||
}
|
||||
</style>
|
||||
Loading…
Reference in New Issue