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

api/index.js

@@ -1,4 +1,4 @@
-import {post, upload, uploads,videoApiGet} from "../utils/request";
+import {post, upload, uploads,videoApiGet} from "@/utils/request";
 
 export const submitLogin = (params) => post("/admin/check", params) // 登录
 export const getHotWorkListByState = (params) => post("/app/hotworkapplication/list", params)//获取动火列表
@@ -12,17 +12,13 @@ export const getSafetyenvironmentalCheckList = (params) => post("/app/safetyenvi
 export const getpleadList = (params) => post("/app/safetyenvironmental/pleadList", params) //获取安全环保检查列表
 export const getSafetyenvironmentalGoEdit = (params) => post("/app/safetyenvironmental/goEdit", params) //安全环保检查明细信息
 export const setSafetyenvironmentalAdd = (params) => post("/app/safetyenvironmental/add", params) //新增安全环保检查
-export const setSafetyenvironmentalAdd_plus = (params) => upload("/app/safetyenvironmental/add", params) //新增安全环保检查
+export const setSafetyenvironmentalAdd_plus = (params) => post("/app/safetyenvironmental/add", params) //新增安全环保检查
 export const setSafetyenvironmentalEdit = (params) => post("/app/safetyenvironmental/edit", params) //修改安全环保检查
-export const setSafetyenvironmentalEdit_plus = (params) => upload("/app/safetyenvironmental/edit", params) //修改安全环保检查
+export const setSafetyenvironmentalEdit_plus = (params) => post("/app/safetyenvironmental/edit", params) //修改安全环保检查
 export const setSafetyenvironmentalGoEdit = (params) => post("/app/safetyenvironmental/goEdit", params) //修改安全环保检查
 export const getSafetyenvironmentalRedPoint = (params) => post("/app/safetyenvironmental/countCheck", params) //修改安全环保检查
 export const setSafetyenvironmentalExplain = (params) => post("/app/safetyenvironmental/explain", params) //申辩
 export const setSafetyenvironmentalFlow = (params) => post("/app/safetyenvironmental/showFlowChart", params) //申辩
-export const setImgFilesAdd = (params) => uploads("/app/imgfiles/uploadFile", params) //上传图片
-export const setImgFilesListAdd = (params) => uploads("/app/imgfiles/uploadFileList", params) //上传图片
-export const setVideoAdd = (params) => upload("/app/imgfiles/add", params) //上传视频
-export const setImgFilesAddVideo = (params) => uploads("/app/imgfiles/addVideo", params) //上传视频
 export const getHiddenRegion = (params) => post("/app/hiddenRegion/gerRegionList", {loading: false, ...params}) //获取隐患部位
 export const getInspectedDepartment = (params) => post("/app/corpDepartment/listTreeCorpDept", {loading: false, ...params}) //获取被检查部门
 export const getInspectionDepartment = (params) => post("/app/corpDepartment/listTreeManageAndCorp", {loading: false, ...params}) //获取检查部门
@@ -31,7 +27,7 @@ export const getHiddenLevel = () => post("/app/dictionaries/listSelectTree", {lo
 export const getHiddenType = () => post("/app/dictionaries/listSelectTree", {loading: false, DICTIONARIES_ID: '3babc15144444bdc8d763d0af2bdfff6'}) //获取隐患类型
 export const getInspectionType = () => post("/app/dictionaries/listSelectTree", {loading: false, DICTIONARIES_ID: '60e6481d96e44a5390ff5c347c4d1ffe'}) //获取检查类型
 export const getSafetyenvironmentalinspectorList = (params) => post("/app/safetyenvironmentalinspector/list", params) //安全环保检查检查人确认列表
-export const setSafetyenvironmentalVerify = (params) => upload("/app/safetyenvironmentalinspector/verify", params) //安全环保检查检查人确认
+export const setSafetyenvironmentalVerify = (params) => post("/app/safetyenvironmentalinspector/verify", params) //安全环保检查检查人确认
 export const getCorpInfoList = (params) => post("/app/corpinfo/listRetrieval", params) //分公司信息列表
 export const getCorpInfoGoEdit = (params) => post("/app/corpinfo/goMessage", params) //分公司信息查看
 export const getCorpInfoPersonregistration = (params) => post("/AppUser/personregistration", params) //分公司信息查看入职从业人员登记
@@ -47,7 +43,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) => post("/app/hotworkapplication/editOpinion", 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) //已检查信息与超期未检查记录
@@ -101,7 +97,7 @@ export const setKeyProjectsAIWarningAdd = (params) => post("/app/aiwarning/edit"
 export const getkeyprojectcount = (params) => post("/app/keyprojectcheck/keyProjectCount", params); // 重点工程统计
 export const getPromiseUnsigned = (params) => post("/app/corppromise/ISSIGN", params); // 获取是否有需要签字的承诺书
 export const getPromiseInfo = (params) => post("/app/corppromise/promise", params); // 获取需要签字的承诺书信息
-export const setPromiseSign = (params) => upload("/app/corppromise/editpeople", params); // 承诺书提交签字
+export const setPromiseSign = (params) => post("/app/corppromise/editpeople", params); // 承诺书提交签字
 export const getMyPromiseList = (params) => post("/app/corppromise/promiseV2list", params); // 获取我的承诺列表
 export const getReceivePromiseList = (params) => post("/app/corppromise/receiveV2PromiseList", params); // 获取接收承诺列表
 export const getPromiseView = (params) => post("/app/corppromise/goEdit", params); // 查看承诺书
@@ -147,4 +143,6 @@ export const findHiddenDetailMessage = (params) => post("/app/hidden/evaluation/
 export const getKeyProjectsVideoList = (params) => post("/app/keyProjects/videomanagerList", params); // 获取重点工程的视频列表
 export const loginVideoPlat = (params) => videoApiGet("/api/v1/login", params); // 登录视频监控平台
 export const getPlatVideoPlay = (params) => videoApiGet("/api/v1/stream/start", params); // 获取视频监控平台播放地址
+export const fileUpload = (params) => upload("/app/file/upload", params);
+export const fileUploads = (params) => uploads("/app/file/uploads", params);
 // 结束

main.js

@@ -2,7 +2,6 @@ import Vue from 'vue'
 import store from './store'
 import App from './App'
 import uView from 'uview-ui'
-
 import empty from '@/components/empty/empty.vue'
 import uniTable from '@/components/uni-table/uni-table/uni-table.vue'
 import uniTbody from '@/components/uni-table/uni-tbody/uni-tbody.vue'

pages/general-hidden-management/general-hidden/detail.vue

@@ -14,6 +14,7 @@
               <template v-else-if="form.SOURCE=='4'">安全环保检查(监管端)</template>
               <template v-else-if="form.SOURCE=='5'">安全环保检查(企业端)</template>
               <template v-else-if="form.SOURCE=='6'">消防检查</template>
+              <template v-else-if="form.SOURCE=='8'">点检隐患</template>
             </view>
           </u-cell>
           <u-cell>

pages/general-hidden-management/ignore-hidden/detail.vue

@@ -26,6 +26,9 @@
             <template v-else-if="form.SOURCE=='6'">
               消防检查
             </template>
+            <template v-else-if="form.SOURCE=='8'">
+              点检隐患
+            </template>
           </view>
         </u-cell>
         <u-cell>

pages/key-project-management/AI-warning/detail.vue

@@ -226,17 +226,14 @@
 <script>
 import {
   getKeyProjectsListAllPersonnel,
-  getHiddenLevel,
   getHiddenType,
   getKeyProjectsListAllUnits,
   getInspectionDepartment,
   getInspectionType,
   getInspectors,
-  setImgFilesAdd,
   setKeyProjectsAIWarningAdd,
-  setVideoAdd,
   getKeyProjectsAIWarningView
-} from "../../../api";
+} from "@/api";
 
 export default {
   data() {

pages/key-project-management/hidden-management/list.vue

@@ -146,6 +146,7 @@ export default {
         2: "AI报警(企业端)",
         4: "安全环保检查(监管端)",
         5: "安全环保检查(企业端)",
+        8: "点检隐患",
       },
       state: {
         1: "未整改",

pages/key-project-management/hidden-management/view.vue

@@ -184,7 +184,7 @@
 </template>
 
 <script>
-import {getKeyProjectsCheckCheck, getKeyProjectsCheckHiddenView, setImgFilesAdd} from "../../../api";
+import {fileUpload, getKeyProjectsCheckCheck, getKeyProjectsCheckHiddenView} from "@/api";
 
 export default {
   data() {
@@ -323,13 +323,15 @@ export default {
       })
     },
     async fnSetImgFilesAdd(imgFiles, FOREIGN_KEY,TYPE) {
-      return await setImgFilesAdd({
+      return await fileUpload({
-        files: imgFiles,
+        filePath: imgFiles,
+        name: "file",
         formData: {
-          FOREIGN_KEY,
+          foreignKey: FOREIGN_KEY,
-          TYPE
+          corpInfoId: this.$store.getters.getUserInfo.CORPINFO_ID,
+          type: TYPE,
         },
-        loading:false
+        loading: false
       })
     },
   },

pages/key-project-management/penalty-management/viewHidden.vue

@@ -177,7 +177,7 @@
 </template>
 
 <script>
-import {getKeyProjectsCheckCheck, getKeyProjectsCheckHiddenView, setImgFilesAdd} from "../../../api";
+import {fileUpload, getKeyProjectsCheckCheck, getKeyProjectsCheckHiddenView} from "@/api";
 
 export default {
   data() {
@@ -310,11 +310,13 @@ export default {
       })
     },
     async fnSetImgFilesAdd(imgFiles, FOREIGN_KEY, TYPE) {
-      return await setImgFilesAdd({
+      return await fileUpload({
-        files: imgFiles,
+        filePath: imgFiles,
+        name: "file",
         formData: {
-          FOREIGN_KEY,
+          foreignKey: FOREIGN_KEY,
-          TYPE
+          corpInfoId: this.$store.getters.getUserInfo.CORPINFO_ID,
+          type: TYPE,
         },
         loading: false
       })

pages/key-project-management/safety-environmental-inspection/detail.vue

@@ -312,12 +312,10 @@ import {
   getInspectionDepartment,
   getInspectionType,
   getInspectors,
-  setImgFilesAdd,
   setKeyProjectsCheckAdd,
-  setVideoAdd,
   getKeyProjectsCheckView,
-  getPERSONNELMANAGEMENTID
+  getPERSONNELMANAGEMENTID, fileUpload
-} from "../../../api";
+} from "@/api";
 
 export default {
   data() {
@@ -651,25 +649,25 @@ export default {
       })
     },
     async fnSetImgFilesAdd(imgFiles, FOREIGN_KEY, TYPE) {
-      return await setImgFilesAdd({
+      return await fileUpload({
-        files: imgFiles,
+        filePath: imgFiles,
+        name: "file",
         formData: {
-          FOREIGN_KEY,
+          foreignKey: FOREIGN_KEY,
-          TYPE
+          corpInfoId: this.$store.getters.getUserInfo.CORPINFO_ID,
+          type: TYPE,
         },
-        loading: false
+        loading:false
       })
     },
     async fnSetVideoAdd(filePath, FOREIGN_KEY) {
-      return await setVideoAdd({
+      return await fileUpload({
-        filePath,
+        filePath: filePath,
-        name: 'FFILE',
+        name: "file",
         formData: {
-          FOREIGN_KEY,
+          foreignKey: FOREIGN_KEY,
-          TYPE: 102,
+          corpInfoId: this.$store.getters.getUserInfo.CORPINFO_ID,
-          CORPINFO_ID: this.userInfo.CORPINFO_ID,
+          type: 102,
-          // CORPINFO_ID: this.CORPINFO_ID,
-
         },
         loading: false
       })

pages/larger-major-hidden-management/larger-hidden-management/detail.vue

@@ -17,6 +17,9 @@
             <template v-else-if="form.SOURCE=='3'">
               清单排查
             </template>
+            <template v-else-if="form.SOURCE=='8'">
+              点检隐患
+            </template>
           </view>
         </u-cell>
         <u-cell>

pages/larger-major-hidden-management/major-hidden-management/detail.vue

@@ -17,6 +17,9 @@
             <template v-else-if="form.SOURCE=='3'">
               清单排查
             </template>
+            <template v-else-if="form.SOURCE=='8'">
+              点检隐患
+            </template>
           </view>
         </u-cell>
         <u-cell>

pages/mine/promise/sign.vue

@@ -54,7 +54,7 @@
 
 <script>
 import sign from "../../../components/sign/sign";
-import {getPromiseInfo, setPromiseSign} from "../../../api";
+import {fileUpload, getPromiseInfo, setPromiseSign} from "../../../api";
 
 export default {
   components: {
@@ -98,13 +98,20 @@ export default {
         })
         return
       }
-      await setPromiseSign({
+      let res = await fileUpload({
         filePath: this.info.FILEPATH,
-        name: 'FFILE',
+        name: "file",
         formData: {
-          ...this.info,
+          foreignKey: this.userInfo.USER_ID,
-          CORPINFO_ID: this.userInfo.CORPINFO_ID
+          corpInfoId: this.userInfo.CORPINFO_ID,
+          type: 117,
         },
+        loading: false
+      })
+      await setPromiseSign({
+        ...this.info,
+        CORPINFO_ID: this.userInfo.CORPINFO_ID,
+        attachmentPath: res.data.filePath
       })
       uni.showToast({
         title: '添加成功',

pages/safety-environmental-inspection/initiate/detail.vue

@@ -390,6 +390,7 @@
 
 <script>
 import {
+  fileUpload,
   getDeptUser,
   getHiddenLevel,
   getHiddenRegion,
@@ -399,11 +400,9 @@ import {
   getInspectionType,
   getInspectors,
   getSafetyenvironmentalGoEdit,
-  setImgFilesAdd,
   setSafetyenvironmentalAdd, setSafetyenvironmentalAdd_plus,
-  setSafetyenvironmentalEdit, setSafetyenvironmentalEdit_plus,
+  setSafetyenvironmentalEdit, setSafetyenvironmentalEdit_plus
-  setVideoAdd
+} from "@/api";
-} from "../../../api";
 
 export default {
   data() {
@@ -767,10 +766,18 @@ export default {
       }
       let resData
       if (this.form.INSPECTION_USER_SIGN_IMG) {
-        let params = {
+        let res = await fileUpload({
           filePath: this.form.INSPECTION_USER_SIGN_IMG,
-          name: 'FFILE',
+          name: "file",
           formData: {
+            foreignKey: this.$store.getters.getUserInfo.USER_ID,
+            corpInfoId: this.$store.getters.getUserInfo.CORPINFO_ID,
+            type: 126,
+          },
+          loading: false
+        })
+
+        let params = {
             ...this.form,
             INSPECTION_ORIGINATOR_ID: this.userInfo.USER_ID,
             INSPECTION_STATUS: '1',
@@ -781,8 +788,8 @@ export default {
             INSPECTORJSON: JSON.stringify(this.form.inspectorList),
             SITUATIONJSON: JSON.stringify(this.form.situationList),
             HIDDENJSON: JSON.stringify(this.form.hiddenList),
+            CONFIRM_MESSAGE_SIGN_ROUTE: res.date.filePath,
             loading: false
-          }
         }
         resData = this.INSPECTION_ID ? await setSafetyenvironmentalEdit_plus(params) : await setSafetyenvironmentalAdd_plus(params)
       } else {
@@ -845,13 +852,15 @@ export default {
           console.log('ok')
         }
       }
-      return await setImgFilesAdd({
+      return await fileUpload({
-        files: imgFiles,
+        filePath: imgFiles,
+        name: "file",
         formData: {
-          FOREIGN_KEY,
+          foreignKey: FOREIGN_KEY,
-          TYPE: '3'
+          corpInfoId: this.$store.getters.getUserInfo.CORPINFO_ID,
+          type: 3,
         },
-        loading: false
+        loading:false
       })
     },
     async fnSetVideoAdd(filePath, FOREIGN_KEY) {
@@ -860,13 +869,13 @@ export default {
           console.log('ok')
         }
       }
-      return await setVideoAdd({
+      return await fileUpload({
-        filePath,
+        filePath: filePath,
-        name: 'FFILE',
+        name: "file",
         formData: {
-          FOREIGN_KEY,
+          foreignKey: FOREIGN_KEY,
-          TYPE: 102,
+          corpInfoId: this.$store.getters.getUserInfo.CORPINFO_ID,
-          CORPINFO_ID: this.userInfo.CORPINFO_ID,
+          type: 102,
         },
         loading: false
       })

pages/safety-environmental-inspection/inspector-archives/acceptance.vue

@@ -14,6 +14,7 @@
               <template v-else-if="data.SOURCE == '3'">清单排查</template>
               <template v-else-if="data.SOURCE == '4'">安全环保检查（监管端）</template>
               <template v-else-if="data.SOURCE == '5'">安全环保检查（企业端）</template>
+              <template v-else-if="data.SOURCE == '8'">点检隐患</template>
             </view>
           </u-cell>
           <u-cell>
@@ -450,7 +451,7 @@
 
 <script>
 
-import {getHiddenGoEdit, setFinalCheck, setImgFilesAdd, setVideoAdd} from "../../../api";
+import {fileUpload, getHiddenGoEdit, setFinalCheck} from "@/api";
 
 export default {
   data() {
@@ -622,11 +623,13 @@ export default {
     },
     async fnSetVideoAdd(imgFiles) {
       console.log(imgFiles)
-      return await setImgFilesAdd({
+      return await fileUpload({
-        files: imgFiles,
+        filePath: imgFiles,
+        name: "file",
         formData: {
-          FOREIGN_KEY: this.HIDDEN_ID,
+          foreignKey: this.HIDDEN_ID,
-          TYPE: '50'
+          corpInfoId: this.$store.getters.getUserInfo.CORPINFO_ID,
+          type: 50,
         },
         loading: false
       })

pages/safety-environmental-inspection/inspector-confirms/detail.vue

@@ -282,7 +282,7 @@
 </template>
 
 <script>
-import {getSafetyenvironmentalGoEdit, setSafetyenvironmentalVerify} from "../../../api";
+import {fileUpload, getSafetyenvironmentalGoEdit, setSafetyenvironmentalVerify} from "../../../api";
 import sign from "../../../components/sign/sign";
 
 export default {
@@ -391,10 +391,18 @@ export default {
         }
       }
       console.log(this.form.INSPECTION_USER_SIGN_IMG)
-      await setSafetyenvironmentalVerify({
+      // INSPECTION_USER_SIGN_IMG
+      let res = await fileUpload({
         filePath: this.form.INSPECTION_USER_SIGN_IMG,
-        name: 'FFILE',
+        name: "file",
         formData: {
+          foreignKey: this.INSPECTION_ID,
+          corpInfoId: this.$store.getters.getUserInfo.CORPINFO_ID,
+          type: 127,
+        },
+        loading: false
+      })
+      await setSafetyenvironmentalVerify({
           INSPECTION_STATUS,
           INSPECTION_ID: this.INSPECTION_ID,
           INSPECTION_INSPECTOR_ID: this.INSPECTION_INSPECTOR_ID,
@@ -403,7 +411,7 @@ export default {
           INSPECTION_USER_SIGN_TIME: uni.$u.timeFormat(new Date(), 'yyyy-mm-dd hh:MM'),
           ACTION_USER_ID: this.userInfo.USER_ID,
           ACTION_ID: this.userInfo.USER_ID,
-        },
+        NSPECTION_USER_SIGN_IMG: res.data.filePath
       })
       uni.showToast({
         title: '核查成功',

pages/super-hot/safety-director/detail.vue

@@ -284,12 +284,12 @@
 
 <script>
 import {
-  approveHotWorkSupervisionAndFfile,
+  approveHotWorkSupervisionAndFfile, fileUpload,
   getDept,
   getDeptUser,
   getHotWorkGoEdit,
   getImgfilesListByKeyAndType
-} from "../../../api";
+} from "@/api";
 import sign from "../../../components/sign/sign";
 
 export default {
@@ -384,16 +384,24 @@ export default {
           return false
         }
       }
-      let formData = {
+      let res = await fileUpload({
+        filePath: this.form.safetyDirectorSign,
+        name: "file",
+        formData: {
+          foreignKey: this.userInfo.USER_ID,
+          corpInfoId: this.userInfo.CORPINFO_ID,
+          type: 130,
+        },
+        loading: false
+      })
+      await approveHotWorkSupervisionAndFfile({
         'TYPE': this.form.TYPE,
         'HOTWORKAPPLICATION_ID': this.HOTWORKAPPLICATION_ID,
         'STATE': '37',
         'loginUserId': this.userInfo.USER_ID,
-        'CORPINFO_ID': this.userInfo.CORPINFO_ID
+        'CORPINFO_ID': this.userInfo.CORPINFO_ID,
-      }
+        'AUTOGRAPH': res.data.filePath
-      let rePD = {'filePath': this.form.safetyDirectorSign, name: 'FFILE', 'formData': formData}
+      })
-
-      await approveHotWorkSupervisionAndFfile({...rePD})
       uni.$u.route({
         type: 'navigateBack'
       })

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

@@ -279,7 +279,7 @@ import {
   getDept,
   getDeptUser,
   approveHotWorkSupervision,
-  setImgFilesListAdd
+  fileUploads
 } from '../../../api/index'
 
 export default {
@@ -439,14 +439,11 @@ export default {
         })
       }
       let formData1 = {
-        'TYPE': imgType,
+        'type': imgType,
-        'FOREIGN_KEY': this.HOTWORKAPPLICATION_ID,
+        'foreignKey': this.HOTWORKAPPLICATION_ID,
-        'CORPINFO_ID': this.userInfo.CORPINFO_ID,
+        'corpInfoId': this.userInfo.CORPINFO_ID,
       }
-      await setImgFilesListAdd({files: imgFiles1, formData: formData1})
+      await fileUploads({files: imgFiles1, formData: formData1})
-    },
-    goBack() {
-
     }
   },
 }