lincl 2 年之前
父節點
當前提交
810f5f0837
共有 2 個文件被更改,包括 35 次插入5 次删除
  1. 2 2
      mini-pro-web/public/index.html
  2. 33 3
      mini-pro-web/src/views/machine/index.vue

+ 2 - 2
mini-pro-web/public/index.html

@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="">
<html lang="" style="touch-action: none;">
  <head>
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
@ -27,7 +27,7 @@
    <script src="<%= BASE_URL %>js/vconsole.min.js"></script>
    <script>
			// 初始化
			var vConsole = new VConsole();
			// var vConsole = new VConsole();
		</script> 
  </body>
</html>

+ 33 - 3
mini-pro-web/src/views/machine/index.vue

@ -88,7 +88,7 @@
			@onClose="isShow=true" @onShow="isShow=false"/>
		<DrugTaking ref="DrugTaking" :orgCode="orgCode" :deviceNum="deviceNum" @startSendShipment="startSendShipment" 
			:cardSn="cardSn" :cardNo="cardNo" :idcard="idcard" :userName="userName"
			@onClose="isShow=true" @onShow="isShow=false"/>
			@onClose="isShow=true" @onShow="isShow=false" />
		<TipsDialog ref="TipsDialog" @readcard="readcard" @SetPrintPage="SetPrintPage"/>
		<audio id='audioPlay' src='' hidden='true'/>
@ -179,7 +179,37 @@ export default {
		window.socketUtils = socketUtils
	},
  	methods: {
		playTest(){
		loopCharge(v, item, j){
			return new Promise((resolve, reject)=>{
				item.sort =  j
				setTimeout(()=>{
					resolve()
				}, 1000)
			})
		},
		async playTest(){
			return
			var list = [{needCharge: true, chargeList: [{}, {}]}, {needCharge: true, chargeList: [{}, {}]}]
			var isErr = false
            for(var i=0; i<list.length; i++){
                var v = list[i]
                if(v.needCharge){
                    for(var j=0; j<v.chargeList.length; j++){
                        var res = await this.loopCharge(v, v.chargeList[j], i+j).catch(err=>{
                            isErr = err
                            // api.saveCheckHttpLog.call(this, (err&&err.message) || err, 'chargeByYb', reqParams, _.map(list, v=>{return v.RECIPE_NO}).join(","))
                            reject(err)
                        })
						console.log(i+','+j)
                        if(isErr || res){
							console.log(isErr || res)
                            return reject(isErr || res) 
                        }
                    }
                }
            }
			console.log(list)
			
			return
			this.showTipsDialog({
				contentType: 1,
@ -303,7 +333,7 @@ export default {
							return
						}
						this.prevReadCard = false
						if(msg.mess.indexOf("异常") != -1 || msg.mess.indexOf("读取信息失败") != -1 || msg.mess.indexOf("读取识别码失败") != -1) {
						if(msg.mess.indexOf("异常") != -1 || msg.mess.indexOf("读取信息失败") != -1 || msg.mess.indexOf("读取识别码失败") != -1 || msg.mess.indexOf("读取临时卡信息失败") != -1) {
							playAudio(3)
							this.showTipsDialog({
								contentType: 3,