heyang

api/index.js

@@ -1401,13 +1401,6 @@ export const checkSign = (data) => {
     })
 };
 
-//问题整改重大项-判断是否上传电子签章
-export const queryDeptSignByUserId = (data) => {
-    return apiResquestForm({
-        url: '/base/app/sysuser/api/queryDeptSignByUserId ',
-        method: 'GET',
-    })
-};
 
 
 //获取检查单位
@@ -1551,15 +1544,6 @@ export const teacherApply = (data) => {
     })
 };
 
-//根据名称查询实验室
-export const subjectList = (data) => {
-    return apiResquestForm({
-        url: '/laboratory/subject/list/listAdmin',
-        method: 'GET',
-        data: data
-    })
-};
-
 //安全准入提交接口
 export const materialAdd  = (data) => {
     return apiResquest({
@@ -1885,3 +1869,327 @@ export const subjectTriggerModes = (data) => {
         method: 'GET',
     })
 };
+/**************************3.3.3新安全检查**************************/
+//查询人员身份标识
+export const getGentleIdentifier  = (data) => {
+    return apiResquest({
+        url: `/security/checkSet/getGentle`,
+        method: 'GET',
+        data: data,
+    })
+};
+//数据统计
+export const dataStatistics  = (data) => {
+    return apiResquest({
+        url: `/security/DataStatistics/countApp`,
+        method: 'GET',
+        data: data,
+    })
+};
+//巡查计划-查询是否院级用户
+export const isSCollege  = (data) => {
+    return apiResquest({
+        url: `/security/collegCheck/isSCollege`,
+        method: 'GET',
+        data: data,
+    })
+};
+//巡查计划--添加
+export const checkPlanAdd  = (data) => {
+    return apiResquest({
+        url: `/zd-security/checkPlan/appAdd`,
+        method: 'POST',
+        data: {...data}
+    })
+};
+//巡查计划--列表
+export const checkPlanList  = (data) => {
+    return apiResquest({
+        url: `/zd-security/checkPlan/appList`,
+        method: 'POST',
+        data: {...data}
+    })
+};
+//巡查计划--详情
+export const checkPlanById  = (data) => {
+    return apiResquest({
+        url: `/zd-security/checkPlan/appFindCheckPlan`,
+        method: 'GET',
+        data: data,
+    })
+};
+//巡查计划--修改
+export const checkPlanEdit  = (data) => {
+    return apiResquest({
+        url: `/zd-security/checkPlan/appUpdate`,
+        method: 'PUT',
+        data: {...data}
+    })
+};
+//巡查计划--检查计划各检查状态数据数量
+export const getCheckStatusCount  = (data) => {
+    return apiResquest({
+        url: `/zd-security/checkPlan/getCheckStatusCount`,
+        method: 'GET',
+        data: data,
+    })
+};
+//各检查状态数据数量
+export const getManageStatusCount  = (data) => {
+    return apiResquest({
+        url: `/zd-security/checkManage/getManageStatusCount`,
+        method: 'GET',
+        data: data,
+    })
+};
+//巡查计划--获取巡查组列表
+export const checkGroupList  = (data) => {
+    return apiResquest({
+        url: `/zd-security/checkGroup/appFindGroupList`,
+        method: 'POST',
+        data: {...data}
+    })
+};
+//巡查计划--巡查组详情
+export const checkGroupDetail  = (data) => {
+    return apiResquest({
+        url: `/zd-security/checkGroup/appFind`,
+        method: 'GET',
+        data: data,
+    })
+};
+//巡查计划--查询学院数据
+export const conditionCollegeInfo  = (data) => {
+    return apiResquest({
+        url: `/laboratory/subject/conditionCollegeInfo`,
+        method: 'GET',
+        data: data,
+    })
+};
+//巡查计划--条件查询实验室信息（分页）
+export const conditionSubjectInfo  = (data) => {
+    return apiResquest({
+        url: `/laboratory/subject/conditionSubjectInfo`,
+        method: 'POST',
+        data: {...data}
+    })
+};
+//巡查计划--全校学院/实验室数量
+export const getAllSubNum  = (data) => {
+    return apiResquest({
+        url: `/laboratory/subject/getAllSubNum`,
+        method: 'GET',
+        data: data,
+    })
+};
+//巡查计划--添加
+export const findByCheckPlanId  = (data) => {
+    return apiResquest({
+        url: `/zd-security/checkManage/appFindByCheckPlanId`,
+        method: 'POST',
+        data: {...data}
+    })
+};
+
+//随手拍-----------------------------------------------------
+//随手拍--添加
+export const checkClapAdd  = (data) => {
+    return apiResquest({
+        url: `/security/checkClap/appAdd`,
+        method: 'POST',
+        data: {...data}
+    })
+};
+//随手拍--管理列表
+export const checkClapList  = (data) => {
+    return apiResquest({
+        url: `/security/checkClap/appList`,
+        method: 'GET',
+        data: data,
+    })
+};
+//随手拍--上报记录-列表
+export const checkClapMylist  = (data) => {
+    return apiResquest({
+        url: `/security/checkClap/mylist`,
+        method: 'GET',
+        data: data,
+    })
+};
+//随手拍--获取当前登录人身份信息
+export const getUserCollegCheck  = (data) => {
+    return apiResquest({
+        url: `/security/collegCheck/getloginUser`,
+        method: 'GET',
+        data: data,
+    })
+};
+
+//随手拍--详情
+export const checkClapById  = (data) => {
+    return apiResquest({
+        url: `/security/checkClap/appFindById`,
+        method: 'GET',
+        data: data,
+    })
+};
+//随手拍--整改
+export const checkClapRectify  = (data) => {
+    return apiResquest({
+        url: `/security/checkClap/clapApprove`,
+        method: 'POST',
+        data: {...data}
+    })
+};
+//根据名称查询实验室
+export const subjectList = (data) => {
+    return apiResquestForm({
+        url: '/laboratory/subject/list/listAdmin',
+        method: 'GET',
+        data: data
+    })
+};
+
+//开展检查-------------------------------------------
+//开展检查-获取巡查计划管理列表
+export const checkManageList  = (data) => {
+    return apiResquest({
+        url: `/zd-security/checkManage/appList`,
+        method: 'POST',
+        data: {...data}
+    })
+};
+//开展检查-安全隐患列表(在开展检查列表里待复核)
+export const checkHazardList = (data) => {
+    return apiResquestForm({
+        url: '/security/checkHazard/appList',
+        method: 'GET',
+        data: data
+    })
+};
+//开展检查-通过id查询巡查管理
+export const findCheckManage = (data) => {
+    return apiResquestForm({
+        url: '/zd-security/checkManage/appFindCheckManage',
+        method: 'GET',
+        data: data
+    })
+};
+//开展检查--新增-该实验室没有计划的时候
+export const checkManageAdd  = (data) => {
+    return apiResquest({
+        url: `/zd-security/checkManage/add`,
+        method: 'POST',
+        data: {...data}
+    })
+};
+//开展检查--新增--有计划的时候
+export const checkManageUpdate  = (data) => {
+    return apiResquest({
+        url: `/zd-security/checkManage/appUpdate`,
+        method: 'PUT',
+        data: {...data}
+    })
+};
+//项目检查库-树状列表
+export const checkOptionListNew = (data) => {
+    return apiResquestForm({
+        url: '/zd-security/checkOption/list',
+        method: 'GET',
+        data: data
+    })
+};
+//开展检查-根据实验室id查询该实验室有关计划
+export const getCheckPlanBySubId = (data) => {
+    return apiResquestForm({
+        url: '/zd-security/checkManage/getCheckPlanBySubId',
+        method: 'GET',
+        data: data
+    })
+};
+//开展检查-根据实验室id查询该实验室有关计划
+export const buildBySub = (data) => {
+    return apiResquestForm({
+        url: '/laboratory/subject/buildBySub/list',
+        method: 'GET',
+        data: data
+    })
+};
+//开展检查-根据计划id查询附件列表
+export const findByPlanIdAttachment = (data) => {
+    return apiResquestForm({
+        url: '/zd-security/upload/findByCheckPlanId',
+        method: 'GET',
+        data: data
+    })
+};
+
+
+//问题整改重大项-判断是否上传电子签章
+export const queryDeptSignByUserId = (data) => {
+    return apiResquestForm({
+        url: '/base/app/sysuser/api/queryDeptSignByUserId',
+        method: 'GET',
+    })
+};
+//安全隐患---------------------------------------------------------------
+//开展检查-安全隐患列表
+export const checkHazardAppList = (data) => {
+    return apiResquestForm({
+        url: '/security/checkHazard/appCheckHazardList',
+        method: 'GET',
+        data: data
+    })
+};
+//开展检查-安全隐患详情
+export const getHazardById = (data) => {
+    return apiResquestForm({
+        url: '/security/checkHazard/getAppHazardById',
+        method: 'GET',
+        data: data
+    })
+};
+//开展检查-获取巡查计划管理列表
+export const checkHazardAdd  = (data) => {
+    return apiResquest({
+        url: `/security/checkRectify/addOrApprove`,
+        method: 'POST',
+        data: {...data}
+    })
+};
+//开展检查-安全信息牌
+export const getInforSign = (data) => {
+    return apiResquestForm({
+        url: `/laboratory/subject/manger/subQuery/`+data+`/0`,
+        method: 'GET',
+    })
+};
+
+//公共---------------------------------------------------------------------------
+
+
+//根据学院id查询楼栋
+export const getBuildingList  = (data) => {
+    return apiResquest({
+        url: `/system/dept/`+data+`/building/list`,
+        method: 'GET',
+    })
+};
+
+//查询楼栋/楼层数据  楼栋type:2  楼层type:3 parentId:楼栋ID
+export const buildFloorGetlist  = (data) => {
+    return apiResquestForm({
+        url: `/laboratory/buildFloor/getlist`,
+        method: 'GET',
+        data: data
+    })
+};
+
+//根据楼栋ID查询实验室  buildId:60
+export const buildBySubList  = (data) => {
+    return apiResquestForm({
+        url: `/laboratory/subject/buildBySub/list`,
+        method: 'GET',
+        data: data
+    })
+};

pages.json

@@ -1,6 +1,30 @@
 {
 	"pages": [
-
+		{
+		   "path": "pages/gasBottle/stockList/storageAdd",
+		   "style": {
+		      "navigationBarTitleText": "新增入库",
+		      "navigationBarTextStyle": "white", 
+		      "navigationBarBackgroundColor": "#0183FA" 
+		   }
+		},
+		{
+		   "path": "pages/gasBottle/stockList/stockList",
+		   "style": {
+		      "navigationBarTitleText": "库存列表",
+		      "navigationBarTextStyle": "white", 
+		      "navigationBarBackgroundColor": "#0183FA" 
+		   }
+		},
+		{
+		   "path": "pages/gasBottle/gasManage/gasManage",
+		   "style": {
+		      "navigationBarTitleText": "用气管理",
+		      "navigationBarTextStyle": "white", 
+		      "navigationBarBackgroundColor": "#0183FA"
+		   }
+		},
+		
 
 		{
 			"path": "pages/home",//首页
@@ -11,6 +35,14 @@
 				"navigationStyle": "custom"
 			}
 		},
+		{
+		   "path": "pages/safetyExamineWorkbench",//安全检查
+		   "style": {
+		      "navigationBarTitleText": "安全检查",
+		      "navigationBarTextStyle": "white", //导航文字颜色
+		      "navigationBarBackgroundColor": "#0183FA" //导航背景色
+		   }
+		},
 
 		/* 预警信息 */
 

pages/manageWorkbench.vue

@@ -112,7 +112,7 @@
 <script>
 import $mqtt from '@/utils/mqtt.min.js';
 import { config } from '@/api/request/config.js'
-import { appReceivePhotoNote,getApprovalCount,subject_class,getSafeWarnList,laboratoryInfo,laboratoryList,getLoginUserInfo,outSubjectPhoto,gradingControl,listData} from '@/api/index.js'
+import { appReceivePhotoNote,getApprovalCount,subject_class,getSafeWarnList,laboratoryInfo,laboratoryList,getLoginUserInfo,outSubjectPhoto,gradingControl,listData,getGentleIdentifier} from '@/api/index.js'
 import { tabBar } from '@/component/tabBar.vue'
 import { topWarn } from '@/component/topWarn.vue'
 import { navBar } from '@/component/navbar.vue'
@@ -404,7 +404,7 @@ export default {
     goPage(type){
       if(type=='casuallyPat'){
         uni.navigateTo({
-          url: '/pages/casuallyPat',//随手拍
+            url: '/pages_safetyExamine/snapshotManage/snapshotAdd'
         });
       }else if(type=='receiveCasuallyPat'){//收到随手拍
         uni.navigateTo({