Skip to content

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

修改

parent d8f3d1cc
Show whitespace changes
Inline Side-by-side
Showing with 81 additions and 221 deletions
src/components/ezuikit/carsEZUIKitJs.vue
View file @ 3b5f6f50
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
</div> </div>
<div v-show="noPtz"> <div v-show="noPtz">
<video id="noPtzVideo" width="1378" muted autoplay></video> <video id="noPtzVideo" width="1300" height="700" muted autoplay></video>
</div> </div>
<div v-show="isChildren3" class="dahuaViews"></div> <div v-show="isChildren3" class="dahuaViews"></div>
...@@ -138,7 +138,6 @@ export default { ...@@ -138,7 +138,6 @@ export default {
console.log(data); console.log(data);
let that = this; let that = this;
if (data.children) { if (data.children) {
if (data.children[0].motorcadeId == 1) {
let temporaryData1 = []; let temporaryData1 = [];
let temporaryData2 = []; let temporaryData2 = [];
if (data.children.length > 12) { if (data.children.length > 12) {
...@@ -201,101 +200,12 @@ export default { ...@@ -201,101 +200,12 @@ export default {
this.$nextTick(()=>{ this.$nextTick(()=>{
this.winSize(); this.winSize();
}) })
} else if (data.children[0].motorcadeId == 2) {
this.isChildren1 = false;
this.isChildren2 = false;
this.isChildren3 = true;
this.btnChildren = false;
this.noPtz = false;
if(noPtzhls != null){
noPtzhls.destroy();
}
let dahuaViews = document.querySelector(".dahuaViews");
dahuaViews.innerHTML = `<div><div id="dahuaVideo0"></div></div>
<div><div id="dahuaVideo1"></div></div>
<div><div id="dahuaVideo2"></div></div>
<div><div id="dahuaVideo3"></div></div>`;
var player = this.$cyberplayerJs(`dahuaVideo0`).setup({
width: 340, // 宽度，也可以支持百分比（不过父元素宽度要有）
height: 210, // 高度，也可以支持百分比
title: "", // 标题
isLive: true, // 必须设置，表明是直播视频
file: that.dahuaData[0].url, //您的视频源的地址（目前是乐橙示例播放地址）
image: "", // 预览图
autostart: true, // 是否自动播放
stretching: "uniform", // 拉伸设置
repeat: false, // 是否重复播放
volume: 0, // 音量，注：仅当用户同意、网站由用户激活或媒体无声时允许自动播放
controls: false, // 是否显示控制栏
hls: {
reconnecttime: 5, // hls直播重连间隔秒数
},
ak: "39f82ac87fc3462ea4dcc78734450f57", // 百度智能云平台注册（https://cloud.baidu.com）即可获得accessKey
});
var player = this.$cyberplayerJs(`dahuaVideo1`).setup({
width: 340, // 宽度，也可以支持百分比（不过父元素宽度要有）
height: 210, // 高度，也可以支持百分比
title: "", // 标题
isLive: true, // 必须设置，表明是直播视频
file: that.dahuaData[1].url, //您的视频源的地址（目前是乐橙示例播放地址）
image: "", // 预览图
autostart: true, // 是否自动播放
stretching: "uniform", // 拉伸设置
repeat: false, // 是否重复播放
volume: 0, // 音量，注：仅当用户同意、网站由用户激活或媒体无声时允许自动播放
controls: false, // 是否显示控制栏
hls: {
reconnecttime: 5, // hls直播重连间隔秒数
},
ak: "39f82ac87fc3462ea4dcc78734450f57", // 百度智能云平台注册（https://cloud.baidu.com）即可获得accessKey
});
var player = this.$cyberplayerJs(`dahuaVideo2`).setup({
width: 340, // 宽度，也可以支持百分比（不过父元素宽度要有）
height: 210, // 高度，也可以支持百分比
title: "", // 标题
isLive: true, // 必须设置，表明是直播视频
file: that.dahuaData[2].url, //您的视频源的地址（目前是乐橙示例播放地址）
image: "", // 预览图
autostart: true, // 是否自动播放
stretching: "uniform", // 拉伸设置
repeat: false, // 是否重复播放
volume: 0, // 音量，注：仅当用户同意、网站由用户激活或媒体无声时允许自动播放
controls: false, // 是否显示控制栏
hls: {
reconnecttime: 5, // hls直播重连间隔秒数
},
ak: "39f82ac87fc3462ea4dcc78734450f57", // 百度智能云平台注册（https://cloud.baidu.com）即可获得accessKey
});
var player = this.$cyberplayerJs(`dahuaVideo3`).setup({
width: 340, // 宽度，也可以支持百分比（不过父元素宽度要有）
height: 210, // 高度，也可以支持百分比
title: "", // 标题
isLive: true, // 必须设置，表明是直播视频
file: that.dahuaData[3].url, //您的视频源的地址（目前是乐橙示例播放地址）
image: "", // 预览图
autostart: true, // 是否自动播放
stretching: "uniform", // 拉伸设置
repeat: false, // 是否重复播放
volume: 0, // 音量，注：仅当用户同意、网站由用户激活或媒体无声时允许自动播放
controls: false, // 是否显示控制栏
hls: {
reconnecttime: 5, // hls直播重连间隔秒数
},
ak: "39f82ac87fc3462ea4dcc78734450f57", // 百度智能云平台注册（https://cloud.baidu.com）即可获得accessKey
});
}
} else { } else {
this.btnChildren = false; this.btnChildren = false;
if (data.motorcadeId == 1) {
HttpReq.truckDispatching.mineMonitoringHowYuntaiQuery({ip:data.ip}).then((res) => {
if(!res){
let noPtzVideo = document.getElementById('noPtzVideo'); let noPtzVideo = document.getElementById('noPtzVideo');
noPtzhls = new Hls(); noPtzhls = new Hls();
noPtzhls.loadSource(data.url); //noPtzhls.loadSource(data.url);
noPtzhls.loadSource('http://kbs-dokdo.gscdn.com/dokdo_300/_definst_/dokdo_300.stream/playlist.m3u8');
noPtzhls.attachMedia(noPtzVideo); noPtzhls.attachMedia(noPtzVideo);
noPtzhls.on(Hls.Events.MANIFEST_PARSED,function() { noPtzhls.on(Hls.Events.MANIFEST_PARSED,function() {
noPtzVideo.play(); noPtzVideo.play();
...@@ -305,54 +215,6 @@ export default { ...@@ -305,54 +215,6 @@ export default {
this.isChildren3 = false; this.isChildren3 = false;
this.btnChildren = false; this.btnChildren = false;
this.noPtz = true; this.noPtz = true;
}else{
this.url = "";
let originalUrl = "http://192.168.9.2:85/cn/demo.html?ip=";
// let originalUrl = "http://127.0.0.1:5500/webs/cn/demo.html?ip=";
this.isChildren1 = false;
this.isChildren2 = true;
this.isChildren3 = false;
this.isIP = data.cameraIp;
this.url = originalUrl + data.cameraIp;
this.btnChildren = false;
this.noPtz = false;
if(noPtzhls != null){
noPtzhls.destroy();
}
}
})
} else if (data.motorcadeId == 2) {
this.isChildren1 = false;
this.isChildren2 = false;
this.isChildren3 = true;
this.btnChildren = false;
this.noPtz = false;
if(noPtzhls != null){
noPtzhls.destroy();
}
let dahuaViews = document.querySelector(".dahuaViews");
dahuaViews.innerHTML = '<div id="dahuaVideoAlone"></div>';
var player = this.$cyberplayerJs(`dahuaVideoAlone`).setup({
width: 1390, // 宽度，也可以支持百分比（不过父元素宽度要有）
height: 760, // 高度，也可以支持百分比
title: "", // 标题
isLive: true, // 必须设置，表明是直播视频
file: data.url, //您的视频源的地址（目前是乐橙示例播放地址）
image: "", // 预览图
autostart: true, // 是否自动播放
stretching: "uniform", // 拉伸设置
repeat: false, // 是否重复播放
volume: 0, // 音量，注：仅当用户同意、网站由用户激活或媒体无声时允许自动播放
controls: false, // 是否显示控制栏
hls: {
reconnecttime: 5, // hls直播重连间隔秒数
},
ak: "39f82ac87fc3462ea4dcc78734450f57", // 百度智能云平台注册（https://cloud.baidu.com）即可获得accessKey
});
}
} }
}, },
getDaHua() { getDaHua() {
......
src/views/regionalManagement/regionalInformation/index.vue
View file @ 3b5f6f50
...@@ -43,52 +43,52 @@ ...@@ -43,52 +43,52 @@
<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="" :disabled="form.reqType == 'edit'"/> <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;" :disabled="form.reqType == 'edit'"> <el-select v-model="form.item.areaclass" placeholder="请选择所属类别" size="small" style="width:160px;">
<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="" :disabled="form.reqType == 'edit'"/> <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;" :disabled="form.reqType == 'edit'"> <el-select v-model="form.item.shadow" placeholder="请选择是否需要遮罩层" style="width:160px;">
<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="" :disabled="form.reqType == 'edit'"/> <el-input v-model="form.item.max" style="width:160px;" placeholder="请输入最大承接车辆数"/>
</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)" v-show="form.reqType == 'add'" /> <input type="file" name="image" @change="excelImport($event)" />
</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="" :disabled="form.reqType == 'edit'"/> <el-input v-model="form.item.areashovel" style="width:160px;" placeholder="请输入电铲名称"/>
</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;" :disabled="form.reqType == 'edit'"> <el-select v-model="form.item.arearesources" placeholder="请选择矿种" style="width:160px;">
<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;" :disabled="form.reqType == 'edit'"> <el-select v-model="form.item.areaore" placeholder="请选择是否配矿" style="width:160px;">
<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="" :disabled="form.reqType == 'edit'"></el-input-number> <el-input-number v-model="form.item.areapriority" :min="1" :max="10" label=""></el-input-number>
</el-form-item> </el-form-item>
<div id="centerDiv" class="mapcontainer" v-show="form.reqType == 'add'"> <div id="centerDiv" class="mapcontainer" v-show="form.reqType == 'add'">
<mars3dViewerMap :url="configUrl" @onload="onMapload" ref="mars3dViewerMapMethod"/> <mars3dViewerMap :url="configUrl" @onload="onMapload" ref="mars3dViewerMapMethod"/>
...@@ -99,17 +99,15 @@ ...@@ -99,17 +99,15 @@
<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;" :disabled="form.reqType == 'edit'"> <el-select v-model="form.item.limitclass" placeholder="请选择限制类型" style="width:160px;">
<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>
...@@ -117,20 +115,20 @@ ...@@ -117,20 +115,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;" :disabled="form.reqType == 'edit'"> <el-checkbox-group v-model="checkDataList" style="width:480px;">
<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;" :disabled="form.reqType == 'edit'"> <el-select v-model="form.item.status" placeholder="请选择启停状态" style="width:160px;">
<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" v-show="form.reqType == 'add'"> <div slot="footer" class="dialog-footer">
<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>
...@@ -296,7 +294,7 @@ export default { ...@@ -296,7 +294,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};
......
vue.config.js
View file @ 3b5f6f50
...@@ -24,8 +24,8 @@ module.exports = { ...@@ -24,8 +24,8 @@ module.exports = {
lintOnSave: process.env.NODE_ENV === 'development', lintOnSave: process.env.NODE_ENV === 'development',
productionSourceMap: false, productionSourceMap: false,
devServer: { devServer: {
host: 'localhost', // 也可以直接写IP地址这样方便真机测试 // host: 'localhost', // 也可以直接写IP地址这样方便真机测试
// host: '192.168.0.102', // 也可以直接写IP地址这样方便真机测试 host: '192.168.0.101', // 也可以直接写IP地址这样方便真机测试
port: port, port: port,
open: true, open: true,
overlay: { overlay: {
......
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