Browse Source

设备模块调试

asd26269546 1 year ago
parent
commit
0dd7f51907
3 changed files with 7 additions and 6 deletions
  1. 2 2
      src/utils/axios.js
  2. 2 1
      src/views/equipment/index.vue
  3. 3 3
      src/views/equipment/warpKnitting.vue

+ 2 - 2
src/utils/axios.js

@@ -14,8 +14,8 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例
 const service = axios.create({
   // axios中请求配置有baseURL选项,表示请求URL公共部分
-  baseURL: 'test-api',
-  //baseURL: 'prod-api',
+  //baseURL: 'test-api',
+  baseURL: 'prod-api',
   // 超时
   timeout: 10000
 })

+ 2 - 1
src/views/equipment/index.vue

@@ -73,7 +73,8 @@ const toDtl = (row) => {
 	proxy.$router.push('/main/warpKnitting/' + row.deviceId)
 }
 const getList = () => {
-	if(getUserInfo().tenantId != 'smt') {
+	
+	if(getUserInfo().tenantId == 'smt') {
 		proxy.post('/tdaDevice/computerList').then(res => {
 			listData.value = res.data.rows
 			console.log(res)

+ 3 - 3
src/views/equipment/warpKnitting.vue

@@ -61,14 +61,14 @@
 						<i class="iconfont icon-icon_sdbc"></i>
 					</div>
 					<div class="text">{{$t('warpKnitting.setClothLength')}}</div>
-					<div class="btn">{{deviceData.parameter.max_bulen / 100}} M</div>
+					<div class="btn">{{deviceData.parameter.max_bulen}} M</div>
 				</li>
 				<li>
 					<div class="icon">
 						<i class="iconfont icon-icon_midu"></i>
 					</div>
 					<div class="text">{{$t('warpKnitting.density')}}</div>
-					<div class="btn">{{deviceData.parameter.bumi / 100}} Row/cm</div>
+					<div class="btn">{{deviceData.parameter.bumi}} Row/cm</div>
 				</li>
 			</ul>
 			<ul class="qianla">
@@ -143,7 +143,7 @@ const getDtl = () => {
 			axisData.value.sort(up)
 			const time1 = new Date(res.data.eventTime).getTime()
 			const time2 = new Date().getTime()
-			if(time1 + 600000 > time2){
+			if(time1 + 600000 -  new Date().getTimezoneOffset() * 60 * 1000> time2){
 				swichType.value = true
 			}else{
 				swichType.value = false