修改

mini-pro-web/.env.test

@@ -1,8 +1,9 @@
VUE_APP_BASE_API = 'http://ehr.yihu.com/hlwyy'
VUE_APP_IMAGE_SERVER = 'http://ehr.yihu.com/fastdfs/'
VUE_APP_SOCKET_URL = 'http://ehr.yihu.com'
VUE_APP_IM_API = 'http://ehr.yihu.com/api/v2'
VUE_APP_PRE_PATH = '/hlwyy/intelligent-medicine-abinet'
VUE_APP_BASE_API = 'http://10.95.22.10:9660'
VUE_APP_IMAGE_SERVER = 'http://10.95.22.10:9660/fastdfs/'
VUE_APP_SOCKET_URL = 'http://10.95.22.10:9660'
VUE_APP_IM_API = 'http://10.95.22.10:9660/api/v2'
VUE_APP_PRE_PATH = '/intelligent-medicine-abinet-test'
VUE_APP_MACHINE_SOCKET_URL = 'ws://10.95.22.10:9660/cabinet/websocket/'
VUE_APP_APPID = ""
VUE_APP_WXID = ""

mini-pro-web/src/api/apiGateway.js

@@ -1,2 +1,2 @@
export const BASE = '/cityihealth/base'
export const BASE = process.env.NODE_ENV==='test'? '/cityihealth/baseygTest' : '/cityihealth/base'
export const AUTH = "/cityihealth"

mini-pro-web/src/views/machine/components/Result.vue

@@ -27,7 +27,7 @@
				<div class="list">
					<div class="kitbox" v-for="(item, i) in drugList" :key="i" :style="item.success? 'color: green' : ''">
						<div class="box-flex-1 ellipsis_1" ><van-icon v-if="item.success" style="vertical-align: text-top;" name="passed"/> {{i+1}}、{{item.goodsName || item.drugName}}</div>
						<div v-if="item.orderState==1||rsType==1||rsType==3||rsType==4">x{{item.quantity || 1}} （{{item.unit}}）</div>
						<div v-if="item.orderState==1||rsType==1||rsType==3||rsType==4">x{{item.quantity || 1}} （{{item.packUnit}}）</div>
						<div v-else class="c-red">药柜无货</div>
					</div>
				</div>

mini-pro-web/src/views/machine/index.vue

@@ -650,7 +650,7 @@ export default {
					type:"text", text: (v.drugName||v.goodsName)+"\n",nLan:0,nOrgx:-1,nWidthTimes:0,nHeightTimes:0,FontType:0,nFontStyle:0
				})
				printcon.push({
					type:"text", text: `数量：${v.quantity}${v.unit}\n规格：${v.specif}\n用法：${v.useWay||''}  ${v.useDose||''}${v.unit||''}  ${v.useRate||''}`,nLan:0,nOrgx:-1,nWidthTimes:0,nHeightTimes:0,FontType:0,nFontStyle:0
					type:"text", text: `数量：${v.quantity}${v.packUnit}\n规格：${v.specif}\n用法：${v.useWay||''}  ${v.useDose||''}${v.quantityUnit||''}  ${v.useRate||''}`,nLan:0,nOrgx:-1,nWidthTimes:0,nHeightTimes:0,FontType:0,nFontStyle:0
				})
				printcon.push({type:"line"})
			})