diff --git a/src/components/global.vue b/src/components/global.vue index feebf86..e6abc40 100644 --- a/src/components/global.vue +++ b/src/components/global.vue @@ -5,22 +5,33 @@
-

目前网络断开,尝试重连已超时({{ orderInfo.downTimeSecond }}S),系统将自动终结此次打印

-

目前网络断开,尝试重连超时({{ orderInfo.downTimeSecond }}S),可以继续等待或即刻 终止打印

-

目前网络断开,尝试重连超时({{ orderInfo.downTimeSecond||0 }}S)

+

目前网络断开,尝试重连已超时({{ + orderInfo.downTimeSecond + }}S),系统将 + 自动终结此次打印 +

+

目前网络断开,尝试重连超时({{ + orderInfo.downTimeSecond + }}S),可以继续等待或即刻 终止打印

+

+ 目前网络断开,尝试重连超时({{ orderInfo.downTimeSecond || 0 }}S)

-

订单编号 {{orderInfo.taskCode}}

-

时间 {{ycTime}}

+

订单编号 {{ orderInfo.taskCode }}

+

时间 {{ ycTime }}

-

异常原因 {{orderInfo.abnormalReason}}

+

异常原因 {{ orderInfo.abnormalReason }}

-
用户您好,抱歉地通知您:系统检测到打印遇到了异常问题,正在打印中的订单和排队即将处理的订单,都将转变为取件码再次自助打印的订单(取件码可通过小程序【我的】\打印记录-预约记录找到),您可以稍后等机器恢复正常后使用取件码重新打印文件。
-
您也可以通过小程序首页的更多服务-微信客服,联系客服人员进行问题沟通和跟进处理。
+
+ 用户您好,抱歉地通知您:系统检测到打印遇到了异常问题,正在打印中的订单和排队即将处理的订单,都将转变为取件码再次自助打印的订单(取件码可通过小程序【我的】\打印记录-预约记录找到),您可以稍后等机器恢复正常后使用取件码重新打印文件。 +
+
+ 您也可以通过小程序首页的更多服务-微信客服,联系客服人员进行问题沟通和跟进处理。 +
-
+
{{ `NO.1文档打印机总进度` }}
@@ -29,14 +40,16 @@
任务 - {{ `${currentPrint + 1}/${printBackList.length}: ${lastPrintList[lastPrintList.length]?.sourceFileName || ''}` }} - {{orderInfo.currentTaskFileName}} + {{ + `${currentPrint + 1}/${printBackList.length}: ${lastPrintList[lastPrintList.length]?.sourceFileName || ''}` + }} + {{ orderInfo.currentTaskFileName }}
{{ downLoadMessage || '' }}
-
- - - +
+ + +
@@ -59,7 +72,9 @@
-
请问是否确认即刻重启机器恢复服务?
+
+ 请问是否确认即刻重启机器恢复服务? +
立即重启
取消
@@ -72,9 +87,10 @@
- +
输入设备基础维护码授权重启操作
-
+
+
提醒:该操作适用于在打印遇到问题时,复位重启机器以恢复正常打 印服务,请确认是否继续该操作?
马上重启恢复服务
@@ -246,7 +262,7 @@ }, methods: { stopProgram() { - bdStopProgram().then(()=>{ + bdStopProgram().then(() => { }) }, @@ -263,7 +279,7 @@ } _this.qjmData = _this.qjmData + num }, - onTip(name,time) { + onTip(name, time) { let _this = this _this.state.sta = true _this.state.name = name @@ -277,21 +293,21 @@ this.citeL.cqjqSta = false } else if (num === 1) { let {qjmData} = this - if(this.state.sta) { + if (this.state.sta) { return; } - if(!qjmData) { - this.onTip('请输入维护码授权重启操作!',3000) + if (!qjmData) { + this.onTip('请输入维护码授权重启操作!', 3000) return } - getEnterKey({keys: qjmData}).then(res=>{ - if(res) { + getEnterKey({keys: qjmData}).then(res => { + if (res) { this.qjmData = '' this.citeL.cqjqSta = false this.confirmDia = true - }else{ - this.onTip('维护码不正确的,请重新确认!',3000) + } else { + this.onTip('维护码不正确的,请重新确认!', 3000) } }) } @@ -299,11 +315,11 @@ onJqztDo() { this.confirmDia = false bdStop().then(() => { - this.onTip('重启命令已发出',3000) + this.onTip('重启命令已发出', 3000) }) }, add(t) { - if(t<10) { + if (t < 10) { return '0' + t } return t @@ -318,30 +334,30 @@ "h": that.add(date.getHours()), //小时 "m": that.add(date.getMinutes()), //分 }; - return o.y+'/'+o.M+'/'+o.d+' '+o.h+':'+o.m + return o.y + '/' + o.M + '/' + o.d + ' ' + o.h + ':' + o.m }, getDeviceAndOrder() { let that = this; bdGetDeviceAndOrder().then(res => { let {deviceStatus, hasOrder, taskCode, currentTask, downLoadMessage, downTimeSecond, time} = res; if (hasOrder) {// 先判断是否有订单进来 - if(downTimeSecond>310&&that.csSTA) { + if (downTimeSecond > 310 && that.csSTA) { that.csSTA = false that.stopProgram() - }else{ + } else { that.csSTA = true } - if(deviceStatus=='ABNORMAL') { + if (deviceStatus == 'ABNORMAL') { if (!that.cite.ztyc) { that.ycTime = this.format() that.numZt = 120 that.onNum() } that.cite.ztyc = true - }else if (taskCode) { + } else if (taskCode) { if (taskCode == that.taskCode) {//非新任务 if (currentTask) { - console.log('progressPercentage???', that.progressPercentage); + // console.log('progressPercentage???', that.progressPercentage); let completeItem = that.printBackList[that.currentPrint]; if (currentTask == that.currentTaskCode) {//非新的打印文件 // if (deviceStatus == "RUN") { @@ -350,13 +366,15 @@ // this.progressType='fake' // } } else {//新的打印文件 - that.currentTaskCode = currentTask; - that.currentPrint = Number(currentTask.slice(-1)); - that.lastPrintList = [...that.lastPrintList, completeItem]; - if(that.citeL.zxPage) { - that.startProgress(time); + if(that.progressPercentage>0&&that.progressPercentage!=100) { + that.progressPercentage = 100 }else{ - that.startProgress(completeItem?.expectedTime || 3); + that.currentTaskCode = currentTask; + that.currentPrint = Number(currentTask.slice(-1)); + that.lastPrintList = [...that.lastPrintList, completeItem]; + if(time>0) { + that.startProgress(time); + } } } } @@ -366,8 +384,15 @@ } } } else {// 没有订单不显示打印框 - that.DYZshow = false; - that.cite.ztyc = false + if (that.progressPercentage < 100) { + that.progressType = 'fake'; + that.progressPercentage = 100 + } else { + that.progressType = 'real'; + that.DYZshow = false; + that.cite.ztyc = false; + that.lastPrintList = []; + } } that.isOnLine = deviceStatus; that.cite.deviceStatus = deviceStatus; @@ -377,61 +402,59 @@ }).catch(error => { alert(error, that) }) - if(this.citeL.zxPage) { - bdSocket().then(res => { - let {content, idCard, mgc, refreshAD, scan, udisk, complete} = res - if(idCard) { - // 跳转到身份证打印 - this.cite.modeName = '身份证打印' - that.$router.push({ - name: 'operationGuide', - params: { - name: '身份证打印' - } - }) - }else if(refreshAD) { - // 立即刷新广告 - this.getAdvertisement() - }else if(scan) { - // 跳转到扫描打印 - this.cite.modeName = '扫描打印' - this.$router.push({ - name: 'operationGuide', - params: { - name: '扫描打印' - } - }) - }else if(udisk) { - // 跳转到U盘打印 - this.cite.modeName = 'U盘打印' - this.$router.push({ - name: 'operationGuide', - params: { - name: 'U盘打印' - } - }) - }else if(mgc) { - // 是否敏感词 - this.mgcData = { - show: true, - re: content + bdSocket().then(res => { + let {content, idCard, mgc, refreshAD, scan, udisk, complete} = res + if (idCard) { + // 跳转到身份证打印 + this.cite.modeName = '身份证打印' + that.$router.push({ + name: 'operationGuide', + params: { + name: '身份证打印' } - this.numZt = 30 - this.onNum() - }else if(complete) { - this.$router.push({ - name: 'complete' - }) + }) + } else if (refreshAD) { + // 立即刷新广告 + this.getAdvertisement() + } else if (scan) { + // 跳转到扫描打印 + this.cite.modeName = '扫描打印' + this.$router.push({ + name: 'operationGuide', + params: { + name: '扫描打印' + } + }) + } else if (udisk) { + // 跳转到U盘打印 + this.cite.modeName = 'U盘打印' + this.$router.push({ + name: 'operationGuide', + params: { + name: 'U盘打印' + } + }) + } else if (mgc) { + // 是否敏感词 + this.mgcData = { + show: true, + re: content } - }).catch(error => { - console.log(error) - }) - } + this.numZt = 30 + this.onNum() + } else if (complete) { + this.$router.push({ + name: 'complete' + }) + } + }).catch(error => { + console.log(error) + }) }, getPrintList() { printOrderList().then(res => { let {printBackList, code} = res; - console.log('getPrintList????', res); + // console.log('getPrintList????', res); if (code != this.taskCode) { this.taskCode = code; printBackList.map((item) => { @@ -453,9 +476,9 @@ this.progressPercentage = 0; this.progressInterval = setInterval(() => { if (this.progressPercentage >= 100) { - clearInterval(this.progressInterval); // 完成时清除定时器 this.progressType = 'fake' this.progressPercentage = 0; + clearInterval(this.progressInterval); // 完成时清除定时器 } else { this.progressType = 'real' this.progressPercentage += 1; @@ -541,7 +564,7 @@ }, time) } this.state = this.cite.state - }, 2000) + }, 1000) } }, //获取设备信息 @@ -636,6 +659,7 @@ background: linear-gradient(132deg, #52a39d 0%, #a1c553 50%, #81d012 100%); border-radius: 1rem; } + .btn2 { margin: 0; width: 14rem; @@ -682,7 +706,7 @@ /* 黄色条纹宽度 */ #2CD89E 10px, /* 橙色开始位置 */ #2CD89E 20px /* 橙色条纹宽度 */); - width: 70%; + width: 0; /* 进度条的宽度,可以根据需要调整 */ transition: width 2s ease; /* 平滑过渡效果 */ @@ -732,6 +756,7 @@ margin-top: 3rem; } } + .content3 { position: absolute; left: 50%; @@ -741,11 +766,13 @@ margin-top: -14.6875rem; margin-left: -27.5rem; align-items: flex-end; + .box { background: #FFFFFF; border-radius: 1.25rem; text-align: left; position: relative; + .tit { font-weight: bold; font-size: 1.25rem; @@ -754,6 +781,7 @@ border-left: 0.125rem solid #56A599; padding-left: 0.625rem; } + .myInput { padding: 0 0.9375rem; height: 3.125rem; @@ -761,6 +789,7 @@ border-radius: 0.3125rem; border: 0.0625rem solid #EAEDEC; margin: 1.875rem 0; + input { width: 100%; height: 100%; @@ -771,6 +800,7 @@ line-height: 1.125rem; } } + .tip { border-top: 0.0625rem solid #E8E8E8; padding: 1.875rem 0 4.375rem; @@ -779,6 +809,7 @@ color: #FF0000; line-height: 1.5rem; } + .btn { background: linear-gradient(-90deg, #52A39D 0%, #A1C553 100%); width: 100%; @@ -789,6 +820,7 @@ color: #FFFFFF; line-height: 1.5rem; } + .li { width: 3.625rem; height: 3.625rem; @@ -801,6 +833,7 @@ margin-bottom: 1.25rem; cursor: pointer; } + .onClose { position: absolute; width: 28px; @@ -808,17 +841,20 @@ right: 20px; } } + .box1 { width: 33.125rem; height: 25.625rem; padding: 3.75rem 2.1875rem 0; } + .box2 { width: 13.125rem; flex-wrap: wrap; padding: 1.25rem 1.875rem 0; } } + .dlTip { position: absolute; left: 20px; @@ -832,6 +868,7 @@ height: 41px; background: rgba(255, 255, 255, 80%); border-radius: 10px; + span { height: 30px; background: #FA1D1D; @@ -843,6 +880,7 @@ color: #FFFFFF; line-height: 10px; } + en { color: #FF0000; }