Merge remote-tracking branch 'origin/hyx_2025-01-13_xgf2.0' into hyx_2025-01-13_xgf2.0

pages.json

@@ -169,17 +169,7 @@
 		{
 			"path": "pages/eight_assignments/confined_space/gas/list",
 			"style": {
-				"navigationBarTitleText": "受限空间安全作业气体分析",
-				"app-plus": {
-					"titleNView": {
-						"buttons": [{
-							"text": "新建",
-							"fontSize": "15",
-							"float": "right",
-							"width": "40px"
-						}]
-					}
-				}
+				"navigationBarTitleText": "受限空间安全作业气体分析"
 			}
 		},
 		{

pages/eight_assignments/blind_board/apply.vue

@@ -175,8 +175,8 @@ export default {
         BOARD_INSTALL_TIME: '',
         WORK_END_DATE: '',
         WORK_USER: '',
-        WORK_LONGITUDE: '',
-        WORK_LATITUDE: '',
+        WORK_LONGITUDE: '1',
+        WORK_LATITUDE: '1',
         MEDIUM: '',
         TEMPERATURE: '',
         PRESSURE: '',

pages/eight_assignments/confined_space/apply.vue

@@ -119,8 +119,8 @@ export default {
         WORK_CONTENT: '',
         WORK_START_DATE: '',
         WORK_END_DATE: '',
-        WORK_LONGITUDE: '',
-        WORK_LATITUDE: '',
+        WORK_LONGITUDE: '1',
+        WORK_LATITUDE: '1',
         WORK_USER: '',
         SPECIAL_WORK: '',
         RISK_IDENTIFICATION: '',

pages/eight_assignments/confined_space/gas/list.vue

@@ -1,5 +1,8 @@
 <template>
   <view class="content">
+    <view v-if="isView !== '1'" class="flex-end padding" style="padding: 20upx;">
+      <u-button type="primary" text="添加" size="mini" class="bth-mini" @click="goToAdd"/>
+    </view>
     <u-list v-if="list.length > 0">
       <u-list-item v-for="(item, index) in list" :key="index">
         <view class="flex-between main-title">
@@ -51,7 +54,8 @@ export default {
       GAS_NAME4: '',
       EW_RU_TASK_ID: '',
       EW_RU_JOB_ID: '',
-      list: []
+      list: [],
+      isView: '0'
     }
   },
   onLoad(query) {
@@ -61,6 +65,7 @@ export default {
     this.GAS_NAME4 = query.GAS_NAME4;
     this.EW_RU_TASK_ID = query.EW_RU_TASK_ID;
     this.EW_RU_JOB_ID = query.EW_RU_JOB_ID;
+    this.isView = query.isView
   },
   onNavigationBarButtonTap(e) {
     if (e.index === 0) {
@@ -110,8 +115,22 @@ export default {
           }
         }
       })
+    },
+    goToAdd() {
+      uni.$u.route({
+        url: '/pages/eight_assignments/confined_space/gas/add',
+        params: {
+          GAS_NAME1: this.GAS_NAME1,
+          GAS_NAME2: this.GAS_NAME2,
+          GAS_NAME3: this.GAS_NAME3,
+          GAS_NAME4: this.GAS_NAME4,
+          EW_RU_TASK_ID: this.EW_RU_TASK_ID,
+          EW_RU_JOB_ID: this.EW_RU_JOB_ID,
+        }
+      })
     }
   },
+
 }
 </script>
 

pages/eight_assignments/electricity/apply.vue

@@ -132,8 +132,8 @@ export default {
         CORP_NAME: '',
         WORK_START_DATE: '',
         WORK_END_DATE: '',
-        WORK_LONGITUDE: '',
-        WORK_LATITUDE: '',
+        WORK_LONGITUDE: '1',
+        WORK_LATITUDE: '1',
         WORK_PLACE: '',
         WORK_CONTENT: '',
         WORK_USER: '',

pages/eight_assignments/historical_approval_records.vue

@@ -50,6 +50,7 @@ export default {
       let resData = await getHistoricalApprovalRecords({
         EW_RU_TASK_ID: this.EW_RU_TASK_ID,
         EW_RU_JOB_ID: this.EW_RU_JOB_ID,
+        postMethod:'application/json'
       });
       this.list = resData.list;
     },

pages/eight_assignments/technological_process.vue

@@ -21,7 +21,7 @@ export default {
   },
   methods: {
     async fnGetData(taskId) {
-      let resData = await getTaskTechnologicalProcess({ID: taskId})
+      let resData = await getTaskTechnologicalProcess({ID: taskId,postMethod:'application/json'})
       this.stepData = resData.list
     }
   },

pages/eight_assignments/view_info.vue

@@ -123,7 +123,7 @@ export default {
   },
   methods: {
     async fnGetData(taskId) {
-      let resData = await getTaskInfo({EW_RU_TASK_ID: taskId})
+      let resData = await getTaskInfo({EW_RU_TASK_ID: taskId,postMethod:'application/json'})
       this.form = resData.list.fromTrans
       this.jobs = resData.list.jobs
       this.questionnaires = resData.list.simpleQues[0]

utils/request.js

@@ -1,10 +1,11 @@
 import refreshToken from "../api/refreshToken";
 
 // let requestPath = 'http://192.168.0.102:8059/xgf_gwj_2.0/'; // 后台请求地址
-let requestPath = 'http://192.168.0.37:8058/xgf_gwj_2.0/'; // 后台请求地址
+let requestPath = 'http://192.168.0.101:8059/xgf_gwj_2.0/'; // 后台请求地址
 // let requestPath = 'https://skqhdg.porthebei.com:9006/qa-prevention-xgf/'; // 后台请求地址
 // let requestPath = 'https://qgxgf.qhdsafety.com/qa-prevention-xgf/'; // 外网地址
 import store from '../store/index'
+import {setRefreshToken} from "../api/api";
 
 function post(url, data) {
     return new Promise((resolve, reject) => {
@@ -38,7 +39,6 @@ function post(url, data) {
                     uni.hideLoading();
                 }
                 if (res.data.result === 'success') {
-                    refreshToken()
                     resolve(res.data)
                 } else {
                     uni.showToast({
@@ -146,3 +146,11 @@ function uploads(url, data) {
 }
 
 export {post, upload, uploads}
+
+setInterval(async () => {
+    if (uni.getStorageSync('tokenTime') == null) return;
+    if (dayjs().diff(dayjs(uni.getStorageSync('tokenTime')), "minute") >= 0.5) {
+        uni.setStorageSync('tokenTime', dayjs().format("YYYY-MM-DD HH:mm:ss"))
+        await setRefreshToken();
+    }
+}, 1000 * 60);