|
|
@ -50,7 +50,7 @@
|
|
|
|
<div class="w8">时间表:</div>
|
|
|
|
<div class="w8">时间表:</div>
|
|
|
|
<div class="w80 flexonly" v-loading="timeloading">
|
|
|
|
<div class="w80 flexonly" v-loading="timeloading">
|
|
|
|
<el-tag
|
|
|
|
<el-tag
|
|
|
|
v-if="timeProtocol == '65283'"
|
|
|
|
v-if="timeProtocol == '65283' || timeProtocol == '65285'"
|
|
|
|
class="mr10 mt10"
|
|
|
|
class="mr10 mt10"
|
|
|
|
size="mini"
|
|
|
|
size="mini"
|
|
|
|
v-for="(val, index) in this.shedulenr"
|
|
|
|
v-for="(val, index) in this.shedulenr"
|
|
|
@ -75,7 +75,7 @@
|
|
|
|
>
|
|
|
|
>
|
|
|
|
<div class="w80 flexonly" v-loading="timeloading">
|
|
|
|
<div class="w80 flexonly" v-loading="timeloading">
|
|
|
|
<el-tag
|
|
|
|
<el-tag
|
|
|
|
v-if="timeProtocol == '65283'"
|
|
|
|
v-if="timeProtocol == '65283' || timeProtocol == '65285'"
|
|
|
|
class="mr10 mt10"
|
|
|
|
class="mr10 mt10"
|
|
|
|
size="mini"
|
|
|
|
size="mini"
|
|
|
|
v-for="(val, index) in this.newshedulenr"
|
|
|
|
v-for="(val, index) in this.newshedulenr"
|
|
|
@ -393,7 +393,10 @@ export default {
|
|
|
|
console.log("aaaaa");
|
|
|
|
console.log("aaaaa");
|
|
|
|
console.log(this.shedulenr);
|
|
|
|
console.log(this.shedulenr);
|
|
|
|
//湖南规约
|
|
|
|
//湖南规约
|
|
|
|
if (this.timeProtocol == "65283") {
|
|
|
|
if (
|
|
|
|
|
|
|
|
this.timeProtocol == "65283" ||
|
|
|
|
|
|
|
|
this.timeProtocol == "65285"
|
|
|
|
|
|
|
|
) {
|
|
|
|
console.log("1111111111111111111111111111111111111");
|
|
|
|
console.log("1111111111111111111111111111111111111");
|
|
|
|
var hnarr = [];
|
|
|
|
var hnarr = [];
|
|
|
|
for (var i = 0; i < this.shedulenr.length; i++) {
|
|
|
|
for (var i = 0; i < this.shedulenr.length; i++) {
|
|
|
@ -504,7 +507,7 @@ export default {
|
|
|
|
this.shedulenr = res.data.list;
|
|
|
|
this.shedulenr = res.data.list;
|
|
|
|
console.log(this.shedulenr);
|
|
|
|
console.log(this.shedulenr);
|
|
|
|
//湖南规约
|
|
|
|
//湖南规约
|
|
|
|
if (this.timeProtocol == "65283") {
|
|
|
|
if (this.timeProtocol == "65283" || this.timeProtocol == "65285") {
|
|
|
|
console.log("1111111111111111111111111111111111111");
|
|
|
|
console.log("1111111111111111111111111111111111111");
|
|
|
|
var hnarr = [];
|
|
|
|
var hnarr = [];
|
|
|
|
for (var i = 0; i < this.shedulenr.length; i++) {
|
|
|
|
for (var i = 0; i < this.shedulenr.length; i++) {
|
|
|
@ -634,7 +637,10 @@ export default {
|
|
|
|
console.log("qqqqqqqqqqqqqqqqqqqqqq");
|
|
|
|
console.log("qqqqqqqqqqqqqqqqqqqqqq");
|
|
|
|
console.log(this.offsetnum);
|
|
|
|
console.log(this.offsetnum);
|
|
|
|
//湖南规约
|
|
|
|
//湖南规约
|
|
|
|
if (this.timeProtocol == "65283") {
|
|
|
|
if (
|
|
|
|
|
|
|
|
this.timeProtocol == "65283" ||
|
|
|
|
|
|
|
|
this.timeProtocol == "65285"
|
|
|
|
|
|
|
|
) {
|
|
|
|
console.log("湖南规约");
|
|
|
|
console.log("湖南规约");
|
|
|
|
console.log("1111111111111111111111111111111111111");
|
|
|
|
console.log("1111111111111111111111111111111111111");
|
|
|
|
var hnarr = [];
|
|
|
|
var hnarr = [];
|
|
|
@ -976,7 +982,10 @@ export default {
|
|
|
|
console.log(Stime, Etime, spanTime);
|
|
|
|
console.log(Stime, Etime, spanTime);
|
|
|
|
console.log(moment(this.scheduleInfo[j].endTime).hour());
|
|
|
|
console.log(moment(this.scheduleInfo[j].endTime).hour());
|
|
|
|
//判断湖南规约
|
|
|
|
//判断湖南规约
|
|
|
|
if (this.deviceListData.zzprotocol == "65283") {
|
|
|
|
if (
|
|
|
|
|
|
|
|
this.deviceListData.zzprotocol == "65283" ||
|
|
|
|
|
|
|
|
this.deviceListData.zzprotocol == "65285"
|
|
|
|
|
|
|
|
) {
|
|
|
|
console.log("湖南规约");
|
|
|
|
console.log("湖南规约");
|
|
|
|
console.log(Stime, Etime);
|
|
|
|
console.log(Stime, Etime);
|
|
|
|
console.log(typeof Stime);
|
|
|
|
console.log(typeof Stime);
|
|
|
|