Merge remote-tracking branch 'origin/pet-2.0' into pet-2.0

api/index.js

@@ -48,7 +48,7 @@ export const getDepartmentLevel = () => post("/app/dictionaries/getLevels", {loa
 export const getCheckCycle = () => post("/app/dictionaries/getLevels", {loading: false, DICTIONARIES_ID: 'f60cf0e8315b4993b6d6049dd29f2ba5'}) //获取排查周期
 export const getListType = () => post("/app/dictionaries/getLevels", {loading: false, DICTIONARIES_ID: '4a3d0d99b0ea4e268c11dd0b18866917'}) //获取清单类型
 export const approveHotWorkSupervision = (params) => post("/app/hotworkapplication/editOpinion", params) //特级动火 安全监督部初审
-export const approveHotWorkSupervisionAndFfile = (params) => upload("/app/hotworkapplication/editOpinion", params) //特级动火 安全监督部初审 增加签字附件
+export const approveHotWorkSupervisionAndFfile = (params) => upload("/app/hotworkapplication/editOpinion/file", params) //特级动火 安全监督部初审 增加签字附件
 export const getInspectionReportCorpInfoList = (params) => post("/app/inspectionReport/corpinfo/list", params) //获取所有的分公司自查自报记录
 export const getInspectionReportListManageList = (params) => post("/app/inspectionReport/listManage/list", params) //分公司的清单记录
 export const getInspectionReportListManageRecordsList = (params) => post("/app/inspectionReport/listManage/records/list", params) //已检查信息与超期未检查记录

pages/super-hot/security-committee/detail.vue

@@ -215,21 +215,12 @@
             <view slot="label" class="mt-10">
               <u-upload
                   ref="aaa"
-                  capture="album"
                   uploadIcon="plus"
                   :fileList="fileList"
                   @afterRead="afterRead"
                   @delete="deletePic"
                   name="1" multiple
                   :maxCount="4"></u-upload>
-              <!--            <u-upload-->
-              <!--                uploadIcon="plus"-->
-              <!--                :fileList="form.fileList"-->
-              <!--                @afterRead="afterRead"-->
-              <!--                @delete="deletePic"-->
-              <!--                multiple-->
-              <!--                :maxCount="4"-->
-              <!--            ></u-upload>-->
             </view>
           </u-cell>
           <u-cell v-if="pd.isChange === '2'">

utils/request.js

@@ -1,7 +1,7 @@
 
 // export var requestPath = 'https://skqhdg.porthebei.com:9005/qa-regulatory-gwj/'; // 后台请求地址
 
-export var requestPath = 'http://192.168.0.102:8060/new_template';
+export var requestPath = 'http://192.168.0.101:8060/new_template';
 
 let videoApiPath = 'https://arqsp.qhdsafety.com:10010'; // 视频平台后台请求地址
 import store from '../store/index'
@@ -31,10 +31,6 @@ function post(url, data) {
                     uni.hideLoading();
                 }
                 if (res.data.result === 'success') {
-                    if (dayjs().diff(dayjs(uni.getStorageSync('tokenTime')), "minute") >= 5) {
-                        uni.setStorageSync('tokenTime', dayjs().format("YYYY-MM-DD HH:mm:ss"))
-                        setRefreshToken();
-                    }
                     resolve(res.data)
                 } else {
                     if(url =='/admin/check'){
@@ -189,4 +185,12 @@ function videoApiGet(url, data) {
     })
 }
 
+setInterval(async () => {
+    if (uni.getStorageSync('tokenTime') == null) return;
+    if (dayjs().diff(dayjs(uni.getStorageSync('tokenTime')), "minute") >= 5) {
+        uni.setStorageSync('tokenTime', dayjs().format("YYYY-MM-DD HH:mm:ss"))
+        await setRefreshToken();
+    }
+}, 1000 * 60);
+
 export {post, upload, uploads,setBasePath,videoApiGet}