heyang 2 vuotta sitten
vanhempi
commit
9268b9b414
100 muutettua tiedostoa jossa 15 lisäystä ja 13324 poistoa
  1. 14 868
      pages.json
  2. 0 387
      pages/casuallyPat.vue
  3. 0 415
      pages/fingerprint.vue
  4. 1 7
      pages/home.vue
  5. 0 487
      pages/studentWorkbench.vue
  6. 0 89
      pages/supplier/mine/forbidden.vue
  7. 0 97
      pages/supplier/mine/hasten.vue
  8. 0 118
      pages/supplier/mine/reject.vue
  9. 0 445
      pages/supplierWorkbench.vue
  10. 0 268
      pages_manage/aptitudeAudit/aptitudeAudit.vue
  11. 0 474
      pages_manage/aptitudeAudit/aptitudeAuditCheck.vue
  12. 0 259
      pages_manage/aptitudeAudit/aptitudeAuditDetail.vue
  13. 0 2310
      pages_manage/emergencyEvacuationBig.vue
  14. 0 677
      pages_manage/emergencyEvacuationBigFullScreen.vue
  15. 0 200
      pages_manage/examination/examination.vue
  16. 0 743
      pages_manage/examination/examinationAdd.vue
  17. 0 286
      pages_manage/examination/examinationDetail.vue
  18. 0 407
      pages_manage/examination/examinationSelect.vue
  19. 0 528
      pages_manage/gasApply/awaitStorage.vue
  20. 0 203
      pages_manage/gasApply/gasApply.vue
  21. 0 469
      pages_manage/gasApply/gasApplyAdd.vue
  22. 0 311
      pages_manage/gasApply/gasApplyList.vue
  23. 0 256
      pages_manage/gasApply/gasApplyReject.vue
  24. 0 168
      pages_manage/gasList/gasList.vue
  25. 0 211
      pages_manage/gasList/gasListBinding.vue
  26. 0 351
      pages_manage/gasList/gasListDetail.vue
  27. 0 242
      pages_manage/gasList/gasUseDetail.vue
  28. 0 358
      pages_manage/gasManage/gasManage.vue
  29. 0 290
      pages_manage/gradingControl/gradingControl.vue
  30. 0 644
      pages_manage/gradingControl/gradingControlAdd.vue
  31. 0 450
      pages_manage/gradingControl/gradingControlDetail.vue
  32. 0 306
      pages_manage/gradingControl/gradingControlFinish.vue
  33. BIN
      pages_manage/images/Version2.2/for_min_bg.png
  34. BIN
      pages_manage/images/Version2.2/icon-aqjc_fzr.png
  35. BIN
      pages_manage/images/Version2.2/icon_aqjc_czwt.png
  36. BIN
      pages_manage/images/Version2.2/icon_aqjc_sm.png
  37. BIN
      pages_manage/images/Version2.2/icon_aqjc_sq.png
  38. BIN
      pages_manage/images/Version2.2/icon_aqjc_sq_two.png
  39. BIN
      pages_manage/images/Version2.2/icon_aqjc_sysxx.png
  40. BIN
      pages_manage/images/Version2.2/icon_aqjc_yhsl.png
  41. BIN
      pages_manage/images/Version2.2/icon_aqjc_zgxx.png
  42. BIN
      pages_manage/images/Version2.2/icon_bg_ywc.png
  43. BIN
      pages_manage/images/Version2.2/icon_jcjl_dh.png
  44. BIN
      pages_manage/images/Version2.2/icon_jcjl_xm.png
  45. BIN
      pages_manage/images/Version2.2/icon_wtj.png
  46. BIN
      pages_manage/images/Version2.2/icon_wtzg_sj.png
  47. BIN
      pages_manage/images/Version2.2/icon_wtzg_xx.png
  48. BIN
      pages_manage/images/Version2.2/icon_xzwt_kzt.png
  49. BIN
      pages_manage/images/Version2.3/icon_pdf.png
  50. BIN
      pages_manage/images/Version2.3/icon_sczl_sc.png
  51. BIN
      pages_manage/images/Version2.3/icon_word.png
  52. BIN
      pages_manage/images/Version3.0/icon_qpgl_syl.png
  53. BIN
      pages_manage/images/Version3.0/icon_sqqp_sqys.png
  54. BIN
      pages_manage/images/Version3.0/icon_sqxq_jsyy.png
  55. BIN
      pages_manage/images/Version3.0/icon_sydj_sqyqzg.png
  56. BIN
      pages_manage/images/Version3.0/icon_sydj_yubz.png
  57. BIN
      pages_manage/images/Version3.0/icon_xgzl_shz.png
  58. BIN
      pages_manage/images/Version3.0/icon_yqsq_sys.png
  59. BIN
      pages_manage/images/Version3.0/icon_ysclgl_cl.png
  60. BIN
      pages_manage/images/Version3.0/icon_zgsh_sysmph.png
  61. BIN
      pages_manage/images/Version3.0/icon_zgsq_dhh.png
  62. BIN
      pages_manage/images/Version3.0/icon_zgsq_j.png
  63. BIN
      pages_manage/images/Version3.0/icon_zgsq_jian.png
  64. BIN
      pages_manage/images/Version3.0/icon_zgsq_sqr.png
  65. BIN
      pages_manage/images/Version3.0/img_sydj_sltp.png
  66. BIN
      pages_manage/images/Version3.0/img_ysrygl_zwsj.png
  67. BIN
      pages_manage/images/icon_04.png
  68. BIN
      pages_manage/images/icon_06.png
  69. BIN
      pages_manage/images/icon_06_1.png
  70. BIN
      pages_manage/images/icon_07.png
  71. BIN
      pages_manage/images/icon_10.png
  72. BIN
      pages_manage/images/icon_11.png
  73. BIN
      pages_manage/images/icon_14.png
  74. BIN
      pages_manage/images/icon_15.png
  75. BIN
      pages_manage/images/icon_5.png
  76. BIN
      pages_manage/images/icon_6.png
  77. BIN
      pages_manage/images/icon_aqbj_sj.png
  78. BIN
      pages_manage/images/icon_aqjc_ss.png
  79. BIN
      pages_manage/images/icon_aqxxp_dxaq.png
  80. BIN
      pages_manage/images/icon_aqxxp_gbmc.png
  81. BIN
      pages_manage/images/icon_aqxxp_gbsd.png
  82. BIN
      pages_manage/images/icon_aqxxp_gzf.png
  83. BIN
      pages_manage/images/icon_aqxxp_jzxy.png
  84. BIN
      pages_manage/images/icon_aqxxp_jzys.png
  85. BIN
      pages_manage/images/icon_hy_yc.png
  86. BIN
      pages_manage/images/icon_hy_zc.png
  87. BIN
      pages_manage/images/icon_jlfgz_gb.png
  88. BIN
      pages_manage/images/icon_mh.png
  89. BIN
      pages_manage/images/icon_sskz_azsh.png
  90. BIN
      pages_manage/images/icon_sskz_skfs.png
  91. BIN
      pages_manage/images/icon_sskz_xz.png
  92. BIN
      pages_manage/images/icon_sskz_zc.png
  93. BIN
      pages_manage/images/icon_ssp_closure.png
  94. BIN
      pages_manage/images/icon_sy_mhwc.png
  95. BIN
      pages_manage/images/icon_sy_wt.png
  96. BIN
      pages_manage/images/icon_wd_yc.png
  97. BIN
      pages_manage/images/icon_wd_zc.png
  98. BIN
      pages_manage/images/icon_wdwg_gd.png
  99. BIN
      pages_manage/images/icon_yw_yc.png
  100. 0 0
      pages_manage/images/icon_yw_zc.png

+ 14 - 868
pages.json

@@ -1,16 +1,5 @@
 {
 	"pages": [
-		
-	
-	
-		
-		
-		
-		
-		
-		
-		
-		
 		{
 			"path": "pages/safetyExamineWorkbench",//安全检查
 			"style": {
@@ -27,31 +16,7 @@
 				"navigationBarBackgroundColor": "#0183FA" //导航背景色
 			}
 		},
-		
-		{
-			"path": "pages/supplierWorkbench",
-			"style": {
-				"navigationBarTitleText": "供应商管理平台"
-			}
-		},
-		{
-			"path": "pages/supplier/mine/forbidden",//停用
-			"style": {
-				"navigationBarTitleText": "供应商管理平台"
-			}
-		},
-		{
-			"path": "pages/supplier/mine/reject",
-			"style": {
-				"navigationBarTitleText": "驳回"
-			}
-		},
-		{
-			"path": "pages/supplier/mine/hasten",
-			"style": {
-				"navigationBarTitleText": "立即催办"
-			}
-		},
+
 
 		{
 			"path": "pages/mine",//我的
@@ -76,12 +41,7 @@
 				"navigationBarTitleText": "身份验证"
 			}
 		},
-		{
-			"path": "pages/casuallyPat",//随手拍
-			"style": {
-				"navigationBarTitleText": "随手拍"
-			}
-		},
+
 		{
 			"path": "pages/information/information",//消息
 			"style": {
@@ -106,14 +66,7 @@
 				"navigationBarTitleText": ""
 			}
 		},
-		{
-			"path": "pages/fingerprint",//指纹信息
-			"style": {
-				"navigationBarTitleText": "指纹信息",
-				"navigationBarTextStyle": "white", //导航文字颜色
-				"navigationBarBackgroundColor": "#0183FA" //导航背景色
-			}
-		},
+
 
 		{
 			"path": "pages/avatar",//修改头像
@@ -126,7 +79,7 @@
 
 	"subPackages": [
 		{
-			
+
 			/* 安全检查分包 */
 			"root": "pages_safetyExamine",  //分包根路径
 			"name": "safetyExamine", //分包名字可写可不写
@@ -220,7 +173,7 @@
 					"style": {
 						"navigationBarTitleText": "随手拍上报"
 					}
-				},	
+				},
 				{
 					"path": "snapshotManage/snapshotList",
 					"style": {
@@ -233,831 +186,24 @@
 						"navigationBarTitleText": "安全信息牌"
 					}
 				}
-				
+
 			]
 		},
-		{
-			
-			/* 供应商端分包 */
-			"root": "pages_supplier",  //分包根路径
-			"name": "supplier", //分包名字可写可不写
+		{/* 管理端分包 */
+			"root": "pages_manage",  //分包根路径
+			"name": "manage", //分包名字可写可不写
 			"pages": [
-				/* 供应商端 ----------------------*/
-				/* 待办事项 */
-				{
-					"path": "backlogManage/backlogManage",
-					"style": {
-						"navigationBarTitleText": "待办清单"
-					}
-				},
-				{
-					"path": "backlogManage/backlogManageAirDetail",
-					"style": {
-						"navigationBarTitleText": "配送申请"
-					}
-				},
-				{
-					"path": "backlogManage/backlogManageRecycleDetail",
-					"style": {
-						"navigationBarTitleText": "回收申请"
-					}
-				},
-				{
-					"path": "backlogManage/backlogManageIssueDetail",
-					"style": {
-						"navigationBarTitleText": "货品问题"
-					}
-				},
-
-				/* 气瓶管理 */
-				{
-					"path": "gasManage/gasManageDetail",
-					"style": {
-						"navigationBarTitleText": "气瓶详情"
-					}
-				},
-				{
-					"path": "gasManage/gasManageAdd",
-					"style": {
-						"navigationBarTitleText": "新增气瓶"
-					}
-				},
-				{
-					"path": "gasManage/gasManage",
-					"style": {
-						"navigationBarTitleText": "气瓶管理"
-					}
-				},
-				/* 运输车辆 */
-				{
-					"path": "transportCar/transportCar",
-					"style": {
-						"navigationBarTitleText": "运输车辆管理"
-					}
-				},
-				{
-					"path": "transportCar/transportCarDetail",
-					"style": {
-						"navigationBarTitleText": "查看运输车辆"
-					}
-				},
-				{
-					"path": "transportCar/transportCarAdd",
-					"style": {
-						"navigationBarTitleText": "新增运输车辆"
-					}
-				},
-
-
-
-
-				/* 运输人员 */
-				{
-					"path": "transportPerson/transportPersonDetail",
-					"style": {
-						"navigationBarTitleText": "查看运输人员"
-					}
-				},
-				{
-					"path": "transportPerson/transportPersonAdd",
-					"style": {
-						"navigationBarTitleText": "新增运输人员"
-					}
-				},
-				{
-					"path": "transportPerson/transportPerson",
-					"style": {
-						"navigationBarTitleText": "运输人员管理"
-					}
-				},
-				/* 供气回收记录 */
-				{
-					"path": "gasRecycle/gasRecycleAirDetail",
-					"style": {
-						"navigationBarTitleText": "配送申请"
-					}
-				},
-				{
-					"path": "gasRecycle/gasRecycleRecycleDetail",
-					"style": {
-						"navigationBarTitleText": "回收申请"
-					}
-				},
-				{
-					"path": "gasRecycle/gasRecycleIssueDetail",
-					"style": {
-						"navigationBarTitleText": "货品问题"
-					}
-				},
-				{
-					"path": "gasRecycle/gasRecycle",
-					"style": {
-						"navigationBarTitleText": "供气回收记录"
-					}
-				},
-
-
-
-				/* 个人中心 */
-
-				{
-					"path": "mine/changePassword",
-					"style": {
-						"navigationBarTitleText": "修改密码"
-					}
-				},
-				{
-					"path": "mine/mine",
-					"style": {
-						"navigationBarTitleText": "资料信息"
-					}
-				},
-
-				/* 注册 */
-
-				{
-					"path": "register/forgotPassword",//忘记密码
-					"style": {
-						"navigationBarTitleText": "密码重置申请"
-					}
-				},
-				{
-					"path": "register/registerSuccess",//注册
-					"style": {
-						"navigationBarTitleText": "申请入驻"
-					}
-				},
-
-				{
-					"path": "register/register",//注册
-					"style": {
-						"navigationBarTitleText": "注册"
-					}
-				},
 				{
-					"path": "register/registerTow",//注册
+					"path": "workbench/signature/signature",//电子签名
 					"style": {
-						"navigationBarTitleText": "注册"
-					}
-				}
-			]
-		},
-		{
-			/* 学生端分包 */
-			"root": "pages_student",  //分包根路径
-			"name": "student", //分包名字可写可不写
-			"pages": [
-				/* 分级管控 */
-				{
-					"path": "gradingControl/gradingControl",//分级管控
-					"style": {
-						"navigationBarTitleText": "分级管控"
-					}
-				},
-				{
-					"path": "gradingControl/gradingControlFinish",//分级管控-完成列表
-					"style": {
-						"navigationBarTitleText": "分级管控"
-					}
-				},
-				{
-					"path": "gradingControl/gradingControlAdd",//分级管控-添加
-					"style": {
-						"navigationBarTitleText": "分级管控"
-					}
-				},
-				{
-					"path": "gradingControl/gradingControlDetail",//分级管控-详情
-					"style": {
-						"navigationBarTitleText": "分级管控"
-					}
-				},
-				//用户端
-				{
-					"path": "mine/codeSuccess",//扫码成功
-					"style": {
-						"navigationBarTitleText": "扫码成功"
-					}
-				},
-				{
-					"path": "mine/creditPoints",//信用分记录
-					"style": {
-						"navigationBarTitleText": "信用分记录",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "mine/rewardPoints",//奖励分记录
-					"style": {
-						"navigationBarTitleText": "奖励分记录",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "mine/upStudentCard",//学生卡上传
-					"style": {
-						"navigationBarTitleText": "学生卡上传"
-					}
-				},
-				{
-					"path": "mine/pointsRecord",//积分记录
-					"style": {
-						"navigationBarTitleText": "积分记录"
-					}
-				},
-				{
-					"path": "workbench/meViolation",//我的违规
-					"style": {
-						"navigationBarTitleText": "我的违规"
-					}
-				},
-				{
-					"path": "workbench/photoInspection",//离开检查
-					"style": {
-						"navigationBarTitleText": "离开检查"
-					}
-				},
-				{
-					"path": "workbench/resultInquiry",//我的成绩
-					"style": {
-						"navigationBarTitleText": "我的成绩"
-					}
-				},
-				{
-					"path": "workbench/safeAccess/safeAccess",//安全准入
-					"style": {
-						"navigationBarTitleText": "我的准入"
-					}
-				},
-				{
-					"path": "workbench/safeAccess/chooseALaboratory",//选择实验室
-					"style": {
-						"navigationBarTitleText": "安全准入"
-					}
-				},
-				{
-					"path": "workbench/safeAccess/newApplication",//选择实验室
-					"style": {
-						"navigationBarTitleText": "准入申请"
-					}
-				},
-				{
-					"path": "workbench/safeAccess/accessApplication",//准入申请
-					"style": {
-						"navigationBarTitleText": "安全准入"
-					}
-				},
-				{
-					"path": "workbench/safeAccess/applicationDetails",//申请详情
-					"style": {
-						"navigationBarTitleText": ""
-					}
-				},
-				{
-					"path": "workbench/exam/examList",//在线考试
-					"style": {
-						"navigationBarTitleText": "在线考试"
-					}
-				},
-				{
-					"path": "workbench/exam/examInfo",//开始考试
-					"style": {
-						"navigationBarTitleText": ""
-					}
-				},
-				/* 气瓶归还登记 */
-				{
-					"path": "leaveConfirm/amendAir",
-					"style": {
-						"navigationBarTitleText": "修改气压"
-					}
-				},
-				{
-					"path": "leaveConfirm/leaveConfirm",
-					"style": {
-						"navigationBarTitleText": "出库确认"
-					}
-				},
-				/* 气瓶归还登记 */
-				{
-					"path": "useRegister/giveRegister",
-					"style": {
-						"navigationBarTitleText": "归还登记"
-					}
-				},
-				/* 气瓶使用登记 */
-				{
-					"path": "useRegister/useRegister",
-					"style": {
-						"navigationBarTitleText": "使用登记"
-					}
-				},
-				/* 气瓶使用记录 */
-				{
-					"path": "useRecord/useRecordDetail",
-					"style": {
-						"navigationBarTitleText": "使用详情"
-					}
-				},
-				{
-					"path": "useRecord/useRecord",
-					"style": {
-						"navigationBarTitleText": "使用记录"
-					}
-				},
-				/* 气瓶列表 */
-				{
-					"path": "gasList/gasListBinding",
-					"style": {
-						"navigationBarTitleText": "气瓶详情"
-					}
-				},
-				{
-					"path": "gasList/gasUseDetail",
-					"style": {
-						"navigationBarTitleText": "使用详情"
-					}
-				},
-				{
-					"path": "gasList/gasListDetail",
-					"style": {
-						"navigationBarTitleText": "气瓶详情"
-					}
-				},
-				{
-					"path": "gasList/gasList",
-					"style": {
-						"navigationBarTitleText": "气瓶列表"
-					}
-				},
-				/* 气瓶申请 */
-				{
-					"path": "gasApply/awaitStorage",
-					"style": {
-						"navigationBarTitleText": "待入库"
-					}
-				},
-				{
-					"path": "gasApply/gasApplyReject",
-					"style": {
-						"navigationBarTitleText": "拒收气瓶"
-					}
-				},
-				{
-					"path": "gasApply/gasApplyList",
-					"style": {
-						"navigationBarTitleText": "申请详情"
-					}
-				},
-				{
-					"path": "gasApply/gasApplyAdd",//添加
-					"style": {
-						"navigationBarTitleText": "申请气瓶"
-					}
-				},
-				{
-					"path": "gasApply/gasApply",
-					"style": {
-						"navigationBarTitleText": "气瓶申请"
-					}
-				},
-
-				/* 资格申请 */
-				{
-					"path": "examination/examinationSelect",//添加
-					"style": {
-						"navigationBarTitleText": "选择气瓶"
-					}
-				},
-				{
-					"path": "examination/examinationDetail",//详情
-					"style": {
-						"navigationBarTitleText": "资格申请"
-					}
-				},
-				{
-					"path": "examination/examinationAdd",//添加
-					"style": {
-						"navigationBarTitleText": "资格申请"
-					}
-				},
-				{
-					"path": "examination/examinationSucceed",
-					"style": {
-						"navigationBarTitleText": "资格申请"
-					}
-				},
-				{
-					"path": "examination/examination",
-					"style": {
-						"navigationBarTitleText": "资格申请"
-					}
-				},
-				{
-					"path": "gasManage/gasManage",
-					"style": {
-						"navigationBarTitleText": "用气管理"
-					}
-				},
-				/* 用气申请 */
-				{
-					"path": "useGasApply/useGasApply",
-					"style": {
-						"navigationBarTitleText": "用气申请"
-					}
-				},
-				{
-					"path": "useGasApply/useGasApplyAdd",
-					"style": {
-						"navigationBarTitleText": "申请用气"
-					}
-				},
-				{
-					"path": "useGasApply/useGasApplyDetail",
-					"style": {
-						"navigationBarTitleText": "申请详情"
-					}
-				}
-			]
-		},
-		{/* 管理端分包 */
-			"root": "pages_manage",  //分包根路径
-			"name": "manage", //分包名字可写可不写
-			"pages": [
-				{
-					"path": "emergencyEvacuationBig",//应急疏散
-					"style": {
-						"navigationBarTitleText": "风险处置"
-					}
-				},
-				{
-					"path": "emergencyEvacuationBigFullScreen",//应急疏散
-					"style": {
-						"navigationBarTitleText": "风险处置",
-						"pageOrientation": "landscape"
-					}
-				},
-
-				/* 分级管控 */
-				{
-					"path": "gradingControl/gradingControl",//分级管控
-					"style": {
-						"navigationBarTitleText": "分级管控"
-					}
-				},
-				{
-					"path": "gradingControl/gradingControlFinish",//分级管控-完成列表
-					"style": {
-						"navigationBarTitleText": "分级管控"
-					}
-				},
-				{
-					"path": "gradingControl/gradingControlAdd",//分级管控-添加
-					"style": {
-						"navigationBarTitleText": "分级管控"
-					}
-				},
-				{
-					"path": "gradingControl/gradingControlDetail",//分级管控-详情
-					"style": {
-						"navigationBarTitleText": "分级管控"
-					}
-				},
-				{
-					"path": "workbench/receiveCasuallyPat/receiveCasuallyPat",//收到随手拍
-					"style": {
-						"navigationBarTitleText": "收到随手拍"
-					}
-				},
-				{
-					"path": "workbench/receiveCasuallyPat/casuallyPatInfo",//收到随手拍详情
-					"style": {
-						"navigationBarTitleText": "随手拍"
-					}
-				},
-				{
-					"path": "workbench/accessQualification/accessQualification",//准入资格证书
-					"style": {
-						"navigationBarTitleText": "准入审核"
-					}
-				},
-				{
-					"path": "workbench/accessQualification/accessQualificationInfo",//准入资格证书申请详情
-					"style": {
-						"navigationBarTitleText": ""
-					}
-				},
-				{
-					"path": "workbench/accessQualification/approve",//不通过原因
-					"style": {
-						"navigationBarTitleText": "审核未通过"
-					}
-				},
-				{
-					"path": "workbench/laboratory/meLaboratory",//我的实验室
-					"style": {
-						"navigationBarTitleText": "我的实验室"
-					}
-				},
-				{
-					"path": "workbench/laboratory/laboratoryInfo",//实验室详情
-					"style": {
-						"navigationBarTitleText": "实验室详情"
-					}
-				},
-				{
-					"path": "workbench/securityAlert/securityAlertList",//安全警报
-					"style": {
-						"navigationBarTitleText": "安全报警"
-					}
-				},
-				{
-					"path": "workbench/securityAlert/todayList",//今日警报
-					"style": {
-						"navigationBarTitleText": "今日警报"
-					}
-				},
-				{
-					"path": "workbench/securityAlert/yesterdayList",//昨日警报
-					"style": {
-						"navigationBarTitleText": "昨日警报"
-					}
-				},
-				{
-					"path": "workbench/securityAlert/historyList",//历史警报
-					"style": {
-						"navigationBarTitleText": "历史警报"
-					}
-				},
-				{
-					"path": "workbench/plan/planList",//预案执行记录
-					"style": {
-						"navigationBarTitleText": "预案执行记录"
-					}
-				},
-				{
-					"path": "workbench/plan/planInfo",//预案详情
-					"style": {
-						"navigationBarTitleText": "预案详情"
-					}
-				},
-				{
-					"path": "workbench/laboratory/broadcast",//开始广播
-					"style": {
-						"navigationBarTitleText": "开始广播"
-					}
-				},
-				{
-					"path": "workbench/laboratory/word",//播放文字
-					"style": {
-						"navigationBarTitleText": "播放文字"
-					}
-				},
-				{
-					"path": "workbench/laboratory/monitor",//查看监控
-					"style": {
-						"navigationBarTitleText": "查看监控"
-					}
-				},
-				{
-					"path": "workbench/laboratory/safetyCard",//安全信息牌
-					"style": {
-						"navigationBarTitleText": "安全信息牌"
-					}
-				},
-
-				{
-					"path": "workbench/securityCheck/unsubmittedList",//未提交检查
-					"style": {
-						"navigationBarTitleText": "未提交检查"
-					}
-				},
-				{
-					"path": "workbench/securityCheck/inspectionRecords",//检查记录
-					"style": {
-						"navigationBarTitleText": "检查记录"
-					}
-				},
-				{
-					"path": "workbench/securityCheck/safetyInspect",//安全检查
-					"style": {
-						"navigationBarTitleText": "安全检查"
-					}
-				},
-
-				{
-					"path": "workbench/securityCheck/recordDetails",//检查记录详情
-					"style": {
-						"navigationBarTitleText": ""
-					}
-				},
-				{
-					"path": "workbench/problemRectification/rectifyList",//问题整改
-					"style": {
-						"navigationBarTitleText": "问题整改"
-					}
-				},
-				{
-					"path": "workbench/problemRectification/rectifyDetails",//整改详情
-					"style": {
-						"navigationBarTitleText": ""
-					}
-				},
-				{
-					"path": "workbench/problemRectification/rectifyInfo",//整改信息
-					"style": {
-						"navigationBarTitleText": "整改信息"
-					}
-				},
-				{
-					"path": "workbench/signature/signature",//电子签名
-					"style": {
-						"navigationBarTitleText": "电子签名",
-						"navigationBarTextStyle": "white", //导航文字颜色
-						"navigationBarBackgroundColor": "#0183FA" //导航背景色
-					}
-				},
-				{
-					"path": "workbench/signature/signatureImg",//电子签名-图片处理
-					"style": {
-						"navigationBarTitleText": ""
-					}
-				},
-
-				{
-					"path": "workbench/securityCheck/startChecking",//安全检查
-					"style": {
-						"navigationBarTitleText": "安全检查"
-					}
-				},
-				/* 用气申请 */
-				{
-					"path": "useGasApply/useGasApply",
-					"style": {
-						"navigationBarTitleText": "用气申请"
-					}
-				},
-				{
-					"path": "useGasApply/useGasApplyAdd",
-					"style": {
-						"navigationBarTitleText": "申请用气"
-					}
-				},
-				{
-					"path": "useGasApply/useGasApplyDetail",
-					"style": {
-						"navigationBarTitleText": "申请详情"
-					}
-				},
-				/* 资质审核 */
-				{
-					"path": "aptitudeAudit/aptitudeAudit",
-					"style": {
-						"navigationBarTitleText": "资格审核"
-					}
-				},
-				{
-					"path": "aptitudeAudit/aptitudeAuditDetail",
-					"style": {
-						"navigationBarTitleText": "资格审核"
-					}
-				},
-				{
-					"path": "aptitudeAudit/aptitudeAuditCheck",
-					"style": {
-						"navigationBarTitleText": "资格审核"
-					}
-				},
-				/* 气瓶归还登记 */
-				{
-					"path": "leaveConfirm/amendAir",
-					"style": {
-						"navigationBarTitleText": "修改气压"
-					}
-				},
-				{
-					"path": "leaveConfirm/leaveConfirm",
-					"style": {
-						"navigationBarTitleText": "出库确认"
-					}
-				},
-				/* 气瓶归还登记 */
-				{
-					"path": "useRegister/giveRegister",
-					"style": {
-						"navigationBarTitleText": "归还登记"
-					}
-				},
-				/* 气瓶使用登记 */
-				{
-					"path": "useRegister/useRegister",
-					"style": {
-						"navigationBarTitleText": "使用登记"
-					}
-				},
-				/* 气瓶使用记录 */
-				{
-					"path": "useRecord/useRecordDetail",
-					"style": {
-						"navigationBarTitleText": "使用详情"
-					}
-				},
-				{
-					"path": "useRecord/useRecord",
-					"style": {
-						"navigationBarTitleText": "使用记录"
-					}
-				},
-				/* 气瓶列表 */
-				{
-					"path": "gasList/gasListBinding",
-					"style": {
-						"navigationBarTitleText": "气瓶详情"
-					}
-				},
-				{
-					"path": "gasList/gasUseDetail",
-					"style": {
-						"navigationBarTitleText": "使用详情"
-					}
-				},
-				{
-					"path": "gasList/gasListDetail",
-					"style": {
-						"navigationBarTitleText": "气瓶详情"
-					}
-				},
-				{
-					"path": "gasList/gasList",
-					"style": {
-						"navigationBarTitleText": "气瓶列表"
-					}
-				},
-				/* 气瓶申请 */
-				{
-					"path": "gasApply/awaitStorage",
-					"style": {
-						"navigationBarTitleText": "待入库"
-					}
-				},
-				{
-					"path": "gasApply/gasApplyReject",
-					"style": {
-						"navigationBarTitleText": "拒收气瓶"
-					}
-				},
-				{
-					"path": "gasApply/gasApplyList",
-					"style": {
-						"navigationBarTitleText": "申请详情"
-					}
-				},
-				{
-					"path": "gasApply/gasApplyAdd",//添加
-					"style": {
-						"navigationBarTitleText": "申请气瓶"
-					}
-				},
-				{
-					"path": "gasApply/gasApply",
-					"style": {
-						"navigationBarTitleText": "气瓶申请"
-					}
-				},
-
-				/* 资格申请 */
-				{
-					"path": "examination/examinationSelect",//添加
-					"style": {
-						"navigationBarTitleText": "选择气瓶"
-					}
-				},
-				{
-					"path": "examination/examinationAdd",//添加
-					"style": {
-						"navigationBarTitleText": "资格申请"
-					}
-				},
-				{
-					"path": "examination/examinationDetail",
-					"style": {
-						"navigationBarTitleText": "资格申请"
-					}
-				},
-				{
-					"path": "examination/examination",
-					"style": {
-						"navigationBarTitleText": "资格申请"
-					}
-				},
-				{
-					"path": "gasManage/gasManage",
-					"style": {
-						"navigationBarTitleText": "用气管理"
+						"navigationBarTitleText": "电子签名",
+						"navigationBarTextStyle": "white", //导航文字颜色
+						"navigationBarBackgroundColor": "#0183FA" //导航背景色
 					}
 				}
 			]
 		}
+
 	],
 
 

+ 0 - 387
pages/casuallyPat.vue

@@ -1,387 +0,0 @@
-<!-- 随手拍 -->
-<template>
-    <view id="casuallyPat">
-        <view class="casuallyPatList-page-go" :class="casuallyNum>0?'casuallyPatList-page-go-num':''" v-if="casuallyType" @click="goPage">
-            <view>收到随手拍</view>
-            <view>未处理{{casuallyNum}}条</view>
-            <img src="@/images/icon_04.png"/>
-        </view>
-        <view class="casuallyPat-page">
-            <view class="picker-box">
-                <view class="left-box">实验室:</view>
-                <view class="right-box">
-                    <picker @change="bindPickerChange" :value="laboratoryIndex" :range="laboratory">
-                        <view class="right-min-box">
-                            <view :class="{'colorA':newData.laboratory=='请选择实验室'}">{{newData.laboratory}}</view>
-                            <img src="@/images/icon_06.png"/>
-                        </view>
-                    </picker>
-                </view>
-            </view>
-            <view class="up-img-box">
-                <view class="title-view">照片:</view>
-                <view class="img-max-box">
-                    <view class="img-box" v-for="(item,index) in newData.imgList" :key="index">
-                        <img class="img-data" :src="item"/>
-                        <img class="position-img" src="@/images/icon_ssp_closure.png" @click="delImg(index)"/>
-                    </view>
-                    <img class="add-button" src="@/images/icon_07.png" @click="selectImage" v-if="newData.imgList.length<9"/>
-                </view>
-            </view>
-            <view class="input-box">
-                <view class="left-box">描述:</view>
-                <textarea v-model="newData.text" maxlength="200" placeholder="请输入描述"></textarea>
-            </view>
-        </view>
-        <view class="up-button-box" @click="upDataButton">提交</view>
-    </view>
-</template>
-
-<script>
-    import { config } from '@/api/request/config.js'
-    import { getSubjectDict,addPhotoNote,myIsadmin } from '@/api/index.js'
-    import { appReceivePhotoNote } from '@/api/index.js'
-    export default {
-        data() {
-            return {
-                userType:0,
-				casuallyType:false,
-                //收到未处理随手拍数量
-                casuallyNum:"",
-                laboratory:['请选择实验室'],
-                laboratoryList:[],
-                laboratoryIndex:0,
-                newData:{
-                    laboratory:"请选择实验室",
-                    text:"",
-                    imgList:[],
-                    realImgList:[]
-                }
-            }
-        },
-        onLoad() {
-            this.userType = uni.getStorageSync('userType')
-        },
-        onShow(){
-			this.myIsadmin();
-            this.getSubjectDict();
-            if(this.userType == 1){
-                this.appReceivePhotoNote();
-            }
-        },
-        methods: {
-            goPage(){
-                uni.navigateTo({
-                    url: '/pages_manage/workbench/receiveCasuallyPat/receiveCasuallyPat',
-                });
-            },
-            //获取管理员工作台随手拍数量数据
-            async appReceivePhotoNote(){
-                const {data} = await appReceivePhotoNote();
-                if(data.code == 200){
-                    this.casuallyNum = data.data.photoCount;
-                }
-            },
-            //提交按钮
-            upDataButton(){
-                let self = this;
-                if(self.newData.laboratory == '请选择实验室'){
-                    uni.showToast({
-                        title: '请选择实验室',
-                        icon:"none",
-                        mask:true,
-                        duration: 2000
-                    });
-                    return
-                }
-                if(!self.newData.text){
-                    uni.showToast({
-                        title: '请输入描述信息',
-                        icon:"none",
-                        mask:true,
-                        duration: 2000
-                    });
-                    return
-                }
-                if(!self.newData.imgList[0]){
-                    uni.showToast({
-                        title: '请添加图片',
-                        icon:"none",
-                        mask:true,
-                        duration: 2000
-                    });
-                    return
-                }
-                uni.showModal({
-                    content: '确认要提交吗?',
-                    cancelColor:"#999",
-                    confirmColor:"#0183FA",
-                    success: function (res) {
-                        if (res.confirm) {
-                            self.addPhotoNote();
-                        } else if (res.cancel) {
-                        }
-                    }
-                });
-            },
-			async myIsadmin(){
-				let self = this;
-				let {data} = await myIsadmin()
-                if(data.code == 200){
-					this.casuallyType = data.data;
-                }
-			},
-            // 随手拍实验室列表
-            async getSubjectDict(){
-                let self = this;
-                let {data} = await getSubjectDict()
-                if(data.code == 200){
-                    if(data.data[0]){
-                        let list = [];
-                        for(let i=0;i<data.data.length;i++){
-                            list.push(data.data[i].name);
-                        }
-                        this.laboratory = list;
-                        this.laboratoryList = data.data;
-                    }
-                    // this.violationData = data.data;
-                }
-            },
-            // 随手拍提交
-            async addPhotoNote(){
-                let self = this;
-                let obj = {
-                    imgUrls:self.newData.realImgList,
-                    subjectId:self.laboratoryList[self.laboratoryIndex].id,
-                    describe:self.newData.text,
-                }
-                let {data} = await addPhotoNote(obj)
-                if(data.code == 200){
-                    uni.showToast({
-                        title: '提交成功',
-                        icon:"none",
-                        mask:true,
-                        duration: 2000
-                    });
-                    setTimeout(function(){
-                        uni.navigateBack();
-                    },2000);
-                }
-            },
-            //实验室选择器
-            bindPickerChange(e){
-                this.laboratoryIndex = e.target.value;
-                this.newData.laboratory = this.laboratory[this.laboratoryIndex];
-            },
-            // 图片上传
-            selectImage(index) {
-                let self = this;
-                if(self.newData.imgList.length>4){
-                    uni.showToast({
-                        title: '最多上传5张图片',
-                        icon:"none",
-                        mask:true,
-                        duration: 2000
-                    });
-                    return
-                }
-                wx.chooseImage({
-                    count: 1,
-                    sizeType: ["original", "compressed"],
-                    sourceType: ["album", "camera"],
-                    success: function(res) {
-                        let tempFilePaths = res.tempFilePaths[0];
-                        self.uploadImg(tempFilePaths,index);
-                    }
-                });
-            },
-            async uploadImg(tempFilePaths,index){
-                var self = this;
-                uni.showLoading({
-                    title: '上传中',
-                    mask: true
-                });
-                uni.uploadFile({
-                    url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
-                    header:{'Authorization':uni.getStorageSync('token')},
-                    filePath: tempFilePaths,
-                    name: 'file',
-                    formData: {
-                        'user': 'test'
-                    },
-                    success: (uploadFileRes) => {
-                        let res = JSON.parse(uploadFileRes.data);
-						if(res.code == 200){
-						    var url=config.base_url+res.data.url;
-                            url=url.replace("//","/").replace("https:/","https://").replace("http:/","http://");
-							self.newData.imgList.push(url);
-                            self.newData.realImgList.push(res.data.url)
-						}else{
-							uni.showToast({
-								title: res.msg,
-								icon:"none",
-								mask:true,
-								duration: 2000
-							});
-						}
-                    },
-                    fail: err => {},
-                    complete: () => {
-                        uni.hideLoading()
-                    }
-                });
-            },
-            //删除图片
-            delImg(index){
-                this.newData.imgList.splice(index,1);
-            },
-        }
-    }
-</script>
-
-<style lang="stylus" scoped>
-    #casuallyPat{
-        height:100%;
-        width:100%;
-        background #f5f5f5
-        overflow-y scroll
-		.casuallyPatList-page-go-num{
-			background rgba(249,95,95,0.2)!important;
-            view:nth-child(2){
-                color:#F95F5F!important;
-            }
-		}
-        .casuallyPatList-page-go{
-			background rgba(0,0,0,0.1);
-            height:80rpx;
-            display flex
-            view{
-                font-size:28rpx;
-                line-height:80rpx;
-            }
-            view:nth-child(1){
-                margin-left:21rpx;
-                flex:1;
-                color:#333;
-            }
-            view:nth-child(2){
-                color:#333;
-                margin-right:30rpx;
-            }
-            img:nth-child(3){
-                margin:29rpx 20rpx 0 0;
-                width:12rpx;
-                height:24rpx;
-            }
-        }
-        .casuallyPat-page{
-            background #fff
-            margin:20rpx;
-            overflow hidden
-            border-radius:20rpx;
-            padding:30rpx;
-            .picker-box{
-                height:80rpx;
-                display flex
-                .left-box{
-                    width:140rpx;
-                    line-height:80rpx;
-                    font-size: 30rpx;
-                    color:#333;
-                }
-                .right-box{
-                    flex:1;
-                    width:470rpx;
-                    .right-min-box{
-                        display: flex;
-                        height:76rpx;
-                        border:2rpx solid #E0E0E0;
-                        border-radius: 10rpx;
-                        .colorA{
-                            color:#999!important;
-                        }
-                        view{
-                            flex:1;
-                            font-size: 24rpx;
-                            color: #333;
-                            margin-left:22rpx;
-                            line-height:78rpx;
-                        }
-                        img{
-                            width:24rpx;
-                            height:12rpx;
-                            margin:32rpx 16rpx 0 0;
-                        }
-                    }
-                }
-            }
-            .input-box{
-                height:250rpx;
-                display flex
-                margin-top:30rpx;
-                .left-box{
-                    width:140rpx;
-                    line-height:80rpx;
-                    font-size: 30rpx;
-                    color:#333;
-                }
-                textarea{
-                    width:470rpx;
-                    border-radius: 10rpx;
-                    border:2rpx solid #E0E0E0;
-                    height:206rpx;
-                    padding:20rpx;
-                    font-size: 24rpx;
-                    color: #333;
-                }
-            }
-            .up-img-box{
-                display flex
-                margin-top:30rpx;
-                .title-view{
-                    width:140rpx;
-                    line-height:80rpx;
-                    font-size: 30rpx;
-                    color:#333;
-                }
-                .img-max-box{
-                    width:510rpx;
-                    .img-box{
-                        display inline-block
-                        height:150rpx;
-                        width:150rpx;
-                        position relative
-                        margin:0 20rpx 20rpx 0;
-                        .img-data{
-                            height:150rpx;
-                            width:150rpx;
-                        }
-                        .position-img{
-                            position absolute
-                            right:0;
-                            top:0;
-                            width:36rpx;
-                            height:36rpx;
-                        }
-                    }
-                    .add-button{
-                        display inline-block
-                        height:150rpx;
-                        width:150rpx;
-                    }
-                }
-            }
-        }
-        .up-button-box{
-            width: 550rpx;
-            height: 80rpx;
-            line-height: 80rpx;
-            background: #0183FA;
-            border-radius: 20rpx;
-            font-size:30rpx;
-            margin:80rpx auto;
-            text-align center;
-            color:#fff;
-        }
-    }
-</style>

+ 0 - 415
pages/fingerprint.vue

@@ -1,415 +0,0 @@
-<!-- 指纹 -->
-<template>
-	<view id="fingerprint">
-		<view class="fingerprint_one" v-if="pageType==1">
-			<view class="fingerprint_one_li" @click="goPage(item)" v-for="(item,index) in fingerprintList" :key="index">
-				<view class="fingerprint_one_li_l">{{item.name}}</view>
-				<view :class="item.isConfig?'colorB':'colorA'">{{item.isConfig?'已配置':'无'}}</view>
-				<img  class="fingerprint_one_li_r" src="@/images/icon_04.png">
-			</view>
-		</view>
-		<view class="tip_tow" v-if="pageType==2">
-			<view class="tip_tow_l">提醒</view>
-			<view class="tip_tow_l">请选中门禁点击【指纹采集】并在当前门禁上录入指纹</view>
-		</view>
-		<view class="fingerprint_tow" v-if="pageType==2">
-			<view class="input_tip">请选择可采集的指纹门禁:</view>
-			<input class="input_search"  type="text" v-model="dialogForm.searchValue" placeholder="请输入门禁名称" @blur="searchGuard()"/>
-			<view class="fingerprint_tow_border_li" v-for="(item2,index2) in yesUseList" @click="selectGuard(item2,index2)" :key="index2">
-				<view :class="item2.isCheck?'colorD':'colorC'">{{item2.subName +'+'+ item2.hardName}}</view>
-				<img  v-if="item2.isCheck" class="fingerprint_tow_border_li_r" src="@/images/icon_xzwt_xz.png">
-			</view>
-		</view>
-		<view v-if="pageType==1" class="tip_one">至少添加一个指纹才可以通过指纹开锁</view>
-		<view v-if="pageType==1" class="out-button" @click="fingerprintGtherSyncFun">确定</view>
-		<view v-if="pageType==2" class="out-button" @click="gather">指纹采集</view>
-		<!-- 指纹采集遮罩-->
-		  <view class="shade-outfire" v-if="dialogVisible">
-			<view class="null-box" @click="dialogClose()"></view>
-			<view class="shade-outfire-n">
-			  <view class="shade-outfire-n-t">门禁名称</view>
-			  <img  class="shade-outfire-n-t2" src="@/images/icon_zw_bk.png" />
-			  <img class="shade-outfire-n-m" src="@/images/icon_wd_zw.png" />
-			  <view class="shade-outfire-n-b">指纹采集中...</view>
-			</view>
-		  </view>
-	</view>
-</template>
-
-<script>
-    import { config } from '@/api/request/config.js'
-    import {fingerprintQeryMySubList,fingerprintGther,fingerprintQueryList,fingerprintGtherSync} from '@/api/index.js'
-	export default {
-
-		data() {
-			return {
-				//页面状态
-				pageType:1,
-				//签名
-				checked:true,
-				name:'',
-				dialogVisible:false,
-				dialogForm:{
-					searchValue:'',
-				},
-				fingerprintList:[
-					{
-						name:'第一个指纹',
-						num:1,
-						isConfig:false,
-					},
-					{
-						name:'第二个指纹',
-						num:2,
-						isConfig:false,
-					},
-					{
-						name:'第三个指纹',
-						num:3,
-						isConfig:false,
-					},
-					{
-						name:'第四个指纹',
-						num:4,
-						isConfig:false,
-					},
-					{
-						name:'第五个指纹',
-						num:5,
-						isConfig:false,
-					},
-				],
-				yesUseList:[],
-				fingerNum:null,//第几个指纹
-
-
-			}
-		},
-		onLoad() {
-			this.impowerUseList();
-			this.fingerprintClick();
-		},
-		onShow(){
-
-
-		},
-
-		methods: {
-			//指紋采集
-			gather(){
-				let rest=this.yesUseList.some(v=>v.isCheck==true)
-				if(rest){
-					this.dialogVisible=true;
-					this.fingerprintGtherFun()
-				}else{
-					uni.showToast({
-							mask:true,
-							icon:"none",
-							position:"center",
-							title: '请先选择门禁名称!',
-							duration: 3000
-						});
-				}
-				
-			},
-		   dialogClose(){
-			   this.dialogVisible=false;
-		   },
-		   searchGuard(){
-			   this.impowerUseList();
-		   },
-		   selectGuard(d,index){
-			   let _this=this;
-			   //选中
-				d.isCheck=!d.isCheck
-				this.$set(this.yesUseList,index,d)
-			 //循环实现单选
-			  if(_this.yesUseList[index].isCheck==true){
-			    _this.yesUseList.forEach(function(item2) {
-			      if(item2.hardId==_this.yesUseList[index].hardId){
-			        item2.isCheck=true
-			      }else{
-			        item2.isCheck=false
-			      }
-			    })
-			  }
-		   },
-		   //查询用户指纹录取数据
-		   async fingerprintClick(){
-		   	let _this=this;
-		       const {data} = await fingerprintQueryList(uni.getStorageSync('userId'));
-				if(data.code == 200){
-					if(data.rows.length>0){
-						_this.fingerprintList.forEach(function(item){
-							data.rows.forEach(function(item2){
-								if(item.num==item2.fingerNum){
-									item.isConfig=true;
-								}
-							})
-						})
-					}
-				}
-		   },
-		   //指纹采集
-		   async fingerprintGtherFun(){
-		       let _this=this;
-			   let obj={}
-			   this.yesUseList.forEach(function(item){
-					  if(item.isCheck){
-						  obj.hardId=item.hardId
-						  obj.num=_this.fingerNum
-					  }
-			   })
-			    
-		       const {data} = await fingerprintGther(obj)
-				if(data.code == 200){
-					_this.dialogVisible=false;
-					_this.pageType=1;
-					_this.fingerprintClick();
-				}else if(data.code==500){
-					_this.dialogVisible=false;
-					uni.showToast({
-						mask:true,
-						icon:"none",
-						position:"center",
-						title: data.msg,
-						duration: 5000
-					});
-				}
-		   },
-		   //指纹同步
-		   async fingerprintGtherSyncFun(){
-		       let _this=this;
-		       const {data} = await fingerprintGtherSync(uni.getStorageSync('userId'))
-					if(data.code == 200){
-						uni.redirectTo({
-						    url: '/pages/mine',
-						});
-					}
-		   },
-			//查询当前用户已授权门禁列表
-			async impowerUseList(){
-				let _this=this;
-			    const {data} = await fingerprintQeryMySubList(_this.dialogForm)
-				if(data.code == 200){
-					_this.yesUseList=data.data;
-					_this.yesUseList.forEach(function(item){
-						item.isCheck=false;
-					})
-				}
-			},
-			//页面跳转
-            goPage(d){
-                this.pageType=2;
-				this.fingerNum=d.num;
-			},
-
-		},
-	}
-</script>
-
-<style lang="stylus" scoped>
-	#fingerprint{
-		height: 100%;
-		  width: 100%;
-		  display: flex;
-		  flex-direction: column;
-		  overflow-y: scroll;
-		.fingerprint_one{
-			width: 710rpx;
-			height: 507rpx;
-			background: #FFFFFF;
-			border-radius: 20rpx;
-			margin: 20rpx;
-			.fingerprint_one_li{
-				display: flex;
-				justify-content: flex-start;
-				align-items: center;
-				height: 100rpx;
-				margin: 0 20rpx;
-				border-bottom: 1px solid #E0E0E0;
-				.fingerprint_one_li_l{
-					font-size: 30rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-					text-align: left;
-					flex: 1;
-
-				}
-				.fingerprint_one_li_r{
-					width: 12rpx;
-					height: 24rpx;
-				}
-				.colorA{
-					font-size: 26rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #999999;
-					text-align: right;
-					margin-right: 40rpx;
-					flex: 1;
-				}
-				.colorB{
-					font-size: 26rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #0183FA;
-					text-align: right;
-					margin-right: 40rpx;
-					flex: 1;
-				}
-			}
-			.fingerprint_one_li:last-child{
-				border-bottom: none;
-			}
-		}
-		.tip_tow{
-			margin: 10rpx 0;
-			.tip_tow_l{
-				font-size: 24rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #FF0000;
-				line-height: 36rpx;
-				text-align: left;
-				margin-left: 36rpx;
-			}
-		}
-		.fingerprint_tow{
-			width: 710rpx;
-			background: #FFFFFF;
-			border-radius: 10px;
-			margin: 0 20rpx;
-			padding: 0 20rpx;
-			box-sizing: border-box;
-			overflow: hidden;
-			.input_tip{
-				font-size: 30rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #333333;
-				line-height: 30rpx;
-				margin: 34rpx 0;
-			}
-			.input_search{
-				width: 670rpx;
-				height: 80rpx;
-				background: #FFFFFF;
-				border: 1px solid #E0E0E0;
-				border-radius: 10rpx;
-				padding-left: 20rpx;
-				box-sizing: border-box;
-				margin-bottom: 32rpx;
-			}
-			.fingerprint_tow_border_li{
-				height: 100rpx;
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				margin: 0 20rpx;
-				border-bottom: 1px solid #E0E0E0;
-				.fingerprint_tow_border_li_l{}
-				.fingerprint_tow_border_li_r{
-					width: 30rpx;
-					height: 20rpx;
-				}
-				.colorC{
-					font-size: 30rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-				}
-				.colorD{
-					font-size: 30rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #0183FA;
-				}
-			}
-			.fingerprint_tow_border_li:last-child{
-				border-bottom: none;
-			}
-		}
-		.tip_one{
-			font-size: 28rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #FF0000;
-			line-height: 30rpx;
-			margin-top: 36rpx;
-			text-align: center;
-		}
-		.out-button{
-			position absolute
-			bottom:140rpx;
-			left:25rpx;
-			width:700rpx;
-			height:100rpx;
-			line-height:100rpx;
-			border-radius:10rpx;
-			text-align center
-			background #0183FA;
-			color:#FFFFFF;
-			font-size: 30rpx;
-			margin:0 auto;
-		}
-	    /* 指纹采集 */
-	    .shade-outfire {
-	      height: 100%;
-	      width: 100%;
-	      position: fixed;
-	      display: flex;
-	      flex-direction: column;
-	      z-index: 10;
-	      background: rgba(0, 0, 0, 0.2);
-	      .null-box {
-	        flex: 1;
-	      }
-	      .shade-outfire-n {
-	        width: 625rpx;
-	        height: 550rpx;
-	        background: #FFFFFF;
-	        border-radius: 20rpx;
-	        position: absolute;
-	        top: 370rpx;
-	        left: 62rpx;
-
-	        .shade-outfire-n-t {
-				 font-size: 30rpx;
-				 font-family: PingFang SC;
-				 font-weight: 500;
-				 color: #333333;
-				 text-align: center;
-				 margin-top: 32rpx;
-	        }
-			.shade-outfire-n-t2 {
-			  width: 182rpx;
-			  height: 202rpx;
-			  position: absolute;
-			  left: 222rpx;
-			  top: 106rpx;
-			}
-
-	        .shade-outfire-n-m {
-	          width: 84rpx;
-	          height: 108rpx;
-	          position: absolute;
-	          left: 266rpx;
-	          top: 150rpx;
-	        }
-
-	        .shade-outfire-n-b {
-				width: 100%;
-	         font-size: 30rpx;
-	         font-family: PingFang SC;
-	         font-weight: 500;
-	         color: #0183FA;
-			 text-align: center;
-			 position: absolute;
-			 top: 358rpx;
-	        }
-	      }
-	    }
-	  }
-</style>

+ 1 - 7
pages/home.vue

@@ -4,19 +4,13 @@
   </view>
 </template>
 <script>
-import { manageHome } from '@/pages/manageWorkbench'
-import { userHome } from '@/pages/studentWorkbench.vue'
-import { supplierHome } from '@/pages/supplierWorkbench.vue'
 import { safetyExamineHome} from '@/pages/safetyExamineWorkbench.vue'
 import { tabBar } from '@/component/tabBar.vue'
 export default {
   name: "home",
   components: {
-    manageHome,
-    userHome,
-    supplierHome,
     tabBar,
-	safetyExamineHome
+	 safetyExamineHome
   },
   data() {
     return {

+ 0 - 487
pages/studentWorkbench.vue

@@ -1,487 +0,0 @@
-<!-- 学生端工作台 -->
-<template>
-  <view class="user-workbench">
-    <img class="top-big-img" :src="homepageBanner">
-    <view class="min-icon-button-box">
-      <view @click="goPage('casuallyPat')">
-        <img src="@/images/Version2.2/icon_sy_ssp.png">
-        <view>随手拍</view>
-      </view>
-      <view @click="saoCode">
-        <img src="@/images/Version2.2/btn_wd_jfdh.png">
-        <view>积分兑换</view>
-      </view>
-      <view @click="goPage('safeAccess')">
-        <img src="@/images/Version2.2/icon_sy_zrsq.png">
-        <view>准入申请</view>
-      </view>
-      <view @click="goPage('safetyInspect')">
-        <img src="@/images/Version2.2/icon_sy_aqjc.png">
-        <view>安全检查</view>
-      </view>
-      <view @click="goPage('photoInspection')">
-        <img src="@/images/icon_dzt_pzjc.png">
-        <view>离开检查</view>
-      </view>
-      <view @click="goPage('gas')">
-        <img src="@/images/Version3.0/icon_sy_qpgl.png">
-        <view>气瓶管理</view>
-      </view>
-      <view @click="goPage('none')">
-        <img src="@/images/Version3.0/icon_sy_hxp.png">
-        <view>化学品管理</view>
-      </view>
-      <view @click="goPage('none')">
-        <img src="@/images/Version3.0/icon_sy_tzsb.png">
-        <view>特种设备</view>
-      </view>
-    </view>
-    <!-- 分级管控 -->
-    <view class="grading">
-      <img class="grading_l" src="@/images/icon_sy_fjgk.png"/>
-      <view class="grading_c">分级管控</view>
-      <view class="grading_r" @click="goPage('grading')">{{gradingCount>0?gradingCount+'项工作待完成':''}}<img src="@/images/icon_wdwg_gd.png"/></view>
-    </view>
-    <view class="big-icon-button-box">
-      <view class="left-box">
-        <img class="left-top-img" @click="goNull" src="@/images/Version2.2/img_bg_cjcx.png">
-        <img class="left-bottom-img" @click="goPage('meViolation')" src="@/images/Version2.2/img_bg_wgjl.png">
-      </view>
-      <img class="right-img" @click="goNull" src="@/images/Version2.2/img_bg_jfmx.png">
-    </view>
-    <view class="bottom-max-box">
-      <view class="bottom-title">
-        <img src="@/images/Version2.2/icon_sy_wdzs.png">
-        <view>我的证书</view>
-      </view>
-      <view class="bottom-big-box">
-        <view class="bottom-for-box" v-for="(item,index) in dataList" :key="index">
-          <view class="bottom-top-box">{{item.certTitle}}</view>
-          <view class="bottom-bottom-box">
-            <view class="bottom-right-box">{{item.createTime}}获得</view>
-            <view class="bottom-right-box">到期时间:{{item.expirationTime}}</view>
-          </view>
-        </view>
-        <view class="null-view" v-if="!dataList[0]">暂无数据</view>
-      </view>
-    </view>
-    <tab-bar></tab-bar>
-  </view>
-</template>
-
-<script>
-import { myViolationCount,queryMyCert,outSubjectPhoto,gradingControl} from '@/api/index.js'
-import { tabBar } from '@/component/tabBar.vue'
-export default {
-  components: {
-    tabBar
-  },
-  data() {
-    return {
-      hintType:false,
-      dataList:[],
-      violationData:{},
-      gradingCount:0,
-      homepageBanner:uni.getStorageSync('homepageBanner'),
-    }
-  },
-  created() {
-
-  },
-  mounted(){
-    this.myViolationCount();
-    this.getGrading();
-
-    this.queryMyCert();
-  },
-  methods: {
-    //获取分级管控未完成总数
-    async getGrading(){
-      let obj = {
-
-      }
-      const {data} = await gradingControl(obj)
-      if(data.code==200){
-        this.gradingCount=data.count;
-      }
-
-    },
-    //暂无提示
-    goNull(){
-      uni.showToast({
-        title: '暂未开放',
-        mask:true,
-        icon:"none",
-        duration: 2000
-      });
-    },
-
-    //调用摄像头
-    saoCode(){
-      uni.scanCode({
-        onlyFromCamera: true,
-        success: function (res) {
-          uni.navigateTo({
-            url: '/pages_student/mine/codeSuccess?q='+encodeURIComponent(JSON.stringify(res.result))
-          });
-        }
-      });
-    },
-    // 查询违规记录列表 (用户端)
-    async myViolationCount(){
-      let self = this;
-      let {data} = await myViolationCount()
-      if(data.code == 200){
-        this.violationData = data.data;
-      }
-    },
-    // 查询证书列表 (用户端)
-    async queryMyCert(){
-      let self = this;
-      let {data} = await queryMyCert({})
-      if(data.code == 200){
-        let list = [];
-        for(let i=0;i<data.rows.length;i++){
-          let timeOne = (new Date(data.rows[i].createTime)).getTime();
-          let timeTwo = (new Date(data.rows[i].expirationTime)).getTime();
-          data.rows[i].createTime = self.formatDate(timeOne);
-          data.rows[i].expirationTime = self.formatDate(timeTwo);
-        }
-        this.dataList = data.rows;
-      }
-    },
-    formatDate(date) {
-      let newDate = new Date(date);
-      let YY = newDate.getFullYear() + '-';
-      let MM = (newDate.getMonth() + 1 < 10 ? '0' + (newDate.getMonth() + 1) : newDate.getMonth() + 1) + '-';
-      let DD = (newDate.getDate() < 10 ? '0' + (newDate.getDate()) : newDate.getDate());
-      return YY + MM + DD;
-    },
-    //页面跳转
-    goPage(type){
-      if(type == 'meViolation'){//我的违规
-        uni.navigateTo({
-          url: '/pages_student/workbench/meViolation',
-        });
-      }else if(type == 'photoInspection'){//离开检查
-        this.outSubjectPhoto();
-      }else if(type == 'resultInquiry'){//成绩查询
-        uni.navigateTo({
-          url: '/pages_student/workbench/resultInquiry',
-        });
-      }else if(type == 'casuallyPat'){//随手拍
-        uni.navigateTo({
-          url: '/pages/casuallyPat',//随手拍
-        });
-      }else if(type == 'safeAccess'){//安全准入
-        uni.navigateTo({
-          url: '/pages_student/workbench/safeAccess/safeAccess',
-        });
-      }else if(type == 'examList'){//在线考试
-        uni.navigateTo({
-          url: '/pages_student/workbench/exam/examList',
-        });
-      }else if(type == 'grading'){
-        uni.navigateTo({
-          url: '/pages_student/gradingControl/gradingControl',//分级管控
-        });
-      }else if(type == 'safetyInspect'){//安全检查
-
-        uni.navigateTo({
-          url: '/pages_manage/workbench/problemRectification/rectifyList',//安全检查
-        });
-      }else if(type == 'gas'){//气瓶管理
-        uni.navigateTo({
-          url: '/pages_student/gasManage/gasManage',
-        });
-      }else if(type == 'none'){
-		  uni.showToast({
-		    title: '暂未开放',
-		    icon:"none",
-		    mask:true,
-		    duration: 2000
-		  });
-	  }
-    },
-    //获取拍照检查配置
-    async outSubjectPhoto(){
-      const {data} = await outSubjectPhoto();
-      if(data.code == 200){
-        if(data.data == null){
-          //需要检查(重新填写)
-          let obj = {
-            sub:"实验室照片",
-            subUrl:"",
-            garbage:"垃圾桶清理后照片",
-            garbageUrl:"",
-            dangerous:"使用危险设备照片(选填)",
-            dangerousUrl:"",
-            sourceRisk:"危险源设备使用登记本照片(选填)",
-            sourceRiskUrl:"",
-          };
-          uni.navigateTo({
-            url: '/pages_student/workbench/photoInspection?newData='+encodeURIComponent(JSON.stringify(obj)),
-          });
-        }else if(data.data == false){
-          //不需要检查
-          uni.showToast({
-            title: '暂无检查数据',
-            icon:"none",
-            mask:true,
-            duration: 2000
-          });
-        }else{
-          //需要检查(修改内容)
-          let obj = {
-            id:data.data.id,
-            sub:"实验室照片",
-            subUrl:data.data.subUrl,
-            garbage:"垃圾桶清理后照片",
-            garbageUrl:data.data.garbageUrl,
-            dangerous:"使用危险设备照片(选填)",
-            dangerousUrl:data.data.dangerousUrl,
-            sourceRisk:"危险源设备使用登记本照片(选填)",
-            sourceRiskUrl:data.data.sourceRiskUrl,
-          };
-          uni.navigateTo({
-            url: '/pages_student/workbench/photoInspection?newData='+encodeURIComponent(JSON.stringify(obj)),
-          });
-        }
-      }
-    },
-  }
-}
-</script>
-
-<style lang="stylus" scoped>
-.user-workbench{
-  height:100%;
-  flex:1;
-  .top-big-img{
-    height:342rpx;
-    width:750rpx;
-    background :#ffffff;
-  }
-  .min-icon-button-box{
-    display flex;
-    justify-content: flex-start;
-    flex-wrap: wrap;
-    width:710rpx;
-    margin:20rpx;
-    background :#ffffff;
-    border-radius:20rpx;
-    padding-bottom: 20rpx;
-    view{
-      width: 176rpx;
-      img{
-        height:75rpx;
-        width:75rpx;
-        margin:30rpx auto 10rpx;
-      }
-      view{
-        text-align center
-        font-size:24rpx;
-      }
-    }
-  }
-  /* 分级管控 */
-  .grading{
-    width :712rpx;
-    height :80rpx;
-    background: #FFFFFF;
-    border-radius: 20rpx;
-    margin-left:20rpx;
-    margin-bottom :20rpx;
-    display:flex;
-    justify-content :flex-start;
-    align-items :center;
-    .grading_l{
-      width :34rpx;
-      height :34rpx;
-      margin-left:16rpx;
-    }
-    .grading_c{
-      font-size: 28rpx;
-      font-family: PingFang SC;
-      font-weight: 500;
-      color: #333333;
-      margin-left:16rpx;
-    }
-    .grading_r{
-      width :504rpx;
-      height :80rpx;
-      font-size: 26rpx;
-      font-family: PingFang SC;
-      font-weight: 500;
-      color: #EE3A3A;
-      display :flex;
-      justify-content :flex-end;
-      align-items: center;
-      >img{
-        width: 20rpx;
-        height: 20rpx;
-        margin-left :20rpx;
-        margin-top :8rpx;
-      }
-    }
-  }
-
-  .big-icon-button-box{
-    width:710rpx;
-    height:354rpx;
-    margin:0 20rpx 20rpx;
-    background :#ffffff;
-    border-radius:20rpx;
-    display flex
-    .left-box{
-      width:310rpx;
-      height:310rpx;
-      margin:22rpx 10rpx 22rpx 15rpx;
-      .left-top-img{
-        width:310rpx;
-        height:150rpx;
-        margin-bottom:14rpx;
-      }
-      .left-bottom-img{
-        width:310rpx;
-        height:150rpx;
-      }
-    }
-    .right-img{
-      width:362rpx;
-      height:310rpx;
-      margin:22rpx 13rpx 22rpx 0;
-    }
-  }
-  .top-max-box{
-    height:119rpx;
-    background #fff
-    overflow hidden
-    .top-big-box{
-      height:60rpx;
-      width:649rpx;
-      background: #F5F5F5;
-      border-radius: 30px;
-      margin:30rpx auto;
-      padding:0 30rpx;
-    }
-    .top-big-one-type{
-      color:#F95F5F;
-      line-height:60rpx;
-      font-size: 26rpx;
-    }
-    .top-big-two-type{
-      line-height:60rpx;
-      font-size: 26rpx;
-      display flex
-      .left-view{
-        flex:1;
-        display flex
-        color:#333;
-        .left-min-view{
-          color:#e45656;
-        }
-      }
-      .left-button-view{
-        color:#0183fa;
-      }
-    }
-  }
-  .button-max-box{
-    /*height:446rpx;*/
-    background #fff
-    margin-bottom:20rpx;
-    .button-title{
-      line-height:100rpx;
-      border-bottom:1rpx solid #E0E0E0;
-      padding-left:20rpx;
-    }
-    .button-max-box{
-      /*height:345rpx;*/
-      .button-min-box{
-        width:250rpx;
-        height:172rpx;
-        display inline-block
-        img{
-          width:80rpx;
-          height:80rpx;
-          margin:34rpx auto 0;
-        }
-        view{
-          line-height:50rpx;
-          text-align center;
-          font-size:28rpx;
-          color: #333;
-        }
-      }
-    }
-  }
-  .bottom-max-box{
-    flex:1;
-    background #fff
-    margin:0 20rpx 100rpx;
-    border-radius:20rpx;
-    display flex
-    flex-direction column
-    overflow-y hidden
-    .bottom-title{
-      display flex
-      border-bottom:1rpx solid #E0E0E0;
-      img{
-        width:34rpx;
-        height:34rpx;
-        margin:35rpx 16rpx 0 10rpx;
-      }
-      view{
-        line-height:100rpx;
-      }
-    }
-    .bottom-big-box{
-      flex:1;
-      overflow-y scroll
-      .bottom-for-box:nth-child(1){
-        border:none;
-      }
-      .bottom-for-box{
-        height:154rpx;
-        margin:0 20rpx;
-        border-top:1rpx solid #E0E0E0;
-        overflow hidden
-        .bottom-top-box{
-          font-size:28rpx;
-          line-height:28rpx;
-          color:#333;
-          display:block;
-          overflow:hidden;
-          text-overflow:ellipsis;
-          white-space:nowrap;
-          margin:36rpx 0 30rpx;
-        }
-        .bottom-bottom-box{
-          display flex
-          view{
-            flex:1;
-            line-height:48rpx;
-            font-size: 28rpx;
-            color: #999999;
-            display:block;
-            overflow:hidden;
-            text-overflow:ellipsis;
-            white-space:nowrap;
-          }
-          view:nth-child(2){
-            text-align right
-          }
-
-        }
-      }
-      .null-view{
-        text-align center;
-        color:#999;
-        line-height:80rpx;
-        font-size:28rpx;
-      }
-    }
-  }
-}
-</style>

+ 0 - 89
pages/supplier/mine/forbidden.vue

@@ -1,89 +0,0 @@
-<!-- 停用 -->
-<template>
-    <view class="register">
-		<view class="register_li">
-			<img  class="register_li_t" src="@/images/Version3.0/img_xgzl_zgty.png">
-			<view class="register_li_m">
-				<text>您的供应商资格已被停用,详情请联系管理人员; </text>
-				<text>联系电话:13227872231</text>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-    import {} from '@/api/index.js'
-	import { config } from '@/api/request/config.js'
-    export default {
-        data() {
-            return {
-				form:{
-					name:'',
-				},
-            }
-        },
-        onLoad(option) {
-			
-        },
-        onShow(){
-			
-			
-			
-        },
-		
-        methods: {
-			
-        }
-    }
-</script>
-
-<style lang="stylus" scoped>
-    .register{
-        height:100%;
-        width:100%;
-        display flex
-        flex-direction column;
-		//padding-bottom: 220rpx;
-		.register_li{
-			background #fff;
-			border-radius:20rpx;
-			margin:20rpx 20rpx 0;
-			padding:20rpx 0;
-			box-sizing: border-box;
-			.register_li_t{
-				width:204rpx;
-				height:200rpx;
-				margin: 125rpx 0 0 258rpx;
-			}
-			.register_li_m{
-				margin-top: 92rpx;
-				margin-bottom: 60rpx;
-				text-align: left;
-				padding: 0 50rpx;
-				box-sizing: border-box;
-				>text{
-					display: block;
-				}
-				>text:nth-child(1){
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-					line-height: 28rpx;
-					margin-bottom: 24rpx;
-				}
-				>text:nth-child(2){
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-					line-height: 28rpx;
-				}
-			}
-			
-		}
-	}
-	/deep/.input-value-border{
-		display :none !important;
-	}
-</style>

+ 0 - 97
pages/supplier/mine/hasten.vue

@@ -1,97 +0,0 @@
-<!-- 催办 -->
-<template>
-    <view class="register">
-		<view class="register_li">
-			<img  class="register_li_t" src="@/images/Version3.0/icon_xgzl_shz.png">
-			<view class="register_li_m">您提交的信息正在审核中,请耐心等待</view>
-		</view>
-		<view class="sub_btn" @click="hasten()">立即催办</view>
-	</view>
-</template>
-
-<script>
-    import {} from '@/api/index.js'
-	import { config } from '@/api/request/config.js'
-    export default {
-        data() {
-            return {
-				form:{
-					name:'',
-				},
-            }
-        },
-        onLoad(option) {
-			
-        },
-        onShow(){
-			
-			
-			
-        },
-		
-        methods: {
-			hasten(){
-				uni.showToast({
-					title: '催办成功!',
-					icon:"none",
-					mask:true,
-					duration: 2000
-				});
-			},
-        }
-    }
-</script>
-
-<style lang="stylus" scoped>
-    .register{
-        height:100%;
-        width:100%;
-        display flex
-        flex-direction column;
-		//padding-bottom: 220rpx;
-		.register_li{
-			background #fff;
-			border-radius:20rpx;
-			margin:20rpx 20rpx 0;
-			padding:20rpx 0;
-			box-sizing: border-box;
-			.register_li_t{
-				width:156rpx;
-				height:200rpx;
-				margin: 128rpx 0 0 276rpx;
-			}
-			.register_li_m{
-				margin-top: 80rpx;
-				margin-bottom: 116rpx;
-				text-align: center;
-				font-size: 28rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #333333;
-				line-height: 28rpx;
-				
-			}
-			
-		}
-		/* 按钮 */
-		.sub_btn{
-			width: 650rpx;
-			height: 100rpx;
-			background: #FFAE00;
-			border-radius: 20rpx;
-			font-size: 28rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #FFFFFF;
-			line-height: 100rpx;
-			text-align: center;
-			margin-left: 50rpx;
-			position: fixed;
-			bottom:30rpx;
-			z-index: 1000;
-		}
-	}
-	/deep/.input-value-border{
-		display :none !important;
-	}
-</style>

+ 0 - 118
pages/supplier/mine/reject.vue

@@ -1,118 +0,0 @@
-<!-- 驳回 -->
-<template>
-    <view class="register">
-		<view class="register_li">
-			<img  class="register_li_t" src="@/images/Version3.0/img_xgzl_zgty.png">
-			<view class="register_li_m">
-				<text>您提交申请被驳回</text>
-				<text>驳回原因为:{{infoData}}</text>
-			</view>
-		</view>
-		<view class="sub_btn" @click="againSubmit()">重新申请</view>
-	</view>
-	
-</template>
-
-<script>
-    import {} from '@/api/index.js'
-	import { config } from '@/api/request/config.js'
-    export default {
-		props:{
-			infoData:{}
-		},
-        data() {
-            return {
-				form:{
-					name:'',
-				},
-            }
-        },
-        onLoad(option) {
-			
-        },
-        onShow(){
-			
-        },
-        methods:{
-			//重新提交
-			againSubmit(){
-				uni.redirectTo({
-				   url: '/pages_supplier/register/register?pageStatus=1',
-				});
-			},
-        },
-		mounted(){
-			
-		},
-    }
-</script>
-
-<style lang="stylus" scoped>
-    .register{
-        height:100%;
-        width:100%;
-        display flex
-        flex-direction column;
-		//padding-bottom: 220rpx;
-		.register_li{
-			background #fff;
-			border-radius:20rpx;
-			margin:20rpx 20rpx 0;
-			padding:20rpx 0;
-			box-sizing: border-box;
-			.register_li_t{
-				width:204rpx;
-				height:200rpx;
-				margin: 125rpx 0 0 258rpx;
-			}
-			.register_li_m{
-				margin-bottom: 60rpx;
-				text-align: left;
-				padding: 0 50rpx;
-				box-sizing: border-box;
-				>text{
-					display: block;
-				}
-				>text:nth-child(1){
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-					line-height: 28rpx;
-					margin-bottom: 24rpx;
-					text-align: center;
-					margin-top: 42rpx;
-				}
-				>text:nth-child(2){
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-					line-height: 48rpx;
-					margin-top: 48rpx;
-				}
-			}
-			
-		}
-		/* 按钮 */
-		.sub_btn{
-			width: 650rpx;
-			height: 100rpx;
-			background: #0183FA;
-			border-radius: 20rpx;
-			font-size: 28rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #FFFFFF;
-			line-height: 100rpx;
-			text-align: center;
-			margin-left: 50rpx;
-			position: fixed;
-			bottom:30rpx;
-			z-index: 1000;
-		}
-	}
-	/deep/.input-value-border{
-		display :none !important;
-	}
-</style>

+ 0 - 445
pages/supplierWorkbench.vue

@@ -1,445 +0,0 @@
-<!-- 整改列表 -->
-<template>
-  <view class="supplier" style="display: flex;flex-direction: column;flex: 1;">
-    <view v-if="pageType==0">
-      <view class="supplier_h" @click="handleClick('mine')">
-        <img src="@/images/Version3.0/img_gysglpt_bg.png">
-        <img src="@/images/Version3.0/img_gysglpt_icom.png">
-        <img src="@/images/Version3.0/icon_gyspt_gd.png">
-        <view>{{form.companyName}}</view>
-      </view>
-      <view class="supplier_tab">
-        <view class="supplier_tab_li" @click="handleClick('people')">
-          <text>{{form.peopleSum}}</text>
-          <text>运输人员</text>
-        </view>
-        <view class="supplier_tab_line"></view>
-        <view class="supplier_tab_li" @click="handleClick('car')">
-          <text>{{form.carSum}}</text>
-          <text>运输车辆</text>
-        </view>
-        <view class="supplier_tab_line"></view>
-        <view class="supplier_tab_li" @click="handleClick('bottle')">
-          <text>{{form.bottleSum}}</text>
-          <text>气瓶管理</text>
-        </view>
-      </view>
-      <scroll-view scroll-y @scrolltolower="scrollGet" class="for-max-box">
-        <view class="for-big-box">
-          <view class="backlog" @click="handleClick('backlog')">
-            <img class="backlog_l" src="@/images/Version3.0/icon_glpt_dbqd.png">
-            <view class="backlog_c">待办清单</view>
-            <img class="backlog_r"  src="@/images/icon_wdwg_gd.png">
-          </view>
-          <view class="for-box" @click="goInfo(item)" v-for="(item,index) in dataList" :key="index">
-            <view class="for-title-box">
-              <view v-if="item.remark=='gq'"  class="viewColor1">供气</view>
-              <view v-if="item.remark=='hs'" class="viewColor3">回收</view>
-              <view v-if="item.remark=='wt'" class="viewColor2">问题</view>
-              <view v-if="item.remark=='hs' || item.remark=='wt'">{{item.airName}}-{{item.configName}}</view>
-              <view  v-if="item.remark=='gq'" ><text v-for="(item2,index2) in item.detailListVO" :key="index2" v-if="index2<2">{{item2.airName}}-{{item2.configName}}*{{item2.bottleNumber}}<text>{{index2<1?' ':'...'}}</text></text></view>
-            </view>
-            <view class="for-address-box">
-              <img src="@/images/Version2.2/icon_wtzg_xx.png">
-              <view >{{item.campus}}-{{item.building}}-{{item.room}}</view>
-            </view>
-            <view class="for-time-box">
-              <img src="@/images/Version2.2/icon_wtzg_sj.png">
-              <view>{{item.createTime}}</view>
-            </view>
-          </view>
-        </view>
-        <img class="null-img" v-if="!dataList[0]" src="@/images/null-data-1.png">
-      </scroll-view>
-      <img class="supernatant"  @click="handleClick('recycle')"  src="@/images/Version3.0/icon_glpt_gqhsjl.png">
-    </view>
-    <view class="empty" v-if="emptyList==4 && pageType==0">
-      <img class="for-back-img" src="@/images/Version3.0/img_ysrygl_zwsj.png">
-      <view>暂无数据</view>
-    </view>
-    <hasten-page v-if="pageType==1"></hasten-page>
-    <reject-page v-if="pageType==2" :infoData="infoData"></reject-page>
-    <forbidden-page v-if="pageType==3"></forbidden-page>
-  </view>
-
-</template>
-
-<script>
-import { config } from '@/api/request/config.js'
-import { supplierDetail,storageListTaskIndex} from '@/api/index.js'
-import { hastenPage } from '@/pages/supplier/mine/hasten.vue'
-import { rejectPage } from '@/pages/supplier/mine/reject.vue'
-import { forbiddenPage } from '@/pages/supplier/mine/forbidden.vue'
-export default {
-  name: "rectifyList",
-  components: {
-    hastenPage,//供应商正在审核
-    rejectPage,//供应商驳回
-    forbiddenPage,//供应商停用
-  },
-  data() {
-    return {
-      emptyList:0,
-      pageType:4,
-      dataList:[],
-      //列表请求参数
-      getData:{
-        pageNum:1,
-        pageSize:5,
-      },
-      form:{
-        companyName:'',//企业名称
-        peopleSum:'0',//人员数量总数
-        carSum:'0',//运输车辆总数
-        bottleSum:'0',//气瓶数量总数
-      },
-      infoData:'',//驳回原因
-      state:'',
-    }
-  },
-  onLoad() {
-
-  },
-  onShow() {
-
-    this.infoList=[];
-
-  },
-  mounted(){
-    this.getInfo();
-    this.getList();
-  },
-  methods: {
-    //滚动加载事件
-    scrollGet(){
-      if(this.getData.getType){
-        this.getData.page += 1;
-        this.getList();
-      }
-    },
-    goInfo(d){
-      if(d.remark=='gq'){
-        uni.navigateTo({
-          url:'/pages_supplier/backlogManage/backlogManageAirDetail?item='+encodeURIComponent(JSON.stringify(d))
-        });
-      }else if(d.remark=='hs'){
-        uni.navigateTo({
-          url:'/pages_supplier/backlogManage/backlogManageRecycleDetail?item='+encodeURIComponent(JSON.stringify(d))
-        });
-      }else if(d.remark=='wt'){
-        uni.navigateTo({
-          url:'/pages_supplier/backlogManage/backlogManageIssueDetail?item='+encodeURIComponent(JSON.stringify(d))
-        });
-      }
-
-    },
-    handleClick(doType) {
-      if(doType=='people'){
-        uni.navigateTo({
-          url:'/pages_supplier/transportPerson/transportPerson'
-        });
-      }else if(doType=='car'){
-        uni.navigateTo({
-          url:'/pages_supplier/transportCar/transportCar'
-        });
-      }else if(doType=='bottle'){
-        uni.navigateTo({
-          url:'/pages_supplier/gasManage/gasManage'
-        });
-      }else if(doType=='mine'){
-        uni.navigateTo({
-          url: '/pages_supplier/mine/mine?state='+this.state
-        });
-      }else if(doType=='backlog'){//待办清单
-        uni.navigateTo({
-          url:'/pages_supplier/backlogManage/backlogManage'
-        });
-      }else if(doType=='recycle'){//供气回收
-        uni.navigateTo({
-          url:'/pages_supplier/gasRecycle/gasRecycle'
-        });
-      }
-
-
-    },
-    //获取首页详情
-    async getInfo(){
-      let _this = this;
-      const {data} = await supplierDetail()
-      let res=data.data
-      if(data.code==200){
-        this.state=res.state;
-        if(res.state==0){//审核状态(0:未审核,1:审核通过,2:审核未通过)
-          this.pageType=1;
-        }else if(res.state==1){
-          this.pageType=0;
-        }else if(res.state==2){
-          this.pageType=2;
-          this.infoData=res.audit.auditContent//驳回原因
-        }
-        this.form.companyName=res.companyName
-        this.form.peopleSum=res.peopleSum
-        this.form.carSum=res.carSum
-        this.form.bottleSum=res.bottleSum
-
-      }else if(data.code==500){//资格状态status(0:启用,1:停用)
-        this.pageType=3;
-      }
-    },
-    //获取列表数据
-    async getList(){
-      let _this = this;
-      const {data} = await storageListTaskIndex(_this.getData);
-      if(data.code==200){
-        let res=data.rows;
-        _this.dataList=res;
-        if(_this.dataList.length<=0){
-          _this.emptyList=4
-        }
-      }
-    },
-  }
-}
-</script>
-
-<style lang="stylus" scoped>
-.empty{
-  text-align: center;
-  margin-top: 116rpx;
-  >img{
-    width: 336rpx;
-    height: 222rpx;
-    margin-left: 208rpx;
-  }
-  >view{
-    font-size: 30rpx;
-    font-family: PingFang SC;
-    font-weight: 500;
-    color: #E0E0E0;
-    line-height: 30rpx;
-    margin-top: 48rpx;
-  }
-}
-.supplier{
-  .supplier_h{
-    width: 750rpx;
-    height: 200rpx;
-    position: relative;
-    >img:nth-child(1){
-      width: 750rpx;
-      height: 200rpx;
-      position: absolute;
-      left: 0;
-      top: 0;
-    }
-    >img:nth-child(2){
-      width: 110rpx;
-      height: 110rpx;
-      position: absolute;
-      left: 18rpx;
-      top: 44rpx;
-    }
-    >img:nth-child(3){
-      width: 12rpx;
-      height: 24rpx;
-      position: absolute;
-      left: 716rpx;
-      top: 92rpx;
-    }
-    >view{
-      width: 550rpx;
-      font-size: 30rpx;
-      font-family: PingFang SC;
-      font-weight: 500;
-      color: #FFFFFF;
-      line-height: 30rpx;
-      position: absolute;
-      left: 164rpx;
-      top: 84rpx;
-    }
-  }
-  .supplier_tab{
-    width: 710rpx;
-    height: 180rpx;
-    background: #FFFFFF;
-    border-radius: 10rpx;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin: 20rpx 20rpx 0;
-    .supplier_tab_line{
-      width: 2rpx;
-      height: 30rpx;
-      background: #E0E0E0;
-    }
-    .supplier_tab_li{
-      flex: 1;
-      text-align: center;
-      >text{
-        display: block;
-      }
-      >text:nth-child(1){
-        font-size: 30rpx;
-        font-family: PingFang SC;
-        font-weight: 500;
-        color: #0183FA;
-        line-height: 30rpx;
-      }
-      >text:nth-child(2){
-        font-size: 30rpx;
-        font-family: PingFang SC;
-        font-weight: 500;
-        color: #333333;
-        line-height: 30rpx;
-        margin-top: 36rpx;
-      }
-    }
-  }
-  /* 列表 */
-  .for-max-box{
-    flex:1;
-    overflow-y scroll;
-    .for-big-box{
-      background:#fff;
-      border-radius:20rpx;
-      margin:20rpx;
-      .backlog{
-        height: 100rpx;
-        display: flex;
-        justify-content: flex-start;
-        align-items: center;
-        .backlog_l{
-          width: 34rpx;
-          height: 32rpx;
-          margin-left:20rpx;
-        }
-        .backlog_c{
-          font-size: 30rpx;
-          font-family: PingFang SC;
-          font-weight: 500;
-          color: #333333;
-          line-height: 30rpx;
-          margin-left:16rpx;
-        }
-        .backlog_r{
-          width: 24rpx;
-          height: 24rpx;
-          margin-left:472rpx;
-        }
-
-      }
-      .for-box:nth-child(1){
-        .for-title-box{
-          border:none;
-        }
-      }
-      .for-box{
-        overflow hidden
-        .for-title-box{
-          display:flex;
-          margin:0 26rpx 0;
-          border-top:1rpx solid #dedede;
-          padding-top:45rpx;
-          view:nth-child(1){
-            width:98rpx;
-            line-height:38rpx;
-            height:38rpx;
-            border-radius:6rpx;
-            font-size:20rpx;
-            text-align center;
-            margin-right:10rpx;
-          }
-          view:nth-child(2){
-            flex:1;
-            font-size:30rpx;
-            color:#333;
-            height:36rpx;
-            lin-height:36rpx;
-            margin-right:10rpx;
-            display:block;
-            overflow:hidden;
-            text-overflow:ellipsis;
-            white-space:nowrap;
-          }
-          view:nth-child(3){
-            font-size:30rpx;
-            color:#333;
-            height:36rpx;
-            lin-height:36rpx;
-            color:#D80000;
-          }
-          .viewColor1{
-            background #ffe6e6;
-            color:#ff5555;
-          }
-          .viewColor2{
-            background #fef2dd;
-            color:#f6a71d;
-          }
-          .viewColor3{
-            background #e0f1e2;
-            color:#30a23d;
-          }
-          .viewColor4{
-            background #f2dddd;
-            color:#a51919;
-          }
-          .viewColor5{
-            background #e2f6f8;
-            color:#3ac3d3;
-          }
-          .viewColor6{
-            background #d9edfe;
-            color:#0183fa;
-          }
-        }
-        .for-address-box{
-          display:flex;
-          margin:33rpx 26rpx 0;
-          img{
-            width:28rpx;
-            height:28rpx;
-            margin-right:20rpx;
-          }
-          view{
-            font-size:28rpx;
-            line-height:28rpx;
-            color:#666;
-          }
-        }
-        .for-time-box{
-          display:flex;
-          margin:26rpx 26rpx 0;
-          padding-bottom:32rpx;
-          img{
-            width:28rpx;
-            height:28rpx;
-            margin-right:20rpx;
-          }
-          view{
-            font-size:28rpx;
-            line-height:28rpx;
-            color:#666;
-          }
-        }
-      }
-    }
-    .null-img{
-      display block
-      width:276rpx;
-      height:321rpx;
-      position absolute
-      top:100rpx;
-      left:274rpx;
-    }
-  }
-  /* 供求回收记录 */
-  .supernatant{
-    width: 152rpx;
-    height: 152rpx;
-    position: fixed;
-    right: 0rpx;
-    bottom: 60rpx;
-  }
-}
-</style>

+ 0 - 268
pages_manage/aptitudeAudit/aptitudeAudit.vue

@@ -1,268 +0,0 @@
-<!--资质审核-->
-<template>
-    <view id="gasRecycle">
-		<view class="tabTitle" v-if="userType==1">
-			<view class="tabTitle_li" @tap="tabClick(index)"  :key="index" v-for="(item,index) in tabText">
-				<view :class="{on:curTab==index}" class="tabTitle_text">{{item}}</view>
-			    <view :class="{on:curTab==index}" class="tabTitle_across"></view>
-			</view>
-		</view>
-		<scroll-view scroll-y @scrolltolower="scrollGet" class="scroll-box">
-		    <view class="list">
-				<view class="list_li" @click="goInfo(item)" v-for="(item,index) in dataList">
-					<view class="list_li_t">
-						<text v-if="curTab==1" :class="item.auditStatus==1?'colorA':'colorB'">{{item.auditStatus==1?'已通过':'未通过'}}</text>
-						<text>{{item.applyUser}}</text>
-						<text style="color: #0183FA;">{{item.remark=='yq'?'用气申请':'资格申请'}}</text>
-					</view>
-					<view class="list_li_b">
-						<img src="@/pages_manage/images/Version3.0/icon_zgsh_sysmph.png">
-						<text>{{item.room}}</text>
-						<img src="@/pages_manage/images/Version2.2/icon_wtzg_sj.png">
-						<text>{{item.createTime}}</text>
-					</view>
-				</view>
-			</view>
-			<view class="get-null-box" v-if="noData">暂无更多数据</view>
-		</scroll-view>
-	</view>
-</template>
-
-<script>
-	import { auditList } from '@/api/index.js'
-    export default {
-
-        name: "gasRecycle",
-        data() {
-            return {
-
-				pageType:0,
-				//列表请求参数
-				params:{
-				    pageNum:1,
-					pageSize:10,
-					auditStatus:0,//0待审核  3已审核
-				},
-				userType:uni.getStorageSync('userType'),
-				pageType:0,
-				curTab:0,
-				tabText:['待审核','已审核',],
-                dataList:[],
-				noData:false,
-            }
-        },
-        onLoad() {
-
-        },
-        onShow() {
-
-        },
-        methods: {
-			goInfo(d){
-
-				if(this.curTab==0){//审核
-					uni.redirectTo({
-					    url:'/pages_manage/aptitudeAudit/aptitudeAuditCheck?item='+encodeURIComponent(JSON.stringify(d))
-					});
-				}else if(this.curTab==1){//详情
-					uni.navigateTo({
-					    url:'/pages_manage/aptitudeAudit/aptitudeAuditDetail?item='+encodeURIComponent(JSON.stringify(d))
-					});
-				}
-
-			},
-			//顶部tab点击
-			tabClick(index) {
-				this.curTab = index;
-				this.pageType=index;
-				this.params.pageNum=1;
-
-				if(index==0){
-					this.params.auditStatus=0;
-				}else if(index==1){
-					this.params.auditStatus=3;
-				}
-				this.dataList=[];
-				this.getList();
-			},
-			//滚动加载事件
-			scrollGet(){
-			   this.params.pageNum += 1;
-			   this.getList();
-			},
-			//查询实验室
-			async getList(){
-				const {data} = await auditList(this.params)
-				if(data.code == 200){
-					let _this=this;
-					let res=data.rows
-					if(res && res.length>0){
-						if(_this.params.pageNum==1){
-							_this.dataList=res;
-						}else{
-							_this.dataList=_this.dataList.concat(res);
-
-						}
-					}else{
-						_this.noData=true;
-					}
-
-
-				}
-			},
-
-        },
-		mounted(){
-		   this.getList();
-
-		},
-    }
-</script>
-
-<style lang="stylus" scoped>
-    #gasRecycle {
-        height: 100%;
-        width: 100%;
-		flex :1;
-        display flex;
-        flex-direction column
-        overflow hidden
-		.tabTitle{
-			display flex;
-			width:100%;
-			height: 100rpx;
-			background: #fff;
-			margin-bottom 16rpx;
-
-			.tabTitle_li{
-				width:146rpx;
-				text-align center;
-				.tabTitle_text{
-					display: inline-block;
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-					line-height: 70rpx;
-					&.on{
-						color:#0183FA;
-					}
-				}
-				.tabTitle_across{
-					width: 50rpx;
-					height: 6rpx;
-					background: #0183FA;
-					border-radius: 3rpx;
-					margin-left 50rpx;
-					display none;
-					&.on{
-						display block;
-					}
-				}
-
-			}
-
-
-		}
-     .scroll-box{
-        // flex:1;
-         overflow-y scroll;
-     	.list{
-			width: 710rpx;
-			background: #FFFFFF;
-			border-radius: 10rpx;
-			margin: 20rpx;
-			overflow: hidden;
-			.list_li{
-				height: 134rpx;
-				border-bottom: 1px solid #E0E0E0;
-				margin: 0 20rpx;
-				padding-top: 20rpx;
-				box-sizing: border-box;
-				.list_li_t{
-					display: flex;
-					justify-content: space-between;
-					align-items: center;
-					.colorA{
-						display: inline-block;
-						background: rgba(48,162,61,0.2);
-						border-radius: 6rpx;
-						font-size: 22rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #30A23D;
-						padding: 6rpx 18rpx;
-						box-sizing: border-box;
-					}
-					.colorB{
-						display: inline-block;
-						background: rgba(165,25,25,0.2);
-						border-radius: 6rpx;
-						font-size: 22rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #A51919;
-						padding: 6rpx 18rpx;
-						box-sizing: border-box;
-					}
-					>text:nth-of-type(2){
-						font-size: 28rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #333333;
-						line-height: 28rpx;
-						margin-left: 12rpx;
-					}
-					>text:nth-of-type(3){
-						flex: 1;
-						font-size: 26rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #333333;
-						line-height: 26rpx;
-						text-align: right;
-					}
-
-				}
-				.list_li_b{
-					margin-top: 30rpx;
-					display: flex;
-					>img:nth-of-type(1){
-						width: 28rpx;
-						height: 28rpx;
-						margin-right: 16rpx;
-					}
-					>img:nth-of-type(2){
-						width: 28rpx;
-						height: 28rpx;
-						margin-right: 20rpx;
-					}
-					>text:nth-of-type(1){
-						font-size: 26rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #666666;
-						line-height: 26rpx;
-						width: 152rpx;
-					}
-					>text:nth-of-type(2){
-						font-size: 26rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #666666;
-						line-height: 26rpx;
-
-					}
-				}
-			}
-		}
-		/*暂无数据*/
-		.get-null-box{
-		    height:100rpx;
-		    line-height:100rpx;
-		    color:#999;
-		    text-align center
-		}
-	 }
-	}
-</style>

+ 0 - 474
pages_manage/aptitudeAudit/aptitudeAuditCheck.vue

@@ -1,474 +0,0 @@
-<!-- 资质审核-->
-<template>
-    <view id="register">
-		<view class="register_li">
-			<view class="register_li_min">
-				<img class="icon_img" src="@/pages_manage/images/Version3.0/icon_zgsq_sqr.png">
-				<view>申请人:</view>
-				<input v-model="form.applyUser" disabled  type="text" >
-			</view>
-			<view class="register_li_min" style="border: none;">
-				<img class="icon_img" src="@/pages_manage/images/Version3.0/icon_zgsq_dhh.png">
-				<view>联系方式:</view>
-				<input v-model="form.phone" disabled  type="text" >
-			</view>
-		</view>
-		<view class="register_li" v-if="status=='zg'">
-			<view class="register_li_min" v-for="(item,index) in form.airBottlelist" style="border-bottom:0;" >
-				<view></view>
-				<view>{{item.airName}}-{{item.configName}}:</view>
-				<input v-model="'数量:'+item.bottleNumber" disabled  type="text" >
-			</view>
-		</view>
-		<view class="register_li">
-			<view class="register_li_min">
-				<view></view>
-				<view>实验地点:</view>
-				<input v-model="form.location" disabled type="text" >
-			</view>
-			<!-- 使用期限 -->
-			<view class="register_li_min2">
-				<view><text  style="color: #f00;margin-right: 10rpx;"></text>使用期限:</view>
-				<picker mode="date" disabled @change="startChange($event)">
-					<input class="picker-text" v-model="form.startTime" disabled  type="text"  placeholder="开始时间">
-				</picker>
-				<view>-</view>
-				<picker mode="date" disabled @change="endChange($event)">
-					<input class="picker-text2" v-model="form.endTime" disabled  type="text"  placeholder="结束时间">
-				</picker>
-			</view>
-			<view class="register_li_min">
-			    <view></view>
-				<view>气体用途:</view>
-				<input v-model="form.gasUse" disabled  type="text" >
-			</view>
-			<view class="register_li_min">
-			    <view></view>
-				<view>安全措施:</view>
-				<input v-model="form.safetyPrecautions" disabled  type="text" >
-			</view>
-			<view  class="issue_li" style="border-bottom:0;"  @click="lookItem(form.applyCertificate)">
-				<view></view>
-				<view>用气申请表:</view>
-				<img class="issue_img" :src="baseUrl+form.applyCertificate">
-			</view>
-			<view  class="check_li" style="border-bottom:0;"
-				v-if="(status=='yq' && form.leadAuditStaus==0 && form.isAdmin && form.audit)||(status=='yq' && form.leadAuditStaus==1 && form.centerAuditStatus!=2 && form.audit)">
-				<view></view>
-				<view>审核意见:</view>
-				<textarea v-model="params.leadAuditCause" class="check_li_b"  placeholder="请输入审核意见"></textarea>
-			</view>
-			<view  class="check_li" style="border-bottom:0;"
-				v-if="(status=='zg' && form.leadAuditStatus==0 && form.isAdmin && form.audit)||(status=='zg' && form.leadAuditStatus==1 && form.centerAuditStatus!=2 && form.audit)">
-				<view></view>
-				<view>审核意见:</view>
-				<textarea v-model="params.leadAuditCause" class="check_li_b"  placeholder="请输入审核意见"></textarea>
-			</view>
-		</view>
-		<!-- 用气实验室 -->
-		<view  class="sub_btn" v-if="status=='yq' && form.leadAuditStaus==0  && form.isAdmin && form.audit">
-			<view class="sub_btn_l" @click="submitForm(2)">审核驳回</view>
-			<view class="sub_btn_r" @click="submitForm(1)">审核通过</view>
-		</view>
-		<!-- 用气实验中心 -->
-		<view  class="sub_btn" v-if="status=='yq' && form.leadAuditStaus==1 && form.centerAuditStatus!=2  && form.audit">
-			<view class="sub_btn_l" @click="submitForm2(2)">审核驳回</view>
-			<view class="sub_btn_r" @click="submitForm2(1)">审核通过</view>
-		</view>
-		<!-- 资格实验室 -->
-		<view  class="sub_btn" v-if="status=='zg' && form.leadAuditStatus==0 && form.isAdmin && form.audit">
-			<view class="sub_btn_l" @click="submitForm(2)">审核驳回</view>
-			<view class="sub_btn_r" @click="submitForm(1)">审核通过</view>
-		</view>
-		<!-- 资格实验中心 -->
-		<view  class="sub_btn" v-if="status=='zg' && form.leadAuditStatus==1 && form.centerAuditStatus!=2  && form.audit">
-			<view class="sub_btn_l" @click="submitForm2(2)">审核驳回</view>
-			<view class="sub_btn_r" @click="submitForm2(1)">审核通过</view>
-		</view>
-	</view>
-</template>
-
-<script>
-    import {auditDetail,qualificationDetail,auditCheck,auditCenterCheck,auditUseAgsCheck,auditUseAgsCenterCheck} from '@/api/index.js'
-	import { config } from '@/api/request/config.js'
-    export default {
-        data() {
-            return {
-				baseUrl:config.base_url,
-				form:{},
-				id:'',
-				status:null,//yq 用气申请 zg 资格申请
-				params:{
-					id:'',
-					leadAuditCause:'',
-					leadAuditStatus:'',//审核状态 0 未审核 1.审核通过 2.审核未通过
-				},
-            }
-        },
-        onLoad(option) {
-			if(decodeURIComponent(option.item)){
-				this.id=JSON.parse(decodeURIComponent(option.item)).id;
-				this.status=JSON.parse(decodeURIComponent(option.item)).remark;
-			}
-			if(this.status=='yq'){
-				wx.setNavigationBarTitle({
-				  title: '用气申请',
-				})
-			}else if(this.status=='zg'){
-				wx.setNavigationBarTitle({
-				  title: '资格申请',
-				})
-			}
-
-
-        },
-        onShow(){
-
-        },
-
-        methods: {
-			//获取详情
-			async getInfo(){
-			    let _this = this;
-				if(this.status=='yq'){
-					const {data} = await auditDetail({id:this.id})
-					if(data.code==200){
-						let res=data.data
-						_this.form=res.apply;
-						_this.form.isAdmin=res.isAdmin;
-						_this.form.audit=res.audit;
-						_this.form.airBottlelist=res.airBottlelist;
-						_this.params.id=res.apply.id;
-
-					}
-				}else if(this.status=='zg'){
-					const {data} = await qualificationDetail({id:this.id})
-					if(data.code==200){
-						let res=data.data
-						_this.form=res.apply;
-						_this.form.isAdmin=res.isAdmin;
-						_this.form.audit=res.audit;
-						_this.form.airBottlelist=res.airBottlelist;
-						_this.params.id=res.apply.id;
-
-					}
-				}
-
-			},
-			lookItem(item){
-				//查看图片
-				wx.previewImage({
-					urls: [config.base_url+item], //需要预览的图片http链接列表,多张的时候,url直接写在后面就行了
-					current: '', // 当前显示图片的http链接,默认是第一个
-					success: function(res) {},
-					fail: function(res) {},
-					complete: function(res) {},
-				})
-			},
-			//重新提交
-			//提交实验室
-			async submitForm(auditStatus){
-				let _this = this;
-
-				if(!_this.params.leadAuditCause){
-					uni.showToast({
-					    title: '请输入审核意见!',
-					    icon:"none",
-					    mask:true,
-					    duration: 2000
-					});
-					return
-				}
-				let obj={};
-				obj.leadAuditCause=_this.params.leadAuditCause;
-				obj.id=_this.params.id;
-				if(this.status=='yq'){
-					if(auditStatus==1){//通过
-						obj.leadAuditStaus=1
-					}else if(auditStatus==2){//驳回
-					    obj.leadAuditStaus=2
-					}
-					const {data} = await auditUseAgsCheck(obj);
-					if(data.code == 200){
-					    uni.showToast({
-					        title: '审核成功',
-					        icon:"none",
-					        mask:true,
-					        duration: 2000
-					    });
-						uni.removeStorageSync('listDetail');
-					    setTimeout(function(){
-					       uni.redirectTo({
-					            url: '/pages_manage/aptitudeAudit/aptitudeAudit'
-					        });
-					    },2000);
-					}
-				}else if(this.status=='zg'){
-					obj.leadAuditCause=_this.params.leadAuditCause;
-					if(auditStatus==1){//通过
-						obj.leadAuditStatus=1
-					}else if(auditStatus==2){//驳回
-					    obj.leadAuditStatus=2
-					}
-					const {data} = await auditCheck(obj);
-					if(data.code == 200){
-					    uni.showToast({
-					        title: '审核成功',
-					        icon:"none",
-					        mask:true,
-					        duration: 2000
-					    });
-						uni.removeStorageSync('listDetail');
-					    setTimeout(function(){
-					       uni.redirectTo({
-					            url: '/pages_manage/aptitudeAudit/aptitudeAudit'
-					        });
-					    },2000);
-					}
-				}
-
-			},
-			//实验中心
-			async submitForm2(auditStatus){
-				let _this = this;
-				let obj={};
-				obj.centerAuditCause=_this.params.leadAuditCause;
-				obj.id=_this.params.id;
-				if(this.status=='yq'){
-					if(auditStatus==1){//通过
-						obj.centerAuditStatus=1
-					}else if(auditStatus==2){//驳回
-					    obj.centerAuditStatus=2
-					}
-					const {data} = await auditUseAgsCenterCheck(obj);
-					if(data.code == 200){
-					    uni.showToast({
-					        title: '审核成功',
-					        icon:"none",
-					        mask:true,
-					        duration: 2000
-					    });
-						uni.removeStorageSync('listDetail');
-					    setTimeout(function(){
-					       uni.redirectTo({
-					            url: '/pages_manage/aptitudeAudit/aptitudeAudit'
-					        });
-					    },2000);
-					}
-				}else if(this.status=='zg'){
-					if(auditStatus==1){//通过
-						obj.centerAuditStatus=1
-					}else if(auditStatus==2){//驳回
-					    obj.centerAuditStatus=2
-					}
-					const {data} = await auditCenterCheck(obj);
-					if(data.code == 200){
-					    uni.showToast({
-					        title: '审核成功',
-					        icon:"none",
-					        mask:true,
-					        duration: 2000
-					    });
-						uni.removeStorageSync('listDetail');
-					    setTimeout(function(){
-					       uni.redirectTo({
-					            url: '/pages_manage/aptitudeAudit/aptitudeAudit'
-					        });
-					    },2000);
-					}
-				}
-
-
-			},
-        },
-		mounted() {
-			this.getInfo();
-
-		}
-    }
-</script>
-
-<style lang="stylus" scoped>
-    #register{
-        height:auto;
-        width:100%;
-        display flex;
-        flex-direction column;
-		padding-bottom: 220rpx;
-		.register_li{
-			background #fff;
-			border-radius:20rpx;
-			margin:20rpx 20rpx 0;
-			padding:20rpx 0;
-			box-sizing: border-box;
-			.register_li_min{
-				margin:0 26rpx;
-				display flex;
-				align-items center;
-				border-bottom: 1px solid #F5F5F5;
-				.icon_img{
-					width: 30rpx;
-					height: 30rpx;
-					margin-right: 12rpx;
-				}
-				view{
-					line-height:100rpx;
-					font-size:28rpx;
-				}
-				view:nth-child(1){
-					color:red;
-					line-height:28rpx;
-					margin-right: 12rpx;
-				}
-				view:nth-child(2){
-					//width:140rpx;
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #999999;
-				}
-
-				>input{
-					flex:1;
-					text-align: right;
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-				}
-
-
-			}
-			/* 时间 */
-			.register_li_min2{
-				margin:0 26rpx;
-				border-bottom: 1px solid #f5f5f5;
-				height: 100rpx;
-				display: flex;
-				justify-content: flex-start;
-				align-items: center;
-				>view:nth-child(1){
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #999999;
-					line-height: 100rpx;
-					margin-right: 120rpx;
-				}
-				.picker-text{
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-					line-height: 100rpx;
-					width: 188rpx;
-
-				}
-				>view:nth-child(2){
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-					line-height: 100rpx;
-				}
-				.picker-text2{
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-					line-height: 100rpx;
-					width: 188rpx;
-					text-align: right;
-				}
-			}
-
-			.issue_li{
-				margin:34rpx 26rpx 0;
-				display flex;
-				border-bottom: 1px solid #F5F5F5;
-				view:nth-child(1){
-					color:red;
-					line-height:28rpx;
-					margin-right: 12rpx;
-				}
-				view:nth-child(2){
-					//width:140rpx;
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #999999;
-				}
-				.issue_img{
-					width: 210rpx;
-					height: 210rpx;
-					border-radius: 10rpx;
-					margin-left:250rpx;
-				}
-			}
-			/* 审核意见 */
-			.check_li{
-				margin:34rpx 26rpx 0;
-				view:nth-child(1){
-					color:red;
-					line-height:28rpx;
-					margin-right: 12rpx;
-				}
-				view:nth-child(2){
-					//width:140rpx;
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #999999;
-				}
-				.check_li_b{
-					width: 657rpx;
-					height: 211rpx;
-					background: #FFFFFF;
-					border: 1px solid #E0E0E0;
-					border-radius: 10rpx;
-					padding: 20rpx;
-					box-sizing: border-box;
-					margin-top: 20rpx;
-				}
-
-			}
-		}
-		/* 按钮 */
-		.sub_btn{
-			width: 650rpx;
-			height: 100rpx;
-			display: flex;
-			position: fixed;
-			bottom: 30rpx;
-			left: 50rpx;
-			z-index: 1000;
-			.sub_btn_l{
-				width: 325rpx;
-				height: 100rpx;
-				background: linear-gradient(-45deg, #FA9901, #F28E26);
-				border-radius: 50rpx 0px 0px 50rpx;
-				font-size: 30rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #FFFFFF;
-				line-height: 100rpx;
-				text-align: center;
-			}
-			.sub_btn_r{
-				width: 325rpx;
-				height: 100rpx;
-			    background: linear-gradient(-35deg, #309CFF, #0183FA);
-			    border-radius: 0px 50rpx 50rpx 0px;
-				font-size: 30rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #FFFFFF;
-				line-height: 100rpx;
-				text-align: center;
-			}
-		}
-	}
-	/deep/.input-value-border{
-		display :none !important;
-	}
-</style>

+ 0 - 259
pages_manage/aptitudeAudit/aptitudeAuditDetail.vue

@@ -1,259 +0,0 @@
-<!-- 资质审核-->
-<template>
-    <view id="register">
-		<viwe v-if="auditStatus==1" class="tip">已通过审核...</viwe>
-		<viwe v-if="auditStatus==2 || auditStatus==0" class="reject">{{form.centerAuditStatus==2?'提交的申请被驳回,驳回原因为:'+form.centerAuditCause:form.leadAuditCause}}</viwe>
-
-		<view class="register_li">
-			<view class="register_li_min">
-				<img class="icon_img" src="@/pages_manage/images/Version3.0/icon_zgsq_sqr.png">
-				<view>申请人:</view>
-				<input v-model="form.applyUser" disabled  type="text" >
-			</view>
-			<view class="register_li_min" style="border: none;">
-				<img class="icon_img" src="@/pages_manage/images/Version3.0/icon_zgsq_dhh.png">
-				<view>联系方式:</view>
-				<input v-model="form.phone" disabled  type="text" >
-			</view>
-		</view>
-		<view class="register_li" v-if="status=='zg'">
-			<view class="register_li_min" v-for="(item,index) in form.airBottlelist" style="border-bottom:0;" >
-				<view></view>
-				<view>{{item.airName}}-{{item.configName}}:</view>
-				<input v-model="'数量:'+item.bottleNumber" disabled  type="text" >
-			</view>
-		</view>
-		<view class="register_li">
-			<view class="register_li_min">
-				<view></view>
-				<view>实验地点:</view>
-				<input v-model="form.location" disabled type="text" >
-			</view>
-			<view class="register_li_min">
-			    <view></view>
-				<view>使用期限-开始:</view>
-				<input v-model="form.startTime" disabled  type="text" >
-			</view>
-			<view class="register_li_min">
-			    <view></view>
-				<view>使用期限-结束:</view>
-				<input v-model="form.endTime" disabled  type="text" >
-			</view>
-			<view class="register_li_min">
-			    <view></view>
-				<view>气体用途:</view>
-				<input v-model="form.gasUse" disabled  type="text" >
-			</view>
-			<view class="register_li_min">
-			    <view></view>
-				<view>安全措施:</view>
-				<input v-model="form.safetyPrecautions" disabled  type="text" >
-			</view>
-			<view  class="issue_li" style="border-bottom:0;"  @click="lookItem(form.applyCertificate)">
-				<view></view>
-				<view>用气申请表:</view>
-				<img class="issue_img" :src="baseUrl+form.applyCertificate">
-			</view>
-		</view>
-
-		<view  class="sub_btn" v-if="status=='2'" @click="submitForm()">重新申请</view>
-	</view>
-</template>
-
-<script>
-    import {auditDetail,qualificationDetail} from '@/api/index.js'
-	import { config } from '@/api/request/config.js'
-    export default {
-        data() {
-            return {
-				baseUrl:config.base_url,
-				form:{},
-				id:'',
-				status:null,
-				auditStatus:null,// 0 未审核 1.通过 2.驳回)
-            }
-        },
-        onLoad(option) {
-			if(decodeURIComponent(option.item)){
-				this.id=JSON.parse(decodeURIComponent(option.item)).id;
-				this.status=JSON.parse(decodeURIComponent(option.item)).remark;
-				this.auditStatus=JSON.parse(decodeURIComponent(option.item)).auditStatus;
-			}
-			if(this.status=='yq'){
-				wx.setNavigationBarTitle({
-				  title: '用气申请',
-				})
-			}else if(this.status=='zg'){
-				wx.setNavigationBarTitle({
-				  title: '资格申请',
-				})
-			}
-
-        },
-        onShow(){
-        },
-
-        methods: {
-			//获取详情
-			async getInfo(){
-			    let _this = this;
-				if(this.status=='yq'){
-					const {data} = await auditDetail({id:this.id})
-					if(data.code==200){
-						let res=data.data
-						_this.form=res.apply;
-						_this.form.airBottlelist=res.airBottlelist
-					}
-				}else if(this.status=='zg'){
-					const {data} = await qualificationDetail({id:this.id})
-					if(data.code==200){
-						let res=data.data
-						_this.form=res.apply;
-						_this.form.airBottlelist=res.airBottlelist
-					}
-				}
-			},
-			lookItem(item){
-				//查看图片
-				wx.previewImage({
-					urls: [config.base_url+item], //需要预览的图片http链接列表,多张的时候,url直接写在后面就行了
-					current: '', // 当前显示图片的http链接,默认是第一个
-					success: function(res) {},
-					fail: function(res) {},
-					complete: function(res) {},
-				})
-			},
-			//重新提交
-			async submitForm(){
-				uni.redirectTo({
-				    url:'/pages_manage/examination/examinationAdd?status=1&id='+this.id
-				});
-			},
-        },
-		mounted() {
-			this.getInfo();
-		}
-    }
-</script>
-
-<style lang="stylus" scoped>
-    #register{
-        height:auto;
-        width:100%;
-        display flex;
-        flex-direction column;
-		padding-bottom: 220rpx;
-		/* 审核通过 */
-		.tip{
-			width: 750rpx;
-			background: rgba(1,204,39,0.2);
-			font-size: 28rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #01CC27;
-			line-height: 28rpx;
-			padding: 36rpx 20rpx;
-			box-sizing: border-box;
-		}
-		/* 驳回 */
-		.reject{
-			width: 750rpx;
-			background: #F3DCDC;
-			font-size: 28rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #DC0000;
-			line-height: 36rpx;
-			padding: 36rpx 20rpx;
-			box-sizing: border-box;
-		}
-		.register_li{
-			background #fff;
-			border-radius:20rpx;
-			margin:20rpx 20rpx 0;
-			padding:20rpx 0;
-			box-sizing: border-box;
-			.register_li_min{
-				margin:0 26rpx;
-				display flex;
-				align-items center;
-				border-bottom: 1px solid #F5F5F5;
-				.icon_img{
-					width: 30rpx;
-					height: 30rpx;
-					margin-right: 12rpx;
-				}
-				view{
-					line-height:100rpx;
-					font-size:28rpx;
-				}
-				view:nth-child(1){
-					color:red;
-					line-height:28rpx;
-					margin-right: 12rpx;
-				}
-				view:nth-child(2){
-					//width:140rpx;
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #999999;
-				}
-
-				>input{
-					flex:1;
-					text-align: right;
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-				}
-
-
-			}
-			.issue_li{
-				margin:34rpx 26rpx 0;
-				display flex;
-				border-bottom: 1px solid #F5F5F5;
-				view:nth-child(1){
-					color:red;
-					line-height:28rpx;
-					margin-right: 12rpx;
-				}
-				view:nth-child(2){
-					//width:140rpx;
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #999999;
-				}
-				.issue_img{
-					width: 210rpx;
-					height: 210rpx;
-					border-radius: 10rpx;
-					margin-left:250rpx;
-				}
-			}
-		}
-		/* 按钮 */
-		.sub_btn{
-			width: 650rpx;
-			height: 100rpx;
-			background: #0183FA;
-			border-radius: 20rpx;
-			font-size: 28rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #FFFFFF;
-			line-height: 100rpx;
-			text-align: center;
-			margin-left: 50rpx;
-			position: fixed;
-			bottom:30rpx;
-			z-index: 1000;
-		}
-	}
-	/deep/.input-value-border{
-		display :none !important;
-	}
-</style>

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 2310
pages_manage/emergencyEvacuationBig.vue


+ 0 - 677
pages_manage/emergencyEvacuationBigFullScreen.vue

@@ -1,677 +0,0 @@
-<template>
-	<view id="emergencyEvacuationBigFullScreen">
-		<view class="emergencyEvacuationBigFullScreen-page" v-if="mapType"
-			:style="'width:'+mapWidth+'px;height:'+mapHeight+'px;transform: scale('+zoomData+');margin-top:-'+mapHeight/2+'px;margin-left:-'+mapWidth/2+'px;'">
-			<view class="map-max-box" :style="'width:'+mapWidth+'px;height:'+mapHeight+'px;'">
-				<!-- :style="'width:'+mapW+'px;height:'+mapH+'px;'" -->
-				<view class="map-max-for-box for-map-box" v-if="item.type == 1" v-for="(item,index) in mapList"
-					:key="index" :class="!item.policeType && checkSubId ==item.subId ? 'room-type-one':(
-                           item.policeType && checkSubId !=item.subId ? 'room-type-two':(
-                           item.policeType && checkSubId ==item.subId ? 'room-type-three':(
-                           !item.loginAdmin ? 'room-type-noe':''
-					   )))" :style="'top:'+item.y+'px;left:'+item.x+'px;width:'+(item.w-4)+'px;height:'+(item.h-4)+'px;'">
-					<view class="map-max-for-min-box">
-						<view class="map-for-name-p" :style="'margin-top:'+((item.h/2)-20)+'px;'">
-							{{item.roomType == '-99'?item.roomName:item.subName}}</view>
-						<view class="map-for-num-p">({{item.roomNum}})</view>
-						<view class="position-box" src="@/images/evacuation3_2/icon_sysbjt_m.png"
-							:class="minItem.toward=='top'?'center-move-door-p-t':(minItem.toward=='bottom'?'center-move-door-p-b':(minItem.toward=='left'?'center-move-door-p-l':(minItem.toward=='right'?'center-move-door-p-r':'')))"
-							v-for="(minItem,minIndex) in item.doorList" :key="minIndex"
-							:style="'top:'+minItem.y+'px;left:'+minItem.x+'px;width:'+minItem.w+'px;height:'+minItem.h+'px;'">
-						</view>
-					</view>
-				</view>
-				<view class="map-max-for-box for-map-box-one" v-if="item.type == 2" v-for="(item,index) in mapList"
-					:key="index" :style="'top:'+item.y+'px;left:'+item.x+'px;width:'+item.w+'px;height:'+item.h+'px;'">
-					<view class="map-max-for-min-box">
-						<view class="position-box" @click="lighButton(minItem)"
-							:class="minItem.state=='1'&&minItem.openType?'lightTopOn':(minItem.state=='1'&&!minItem.openType?'lightTopOff':
-									(minItem.state=='2'&&minItem.openType?'lightBottomOn':(minItem.state=='2'&&!minItem.openType?'lightBottomOff':
-									(minItem.state=='3'&&minItem.openType?'lightLeftOn':(minItem.state=='3'&&!minItem.openType?'lightLeftOff':
-									(minItem.state=='4'&&minItem.openType?'lightRightOn':(minItem.state=='4'&&!minItem.openType?'lightRightOff':'')))))))"
-							v-for="(minItem,minIndex) in item.lightList" :key="minIndex"
-							:style="'top:'+minItem.y+'px;left:'+minItem.x+'px;width:'+minItem.w+'px;height:'+minItem.h+'px;'">
-						</view>
-					</view>
-				</view>
-				<view class="map-max-for-box for-map-box-two" v-if="item.type == 3" v-for="(item,index) in mapList"
-					@click="checkRoom(item)"
-					:key="index" :class="item.roomCheckType?'for-map-box-two-check':''"
-					:style="'top:'+item.y+'px;left:'+item.x+'px;width:'+item.w+'px;height:'+item.h+'px;'">
-				</view>
-			</view>
-		</view>
-		<view class="position-button" @click="backButton">退出全屏</view>
-		<view class="position-button-two" @click="executeEvacuation">已确定疏散出口,立即执行疏散</view>
-	</view>
-</template>
-
-<script>
-	import $mqtt from '@/utils/mqtt.min.js';
-	import {
-		getFloorData,
-		getRedisEvacuation,
-		openLight,
-		closeLight,
-		executeEvacuation
-	} from '@/api/index.js'
-	export default {
-		data() {
-			return {
-				// 楼栋id
-				buildingId: null,
-				//楼层id
-				floorId: null,
-				//实验室ID
-				subId:null,
-				//当前选中实验室
-				checkSubId: null,
-				//页面开关
-				mapType: false,
-				mapList: [],
-				//缩放相关数据
-				zoomData: null,
-				mapWidth: null, //40边框距离
-				mapHeight: null, //40边框距离
-				//弹层地图数据
-				buildingOptions: {},
-				//mqtt
-				floorClient: {},
-				evacuationTopic: "lab/newexit/line", //疏散
-				//疏散按钮
-				buttonType:false
-			}
-		},
-		onLoad(option) {
-			if(option.item){
-				let obj = JSON.parse(decodeURIComponent(option.item));
-				this.$set(this,'buildingId',obj.buildingId);
-				this.$set(this,'floorId',obj.floorId);
-				this.$set(this,'subId',obj.subId);
-				this.$set(this,'checkSubId',obj.subId);
-				if(obj.type == 2){
-					this.$set(this,'buttonType',true);
-				}else{
-					this.$set(this,'buttonType',false);
-				}
-			}
-		},
-		onShow() {
-			// this.offMQTT('on');
-			this.getBuildingData();
-		},
-		methods: {
-			mqttPageFunction(type){
-				let self = this;
-				if (type == 'FLOOR_EXITLINE') {
-					this.getRedisEvacuation();
-				} else if (type == 'FLOOR_OVER_EXITLINE') {
-					uni.showToast({
-						title: '疏散已结束',
-						icon: "none",
-						mask: true,
-						duration: 2000
-					});
-					setTimeout(function() {
-						self.getBuildingData();
-					}, 2000);
-				}
-			},
-			checkRoom(item){
-				if(this.buttonType){
-					item.roomCheckType = !item.roomCheckType;
-					this.$forceUpdate();
-				}
-			},
-			//开始疏散
-			async executeEvacuation(){
-				let self = this;
-				let list = [];
-				let doorPointNames = [];
-				for(let i=0;i<self.mapList.length;i++){
-					if(self.mapList[i].type == 3){
-						if(!self.mapList[i].roomCheckType){
-							list.push(self.mapList[i].key)
-						}else{
-							doorPointNames.push(self.mapList[i].key)
-						}
-					}
-				}
-				if(!doorPointNames[0]){
-					uni.showToast({
-						title: '请选择疏散出口',
-						icon: "none",
-						mask: true,
-						duration: 2000
-					});
-					return
-				}
-				let obj = {
-				buildId:this.buildingId,
-				floorId:this.floorId,
-				subId: this.subId,
-				badPointNames:list,
-				doorPointNames:doorPointNames,
-				}
-				const {	data } = await executeEvacuation(obj)
-				if (data.code == 200) {
-					uni.showToast({
-						title: '执行成功',
-						icon: "none",
-						mask: true,
-						duration: 2000
-					});
-					setTimeout(function(){
-						uni.navigateBack();
-					},2000);
-				}
-			},
-			//疏散页面
-			backButton() {
-				uni.navigateBack()
-			},
-			//地图数据
-			async getBuildingData() {
-				let self = this;
-				const {
-					data
-				} = await getFloorData(this.floorId)
-				if (data.code == 200) {
-					if (data.data.buildFloorLayoutVoList[0]) {
-						let list = JSON.parse(data.data.labExitLineVertex.layoutJoinData)
-						this.getWXSystemInfo(list);
-						for (let i = 0; i < list.length; i++) {
-							if (list[i].type == '2') {
-								//楼道
-								for (let o = 0; o < list[i].lightList.length; o++) {
-									list[i].lightList[o].openType = false;
-								}
-							} else if (list[i].type == '1') {
-								for (let o = 0; o < data.data.buildFloorLayoutVoList.length; o++) {
-									if (list[i].key == data.data.buildFloorLayoutVoList[o].pointName) {
-										list[i].id = data.data.buildFloorLayoutVoList[o].id;
-										list[i].buildId = data.data.buildFloorLayoutVoList[o].buildId;
-										list[i].floorId = data.data.buildFloorLayoutVoList[o].floorId;
-										list[i].roomType = data.data.buildFloorLayoutVoList[o].roomType;
-										list[i].roomName = data.data.buildFloorLayoutVoList[o].roomName;
-										list[i].roomNum = data.data.buildFloorLayoutVoList[o].roomNum;
-										list[i].subName = data.data.buildFloorLayoutVoList[o].subName;
-										list[i].subId = data.data.buildFloorLayoutVoList[o].subId;
-										list[i].online = data.data.buildFloorLayoutVoList[o].online;
-										list[i].loginAdmin = data.data.buildFloorLayoutVoList[o].loginAdmin;
-										list[i].policeType = false;
-									}
-								}
-							} else if (list[i].type == 3) {
-								list[i].roomCheckType = false;
-							}
-						}
-						this.$set(this, 'mapList', JSON.parse(JSON.stringify(list)));
-						this.$set(this, 'mapType', true);
-						setTimeout(function() {
-							self.getRedisEvacuation();
-						}, 500);
-
-					}
-				}
-			},
-			//获取疏散数据
-			async getRedisEvacuation() {
-				let self = this;
-				let obj = {
-					buildId: this.buildingId,
-					floorId: this.floorId,
-				}
-				const {
-					data
-				} = await getRedisEvacuation(obj)
-				if (data.code == 200) {
-					if (data.data.doorPointNames) {
-						for (let o = 0; o < self.mapList.length; o++) {
-							if (self.mapList[o].type == 2) {
-								for (let x = 0; x < self.mapList[o].lightList.length; x++) {
-									let num = 0;
-									for (let i = 0; i < data.data.lightPointSet.length; i++) {
-										if (data.data.lightPointSet[i]) { //处理后端返回的异常的NULL
-											if (self.mapList[o].lightList[x].key == data.data.lightPointSet[i].key) {
-												num++
-											}
-										}
-									}
-									self.mapList[o].lightList[x].openType = num != 0;
-								}
-							}
-						}
-						for (let i = 0; i < data.data.doorPointNames.length; i++) {
-							for (let o = 0; o < self.mapList.length; o++) {
-								if (self.mapList[o].type == 3) {
-									if (data.data.doorPointNames[i] == self.mapList[o].key) {
-										self.mapList[o].roomCheckType = true;
-									}
-								}
-							}
-						}
-						this.$forceUpdate();
-					}
-				};
-			},
-			//灯点击事件
-			lighButton(item) {
-				let self = this;
-				uni.showModal({
-					content: '确定' + (item.openType ? '关闭' : '开启') + '该疏散灯?',
-					cancelColor: "#999",
-					confirmColor: "#0183FA",
-					success: function(res) {
-						if (res.confirm) {
-							if (item.openType) {
-								self.closeLight(item);
-							} else {
-								self.openLight(item);
-							}
-						} else if (res.cancel) {
-						}
-					}
-				});
-			},
-			//开灯
-			async openLight(item) {
-				let obj = {
-					buildId: this.buildingId,
-					floorId: this.floorId,
-					pointName: item.key
-				};
-				const {
-					data
-				} = await openLight(obj)
-				if (data.code == 200) {
-					uni.showToast({
-						title: '操作成功',
-						icon: "none",
-						mask: true,
-						duration: 2000
-					});
-				}
-			},
-			//关灯
-			async closeLight(item) {
-				let obj = {
-					buildId: this.buildingId,
-					floorId: this.floorId,
-					pointName: item.key
-				};
-				const {
-					data
-				} = await closeLight(obj)
-				if (data.code == 200) {
-					uni.showToast({
-						title: '操作成功',
-						icon: "none",
-						mask: true,
-						duration: 2000
-					});
-				}
-			},
-			//计算缩放率
-			getWXSystemInfo(list) {
-				let self = this;
-				wx.getSystemInfo({
-					success: function(res) {
-						self.zoomCalculate(list, res.windowHeight, res.windowWidth);
-					}
-				})
-			},
-			zoomCalculate(list, height, width) {
-				let num = 0;
-				let zoomType = 0;
-				let maxWidth = 0
-				let maxHeight = 0
-				let zoomData = 1;
-				if (height > width) {
-					num = height / width
-				} else {
-					num = width / height
-				}
-				for (let i = 0; i < list.length; i++) {
-					if ((list[i].x + list[i].w) > maxWidth) {
-						maxWidth = list[i].x + list[i].w
-					}
-					if ((list[i].y + list[i].h) > maxHeight) {
-						maxHeight = list[i].y + list[i].h
-					}
-				}
-				this.$set(this, 'mapWidth', maxWidth);
-				this.$set(this, 'mapHeight', maxHeight);
-				  let zoomNumOne = height / maxHeight;
-				  if(parseInt(this.accMul(zoomNumOne,maxHeight)) <= height && parseInt(this.accMul(zoomNumOne,maxWidth)) <= width){
-				    zoomData = zoomNumOne;
-				    this.$set(this,'zoomData',zoomNumOne);
-				  }
-				  let zoomNumTwo = width / maxWidth;
-				  if(parseInt(this.accMul(zoomNumTwo,maxHeight)) <= height && parseInt(this.accMul(zoomNumTwo,maxWidth)) <= width){
-				    zoomData = zoomNumTwo;
-				    this.$set(this,'zoomData',zoomNumTwo);
-				  }
-				// if (maxWidth > maxHeight) {
-				// 	if ((maxWidth / maxHeight) > num) {
-				// 		// 以宽度缩放
-				// 		zoomType = 1;
-				// 	} else {
-				// 		// 以高度缩放
-				// 		zoomType = 2;
-				//  }
-				// } else {
-				// 	if ((maxHeight / maxWidth) > num) {
-				// 		// 以高度缩放
-				// 		zoomType = 2;
-				// 	} else {
-				// 		// 以宽度缩放
-				// 		zoomType = 1;
-				// 	}
-				// }
-
-				// if (zoomType == 1) {
-				// 	if (width > maxWidth) {
-				// 		zoomData = maxWidth / width;
-				// 	} else {
-				// 		zoomData = width / maxWidth;
-				// 	}
-				// 	if (width > maxWidth) {
-				// 		this.$set(this, 'zoomData', maxWidth / width);
-				// 	} else {
-				// 		this.$set(this, 'zoomData', width / maxWidth);
-				// 	}
-				// } else if (zoomType == 2) {
-				//  if (height > maxHeight) {
-				// 		zoomData = maxHeight / height;
-				// 	} else {
-				// 		zoomData = height / maxHeight;
-				// 	}
-				// 	if (height > maxHeight) {
-				// 		this.$set(this, 'zoomData', maxHeight / height);
-				// 	} else {
-				// 		this.$set(this, 'zoomData', height / maxHeight);
-				// 	}
-				// }
-			},
-			  accMul(arg1,arg2){
-				var m=0,s1=arg1.toString(),s2=arg2.toString();
-				try{m+=s1.split(".")[1].length}catch(e){}
-				try{m+=s2.split(".")[1].length}catch(e){}
-				return Number(s1.replace(".",""))*Number(s2.replace(".",""))/Math.pow(10,m)
-			  },
-			/*MQTT*/
-			//订阅
-			onMQTT() {
-				let self = this;
-				const mqttOptions = {
-					keepalive: 30,
-					clean: true, //保留会话
-					connectTimeout: 600000, // 超时时间
-					reconnectPeriod: 5000, // 重连间隔
-					clientId: uni.getStorageSync('token') + 'lab/function/data',
-          username: uni.getStorageSync('mqttUser'),
-          password: uni.getStorageSync('mqttPassword'),
-				}
-				const connectUrl = uni.getStorageSync('mqttUrl');
-				this.floorClient = $mqtt.connect('wxs://' + connectUrl, mqttOptions);
-				this.floorClient.on('connect', () => {
-					this.floorClient.subscribe(this.evacuationTopic + this.floorId, (err) => {
-						if (!err) {
-							console.log("疏散-订阅成功", )
-							this.getBuildingData();
-						}
-					});
-				});
-				// 自动重连
-				this.floorClient.on('reconnect', (msg) => {
-					console.log('自动重连-reconnect-1', msg)
-				});
-				// 错误
-				this.floorClient.on('error', () => {
-					console.log('错误-error-1')
-				});
-				// 断开
-				this.floorClient.on('end', () => {
-					console.log('断开-end-1')
-				});
-				// 掉线
-				this.floorClient.on('offline', (msg) => {
-					console.log('掉线-offline-1', msg)
-				});
-				// 收到消息
-				this.floorClient.on('message', (topic, message) => {
-					let data = JSON.parse(message)
-					if (data) {
-						if (topic == (this.evacuationTopic + this.floorId)) {
-							console.log('疏散通知', data)
-							//疏散消息
-							if (data.data == 'FLOOR_EXITLINE') {
-								this.getRedisEvacuation();
-							} else if (data.data == 'FLOOR_OVER_EXITLINE') {
-								uni.showToast({
-									title: '疏散已结束',
-									icon: "none",
-									mask: true,
-									duration: 2000
-								});
-								setTimeout(function() {
-									self.getBuildingData();
-								}, 2000);
-							}
-						}
-					}
-				});
-				// 全局监听是否有关闭mqtt的消息的事件
-				uni.$on('closeMqtt', () => {
-					this.floorClient.end(true); // 主动断开连接
-				})
-			},
-			//关闭MQTT连接
-			offMQTT(type) {
-				if (this.floorClient.unsubscribe) {
-					this.floorClient.unsubscribe(this.evacuationTopic + this.floorId, error => {
-						if (error) {
-							console.log('疏散连接-关闭错误', error)
-						}
-					});
-					this.floorClient.end(true);
-					this.$set(this, 'floorClient', {});
-				}
-				if (type) {
-					this.onMQTT();
-				}
-			},
-		},
-		beforeDestroy() {
-			//断开mqtt连接
-			this.offMQTT();
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-	#emergencyEvacuationBigFullScreen {
-		height: 100%;
-		width: 100%;
-		display: flex;
-		overflow: hidden;
-
-		.emergencyEvacuationBigFullScreen-page {
-			// overflow: scroll;
-			overflow: hidden;
-			position: absolute;
-			top: 50%;
-			left: 50%;
-
-			.map-max-box {
-				position: relative;
-
-				.map-max-for-box {
-					position: absolute;
-					display: flex;
-					flex-direction: column;
-
-					.map-max-for-min-box {
-						position: relative;
-
-						.position-box {
-							position: absolute;
-						}
-
-						.map-for-name-p {
-							padding: 0 10px;
-							height: 20px;
-							line-height: 20px;
-							font-size: 14px;
-							text-align: center;
-							color: #333;
-							overflow: hidden;
-							text-overflow: ellipsis;
-							white-space: nowrap;
-						}
-
-						.map-for-num-p {
-							padding: 0 10px;
-							height: 20px;
-							line-height: 20px;
-							font-size: 14px;
-							text-align: center;
-							color: #333;
-							overflow: hidden;
-							text-overflow: ellipsis;
-							white-space: nowrap;
-						}
-
-						.center-move-door-p-t {
-							background: url("../images/evacuation3_2/icon_sysbjt_m.png") !important;
-							background-size: 100% !important;
-							transform: rotate(180deg);
-						}
-
-						.center-move-door-p-b {
-							background: url("../images/evacuation3_2/icon_sysbjt_m.png") !important;
-							background-size: 100% !important;
-						}
-
-						.center-move-door-p-l {
-							background: url("../images/evacuation3_2/icon_sysbjt_m.png") !important;
-							background-size: 100% !important;
-							transform: rotate(90deg);
-						}
-
-						.center-move-door-p-r {
-							background: url("../images/evacuation3_2/icon_sysbjt_m.png") !important;
-							background-size: 100% !important;
-							transform: rotateZ(270deg);
-						}
-
-						.lightTopOn {
-							background: url("../images/evacuation3_2//icon_sjt.png");
-							background-size: 100%;
-						}
-
-						.lightTopOff {
-							background: url("../images/evacuation3_2//icon_shang_hs.png");
-							background-size: 100%;
-						}
-
-						.lightBottomOn {
-							background: url("../images/evacuation3_2//icon_xjt.png");
-							background-size: 100%;
-						}
-
-						.lightBottomOff {
-							background: url("../images/evacuation3_2//icon_xia_hs.png");
-							background-size: 100%;
-						}
-
-						.lightLeftOn {
-							background: url("../images/evacuation3_2//icon_zuo.png");
-							background-size: 100%;
-						}
-
-						.lightLeftOff {
-							background: url("../images/evacuation3_2//icon_zou_hs.png");
-							background-size: 100%;
-						}
-
-						.lightRightOn {
-							background: url("../images/evacuation3_2//icon_yuo.png");
-							background-size: 100%;
-						}
-
-						.lightRightOff {
-							background: url("../images/evacuation3_2//icon_you_hs.png");
-							background-size: 100%;
-						}
-					}
-				}
-
-				.for-map-box {
-					border: 2px solid #fff;
-					background: #CEF2FD;
-				}
-
-				.for-map-box-one {
-					background: #CEFDD5;
-				}
-
-				.for-map-box-two {
-					background: url("../images/evacuation3_2/icon_yjtd.png") center center no-repeat #006400;
-					background-size: 60px 60px;
-				}
-
-				.for-map-box-two-check {
-					background: url("../images/evacuation3_2/icon_yjtd.png") center center no-repeat rgba(50, 205, 50, 1);
-					background-size: 80px 80px;
-				}
-
-				.room-type-one {
-					//选中
-					background: rgba(178, 235, 255, 1);
-				}
-
-				.room-type-two {
-					//报警
-					background: rgba(232, 0, 0, 0.4);
-					box-shadow: 0 0 10px 1px #E80000 inset;
-				}
-
-				.room-type-three {
-					//选中报警
-					background: rgba(178, 235, 255, 1);
-					box-shadow: 0 0 10px 1px #E80000 inset;
-				}
-			}
-		}
-
-		.position-button {
-			position: fixed;
-			top: 10px;
-			right: 10px;
-			width: 100px;
-			line-height: 30px;
-			font-size: 16px;
-			background: rgba(0, 0, 0, 0.5);
-			color: #fff;
-			text-align: center;
-			border-radius: 18px;
-			border: none;
-		}
-		.position-button-two{
-			position: fixed;
-			bottom: 20px;
-			left: 50%;
-			width: 240px;
-			line-height: 30px;
-			font-size: 16px;
-			text-align: center;
-			color: #fff;
-			background: #0183FA;
-			border-radius: 4px;
-			margin-left: -120px;
-			border: none;
-		}
-	}
-</style>

+ 0 - 200
pages_manage/examination/examination.vue

@@ -1,200 +0,0 @@
-<!--资格申请-->
-<template>
-    <view id="transportPerson">
-		<scroll-view scroll-y @scrolltolower="scrollGet" class="scroll-box">
-		    <view class="list">
-				<view class="list_li" v-for="(item,index) in  dataList" @click="goInfo(item)">
-					<img class="for-back-img" src="@/pages_manage/images/Version3.0/icon_yqsq_sys.png">
-					<text class="list_li_text">{{item.room}}</text>
-					<text  :class="item.remark=='1'?'list_li_text2':(item.remark=='0'?'colorA':(item.remark=='2'?'colorB':''))">{{item.remark=='1'?'有效期:'+item.startTime+'至'+item.endTime+'':(item.remark=='0'?'审核中':(item.remark=='2'?'审核驳回':''))}}</text>
-				</view>
-			</view>
-		</scroll-view>
-		<view class="empty" v-if="pageType==4">
-			<img class="for-back-img" src="@/pages_manage/images/Version3.0/img_ysrygl_zwsj.png">
-			<view>暂无数据</view>
-		</view>
-		<view class="sub_btn" @click="subBtn()">申请资格</view>
-	</view>
-</template>
-
-<script>
-	import { qualificationList } from '@/api/index.js'
-    export default {
-
-        name: "transportPerson",
-        data() {
-            return {
-
-				pageType:0,
-				//列表请求参数
-				getData:{
-				    pageNum:1,
-					pageSize:20,
-				},
-                dataList:[],
-				status:0,
-            }
-        },
-        onLoad() {
-
-        },
-        onShow() {
-			//今天页面返回,清除存储气瓶信息
-			uni.removeStorageSync('listDetail');
-        },
-
-        methods: {
-			subBtn(){
-				uni.redirectTo({
-				    url:'/pages_manage/examination/examinationAdd?status=0'
-				});
-			},
-			goInfo(d){
-				uni.redirectTo({
-				    url:'/pages_manage/examination/examinationDetail?item='+encodeURIComponent(JSON.stringify(d))
-				});
-			},
-			//滚动加载事件
-			scrollGet(){
-			   this.getData.pageNum += 1;
-			   this.getList();
-			},
-			//查询实验室
-			async getList(){
-				const {data} = await qualificationList()
-				if(data.code == 200){
-					let _this=this;
-					let res=data.rows
-					if(_this.getData.pageNum==1){
-						_this.dataList=res;
-						if(res.length>0){
-							_this.pageType=0;
-						}else{
-							_this.pageType=4;
-						}
-					}else{
-						_this.dataList=_this.dataList.concat(res);
-					}
-				}
-			},
-
-        },
-		mounted(){
-			this.getList();
-		},
-    }
-</script>
-
-<style lang="stylus" scoped>
-    #transportPerson {
-        height: auto;
-        width: 100%;
-		flex :1;
-        display flex;
-        flex-direction column
-        overflow hidden;
-		padding-bottom: 220rpx;
-        .scroll-box{
-        // flex:1;
-         overflow-y scroll;
-		 .list{
-			 background: #FFFFFF;
-			 border-radius: 20rpx;
-			 margin: 20rpx 20rpx 0;
-			 padding: 0 20rpx;
-			 box-sizing: border-box;
-			 .list_li{
-				 height: 110rpx;
-				 display: flex;
-				 align-items: center;
-				 border-bottom:1px solid #f5f5f5;
-				 >img{
-					 width: 60rpx;
-					 height: 60rpx;
-				 }
-				 >text{
-					 font-size: 28rpx;
-					 font-family: PingFang SC;
-					 font-weight: 500;
-					 color: #333333;
-					 line-height: 28rpx;
-					 display: inline-block;
-
-				 }
-				 .list_li_text{
-					 margin-left: 30rpx;
-					 width: 150rpx;
-					 font-size: 28rpx;
-					 font-family: PingFang SC;
-					 font-weight: 500;
-					 color: #333333;
-					 line-height: 28rpx;
-				 }
-				 .list_li_text2{
-					 flex: 1;
-					 text-align: right;
-					 font-size: 24rpx;
-					 font-family: PingFang SC;
-					 font-weight: 500;
-					 color: #999999;
-					 line-height: 24rpx;
-				 }
-				 .colorA{
-					 flex: 1;
-					 text-align: right;
-					 font-size: 24rpx;
-					 font-family: PingFang SC;
-					 font-weight: 500;
-					 color: #FF8A00;
-					 line-height: 24rpx;
-				 }
-				 .colorB{
-					 flex: 1;
-					 text-align: right;
-					 font-size: 24rpx;
-					 font-family: PingFang SC;
-					 font-weight: 500;
-					 color: #FF6F6F;
-					 line-height: 24rpx;
-				 }
-
-			 }
-		 }
-     }
-		.empty{
-			text-align: center;
-			margin-top: 316rpx;
-			>img{
-				width: 336rpx;
-				height: 222rpx;
-				margin-left: 208rpx;
-			}
-			>view{
-				font-size: 30rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #E0E0E0;
-				line-height: 30rpx;
-				margin-top: 48rpx;
-			}
-		}
-		/* 按钮 */
-		.sub_btn{
-			width: 650rpx;
-			height: 100rpx;
-			background: #0183FA;
-			border-radius: 20rpx;
-			font-size: 28rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #FFFFFF;
-			line-height: 100rpx;
-			text-align: center;
-			margin-left: 50rpx;
-			position: fixed;
-			bottom:30rpx;
-			z-index: 1000;
-		}
-	}
-</style>

+ 0 - 743
pages_manage/examination/examinationAdd.vue

@@ -1,743 +0,0 @@
-<!-- 资质申请/填写资料-->
-<template>
-    <view id="register">
-		<view class="register_li">
-			<view class="register_li_min">
-				<img class="icon_img" src="@/pages_manage/images/Version3.0/icon_zgsq_sqr.png">
-				<view>申请人:</view>
-				<input v-model="form.applyUser" disabled  type="text" >
-			</view>
-			<view class="register_li_min">
-				<img class="icon_img" src="@/pages_manage/images/Version3.0/icon_zgsq_dhh.png">
-				<view>联系方式:</view>
-				<input v-model="form.phone"   type="text" >
-			</view style="border: none;">
-		</view>
-		<view class="add_gas">
-			<view class="add_gas_list">
-				<view class="add_gas_list_li" v-for="(item,index) in listDetailArr">
-					<text>{{item.airName}}-{{item.configName}}</text>
-					<text>X{{item.bottleNumber}}</text>
-					<view @click="deleteGas(item)"  class="icon_img"><img src="@/pages_manage/images/Version2.3/icon_sczl_sc.png"></view>
-					<text></text>
-					<text @click="addGas()">重新选择</text>
-				</view>
-			</view>
-			<view class="add_gas_btn" @click="addGas()">
-				<img class="icon_img" src="@/pages_manage/images/Version3.0/icon_zgsq_j.png">
-				添加气瓶
-			</view>
-		</view>
-		<view class="register_li2">
-			<picker @change="bindPickerChange" :value="pickerIndex" :range="pickerArray">
-				<view class="register_li_min">
-					<view>*</view>
-					<view>实验地点:</view>
-					<input v-model="form.location" disabled type="text" placeholder="请选择实验地点" placeholder-style="color:#999;">
-				</view>
-			</picker>
-			<!-- 使用期限 -->
-			<view class="register_li_min2">
-				<view><text  style="color: #f00;margin-right: 10rpx;">*</text>使用期限:</view>
-				<picker mode="date" @change="startChange($event)">
-					<input class="picker-text" v-model="form.startTime" disabled  type="text"  placeholder="开始时间" placeholder-style="color:#999;">
-				</picker>
-				<view>-</view>
-				<picker mode="date" @change="endChange($event)">
-					<input class="picker-text2" v-model="form.endTime" disabled  type="text"  placeholder="结束时间" placeholder-style="color:#999;">
-				</picker>
-			</view>
-			<view class="register_li_min">
-			    <view>*</view>
-				<view>气体用途:</view>
-				<input v-model="form.gasUse"   type="text"  placeholder="请输入气体用途" placeholder-style="color:#999;">
-			</view>
-			<view class="register_li_min">
-			    <view>*</view>
-				<view>安全措施:</view>
-				<input v-model="form.safetyPrecautions"   type="text"  placeholder="请输入主要安全管理措施" placeholder-style="color:#999;">
-			</view>
-			<view  class="issue_li" style="border-bottom:0;">
-				<view>*</view>
-				<view>用气申请表:</view>
-				<view @click="selectImage">
-					<img :src="baseUrl+form.applyCertificate">
-					<text>+上传图片</text>
-				</view>
-			</view>
-		</view>
-
-		<view v-if="listType==0" class="sub_btn" @click="submitVerify()">提交</view>
-		<view v-if="listType==2" class="sub_btn">重新申请</view>
-	</view>
-</template>
-
-<script>
-    import {labList,getLoginUser,qualificationApplyManageAdd,qualificationDetail,qualificationApplyAmend,qualificationVerify,gasApplyVerify} from '@/api/index.js'
-	import { config } from '@/api/request/config.js'
-    export default {
-        data() {
-            return {
-				baseUrl:config.base_url,
-				listType:0,
-				form:{
-					applyUser:'',//申请人
-					applyUserid:'',//申请人id
-					phone:'',//	联系方式
-					location:'',//实验地点
-					subjectId:'',//实验地点Id
-					startTime:'',//期限开始
-					endTime:'',//期限结束
-					gasUse:'',//气体用途
-					safetyPrecautions:'',//安全措施
-					applyCertificate:'',//用气申请表
-					listDetail:[],
-				},
-				listDetailArr:[],
-				checkStatus:0,
-				pickerArray:[],
-				pickerArrayList:[],
-				status:null,//0添加1编辑
-				id:null,
-				amount:0,
-            }
-        },
-        onLoad(option) {
-			this.status=option.status;
-			this.id=option.id;
-			if(option.form){
-				this.form=JSON.parse(decodeURIComponent(option.form));
-			}
-			//气瓶数据
-			if(uni.getStorageSync('listDetail')){
-				this.listDetailArr=JSON.parse(decodeURIComponent(uni.getStorageSync('listDetail')));
-			}
-        },
-        onShow(){
-
-        },
-        methods: {
-			//添加气瓶按钮
-			addGas(){
-				uni.redirectTo({
-				    url:'/pages_manage/examination/examinationSelect?status='+this.status+'&id='+this.id+'&form='+encodeURIComponent(JSON.stringify(this.form))
-				});
-			},
-			//删除气瓶
-			deleteGas(d){
-				let _this=this;
-				_this.listDetailArr.forEach(function(item){
-					if(d.id==item.id){
-						_this.listDetailArr.splice(item,1);
-						uni.setStorageSync('listDetail',encodeURIComponent(JSON.stringify(_this.listDetailArr)))
-					}
-				})
-			},
-			//查询实验室
-			async labList(){
-				const {data} = await labList()
-				if(data.code == 200){
-					let _this=this;
-					let res=data.data
-					_this.pickerArrayList=res;
-					res.forEach(function(item){
-						_this.pickerArray.push(item.name);
-					})
-
-				}
-			},
-			//查询用户信息
-			async getLoginUser(){
-				const {data} = await getLoginUser()
-				if(data.code == 200){
-					let _this=this;
-					let res=data.data;
-					_this.form.applyUser=res.nickName;
-					_this.form.applyUserid=res.id;
-					_this.form.phone=res.phonenumber;
-				}
-			},
-			//选择实验室
-			async bindPickerChange(e){
-				let _this=this;
-				let index=e.target.value
-				//获取实验室名称
-				_this.form.location=_this.pickerArray[index]
-				//循环获取实验室id
-				_this.pickerArrayList.forEach(function(item){
-					if(_this.pickerArray[index]==item.name){
-						_this.form.subjectId=item.id;
-					}
-				})
-				//校验当前用户有乜有当前实验室使用 权限
-				const {data} = await qualificationVerify({subjectId:_this.form.subjectId})
-				if(data.code==200){
-					let res=data.data
-					if(res.count>0){//有资格
-
-					}else{//没资格
-						uni.showToast({
-							title:'在申请资格前需要先申请对应实验地点的安全准人资格!',
-							icon:"none",
-							mask:true,
-							duration: 2000
-						});
-						_this.form.location='';
-						_this.form.subjectId='';
-					}
-				}
-
-			},
-			//时间选中
-			startChange(e){
-				if(new Date(e.target.value).getTime()>=new Date(this.form.endTime).getTime()){
-					 uni.showToast({
-						title: '结束时间不能小于开始时间',
-						icon:"none",
-						mask:true,
-						duration: 2000
-					});
-				}else{
-					this.form.startTime = e.target.value
-				}
-			},
-			endChange(e){
-				if(new Date(this.form.startTime).getTime()>=new Date(e.target.value).getTime()){
-					 uni.showToast({
-						title: '结束时间不能小于开始时间',
-						icon:"none",
-						mask:true,
-						duration: 2000
-					});
-				}else{
-					this.form.endTime = e.target.value
-				}
-			},
-
-
-
-
-			// 图片上传
-			selectImage() {
-
-			    let self = this;
-			    wx.chooseImage({
-			        count: 1,
-			        sizeType: ["original", "compressed"],
-			        sourceType: ["album", "camera"],
-			        success: function(res) {
-			            let tempFilePaths = res.tempFilePaths[0];
-			            self.uploadImg(tempFilePaths);
-			        }
-			    });
-			},
-			async uploadImg(tempFilePaths){
-			    var self = this;
-			    uni.showLoading({
-			        title: '上传中',
-			        mask: true
-			    });
-			    uni.uploadFile({
-			        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
-			        header:{'Authorization':uni.getStorageSync('token')},
-			        filePath: tempFilePaths,
-			        name: 'file',
-			        formData: {
-			            'user': 'test'
-			        },
-			        success: (uploadFileRes) => {
-			            let res = JSON.parse(uploadFileRes.data);
-						if(res.code == 200){
-							self.form.applyCertificate=res.data.url
-						}else{
-							uni.showToast({
-								title: res.msg,
-								icon:"none",
-								mask:true,
-								duration: 2000
-							});
-						}
-			        },
-			        fail: err => {},
-			        complete: () => {
-			            uni.hideLoading()
-			        }
-			    });
-			},
-			//删除图片
-			delImg(index){
-			    this.newData.imgList.splice(index,1);
-			},
-			//获取详情
-			async getInfo(){
-			    let _this = this;
-			    const {data} = await qualificationDetail({id:this.id})
-			    if(data.code==200){
-					let res=data.data
-					_this.form=res.apply;
-					//编辑的时候判断气瓶状态,是选择首次进入列表数据还是修改后的数据
-					if(uni.getStorageSync('listDetail')){
-
-					}else{
-						_this.listDetailArr=res.airBottlelist
-						uni.setStorageSync('listDetail',encodeURIComponent(JSON.stringify(_this.listDetailArr)))
-					}
-				}
-			},
-			//校验气瓶数量
-			async submitVerify(){
-				let _this=this;
-				if(_this.form.location==''){
-					uni.showToast({
-					    title: '请先选择实验室!',
-					    icon:"none",
-					    mask:true,
-					    duration: 2000
-					});
-					return;
-				}
-				_this.amount=0;
-				this.listDetailArr.forEach(function(item){
-					_this.amount+=item.bottleNumber;
-				})
-				const {data} = await gasApplyVerify({subjectId:_this.form.subjectId});
-				if(data.code == 200){
-					let res=data.data
-					if(!res.flgSubject){
-						uni.showToast({
-							title: '请先配置实验室气瓶总量数',
-							icon:"none",
-							mask:true,
-							duration: 2000
-						});
-						return
-					}
-					if(!res.flgUser){
-						uni.showToast({
-							title: '请先配置实验室个人气瓶总量数',
-							icon:"none",
-							mask:true,
-							duration: 2000
-						});
-						return
-					}
-					if(_this.amount>res.subjectNum){
-						uni.showToast({
-							title: '当前申请气瓶个数大于当前实验室气瓶存量!',
-							icon:"none",
-							mask:true,
-							duration: 2000
-						});
-						return
-					}
-					if(_this.amount>res.userNum){
-						uni.showToast({
-							title: '当前申请气瓶个数大于个人气瓶存量!',
-							icon:"none",
-							mask:true,
-							duration: 2000
-						});
-						return
-					}
-					_this.submitForm();
-				}else{
-					return
-				}
-			},
-			//提交
-			async submitForm(){
-				let _this = this;
-				if(!this.form.location){
-					uni.showToast({
-						title: '请选择实验地点',
-						icon:"none",
-						mask:true,
-						duration: 2000
-					});
-					return
-				}
-				if(!this.form.startTime || !this.form.endTime){
-					uni.showToast({
-						title: '请选择使用期限',
-						icon:"none",
-						mask:true,
-						duration: 2000
-					});
-					return
-				}
-				if(!this.form.gasUse){
-					uni.showToast({
-						title: '请输入气体有用途',
-						icon:"none",
-						mask:true,
-						duration: 2000
-					});
-					return
-				}
-				if(!this.form.safetyPrecautions){
-					uni.showToast({
-						title: '请输入安全措施',
-						icon:"none",
-						mask:true,
-						duration: 2000
-					});
-					return
-				}
-				if(!this.form.applyCertificate){
-					uni.showToast({
-						title: '请上传用气申请表',
-						icon:"none",
-						mask:true,
-						duration: 2000
-					});
-					return
-				}
-				if(_this.listDetailArr.length<=0){
-					uni.showToast({
-						title: '请选择气瓶',
-						icon:"none",
-						mask:true,
-						duration: 2000
-					});
-					return
-				}
-				// _this.listDetailArr.forEach(function(item){
-				// 	item.gasLevel=item.parent
-				// 	item.gasNorms=item.specValue
-				// })
-				_this.form.listDetailVo=_this.listDetailArr
-				if(_this.status==0){//添加
-					const {data} = await qualificationApplyManageAdd(_this.form);
-					if(data.code == 200){
-					    uni.showToast({
-					        title: '提交成功',
-					        icon:"none",
-					        mask:true,
-					        duration: 2000
-					    });
-						uni.removeStorageSync('listDetail');
-					    setTimeout(function(){
-					       uni.redirectTo({
-					            url: '/pages_manage/examination/examination'
-					        });
-					    },2000);
-					}
-				}else if(_this.status==1){//编辑
-					const {data} = await qualificationApplyAmend(_this.form);
-					if(data.code == 200){
-					    uni.showToast({
-					        title: '提交成功',
-					        icon:"none",
-					        mask:true,
-					        duration: 2000
-					    });
-						uni.removeStorageSync('listDetail');
-					    setTimeout(function(){
-					       uni.redirectTo({
-					            url: '/pages_manage/examination/examination'
-					        });
-					    },2000);
-					}
-				}
-
-			},
-
-        },
-		mounted(){
-		   this.labList()
-		   this.getLoginUser()
-		   if(this.status==1){
-		   	this.getInfo();
-		   }
-		},
-    }
-</script>
-
-<style lang="stylus" scoped>
-    #register{
-        height:auto;
-        width:100%;
-        display flex;
-        flex-direction column;
-		padding-bottom: 220rpx;
-		/* 添加气瓶按钮 */
-		.add_gas{
-			width: 710rpx;
-			background: #FFFFFF;
-			border-radius: 20rpx;
-			margin: 20rpx;
-			padding: 0 20rpx;
-			box-sizing: border-box;
-			.add_gas_list{
-				.add_gas_list_li{
-					height: 100rpx;
-					display: flex;
-					justify-content: space-between;
-					align-items: center;
-					border-bottom: 1px dotted #f5f5f5;
-					>text{
-						font-size: 28rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #333333;
-						line-height: 28rpx;
-					}
-
-					>text:nth-of-type(1){
-						width: 260rpx;
-					}
-					>text:nth-of-type(2){
-
-					}
-					>text:nth-of-type(3){
-						width: 2rpx;
-						height: 30rpx;
-						background: #E0E0E0;
-						margin: 0 24rpx 0;
-					}
-					>text:nth-of-type(4){
-						color: #0183FA;
-					}
-					.icon_img{
-						width: 30rpx;
-						height: 30rpx;
-						margin-right: 12rpx;
-						>img{
-							width: 30rpx;
-							height: 30rpx;
-						}
-					}
-					>img{
-						width: 28rpx;
-						height: 30rpx;
-						margin-left: 128rpx;
-
-					}
-				}
-			}
-			.add_gas_btn{
-				height: 100rpx;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				font-size: 28rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #0183FA;
-				line-height: 28rpx;
-
-				>img{
-					width: 30rpx;
-					height: 30rpx;
-						margin-right: 14rpx;
-
-				}
-			}
-		}
-		.register_li{
-			background #fff;
-			border-radius:20rpx;
-			margin:20rpx 20rpx 0;
-			padding:20rpx 0;
-			box-sizing: border-box;
-			.register_li_min{
-				margin:0 26rpx;
-				display flex;
-				align-items center;
-				border-bottom: 1px solid #F5F5F5;
-				.icon_img{
-					width: 30rpx;
-					height: 30rpx;
-					margin-right: 12rpx;
-				}
-				view{
-					line-height:100rpx;
-					font-size:28rpx;
-				}
-				view:nth-child(1){
-					color:red;
-					line-height:28rpx;
-					margin-right: 12rpx;
-				}
-				view:nth-child(2){
-					//width:140rpx;
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #999999;
-				}
-
-				>input{
-					flex:1;
-					text-align: right;
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-				}
-
-
-			}
-
-		}
-		.register_li2{
-			background #fff;
-			border-radius:20rpx;
-			margin:20rpx 20rpx 0;
-			padding:20rpx 0;
-			box-sizing: border-box;
-			.register_li_min{
-				margin:0 26rpx;
-				display flex;
-				align-items center;
-				border-bottom: 1px solid #F5F5F5;
-				.icon_img{
-					width: 30rpx;
-					height: 30rpx;
-					margin-right: 12rpx;
-				}
-				view{
-					line-height:100rpx;
-					font-size:28rpx;
-				}
-				view:nth-child(1){
-					color:red;
-					line-height:28rpx;
-					margin-right: 12rpx;
-				}
-				view:nth-child(2){
-					//width:140rpx;
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333;
-				}
-
-				>input{
-					flex:1;
-					text-align: right;
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-				}
-
-
-			}
-			/* 时间 */
-			.register_li_min2{
-				margin:0 26rpx;
-				border-bottom: 1px solid #f5f5f5;
-				height: 100rpx;
-				display: flex;
-				justify-content: flex-start;
-				align-items: center;
-				>view:nth-child(1){
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333;
-					line-height: 100rpx;
-					margin-right: 120rpx;
-				}
-				.picker-text{
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-					line-height: 100rpx;
-					width: 188rpx;
-
-				}
-				>view:nth-child(2){
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-					line-height: 100rpx;
-				}
-				.picker-text2{
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-					line-height: 100rpx;
-					width: 188rpx;
-					text-align: right;
-				}
-			}
-
-			.issue_li{
-				margin:34rpx 26rpx 0;
-
-				view:nth-child(1){
-					color:red;
-					line-height:28rpx;
-					margin-right: 12rpx;
-					display: inline-block;
-				}
-				view:nth-child(2){
-					//width:140rpx;
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333;
-					display: inline-block;
-				}
-				view:nth-child(3){
-					width: 668rpx;
-					height: 270rpx;
-					border: 1px solid #E0E0E0;
-					border-radius: 10rpx;
-					text-align: center;
-					margin-top: 34rpx;
-					position: relative;
-					>img{
-						width: 668rpx;
-						height: 270rpx;
-						position: absolute;
-						z-index: 10;
-					}
-					>text{
-						font-size: 24rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #999999;
-						line-height: 270rpx;
-						position: absolute;
-						left: 278rpx;
-						z-index: 20;
-
-					}
-				}
-				.issue_img{
-					width: 210rpx;
-					height: 210rpx;
-					border-radius: 10rpx;
-					margin-left:250rpx;
-				}
-			}
-		}
-
-		/* 按钮 */
-		.sub_btn{
-			width: 650rpx;
-			height: 100rpx;
-			background: #0183FA;
-			border-radius: 20rpx;
-			font-size: 28rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #FFFFFF;
-			line-height: 100rpx;
-			text-align: center;
-			margin-left: 50rpx;
-			position: fixed;
-			bottom:30rpx;
-			z-index: 1000;
-		}
-	}
-	/deep/.input-value-border{
-		display :none !important;
-	}
-</style>

+ 0 - 286
pages_manage/examination/examinationDetail.vue

@@ -1,286 +0,0 @@
-<!-- 资质审核-->
-<template>
-    <view id="register">
-		<viwe v-if="status==0" class="tip">信息正在审核中,请耐心等待...</viwe>
-		<viwe v-if="status==2" class="reject">{{form.centerAuditStatus==2?'您提交的审核被驳回,驳回原因为:'+form.centerAuditCause:'您提交的审核被驳回,驳回原因为:'+form.leadAuditCause}}</viwe>
-
-		<view class="register_li">
-			<view class="register_li_min">
-				<img class="icon_img" src="@/pages_manage/images/Version3.0/icon_zgsq_sqr.png">
-				<view>申请人:</view>
-				<input v-model="form.applyUser" disabled  type="text" >
-			</view>
-			<view class="register_li_min" style="border: none;">
-				<img class="icon_img" src="@/pages_manage/images/Version3.0/icon_zgsq_dhh.png">
-				<view>联系方式:</view>
-				<input v-model="form.phone" disabled  type="text" >
-			</view>
-		</view>
-		<view class="register_li">
-			<view class="register_li_min" v-for="(item,index) in form.airBottlelist" style="border-bottom:0;" >
-				<view></view>
-				<view>{{item.airName}}-{{item.configName}}:</view>
-				<input v-model="'数量:'+item.bottleNumber" disabled  type="text" >
-			</view>
-		</view>
-		<view class="register_li">
-			<view class="register_li_min">
-				<view></view>
-				<view>实验地点:</view>
-				<input v-model="form.location" disabled type="text" >
-			</view>
-			<!-- 使用期限 -->
-			<view class="register_li_min2">
-				<view><text  style="color: #f00;margin-right: 10rpx;"></text>使用期限:</view>
-				<picker mode="date" disabled @change="startChange($event)">
-					<input class="picker-text" v-model="form.startTime" disabled  type="text"  placeholder="开始时间">
-				</picker>
-				<view>-</view>
-				<picker mode="date" disabled @change="endChange($event)">
-					<input class="picker-text2" v-model="form.endTime" disabled  type="text"  placeholder="结束时间">
-				</picker>
-			</view>
-			<view class="register_li_min">
-			    <view></view>
-				<view>气体用途:</view>
-				<input v-model="form.gasUse" disabled  type="text" >
-			</view>
-			<view class="register_li_min">
-			    <view></view>
-				<view>安全措施:</view>
-				<input v-model="form.safetyPrecautions" disabled  type="text" >
-			</view>
-			<view  class="issue_li" style="border-bottom:0;"  @click="lookItem(form.applyCertificate)">
-				<view></view>
-				<view>用气申请表:</view>
-				<img class="issue_img" :src="baseUrl+form.applyCertificate">
-			</view>
-		</view>
-
-		<view  class="sub_btn" v-if="status=='2'" @click="submitForm()">重新申请</view>
-	</view>
-</template>
-
-<script>
-    import {qualificationDetail} from '@/api/index.js'
-	import { config } from '@/api/request/config.js'
-    export default {
-        data() {
-            return {
-				baseUrl:config.base_url,
-				form:{},
-				id:'',
-				status:null,
-            }
-        },
-        onLoad(option) {
-			if(decodeURIComponent(option.item)){
-				this.id=JSON.parse(decodeURIComponent(option.item)).id;
-				this.status=JSON.parse(decodeURIComponent(option.item)).remark;
-			}
-
-        },
-        onShow(){
-
-
-
-        },
-
-        methods: {
-			//获取详情
-			async getInfo(){
-			    let _this = this;
-			    const {data} = await qualificationDetail({id:this.id})
-			    if(data.code==200){
-					let res=data.data
-					_this.form=res.apply;
-					_this.form.airBottlelist=res.airBottlelist
-			    }
-			},
-			lookItem(item){
-				//查看图片
-				wx.previewImage({
-					urls: [config.base_url+item], //需要预览的图片http链接列表,多张的时候,url直接写在后面就行了
-					current: '', // 当前显示图片的http链接,默认是第一个
-					success: function(res) {},
-					fail: function(res) {},
-					complete: function(res) {},
-				})
-			},
-			//重新提交
-			async submitForm(){
-				uni.redirectTo({
-				    url:'/pages_manage/examination/examinationAdd?status=1&id='+this.id
-				});
-			},
-        },
-		mounted() {
-			this.getInfo();
-		}
-    }
-</script>
-
-<style lang="stylus" scoped>
-    #register{
-        height:auto;
-        width:100%;
-        display flex;
-        flex-direction column;
-		padding-bottom: 220rpx;
-		/* 审核中 */
-		.tip{
-			width: 750rpx;
-			background: rgba(255,144,0,0.2);
-			font-size: 28rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #FF9000;
-			line-height: 28rpx;
-			padding: 36rpx 20rpx;
-			box-sizing: border-box;
-		}
-		/* 驳回 */
-		.reject{
-			width: 750rpx;
-			background: #F3DCDC;
-			font-size: 28rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #DC0000;
-			line-height: 36rpx;
-			padding: 36rpx 20rpx;
-			box-sizing: border-box;
-		}
-		.register_li{
-			background #fff;
-			border-radius:20rpx;
-			margin:20rpx 20rpx 0;
-			padding:20rpx 0;
-			box-sizing: border-box;
-			.register_li_min{
-				margin:0 26rpx;
-				display flex;
-				align-items center;
-				border-bottom: 1px solid #F5F5F5;
-				.icon_img{
-					width: 30rpx;
-					height: 30rpx;
-					margin-right: 12rpx;
-				}
-				view{
-					line-height:100rpx;
-					font-size:28rpx;
-				}
-				view:nth-child(1){
-					color:red;
-					line-height:28rpx;
-					margin-right: 12rpx;
-				}
-				view:nth-child(2){
-					//width:140rpx;
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #999999;
-				}
-
-				>input{
-					flex:1;
-					text-align: right;
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-				}
-
-
-			}
-			/* 时间 */
-			.register_li_min2{
-				margin:0 26rpx;
-				border-bottom: 1px solid #f5f5f5;
-				height: 100rpx;
-				display: flex;
-				justify-content: flex-start;
-				align-items: center;
-				>view:nth-child(1){
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #999999;
-					line-height: 100rpx;
-					margin-right: 120rpx;
-				}
-				.picker-text{
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-					line-height: 100rpx;
-					width: 188rpx;
-
-				}
-				>view:nth-child(2){
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-					line-height: 100rpx;
-				}
-				.picker-text2{
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-					line-height: 100rpx;
-					width: 188rpx;
-					text-align: right;
-				}
-			}
-
-			.issue_li{
-				margin:34rpx 26rpx 0;
-				display flex;
-				border-bottom: 1px solid #F5F5F5;
-				view:nth-child(1){
-					color:red;
-					line-height:28rpx;
-					margin-right: 12rpx;
-				}
-				view:nth-child(2){
-					//width:140rpx;
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #999999;
-				}
-				.issue_img{
-					width: 210rpx;
-					height: 210rpx;
-					border-radius: 10rpx;
-					margin-left:250rpx;
-				}
-			}
-		}
-		/* 按钮 */
-		.sub_btn{
-			width: 650rpx;
-			height: 100rpx;
-			background: #0183FA;
-			border-radius: 20rpx;
-			font-size: 28rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #FFFFFF;
-			line-height: 100rpx;
-			text-align: center;
-			margin-left: 50rpx;
-			position: fixed;
-			bottom:30rpx;
-			z-index: 1000;
-		}
-	}
-	/deep/.input-value-border{
-		display :none !important;
-	}
-</style>

+ 0 - 407
pages_manage/examination/examinationSelect.vue

@@ -1,407 +0,0 @@
-<!--资质申请-->
-<template>
-    <view id="transportPerson">
-		<view class="search">
-			<view class="search_t">
-				<view class="search_n">
-					<input v-model="params.searchValue" @blur="search()"   type="text" placeholder="请输入气体名称或供应商的关键字">
-					<img  class="icon_img" src="@/pages_manage/images/icon_aqjc_ss.png"/>
-				</view>
-			</view>
-		</view>
-		<scroll-view scroll-y @scrolltolower="scrollGet" class="scroll-box">
-		    <view class="list">
-				<view class="list_li" v-for="(item,index) in listDetail">
-					<view class="list_li_l">
-						<view class="list_li_l_t">{{item.airName}}-{{item.configName}}</view>
-						<view class="list_li_l_b">
-							<img  src="@/pages_manage/images/icon_14.png">
-							<text>{{item.companyName}}</text>
-						</view>
-					</view>
-					<view class="list_li_r">
-						<view class="minus"  @click="minus(item)"><img  src="@/pages_manage/images/Version3.0/icon_zgsq_jian.png"></view>
-						<input v-model="item.bottleNumber"  disabled  type="text" >
-						<view class="add"  @click="add(item)"><img  src="@/pages_manage/images/Version3.0/icon_zgsq_j.png"></view>
-					</view>
-				</view>
-			</view>
-		</scroll-view>
-		<view class="empty" v-if="pageType==4">
-			<img class="for-back-img" src="@/pages_manage/images/Version3.0/img_ysrygl_zwsj.png">
-			<view>暂无数据</view>
-		</view>
-		<view v-if="amount>0" class="sub_btn">
-			<view class="sub_btn_l">已选择{{amount}}个气瓶</view>
-			<view class="sub_btn_r" @click="submitForm()">提交</view>
-		</view>
-		<view v-if="amount==0" class="sub_btn2">
-			<view class="sub_btn_l">暂未选择气瓶</view>
-			<view class="sub_btn_r">提交</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import { taskListGood } from '@/api/index.js'
-    export default {
-
-        name: "transportPerson",
-        data() {
-            return {
-
-				pageType:0,
-				//列表请求参数
-				params:{
-					searchValue:'',
-				},
-                listDetail:[],
-				form:{
-
-				},
-				amount:0,
-				status:null,//0添加1编辑
-				id:null,
-            }
-        },
-        onLoad(option) {
-			this.status=option.status;
-			this.id=option.id;
-
-			if(option.form){
-				this.form=JSON.parse(decodeURIComponent(option.form));
-			}
-        },
-        onShow() {
-
-        },
-        methods: {
-			search(){
-				 this.getList();
-			},
-			minus(d) {
-				let _this=this;
-				 if(d.bottleNumber>0){
-					 _this.amount=0;
-					d.bottleNumber--;
-					this.listDetail.forEach(function(item){
-						_this.amount+=item.bottleNumber;
-					})
-				 }
-
-			},
-			add(d) {
-				let _this=this;
-				_this.amount=0;
-				d.bottleNumber++;
-				this.listDetail.forEach(function(item){
-					_this.amount+=item.bottleNumber;
-				})
-
-			},
-			//滚动加载事件
-			scrollGet(){
-
-			},
-			//获取列表数据
-			async getList(){
-				    let _this = this;
-				    const {data} = await taskListGood(this.params);
-				    if(data.code==200){
-						let res=data.rows;
-						if(res){
-							let arr=[];
-							res.forEach(function(item){
-								item.bottleNumber=0;
-							})
-							_this.listDetail=res;
-							if(_this.status==0){//新增
-								//如果有值回显
-								if(uni.getStorageSync('listDetail')){
-									arr=JSON.parse(decodeURIComponent(uni.getStorageSync('listDetail')));
-
-									_this.listDetail.forEach(function(item){
-										arr.forEach(function(item2){
-											if(item.id==item2.id){
-												item.bottleNumber=item2.bottleNumber;
-												_this.amount+=item.bottleNumber
-											}
-										})
-									})
-								}
-							}else if(_this.status==1){//编辑
-								//如果有值回显
-								if(uni.getStorageSync('listDetail')){
-									arr=JSON.parse(decodeURIComponent(uni.getStorageSync('listDetail')));
-
-									_this.listDetail.forEach(function(item){
-										arr.forEach(function(item2){
-											if(item.id==item2.airBottleConfigId){
-												item.bottleNumber=item2.bottleNumber;
-												_this.amount+=item.bottleNumber
-											}
-										})
-									})
-								}
-							}
-						}
-
-				    }
-				},
-			//注册提交
-			async submitForm(){
-				let _this = this;
-				if(_this.listDetail){
-					let arr=[];
-					_this.listDetail.forEach(function(item){
-						if(item.bottleNumber>0){
-							arr.push(item)
-						}
-					})
-					uni.setStorageSync('listDetail',encodeURIComponent(JSON.stringify(arr)))
-				}
-				uni.redirectTo({
-					url: '/pages_manage/examination/examinationAdd?status='+this.status+'&id='+this.id+'&form='+encodeURIComponent(JSON.stringify(this.form)),
-				});
-			},
-
-        },
-		mounted(){
-		   this.getList()
-
-		},
-    }
-</script>
-
-<style lang="stylus" scoped>
-    #transportPerson {
-        height: 100%;
-        width: 100%;
-		flex :1;
-        display flex;
-        flex-direction column
-        overflow hidden;
-
-		/* 搜索 */
-		.search{
-			.search_t{
-				background: #FFFFFF;
-				padding: 20rpx;
-				box-sizing: border-box;
-				.search_n{
-					width: 710rpx;
-					height: 80rpx;
-					border: 1px solid #E0E0E0;
-					border-radius: 40rpx;
-					display: flex;
-					justify-content: space-between;
-					align-items: center;
-					padding:0 40rpx;
-					box-sizing: border-box;
-					>input{
-						width: 640rpx;
-						font-size: 24rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #CCCCCC;
-						line-height: 30rpx;
-					}
-					>img{
-						width: 30rpx;
-						height: 30rpx;
-					}
-				}
-
-			}
-			.search_b{
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				margin: 20rpx 0;
-				>text{
-					display: inline-block;
-					width: 200rpx;
-					height: 60rpx;
-					background: #FFFFFF;
-					border-radius: 30rpx;
-					font-size: 26rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-					line-height: 60rpx;
-					text-align: center;
-					margin-right: 20rpx;
-				}
-			}
-		}
-        .scroll-box{
-        // flex:1;
-         overflow-y scroll;
-		 padding-top: 30rpx;
-		 padding-bottom: 180rpx;
-		 .list{
-			 background: #FFFFFF;
-			 border-radius: 20rpx;
-			 margin: 0 20rpx;
-			 padding: 0 20rpx;
-			 box-sizing: border-box;
-			 .list_li{
-				 height: 180rpx;
-				 display: flex;
-				 justify-content: space-between;
-				 padding: 0 20rpx;
-				 box-sizing: border-box;
-				 border-bottom:1px solid #f5f5f5;
-				 .list_li_l{
-					 flex: 1;
-					 .list_li_l_t{
-						 font-size: 28rpx;
-						 font-family: PingFang SC;
-						 font-weight: 500;
-						 color: #333333;
-						 line-height: 28rpx;
-						 margin-top: 44rpx;
-					 }
-					 .list_li_l_b{
-						 display: flex;
-						 justify-content: flex-start;
-						 margin: 42rpx 0 34rpx 0;
-						 >img{
-							 width: 28rpx;
-							 height: 30rpx;
-							 margin-right: 18rpx;
-						 }
-						 >text{
-							font-size: 24rpx;
-							font-family: PingFang SC;
-							font-weight: 400;
-							color: #666666;
-							line-height: 24rpx;
-						 }
-					 }
-				 }
-				 .list_li_r{
-					 width: 222rpx;
-					 display: flex;
-					 justify-content: space-between;
-					 align-items: center;
-					 .minus{
-						 width: 96rpx;
-						 height: 96rpx;
-						 >img{
-							width: 36rpx;
-							height: 36rpx;
-							margin-top: 30rpx;
-							margin-left: 30rpx;
-						 }
-					 }
-					 .add{
-						 width: 96rpx;
-						 height: 96rpx;
-						>img{
-							width: 36rpx;
-							height: 36rpx;
-						    margin-top: 30rpx;
-						    margin-left: 30rpx;
-						}
-					 }
-					 >input{
-						 text-align: center;
-						 width: 90rpx;
-						 font-size: 28rpx;
-						 font-family: PingFang SC;
-						 font-weight: 500;
-						 color: #333333;
-						 line-height: 36rpx;
-					 }
-				 }
-
-			 }
-		 }
-     }
-		.empty{
-			text-align: center;
-			margin-top: 316rpx;
-			>img{
-				width: 336rpx;
-				height: 222rpx;
-				margin-left: 208rpx;
-			}
-			>view{
-				font-size: 30rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #E0E0E0;
-				line-height: 30rpx;
-				margin-top: 48rpx;
-			}
-		}
-		/* 按钮 */
-		.sub_btn{
-			width: 750rpx;
-			height: 120rpx;
-			background: #FFFFFF;
-			position: fixed;
-			bottom: 0;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			padding: 0 20rpx 0 40rpx;
-			box-sizing: border-box;
-			z-index: 1000;
-			.sub_btn_l{
-				font-size: 28rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #333333;
-				line-height: 120rpx;
-				flex: 1;
-			}
-			.sub_btn_r{
-				width: 200rpx;
-				height: 70rpx;
-				background: #0183FA;
-				border-radius: 35rpx;
-				font-size: 28rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #FFFFFF;
-				line-height: 70rpx;
-				text-align: center;
-			}
-		}
-		.sub_btn2{
-			width: 750rpx;
-			height: 120rpx;
-			background: #FFFFFF;
-			position: fixed;
-			bottom: 0;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			padding: 0 20rpx 0 40rpx;
-			box-sizing: border-box;
-			z-index: 1000;
-			.sub_btn_l{
-				font-size: 28rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #CCCCCC;
-				line-height: 120rpx;
-				flex: 1;
-			}
-			.sub_btn_r{
-				width: 200rpx;
-				height: 70rpx;
-				background: #E0E0E0;
-				border-radius: 35rpx;
-				font-size: 28rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #999999;
-				line-height: 70rpx;
-				text-align: center;
-			}
-		}
-	}
-</style>

+ 0 - 528
pages_manage/gasApply/awaitStorage.vue

@@ -1,528 +0,0 @@
-<!-- 待入库 -->
-<template>
-    <view id="register">
-		<view class="title">{{item.airName}}-{{item.configName}}</view>
-		<view class="register_li">
-			<view class="register_li_min">
-				<view></view>
-				<view>司机姓名:</view>
-				<input v-model="infoForm.user.userName"   type="text" >
-			</view>
-			<view class="register_li_min">
-			    <view></view>
-				<view>司机号牌:</view>
-				<input v-model="infoForm.car.carCode"   type="text" >
-			</view>
-			<view class="register_li_min" style="border-bottom:0;">
-				<view></view>
-				<view>联系方式:</view>
-				<input v-model="infoForm.user.phone"   type="text" >
-			</view>
-		</view>
-		<view class="register_li">
-			<view class="register_li_min" v-for="(item,index) in list">
-				<view></view>
-				<view>{{item.name}}</view>
-				<view class="radio_group">
-					<view class="radio" v-for="(item2,index2) in item.radioList" @click="radioClick(item,item2)">
-						<img v-if="!item2.checked" src="@/pages_manage/images/icon_5.png">
-						<img v-if="item2.checked" src="@/pages_manage/images/icon_6.png">
-						<text>{{item2.name}}</text>
-					</view>
-				</view>
-			</view>
-			<view class="register_li_min">
-				<view>*</view>
-				<view>气表压力:</view>
-				<input v-model="form.gasPressure" maxlength="4"  type="text" placeholder-style="color:#999;" placeholder="请输入气表压力">
-			</view>
-			<!-- 检验有效期 -->
-			<view class="register_li_min2">
-				<view><text  style="color: #f00;margin-right: 10rpx;">*</text>检验有效期:</view>
-				<picker mode="date" @change="startChange($event)">
-					<input class="picker-text" v-model="form.validateStartTime" disabled  type="text" placeholder-style="color:#999;"  placeholder="开始时间">
-				</picker>
-				<view>-</view>
-				<picker mode="date" @change="endChange($event)">
-					<input class="picker-text2" v-model="form.validateEndTime" disabled  type="text"  placeholder-style="color:#999;" placeholder="结束时间">
-				</picker>
-			</view>
-			<view class="register_li_min" >
-				<view>*</view>
-				<view>电子标签:</view>
-				<input v-model="form.electronicTag"   type="text" placeholder-style="color:#999;" placeholder="请输入电子标签ID">
-				<img @click.stop="saoCode"  class="code_img" src="@/pages_manage/images/Version2.2/icon_aqjc_sm.png">
-			</view>
-			<view class="register_li_min" style="border: none;">
-			    <view>*</view>
-				<view>验收备注:</view>
-				<input v-model="form.validateRemark"   type="text" placeholder-style="color:#999;" placeholder="请输入验收备注">
-			</view>
-		</view>
-		<view class="sub_btn">
-			<view class="sub_btn_l" @click="rejection()">拒收</view>
-			<view class="sub_btn_r" @click="submitForm()">确认信息并入库</view>
-		</view>
-	</view>
-</template>
-
-<script>
-    import {gasApplyDetailDrkDetail,gasApplyStorageAdd} from '@/api/index.js'
-	import { config } from '@/api/request/config.js'
-    export default {
-        data() {
-            return {
-				form:{
-					gasPressure:'',
-					validateStartTime:'',
-					validateEndTime:'',
-					electronicTag:'',
-					validateRemark:'',
-				},
-				infoForm:{},
-				item:{},
-				id:{},
-				list:[
-					{
-						id:'0',
-						name:'瓶身颜色:',
-						lab:'color',
-						radioList:[
-							{
-								id:1,
-								name:'灰',
-								checked:true,
-							},
-							{
-								id:2,
-								name:'白',
-								checked:false,
-							},
-							{
-								id:3,
-								name:'蓝',
-								checked:false,
-							},
-						]
-
-					},
-					{
-						id:'0',
-						name:'有无手轮:',
-						lab:'isHandwheel',
-						radioList:[
-							{
-								id:1,
-								name:'有',
-								checked:true,
-							},
-							{
-								id:0,
-								name:'无',
-								checked:false,
-							},
-						]
-
-					},
-					{
-						id:'0',
-						name:'是否固定:',
-						lab:'isFixed',
-						radioList:[
-							{
-								id:1,
-								name:'是',
-								checked:true,
-							},
-							{
-								id:0,
-								name:'否',
-								checked:false,
-							},
-						]
-
-					},
-					{
-						id:'0',
-						name:'电子标签:',
-						lab:'isElectronicTag',
-						radioList:[
-							{
-								id:1,
-								name:'有',
-								checked:true,
-							},
-							{
-								id:0,
-								name:'无',
-								checked:false,
-							},
-						]
-
-					},
-					{
-						id:'0',
-						name:'气瓶状态标牌:',
-						lab:'isStatusSign',
-						radioList:[
-							{
-								id:1,
-								name:'有',
-								checked:true,
-							},
-							{
-								id:0,
-								name:'无',
-								checked:false,
-							},
-						]
-
-					},
-					{
-						id:'0',
-						name:'标牌已拍照:',
-						lab:'isPhoto',
-						radioList:[
-							{
-								id:1,
-								name:'有',
-								checked:true,
-							},
-							{
-								id:0,
-								name:'无',
-								checked:false,
-							},
-						]
-
-					},
-				]
-            }
-        },
-        onLoad(option) {
-        	this.item=JSON.parse(decodeURIComponent(option.item));
-        },
-        onShow(){
-
-        },
-		mounted(){
-		  this.getInfo()
-
-		},
-        methods: {
-			//开始时间选中事件
-			startChange(e){
-				this.form.validateStartTime=e.target.value
-			},
-			//结束时间选中事件
-			endChange(e){
-				this.form.validateEndTime=e.target.value
-			},
-			//单选按钮
-			radioClick(p,d){
-				d.checked=!d.checked
-				if(d.checked){
-					//如果有选中的,循环把其他选中的取消
-					p.radioList.forEach(function(item){
-						if(item.id==d.id){
-
-						}else{
-							item.checked=false;
-						}
-					})
-				}else{
-
-				}
-
-			},
-			//调用摄像头
-			saoCode(){
-				let _this = this;
-			    uni.scanCode({
-			        onlyFromCamera: true,
-			        success: function (res) {
-			    		_this.form.electronicTag=res.result
-			        }
-			    });
-			},
-			//获取列表数据
-			async getInfo(){
-				let _this = this;
-				const {data} = await gasApplyDetailDrkDetail({id:_this.item.id});
-				if(data.code==200){
-					if(data.code==200){
-						let res = data.data;
-						_this.infoForm=res
-					}
-
-				}
-			},
-			//拒收
-			async rejection(){
-				uni.redirectTo({
-				     url: '/pages_manage/gasApply/gasApplyReject?item='+encodeURIComponent(JSON.stringify(this.item))+'&item2='+encodeURIComponent(JSON.stringify(this.infoForm))
-				 });
-			},
-			//提交
-			async submitForm(){
-				let _this = this;
-				if(!this.form.gasPressure){
-					uni.showToast({
-						title: '请输入气表压力',
-						icon:"none",
-						mask:true,
-						duration: 2000
-					});
-					return
-				}
-				if(!this.form.validateStartTime || !this.form.validateEndTime){
-					uni.showToast({
-						title: '请选择检验有效期',
-						icon:"none",
-						mask:true,
-						duration: 2000
-					});
-					return
-				}
-				if(!this.form.electronicTag){
-					uni.showToast({
-						title: '请输入电子标签',
-						icon:"none",
-						mask:true,
-						duration: 2000
-					});
-					return
-				}
-				if(!this.form.validateRemark){
-					uni.showToast({
-						title: '请输入验收备注',
-						icon:"none",
-						mask:true,
-						duration: 2000
-					});
-					return
-				}
-				_this.list.forEach(function(item){
-					item.radioList.forEach(function(item2){
-						if(item.lab=='color' && item2.checked){
-							_this.form.color=item2.id;
-						}else if(item.lab=='isHandwheel' && item2.checked){
-							_this.form.isHandwheel=item2.id;
-						}else if(item.lab=='isFixed' && item2.checked){
-							_this.form.isFixed=item2.id;
-						}else if(item.lab=='isElectronicTag' && item2.checked){
-							_this.form.isElectronicTag=item2.id;
-						}else if(item.lab=='isStatusSign' && item2.checked){
-							_this.form.isStatusSign=item2.id;
-						}else if(item.lab=='isPhoto' && item2.checked){
-							_this.form.isPhoto=item2.id;
-						}
-					})
-				})
-				_this.form.driverName=_this.infoForm.user.userName
-				_this.form.driverId=_this.infoForm.user.id
-				_this.form.carCode=_this.infoForm.car.carCode
-				_this.form.carCodeId =_this.infoForm.car.id
-				_this.form.phone=_this.infoForm.user.phone
-				_this.form.airStatus=0;
-				_this.form.taskId=_this.item.taskId;
-				_this.form.taskDetailId=_this.item.id;
-				_this.form.airName=_this.item.airName;
-				_this.form.parent=_this.item.parent;
-				_this.form.specValue=_this.item.specValue;
-				_this.form.configName=_this.item.configName;
-				_this.form.companyName=_this.item.companyName;
-				_this.form.airConstituents=_this.item.airConstituents;
-				_this.form.airBottleConfigId=_this.item.airBottleConfigId;
-				_this.form.airBottleId =_this.item.airBottleId;
-
-				const {data} = await gasApplyStorageAdd(_this.form);
-				if(data.code == 200){
-				    uni.showToast({
-				        title: '提交成功',
-				        icon:"none",
-				        mask:true,
-				        duration: 2000
-				    });
-				    setTimeout(function(){
-				       uni.redirectTo({
-				            url: '/pages_manage/gasApply/gasApply'
-				        });
-				    },2000);
-				}
-			},
-
-
-		}
-    }
-</script>
-
-<style lang="stylus" scoped>
-    #register{
-        height:auto;
-        width:100%;
-        display flex
-        flex-direction column;
-		padding-bottom: 220rpx;
-		.title{
-			width: 750rpx;
-			height: 100rpx;
-			background: #FFFFFF;
-			font-size: 28rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #333333;
-			line-height: 100rpx;
-			padding-left: 40rpx;
-		}
-		.register_li{
-			background #fff;
-			border-radius:20rpx;
-			margin:20rpx 20rpx 0;
-			padding:20rpx 0;
-			box-sizing: border-box;
-			.register_li_min{
-				margin:0 26rpx;
-				display flex;
-				align-items center;
-				border-bottom: 1px solid #F5F5F5;
-				view{
-					line-height:100rpx;
-					font-size:28rpx;
-				}
-				view:nth-child(1){
-					color:red;
-					line-height:28rpx;
-					margin-right: 12rpx;
-				}
-				view:nth-child(2){
-					//width:140rpx;
-					flex: 1;
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-				}
-				.picker-text{
-					text-align: right;
-					font-size: 28rpx;
-				}
-
-				>input{
-					width 400rpx;
-					text-align: right;
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-				}
-				.code_img{
-					width: 30rpx;
-					height: 28rpx;
-					margin-left: 26rpx;
-				}
-				/* 单选按钮 */
-				.radio_group{
-					display: flex;
-					.radio{
-						display: flex;
-						margin-left: 80rpx;
-						margin-right: 0;
-						>img{
-							width: 30rpx;
-							height: 30rpx;
-						}
-						>text{
-							margin-left: 34rpx;
-							font-size: 28rpx;
-							font-family: PingFang SC;
-							font-weight: 500;
-							color: #333333;
-							line-height: 28rpx;
-						}
-					}
-				}
-			}
-			/* 时间 */
-			.register_li_min2{
-				margin:0 26rpx;
-				border-bottom: 1px solid #f5f5f5;
-				height: 100rpx;
-				display: flex;
-				justify-content: flex-start;
-				align-items: center;
-				>view:nth-child(1){
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-					line-height: 100rpx;
-					margin-right: 96rpx;
-				}
-				.picker-text{
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #999999;
-					line-height: 100rpx;
-					width: 188rpx;
-
-				}
-				>view:nth-child(2){
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #999999;
-					line-height: 100rpx;
-				}
-				.picker-text2{
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #999999;
-					line-height: 100rpx;
-					width: 188rpx;
-					text-align: right;
-				}
-			}
-
-		}
-		/* 按钮 */
-		.sub_btn{
-			width: 650rpx;
-			height: 100rpx;
-			display: flex;
-			position: fixed;
-			bottom: 30rpx;
-			left: 50rpx;
-			z-index: 1000;
-			.sub_btn_l{
-				width: 325rpx;
-				height: 100rpx;
-				background: linear-gradient(-45deg, #FA9901, #F28E26);
-				border-radius: 50rpx 0px 0px 50rpx;
-				font-size: 30rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #FFFFFF;
-				line-height: 100rpx;
-				text-align: center;
-			}
-			.sub_btn_r{
-				width: 325rpx;
-				height: 100rpx;
-			    background: linear-gradient(-35deg, #309CFF, #0183FA);
-			    border-radius: 0px 50rpx 50rpx 0px;
-				font-size: 30rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #FFFFFF;
-				line-height: 100rpx;
-				text-align: center;
-			}
-		}
-	}
-	/deep/.input-value-border{
-		display :none !important;
-	}
-</style>

+ 0 - 203
pages_manage/gasApply/gasApply.vue

@@ -1,203 +0,0 @@
-<!--气瓶申请-->
-<template>
-    <view id="transportPerson">
-		<scroll-view scroll-y @scrolltolower="scrollGet" class="scroll-box">
-		    <view class="list">
-				<view class="list_li" v-for="(item,index) in dataList" @click="goInfo(item)">
-					<view class="list_li_t">
-						<img class="for-back-img" src="@/pages_manage/images/Version3.0/icon_ysclgl_cl.png">
-						<text>申请时间:{{item.createTime}}</text>
-						<text v-if="item.applyNum==item.storageNum">已全部入库</text>
-					</view>
-					<view class="list_li_b">
-						<view>申请:<text>{{item.applyNum}}</text></view>
-						<view>入库:<text>{{item.storageNum}}</text></view>
-					</view>
-				</view>
-			</view>
-		</scroll-view>
-		<view class="empty" v-if="pageType==4">
-			<img class="for-back-img" src="@/pages_manage/images/Version3.0/img_ysrygl_zwsj.png">
-			<view>暂无数据</view>
-		</view>
-		<view class="sub_btn" @click="subBtn()">提交申请</view>
-	</view>
-</template>
-
-<script>
-	import { gasApplyList } from '@/api/index.js'
-    export default {
-
-        name: "transportPerson",
-        data() {
-            return {
-
-				pageType:0,
-				//列表请求参数
-				getData:{
-				    pageNum:1,
-					pageSize:20,
-				},
-				pageType:0,
-                dataList:[],
-            }
-        },
-        onLoad() {
-
-        },
-        onShow() {
-
-        },
-
-        methods: {
-
-			//滚动加载事件
-			scrollGet(){
-			   this.getData.pageNum += 1;
-			   this.getList();
-			},
-			subBtn(){
-				uni.redirectTo({
-				    url:'/pages_manage/gasApply/gasApplyAdd?status=0'
-				});
-			},
-			goInfo(d){
-				uni.redirectTo({
-				    url:'/pages_manage/gasApply/gasApplyList?item='+encodeURIComponent(JSON.stringify(d))
-				});
-			},
-			//获取列表数据
-				async getList(){
-				   let _this=this;
-				    const {data} = await gasApplyList(this.getData);
-				    if(data.code==200){
-						let res=data.rows;
-						if(_this.getData.pageNum==1){
-							_this.dataList=res;
-							if(res.length>0){
-								_this.pageType=0;
-							}else{
-								_this.pageType=4;
-							}
-						}else{
-							_this.dataList=_this.dataList.concat(res);
-						}
-				    }
-				},
-
-        },
-		mounted(){
-			this.getList()
-		},
-    }
-</script>
-
-<style lang="stylus" scoped>
-    #transportPerson {
-        height: 100%;
-        width: 100%;
-		flex :1;
-        display flex;
-        flex-direction column
-        overflow hidden;
-		margin-top: 20rpx;
-        .scroll-box{
-        // flex:1;
-         overflow-y scroll;
-		 padding-bottom: 180rpx;
-		 .list{
-			 background: #FFFFFF;
-			 border-radius: 20rpx;
-			 margin: 0 20rpx;
-			 padding: 0 20rpx;
-			 box-sizing: border-box;
-			 .list_li{
-				 border-bottom:1px solid #f5f5f5;
-				 padding: 30rpx 0 20rpx 0;
-				 box-sizing: border-box;
-				.list_li_t{
-					display: flex;
-					align-items: center;
-					>img{
-						width: 30rpx;
-						height: 30rpx;
-						margin-right: 16rpx;
-					}
-					>text:nth-of-type(1){
-						width: 530rpx;
-						font-size: 28rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #333333;
-						line-height: 28rpx;
-					}
-					>text:nth-of-type(2){
-						width: 130rpx;
-						font-size: 24rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #00CC26;
-						line-height: 24rpx;
-					}
-				}
-				.list_li_b{
-					display: flex;
-					margin-top: 42rpx;
-					>view{
-						width: 150rpx;
-						font-size: 26rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #333333;
-						line-height: 26rpx;
-						>text{
-							font-size: 26rpx;
-							color: #0183FA;
-						}
-					}
-					>view:nth-of-type(2){
-						>text{
-							font-size: 26rpx;
-							color: #00CC26;
-						}
-					}
-				}
-			 }
-		 }
-     }
-		.empty{
-			text-align: center;
-			margin-top: 316rpx;
-			>img{
-				width: 336rpx;
-				height: 222rpx;
-				margin-left: 208rpx;
-			}
-			>view{
-				font-size: 30rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #E0E0E0;
-				line-height: 30rpx;
-				margin-top: 48rpx;
-			}
-		}
-		/* 按钮 */
-		.sub_btn{
-			width: 650rpx;
-			height: 100rpx;
-			background: #0183FA;
-			border-radius: 20rpx;
-			font-size: 28rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #FFFFFF;
-			line-height: 100rpx;
-			text-align: center;
-			margin-left: 50rpx;
-			position: fixed;
-			bottom:30rpx;
-			z-index: 1000;
-		}
-	}
-</style>

+ 0 - 469
pages_manage/gasApply/gasApplyAdd.vue

@@ -1,469 +0,0 @@
-<!--申请气瓶-->
-<template>
-    <view id="transportPerson">
-		<picker @change="bindPickerChange" :value="pickerIndex" :range="pickerArray">
-			<view class="title">
-				<viwe class="title_l">实验地点:</viwe>
-				<input class="title_r" v-model="form.location" disabled type="text" placeholder="请选择实验地点">
-			</view>
-		</picker>
-		<scroll-view scroll-y @scrolltolower="scrollGet" class="scroll-box">
-		    <view class="list">
-				<view class="list_li" v-for="(item,index) in listDetail">
-					<view class="list_li_l">
-						<view class="list_li_l_t">{{item.airName}}-{{item.configName}}</view>
-						<view class="list_li_l_b">
-							<img  src="@/pages_manage/images/icon_14.png">
-							<text>{{item.companyName}}</text>
-						</view>
-					</view>
-					<view class="list_li_r">
-						<view class="minus"  @click="minus(item)"><img  src="@/pages_manage/images/Version3.0/icon_zgsq_jian.png"></view>
-						<input v-model="item.bottleNumber"  disabled  type="text" >
-						<view class="add"  @click="add(item)"><img  src="@/pages_manage/images/Version3.0/icon_zgsq_j.png"></view>
-					</view>
-				</view>
-			</view>
-		</scroll-view>
-		<view class="empty" v-if="pageType==4">
-			<img class="for-back-img" src="@/pages_manage/images/Version3.0/icon_sqqp_sqys.png">
-			<view>
-				<text>气瓶已全部向供应商申请运输</text>
-				<text>如需更多气瓶请重新提交资格申请</text>
-			</view>
-		</view>
-		<view v-if="amount>0" class="sub_btn">
-			<view class="sub_btn_l">已选择{{amount}}个气瓶</view>
-			<view class="sub_btn_r" @click="submitVerify()">提交</view>
-		</view>
-		<view v-if="amount==0" class="sub_btn2">
-			<view class="sub_btn_l">暂未选择气瓶</view>
-			<view class="sub_btn_r">提交</view>
-		</view>
-		<view class="sub_btn2" v-if="pageType==4">提交申请</view>
-	</view>
-</template>
-<script>
-	import { taskListGood,labList,gasApplyAdd,gasApplyVerify} from '@/api/index.js'
-    export default {
-
-        name: "transportPerson",
-        data() {
-            return {
-
-				pageType:0,
-				//列表请求参数
-				params:{
-					pageNum:1,
-					pageSize:20,
-					searchValue:'',
-				},
-                listDetail:[],
-				form:{
-					location:'',
-				},
-				pickerArray:[],
-				pickerArrayList:[],
-				amount:0,
-				status:null,//0添加1编辑
-            }
-        },
-        onLoad(option) {
-			this.status=option.status;
-        },
-        onShow() {
-
-        },
-        methods: {
-			search(){
-				 this.getList();
-			},
-			minus(d) {
-				let _this=this;
-				 if(d.bottleNumber>0){
-					 _this.amount=0;
-					d.bottleNumber--;
-					this.listDetail.forEach(function(item){
-						_this.amount+=item.bottleNumber;
-					})
-				 }
-
-			},
-			add(d) {
-				let _this=this;
-				_this.amount=0;
-				d.bottleNumber++;
-				this.listDetail.forEach(function(item){
-					_this.amount+=item.bottleNumber;
-				})
-
-			},
-			//滚动加载事件
-			scrollGet(){
-			   this.params.pageNum += 1;
-			   this.getList();
-			},
-			//选择实验室
-			bindPickerChange(e){
-				let _this=this;
-				let index=e.target.value
-				//获取实验室名称
-				_this.form.location=_this.pickerArray[index]
-				//循环获取实验室id
-				_this.pickerArrayList.forEach(function(item){
-					if(_this.pickerArray[index]==item.name){
-						_this.form.locationId=item.id;
-					}
-				})
-
-			},
-			//查询实验室
-			async labList(){
-				const {data} = await labList()
-				if(data.code == 200){
-					let _this=this;
-					let res=data.data
-					_this.pickerArrayList=res;
-					res.forEach(function(item){
-						_this.pickerArray.push(item.name);
-					})
-
-				}
-			},
-			//获取列表数据
-				async getList(){
-				    let _this = this;
-
-				    const {data} = await taskListGood(this.params);
-				    if(data.code==200){
-						let res=data.rows;
-						if(res){
-
-							if(_this.params.pageNum==1){
-								res.forEach(function(item){
-									item.bottleNumber=0;
-								})
-								_this.listDetail=res;
-							}else{
-								res.forEach(function(item){
-									item.bottleNumber=0;
-								})
-								_this.listDetail=_this.listDetail.concat(res);
-
-							}
-
-						}
-
-				    }
-				},
-				async submitVerify(){
-
-					let _this=this;
-
-					if(_this.form.location==''){
-						uni.showToast({
-						    title: '请先选择实验室!',
-						    icon:"none",
-						    mask:true,
-						    duration: 2000
-						});
-						return;
-					}
-					const {data} = await gasApplyVerify({subjectId:_this.form.locationId});
-					if(data.code == 200){
-						let res=data.data
-						if(!res.flgSubject){
-							uni.showToast({
-								title: '请先配置实验室气瓶总量数',
-								icon:"none",
-								mask:true,
-								duration: 2000
-							});
-							return
-						}
-						if(!res.flgUser){
-							uni.showToast({
-								title: '请先配置实验室个人气瓶总量数',
-								icon:"none",
-								mask:true,
-								duration: 2000
-							});
-							return
-						}
-						if(_this.amount>res.subjectNum){
-							uni.showToast({
-								title: '当前申请气瓶个数大于当前实验室气瓶存量!',
-								icon:"none",
-								mask:true,
-								duration: 2000
-							});
-							return
-						}
-						if(_this.amount>res.userNum){
-							uni.showToast({
-								title: '当前申请气瓶个数大于个人气瓶存量!',
-								icon:"none",
-								mask:true,
-								duration: 2000
-							});
-							return
-						}
-						_this.submitForm();
-					}else{
-						return
-					}
-				},
-			//注册提交
-			async submitForm(){
-				let _this = this;
-
-				if(_this.listDetail){
-					let arr=[];
-					let supplierId='';
-					_this.listDetail.forEach(function(item){
-						item.supplierId=item.companyId
-						supplierId=item.companyId
-						if(item.bottleNumber>0){
-							arr.push(item)
-						}
-					})
-					_this.form.detailListVO=arr;
-				}
-				const {data} = await gasApplyAdd(_this.form);
-				if(data.code == 200){
-				    uni.showToast({
-				        title: '提交成功',
-				        icon:"none",
-				        mask:true,
-				        duration: 2000
-				    });
-				    setTimeout(function(){
-				       uni.redirectTo({
-				            url: '/pages_manage/gasApply/gasApply'
-				        });
-				    },2000);
-				}
-			},
-
-        },
-		mounted(){
-		   this.getList()
-		   this.labList()
-
-		},
-    }
-</script>
-
-<style lang="stylus" scoped>
-    #transportPerson {
-        height: 100%;
-        width: 100%;
-		flex :1;
-        display flex;
-        flex-direction column
-        overflow hidden;
-		.title{
-			width: 750rpx;
-			height: 118rpx;
-			background: #FFFFFF;
-			padding: 0 40rpx;
-			box-sizing: border-box;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			margin-bottom: 20rpx;
-			.title_l{
-				font-size: 28rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #999999;
-				line-height: 118rpx;
-			}
-			.title_r{
-				flex: 1;
-				font-size: 28rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #333333;
-				text-align: right;
-			}
-		}
-        .scroll-box{
-        // flex:1;
-         overflow-y scroll;
-		 padding-top: 30rpx;
-		 padding-bottom: 180rpx;
-		 .list{
-			 background: #FFFFFF;
-			 border-radius: 20rpx;
-			 margin: 0 20rpx;
-			 padding: 0 20rpx;
-			 box-sizing: border-box;
-			 .list_li{
-				 height: 180rpx;
-				 display: flex;
-				 justify-content: space-between;
-				 padding: 0 20rpx;
-				 box-sizing: border-box;
-				 border-bottom:1px solid #f5f5f5;
-				 .list_li_l{
-					 flex: 1;
-					 .list_li_l_t{
-						 font-size: 28rpx;
-						 font-family: PingFang SC;
-						 font-weight: 500;
-						 color: #333333;
-						 line-height: 28rpx;
-						 margin-top: 44rpx;
-					 }
-					 .list_li_l_b{
-						 display: flex;
-						 justify-content: flex-start;
-						 margin: 42rpx 0 34rpx 0;
-						 >img{
-							 width: 28rpx;
-							 height: 30rpx;
-							 margin-right: 18rpx;
-						 }
-						 >text{
-							font-size: 24rpx;
-							font-family: PingFang SC;
-							font-weight: 400;
-							color: #666666;
-							line-height: 24rpx;
-						 }
-					 }
-				 }
-				.list_li_r{
-					 width: 222rpx;
-					 display: flex;
-					 justify-content: space-between;
-					 align-items: center;
-					 .minus{
-						 width: 96rpx;
-						 height: 96rpx;
-						 >img{
-							width: 36rpx;
-							height: 36rpx;
-							margin-top: 30rpx;
-							margin-left: 30rpx;
-						 }
-					 }
-					 .add{
-						 width: 96rpx;
-						 height: 96rpx;
-						>img{
-							width: 36rpx;
-							height: 36rpx;
-							margin-top: 30rpx;
-							margin-left: 30rpx;
-						}
-					 }
-					 >input{
-						 text-align: center;
-						 width: 90rpx;
-						 font-size: 28rpx;
-						 font-family: PingFang SC;
-						 font-weight: 500;
-						 color: #333333;
-						 line-height: 36rpx;
-					 }
-				}
-
-			 }
-		 }
-     }
-		.empty{
-			width: 710rpx;
-			height: 700rpx;
-			background: #FFFFFF;
-			border-radius: 20px;
-			text-align: center;
-			margin:20rpx;
-			>img{
-				width: 430rpx;
-				height: 280rpx;
-				margin-left: 142rpx;
-				margin-top: 72rpx;
-			}
-			>view{
-				margin-top: 48rpx;
-				>text{
-					display: block;
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #999999;
-					line-height: 44rpx;
-				}
-			}
-		}
-		/* 按钮 */
-		.sub_btn{
-			width: 750rpx;
-			height: 120rpx;
-			background: #FFFFFF;
-			position: fixed;
-			bottom: 0;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			padding: 0 20rpx 0 40rpx;
-			box-sizing: border-box;
-			z-index: 1000;
-			.sub_btn_l{
-				font-size: 28rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #333333;
-				line-height: 120rpx;
-				flex: 1;
-			}
-			.sub_btn_r{
-				width: 200rpx;
-				height: 70rpx;
-				background: #0183FA;
-				border-radius: 35rpx;
-				font-size: 28rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #FFFFFF;
-				line-height: 70rpx;
-				text-align: center;
-			}
-		}
-		.sub_btn2{
-			width: 750rpx;
-			height: 120rpx;
-			background: #FFFFFF;
-			position: fixed;
-			bottom: 0;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			padding: 0 20rpx 0 40rpx;
-			box-sizing: border-box;
-			z-index: 1000;
-			.sub_btn_l{
-				font-size: 28rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #CCCCCC;
-				line-height: 120rpx;
-				flex: 1;
-			}
-			.sub_btn_r{
-				width: 200rpx;
-				height: 70rpx;
-				background: #E0E0E0;
-				border-radius: 35rpx;
-				font-size: 28rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #999999;
-				line-height: 70rpx;
-				text-align: center;
-			}
-		}
-	}
-</style>

+ 0 - 311
pages_manage/gasApply/gasApplyList.vue

@@ -1,311 +0,0 @@
-<!--申请详情-->
-<template>
-    <view id="transportPerson">
-		<view class="title">
-			<viwe class="title_l">申请时间:</viwe>
-			<viwe class="title_r">{{createTime}}</viwe>
-		</view>
-		<view class="tabTitle">
-			<view class="tabTitle_li" @tap="tabClick(index)"  :key="index" v-for="(item,index) in tabText">
-				<view :class="{on:curTab==index}" class="tabTitle_text">{{item}}</view>
-			    <view :class="{on:curTab==index}" class="tabTitle_across"></view>
-			</view>
-		</view>
-		<scroll-view scroll-y @scrolltolower="scrollGet" class="scroll-box">
-		    <view class="list">
-				<view class="list_li" v-for="(item,index) in dataList">
-					<view class="list_li_l" >
-						<view class="list_li_l_t">{{item.airName}}-{{item.configName}}</view>
-						<view class="list_li_l_b">
-							<img  src="@/pages_manage/images/icon_14.png">
-							<text>{{item.companyName}}</text>
-						</view>
-						<view v-if="pageType==2 || pageType==3" class="list_li_l_b">
-							<img  src="@/pages_manage/images/icon_aqbj_sj.png">
-							<text v-if="pageType==2">入库时间:{{item.createTime}}</text>
-							<text v-if="pageType==3">拒收时间:{{item.rejectionApplyTime}}</text>
-						</view>
-						<view  v-if="pageType==3" class="list_li_l_b">
-							<img  src="@/pages_manage/images/Version3.0/icon_sqxq_jsyy.png">
-							<view class="cause"><text>拒收原因:</text><text>{{item.rejectionApplyRemark}}</text></view>
-						</view>
-					</view>
-					<view v-if="pageType==0" class="list_li_r" @click="enterStockFun(item)">入库</view>
-				</view>
-			</view>
-		</scroll-view>
-		<view class="empty" v-if="pageType==4">
-			<img class="for-back-img" src="@/pages_manage/images/Version3.0/img_ysrygl_zwsj.png">
-			<view>暂无数据</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import { gasApplyDetailDrk,gasApplyDetailWps,gasApplyDetailYrk,gasApplyDetailYjs} from '@/api/index.js'
-    export default {
-
-        name: "transportPerson",
-        data() {
-            return {
-
-				pageType:0,
-				//列表请求参数
-				getData:{
-				    pageNum:1,
-					pageSize:20,
-				},
-				userType:uni.getStorageSync('userType'),
-				pageType:0,
-				curTab:0,
-				tabText:['待入库','未派送','已入库','已拒收'],
-                dataList:[],
-				status:null,//0添加1编辑
-				id:null,
-				createTime:'',
-            }
-        },
-        onLoad(option) {
-			let item=JSON.parse(decodeURIComponent(option.item));
-			this.createTime=item.createTime;
-			this.id=item.id;
-        },
-        onShow() {
-
-        },
-		mounted(){
-		  this.getList()
-		},
-        methods: {
-			//顶部tab点击
-			tabClick(index) {
-				this.curTab = index;
-				this.pageType=index;
-				this.dataList=[];
-				if(this.pageType==0){
-					this.getList()
-				}else if(this.pageType==1){
-					this.getList2()
-				}else if(this.pageType==2){
-					this.getList3()
-				}else if(this.pageType==3){
-					this.getList4()
-
-				}
-
-			},
-			//待审核入库按钮
-			enterStockFun(d){
-				uni.redirectTo({
-				    url:'/pages_manage/gasApply/awaitStorage?item='+encodeURIComponent(JSON.stringify(d))
-				});
-			},
-			//滚动加载事件
-			scrollGet(){
-
-			},
-			//待入库
-			async getList(){
-				let _this = this;
-				const {data} = await gasApplyDetailDrk({id:_this.id});
-				if(data.code==200){
-					if(data.code==200){
-						let res = data.data.list;
-						_this.dataList=res
-					}
-				}
-			},
-			//未派送
-			async getList2(){
-				let _this = this;
-				const {data} = await gasApplyDetailWps({id:_this.id});
-				if(data.code==200){
-					if(data.code==200){
-						let res = data.data.list;
-						_this.dataList=res
-					}
-				}
-			},
-			//已入库
-			async getList3(){
-				let _this = this;
-				const {data} = await gasApplyDetailYrk({id:_this.id});
-				if(data.code==200){
-					if(data.code==200){
-						let res = data.rows;
-						_this.dataList=res
-					}
-				}
-			},
-			//已拒收
-			async getList4(){
-				let _this = this;
-				const {data} = await gasApplyDetailYjs({id:_this.id});
-				if(data.code==200){
-					if(data.code==200){
-						let res = data.rows;
-						_this.dataList=res
-					}
-				}
-			},
-
-        }
-    }
-</script>
-
-<style lang="stylus" scoped>
-    #transportPerson {
-        height: 100%;
-        width: 100%;
-		flex :1;
-        display flex;
-        flex-direction column
-        overflow hidden;
-		.title{
-			width: 750rpx;
-			height: 118rpx;
-			background: #FFFFFF;
-			padding: 0 40rpx;
-			box-sizing: border-box;
-			display: flex;
-			justify-content: space-between;
-			.title_l{
-				font-size: 28rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #999999;
-				line-height: 118rpx;
-			}
-			.title_r{
-				font-size: 28rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #333333;
-				line-height: 118rpx;
-			}
-		}
-		.tabTitle{
-			display flex;
-			width:100%;
-			height: 100rpx;
-			.tabTitle_li{
-				width:146rpx;
-				text-align center;
-				.tabTitle_text{
-					display: inline-block;
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-					line-height: 70rpx;
-					&.on{
-						color:#0183FA;
-					}
-				}
-				.tabTitle_across{
-					width: 50rpx;
-					height: 6rpx;
-					background: #0183FA;
-					border-radius: 3rpx;
-					margin-left 50rpx;
-					display none;
-					&.on{
-						display block;
-					}
-				}
-
-			}
-
-
-		}
-        .scroll-box{
-        // flex:1;
-         overflow-y scroll;
-		 .list{
-			 background: #FFFFFF;
-			 border-radius: 20rpx;
-			 margin: 0 20rpx;
-			 padding: 0 20rpx;
-			 box-sizing: border-box;
-			 .list_li{
-					 display: flex;
-					 justify-content: space-between;
-					 padding: 44rpx 0 28rpx 0;
-					 box-sizing: border-box;
-					 border-bottom:1px solid #f5f5f5;
-					 .list_li_l{
-						 flex: 1;
-						 .list_li_l_t{
-							 font-size: 28rpx;
-							 font-family: PingFang SC;
-							 font-weight: 500;
-							 color: #333333;
-							 line-height: 28rpx;
-
-						 }
-						 .list_li_l_b{
-							 display: flex;
-							 justify-content: flex-start;
-							 margin-top:38rpx;
-							 >img{
-								 width: 28rpx;
-								 height: 30rpx;
-								 margin-right: 18rpx;
-							 }
-							 >text{
-								font-size: 24rpx;
-								font-family: PingFang SC;
-								font-weight: 400;
-								color: #666666;
-								line-height: 30rpx;
-							 }
-							 .cause{
-								 display: flex;
-								 flex: 1;
-								 >text{
-									font-size: 24rpx;
-									font-family: PingFang SC;
-									font-weight: 400;
-									color: #666666;
-									line-height: 30rpx;
-								 }
-								 >text:nth-of-type(1){
-								   width: 200rpx;
-								 }
-								 >text:nth-of-type(2){
-									display: block;
-								 }
-							 }
-						 }
-					 }
-					 .list_li_r{
-						 font-size: 28rpx;
-						 font-family: PingFang SC;
-						 font-weight: 500;
-						 color: #0183FA;
-						 line-height: 28rpx;
-						 margin-top: 26rpx;
-					 }
-				 }
-			 }
-     }
-		.empty{
-			text-align: center;
-			margin-top: 316rpx;
-			>img{
-				width: 336rpx;
-				height: 222rpx;
-				margin-left: 208rpx;
-			}
-			>view{
-				font-size: 30rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #E0E0E0;
-				line-height: 30rpx;
-				margin-top: 48rpx;
-			}
-		}
-
-	}
-</style>

+ 0 - 256
pages_manage/gasApply/gasApplyReject.vue

@@ -1,256 +0,0 @@
-<!-- 拒收气瓶 -->
-<template>
-    <view id="register">
-		<view class="register_li">
-			<view class="register_li_min">
-				<view>*</view>
-				<view>拒收原因:</view>
-				<input v-model="form.rejectionApplyRemark"   type="text" placeholder="请输入拒收原因">
-			</view>
-			<view class="up-img-box">
-			    <view class="title-view">问题照片:</view>
-			    <view class="img-max-box">
-			        <view class="img-box" v-for="(item,index) in imgList" :key="index">
-			            <img class="img-data" :src="baseUrl+item">
-			            <img class="position-img" src="@/pages_manage/images/icon_ssp_closure.png" @click="delImg(index)">
-			        </view>
-			        <img class="add-button" src="@/pages_manage/images/icon_07.png" @click="selectImage" v-if="imgList.length<5">
-			    </view>
-			</view>
-		</view>
-
-		<view class="sub_btn" @click="submitForm()">提交</view>
-	</view>
-</template>
-
-<script>
-    import {gasApplyYjsAdd } from '@/api/index.js'
-	import { config } from '@/api/request/config.js'
-    export default {
-        data() {
-            return {
-				baseUrl:config.base_url,
-				form:{
-					rejectionApplyRemark:'',
-					rejectionApplyImg:'',
-
-				},
-				imgList:[],
-				item:{},//从列表传过来的值
-				item2:{},//从列表传过来的值
-            }
-        },
-        onLoad(option) {
-			this.item=JSON.parse(decodeURIComponent(option.item));
-			this.item2=JSON.parse(decodeURIComponent(option.item2));
-        },
-        onShow(){
-        },
-
-        methods: {
-			// 图片上传
-			selectImage(index) {
-			    let self = this;
-			    if(self.imgList.length>4){
-			        uni.showToast({
-			            title: '最多上传5张图片',
-			            icon:"none",
-			            mask:true,
-			            duration: 2000
-			        });
-			        return
-			    }
-			    wx.chooseImage({
-			        count: 1,
-			        sizeType: ["original", "compressed"],
-			        sourceType: ["album", "camera"],
-			        success: function(res) {
-			            let tempFilePaths = res.tempFilePaths[0];
-			            self.uploadImg(tempFilePaths,index);
-			        }
-			    });
-			},
-			async uploadImg(tempFilePaths,index){
-			    var self = this;
-			    uni.showLoading({
-			        title: '上传中',
-			        mask: true
-			    });
-			    uni.uploadFile({
-			        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
-			        header:{'Authorization':uni.getStorageSync('token')},
-			        filePath: tempFilePaths,
-			        name: 'file',
-			        formData: {
-			            'user': 'test'
-			        },
-			        success: (uploadFileRes) => {
-			            let res = JSON.parse(uploadFileRes.data);
-						if(res.code == 200){
-
-							self.imgList.push(res.data.url);
-
-						}else{
-							uni.showToast({
-								title: res.msg,
-								icon:"none",
-								mask:true,
-								duration: 2000
-							});
-						}
-			        },
-			        fail: err => {},
-			        complete: () => {
-			            uni.hideLoading()
-			        }
-			    });
-			},
-			//删除图片
-			delImg(index){
-			    this.imgList.splice(index,1);
-			},
-			//提交
-			async submitForm(){
-				let _this = this;
-				if(!_this.form.rejectionApplyRemark){
-					uni.showToast({
-						title: '请输入拒收原因',
-						icon:"none",
-						mask:true,
-						duration: 2000
-					});
-					return
-				}
-				_this.form.carCode=_this.item2.car.carCode
-				_this.form.carCodeId =_this.item2.car.id
-				_this.form.phone=_this.item2.user.phone
-				_this.form.driverName=_this.item2.user.userName
-				_this.form.driverId=_this.item2.user.id
-
-				_this.form.airStatus=1;
-				_this.form.taskId=_this.item.taskId;
-				_this.form.taskDetailId=_this.item.id;
-
-				_this.form.rejectionApplyImg=_this.imgList.join(',')
-
-				const {data} = await gasApplyYjsAdd(_this.form);
-				if(data.code == 200){
-				    uni.showToast({
-				        title: '提交成功',
-				        icon:"none",
-				        mask:true,
-				        duration: 2000
-				    });
-				    setTimeout(function(){
-				       uni.redirectTo({
-				            url: '/pages_manage/gasApply/gasApply'
-				        });
-				    },2000);
-				}
-			},
-        }
-    }
-</script>
-
-<style lang="stylus" scoped>
-    #register{
-        height:100%;
-        width:100%;
-        display flex
-        flex-direction column;
-		padding-bottom: 220rpx;
-		.register_li{
-			background #fff;
-			border-radius:20rpx;
-			margin:20rpx 20rpx 0;
-			padding:20rpx 0;
-			box-sizing: border-box;
-			.register_li_min{
-				margin:0 26rpx;
-				display flex;
-				align-items center;
-				border-bottom: 1px solid #F5F5F5;
-				view{
-					line-height:100rpx;
-					font-size:28rpx;
-				}
-				view:nth-child(1){
-					color:red;
-					line-height:28rpx;
-					margin-right: 12rpx;
-				}
-				view:nth-child(2){
-					width:140rpx;
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-				}
-
-				>input{
-					width 490rpx;
-					text-align: right;
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #CCCCCC;
-				}
-			}
-			.up-img-box{
-			    display flex
-			    margin:34rpx 26rpx;
-			    .title-view{
-			        width:160rpx;
-			        line-height:80rpx;
-			        font-size: 30rpx;
-			        color:#333;
-			    }
-			    .img-max-box{
-			        width:510rpx;
-			        .img-box{
-			            display inline-block
-			            height:146rpx;
-			            width:146rpx;
-			            position relative
-			            margin:0 20rpx 20rpx 0;
-			            .img-data{
-			                height:146rpx;
-			                width:146rpx;
-			            }
-			            .position-img{
-			                position absolute
-			                right:0;
-			                top:0;
-			                width:36rpx;
-			                height:36rpx;
-			            }
-			        }
-			        .add-button{
-			            display inline-block
-			            height:150rpx;
-			            width:150rpx;
-			        }
-			    }
-			}
-		}
-		/* 按钮 */
-		.sub_btn{
-			width: 650rpx;
-			height: 100rpx;
-			background: #0183FA;
-			border-radius: 20rpx;
-			font-size: 28rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #FFFFFF;
-			line-height: 100rpx;
-			text-align: center;
-			margin-left: 50rpx;
-			position: fixed;
-			bottom:30rpx;
-		}
-	}
-	/deep/.input-value-border{
-		display :none !important;
-	}
-</style>

+ 0 - 168
pages_manage/gasList/gasList.vue

@@ -1,168 +0,0 @@
-<!--气瓶列表-->
-<template>
-    <view id="gasRecycle">
-		<scroll-view scroll-y @scrolltolower="scrollGet" class="scroll-box">
-		    <view class="for-big-box" v-for="(item,index) in dataList" :key="index">
-		        <view class="for-time-p">{{item.location}}</view>
-		        <img class="for-back-img" src="@/pages_manage/images/Version2.2/for_min_bg.png">
-		        <view class="for-box" @click="goInfo(item2)" v-for="(item2,index2) in item.airGoodsConfigRelationVo" :key="index2">
-		        	<view class="for-box_t">{{item2.airName}}-{{item2.configName}}</view>
-		        	<view class="for-box_b">
-						<img class="for-back-img" src="@/pages_manage/images/Version3.0/icon_qpgl_syl.png">
-						<text>余量: {{item2.pressure==null?'':item2.pressure}}Mpa</text>
-						<img class="for-back-img" src="@/pages_manage/images/Version2.2/icon_wtzg_sj.png">
-						<text>最近使用时间: {{item2.useTimeApp==null?'':item2.useTimeApp}}</text>
-					</view>
-		        </view>
-		    </view>
-			<view class="get-null-box" v-if="noData">暂无更多数据</view>
-		</scroll-view>
-
-	</view>
-</template>
-
-<script>
-	import { gasList  } from '@/api/index.js'
-    export default {
-
-        name: "gasRecycle",
-        data() {
-            return {
-
-				pageType:0,
-				//列表请求参数
-				getData:{
-				    pageNum:1,
-					pageSize:20,
-					remark:'login',
-				},
-				userType:uni.getStorageSync('userType'),
-
-                dataList:[],
-				noData:false,
-            }
-        },
-        onLoad() {
-			 this.getList();
-        },
-        onShow() {
-
-        },
-		mounted(){
-
-
-		},
-        methods: {
-			goInfo(d){
-
-				uni.navigateTo({
-				    url:'/pages_manage/gasList/gasListDetail?item='+encodeURIComponent(JSON.stringify(d))
-				});
-			},
-			//滚动加载事件
-			scrollGet(){
-			    this.getData.pageNum += 1;
-			    this.getList();
-			},
-			//获取列表数据
-				async getList(){
-				   let _this = this;
-
-				    const {data} = await gasList(_this.getData);
-				    if(data.code==200){
-						let res = data.rows;
-						if(res && res.length>0){
-							if(_this.getData.pageNum==1){
-								_this.dataList=res;
-							}else{
-								_this.dataList=_this.dataList.concat(res);
-							}
-						}else{
-							_this.noData=true;
-						}
-				    }
-				},
-
-        }
-    }
-</script>
-
-<style lang="stylus" scoped>
-    #gasRecycle {
-        height: 100%;
-        width: 100%;
-		flex :1;
-        display flex;
-        flex-direction column
-        overflow hidden;
-     .scroll-box{
-        // flex:1;
-         overflow-y scroll;
-		 margin-top: 20rpx;
-
-         .for-big-box:last-child{
-             margin-bottom:180rpx;
-         }
-         .for-big-box{
-             margin:0 20rpx 20rpx;
-             overflow hidden
-             border-bottom-left-radius :20rpx;
-             border-bottom-right-radius :20rpx;
-             .for-time-p{
-                 background #fff
-                 line-height:87rpx;
-                 font-size:30rpx;
-                 padding:0 22rpx;
-                 border-top-left-radius:20rpx;
-                 border-top-right-radius:20rpx;
-             }
-             .for-back-img{
-                 height:30rpx;
-                 width:710rpx;
-             }
-			.for-box{
-				overflow hidden;
-				background: #fff;
-
-				padding: 0 20rpx;
-				box-sizing: border-box;
-				.for-box_t{
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-					line-height: 28rpx;
-					margin: 28rpx 0 40rpx 0;
-				}
-				.for-box_b{
-					border-bottom: 1px solid #E0E0E0;
-					display: flex;
-					>img{
-						width: 28rpx;
-						height: 28rpx;
-						margin-right: 10rpx;
-					}
-					>text{
-						font-size: 24rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #666666;
-						line-height: 26rpx;
-						margin-bottom: 20rpx;
-					}
-					>text:nth-of-type(1){
-						width: 190rpx;
-					}
-				}
-			}
-		 }
-		 /*暂无数据*/
-		 .get-null-box{
-			 height:100rpx;
-			 line-height:100rpx;
-			 color:#999;
-			 text-align center
-		 }
-     }
-	}
-</style>

+ 0 - 211
pages_manage/gasList/gasListBinding.vue

@@ -1,211 +0,0 @@
-<!--气瓶列表-->
-<template>
-    <view id="gasRecycle">
-		<view class="title">{{item.airName}}-{{item.configName}}</view>
-		<view class="register_li">
-			<view class="register_li_min">
-				<view>*</view>
-				<view>电子标签:</view>
-				<input v-model="form.electronicTag"   type="text" placeholder="请输入电子标签ID">
-				<img @click.stop="saoCode"  class="code_img" src="@/pages_manage/images/Version2.2/icon_aqjc_sm.png">
-			</view>
-		</view>
-		<view  class="sub_btn" @click="getBinding()">确认绑定</view>
-	</view>
-</template>
-
-<script>
-	import { gasTagBinding } from '@/api/index.js'
-    export default {
-        name: "gasRecycle",
-        data() {
-            return {
-				pageType:0,
-				form:{
-					id:'',
-					electronicTag:'',
-				},
-				item:{},
-            }
-        },
-        onLoad(option) {
-			this.item=JSON.parse(decodeURIComponent(option.item));
-			this.form.id=this.item.bottleStorageId;
-        },
-        onShow() {
-
-        },
-		mounted(){
-
-
-		},
-        methods: {
-			async getBinding(){
-				let _this=this;
-				if(!_this.form.electronicTag){
-					uni.showToast({
-						title: '请录入电子标签码!',
-						icon:"none",
-						mask:true,
-						duration: 2000
-					});
-					return
-				}
-				const {data} = await gasTagBinding(this.form);
-				if(data.code==200){
-					let res = data.data;
-					if(data.code==200){
-						uni.showToast({
-							title: '绑定成功!',
-							icon:"none",
-							mask:true,
-							duration: 2000
-						});
-						uni.redirectTo({
-						     url: '/pages_manage/gasList/gasListDetail?item='+encodeURIComponent(JSON.stringify(this.item))
-						 });
-					}else{
-						_this.form.electronicTag='';
-						uni.showModal({
-									showCancel:false,
-									confirmColor:'#0183FA',
-							content: '该RFID已被绑定,请重新选择 RFID标签',
-							success: function (res) {
-								if (res.confirm) {
-
-								}
-							}
-						});
-					}
-				}
-			},
-			//调用摄像头
-			saoCode(){
-				let _this = this;
-			    uni.scanCode({
-			        onlyFromCamera: true,
-			        success: function (res) {
-						_this.form.electronicTag=res.result
-						_this.getBinding();
-			        }
-			    });
-			},
-        }
-    }
-</script>
-
-<style lang="stylus" scoped>
-    #gasRecycle {
-        height: 100%;
-        width: 100%;
-		flex :1;
-        display flex;
-        flex-direction column
-        overflow hidden;
-		.title{
-			width: 750rpx;
-			height: 100rpx;
-			background: #FFFFFF;
-			font-size: 28rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #333333;
-			line-height: 100rpx;
-			padding-left: 40rpx;
-		}
-		.register_li{
-			background #fff;
-			border-radius:20rpx;
-			margin:20rpx 20rpx 0;
-			padding:20rpx 0;
-			box-sizing: border-box;
-			.register_li_min{
-				height: 100rpx;
-				margin:0 26rpx;
-				display flex;
-				align-items center;
-				/* border-bottom: 1px solid #F5F5F5; */
-				.icon_img{
-					width: 30rpx;
-					height: 30rpx;
-					margin-right: 12rpx;
-				}
-				view{
-					//width:140rpx;
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #999999;
-				}
-				view:nth-child(1){
-					color:red;
-					line-height:28rpx;
-					margin-right: 12rpx;
-				}
-				.code_img{
-					width: 30rpx;
-					height: 28rpx;
-					margin-left: 26rpx;
-				}
-				>input{
-					flex:1;
-					text-align: right;
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-				}
-				.binding{
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #0183FA;
-					line-height: 24rpx;
-					margin-left: 24rpx;
-				}
-
-
-			}
-			.issue_li{
-				margin:34rpx 26rpx 0;
-				display flex;
-				border-bottom: 1px solid #F5F5F5;
-				view:nth-child(1){
-					color:red;
-					line-height:28rpx;
-					margin-right: 12rpx;
-				}
-				view:nth-child(2){
-					//width:140rpx;
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #999999;
-				}
-				.issue_img{
-					width: 210rpx;
-					height: 210rpx;
-					border-radius: 10rpx;
-					margin-left:250rpx;
-				}
-			}
-		}
-
-	 /* 按钮 */
-	 .sub_btn{
-	 	width: 650rpx;
-	 	height: 100rpx;
-	 	background: #0183FA;
-	 	border-radius: 20rpx;
-	 	font-size: 28rpx;
-	 	font-family: PingFang SC;
-	 	font-weight: 500;
-	 	color: #FFFFFF;
-	 	line-height: 100rpx;
-	 	text-align: center;
-	 	margin-left: 50rpx;
-	 	position: fixed;
-	 	bottom:30rpx;
-	 }
-	}
-</style>

+ 0 - 351
pages_manage/gasList/gasListDetail.vue

@@ -1,351 +0,0 @@
-<!--气瓶列表-->
-<template>
-    <view id="gasRecycle">
-		<view class="title">{{specificationName.airName}}-{{specificationName.gasLevel}}</view>
-		<view class="register_li">
-			<view class="register_li_min">
-				<view>实验地点:</view>
-				<input v-model="form.location" disabled  type="text" >
-			</view>
-			<view class="register_li_min">
-				<view>编号:</view>
-				<input v-model="form.airNumber" disabled  type="text" >
-			</view>
-			<view class="register_li_min" v-if="form.electronicTag" style="border: none;">
-				<view>电子标签:</view>
-				<input v-model="form.electronicTag" disabled  type="text" >
-				<view class="binding" @click="binding()">更换</view>
-			</view>
-			<view class="register_li_min" v-if="!form.electronicTag" style="border: none;">
-				<view>电子标签:</view>
-				<input v-model="form.electronicTag" disabled  type="text" placeholder="暂未绑定电子标签">
-				<view class="binding" @click="binding()">去绑定</view>
-			</view>
-		</view>
-		<scroll-view scroll-y @scrolltolower="scrollGet" class="scroll-box">
-			<view class="small_title" @click="handleClick('useRecord')">使用记录</view>
-		    <view class="register_li2" >
-		    	<viwe class="register_li2_min" @tap="useRecordInfo(item)" v-for="(item,index) in dataList">
-		    		<view class="register_li2_t">{{item.contacts}}</view>
-		    		<view class="register_li2_b">
-		    			<img src="@/pages_manage/images/Version3.0/icon_qpgl_syl.png">
-		    			<view>使用量: {{item.amount}}Mpa</view>
-		    		</view>
-					<view class="register_li2_b2">
-						<img src="@/pages_manage/images/Version2.2/icon_wtzg_sj.png">
-						<view>使用时间: {{item.useTimeApp==null?'':item.useTimeApp}}-{{item.backTimeApp==null?'':item.backTimeApp}}</view>
-					</view>
-		    	</viwe>
-		    </view>
-		</scroll-view>
-		<view class="empty" v-if="pageType==4">
-			<img class="for-back-img" src="@/pages_manage/images/Version3.0/img_ysrygl_zwsj.png">
-			<view>暂无数据</view>
-		</view>
-		<view  class="sub_btn" @click="outStock()"> 申请出库</view>
-	</view>
-</template>
-
-<script>
-	import {gasDetail,gasDetailRecord } from '@/api/index.js'
-    export default {
-
-        name: "gasRecycle",
-        data() {
-            return {
-
-				pageType:0,
-				//列表请求参数
-				getData:{
-				    pageNum:1,
-					pageSize:10,
-					storageId:'',
-				},
-				form:{
-				},
-                dataList:[],
-				id:'',
-				item:{},
-				specificationName:{},
-            }
-        },
-        onLoad(option) {
-			this.item=JSON.parse(decodeURIComponent(option.item));
-			this.id=this.item.bottleStorageId;
-			this.getData.storageId=this.item.bottleStorageId;
-
-        },
-        onShow() {
-
-        },
-		mounted(){
-		  this.getInfo();
-		  this.getList();
-		},
-        methods: {
-
-			//滚动加载事件
-			scrollGet(){
-			    if(this.getData.getType){
-			        this.getData.pageNum += 1;
-			        this.getList();
-			    }
-			},
-			//使用记录详情
-			useRecordInfo(d){
-				uni.navigateTo({
-				    url:'/pages_manage/gasList/gasUseDetail?item='+encodeURIComponent(JSON.stringify(d))
-				});
-			},
-			//标签绑定
-			binding(){
-				uni.navigateTo({
-				    url:'/pages_manage/gasList/gasListBinding?item='+encodeURIComponent(JSON.stringify(this.item))
-				});
-			},
-			//出库申请
-			outStock(){
-				uni.navigateTo({
-				    url:'/pages_manage/leaveConfirm/leaveConfirm?item='+encodeURIComponent(JSON.stringify(this.item))
-				});
-			},
-			async getInfo(){
-				let _this=this;
-				const {data} = await gasDetail({id:_this.id});
-				if(data.code==200){
-					let res = data.data;
-					_this.form=res;
-					_this.specificationName=JSON.parse(res.specificationName)
-				}
-			},
-
-			//获取列表数据
-			async getList(){
-				let _this = this;
-				const {data} = await gasDetailRecord(this.getData);
-				if(data.code==200){
-					let res=data.rows
-					_this.dataList=res
-					if(_this.dataList.length<=0){
-						_this.pageType=4
-					}
-				}
-			},
-
-        }
-    }
-</script>
-
-<style lang="stylus" scoped>
-    #gasRecycle {
-        height: auto;
-        width: 100%;
-		flex :1;
-        display flex;
-        flex-direction column
-        overflow hidden;
-		padding-bottom: 220rpx;
-		.empty{
-			text-align: center;
-			margin-top: 46rpx;
-			>img{
-				width: 336rpx;
-				height: 222rpx;
-				margin-left: 208rpx;
-			}
-			>view{
-				font-size: 30rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #E0E0E0;
-				line-height: 30rpx;
-				margin-top: 48rpx;
-			}
-		}
-		.title{
-			width: 750rpx;
-			height: 100rpx;
-			background: #FFFFFF;
-			font-size: 28rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #333333;
-			line-height: 100rpx;
-			padding-left: 40rpx;
-		}
-		.register_li{
-			background #fff;
-			border-radius:20rpx;
-			margin:20rpx 20rpx 0;
-			padding:20rpx 0;
-			box-sizing: border-box;
-			.register_li_min{
-				height: 100rpx;
-				margin:0 26rpx;
-				display flex;
-				align-items center;
-				border-bottom: 1px solid #F5F5F5;
-				.icon_img{
-					width: 30rpx;
-					height: 30rpx;
-					margin-right: 12rpx;
-				}
-				view{
-					//width:140rpx;
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #999999;
-				}
-				>input{
-					flex:1;
-					text-align: right;
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-				}
-				.binding{
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #0183FA;
-					line-height: 24rpx;
-					margin-left: 24rpx;
-				}
-
-
-			}
-			.issue_li{
-				margin:34rpx 26rpx 0;
-				display flex;
-				border-bottom: 1px solid #F5F5F5;
-				view:nth-child(1){
-					color:red;
-					line-height:28rpx;
-					margin-right: 12rpx;
-				}
-				view:nth-child(2){
-					//width:140rpx;
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #999999;
-				}
-				.issue_img{
-					width: 210rpx;
-					height: 210rpx;
-					border-radius: 10rpx;
-					margin-left:250rpx;
-				}
-			}
-		}
-     .scroll-box{
-        // flex:1;
-         overflow-y scroll;
-		 margin-top: 20rpx;
-		 .small_title{
-		 	font-size: 30rpx;
-		 	font-family: PingFang SC;
-		 	font-weight: 500;
-		 	color: #333333;
-		 	line-height: 80rpx;
-		 	margin: 0 40rpx;
-		 	display: flex;
-		 	justify-content: space-between;
-		 	align-items: center;
-		 	>img{
-		 		width: 24rpx;
-		 		height: 24rpx;
-		 	}
-		 }
-     	.register_li2{
-			overflow: hidden
-     		background #fff;
-     		border-radius:20rpx;
-     		margin:0 20rpx 0;
-     		padding:0 20rpx;
-     		box-sizing: border-box;
-
-     		.register_li2_min{
-
-     			.register_li2_t{
-     				font-size: 28rpx;
-     				font-family: PingFang SC;
-     				font-weight: 500;
-     				color: #333333;
-     				line-height: 28rpx;
-     				margin-top: 28rpx;
-     			}
-     			.register_li2_b{
-     				display: flex;
-     				justify-content: flex-start;
-     				align-items: center;
-     				margin-top: 42rpx;
-     				padding-bottom: 28rpx;
-     				>img{
-     					width: 28rpx;
-     					height: 28rpx;
-     					margin-right: 10rpx;
-     				}
-     				>view{
-     					font-size: 26rpx;
-     					font-family: PingFang SC;
-     					font-weight: 500;
-     					color: #666666;
-     					line-height: 26rpx;
-     				}
-     				>view:nth-child(1){
-     					width: 200rpx;
-     				}
-     				>view:nth-child(2){
-     					flex: 1;
-     				}
-     			}
-				.register_li2_b2{
-					display: flex;
-					justify-content: flex-start;
-					align-items: center;
-					padding-bottom: 28rpx;
-					border-bottom: 1rpx solid #f5f5f5;
-					>img{
-						width: 28rpx;
-						height: 28rpx;
-						margin-right: 10rpx;
-					}
-					>view{
-						font-size: 26rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #666666;
-						line-height: 26rpx;
-					}
-					>view:nth-child(1){
-						width: 200rpx;
-					}
-					>view:nth-child(2){
-						flex: 1;
-					}
-				}
-     		}
-
-     	}
-     }
-	 /* 按钮 */
-	 .sub_btn{
-	 	width: 650rpx;
-	 	height: 100rpx;
-	 	background: #0183FA;
-	 	border-radius: 20rpx;
-	 	font-size: 28rpx;
-	 	font-family: PingFang SC;
-	 	font-weight: 500;
-	 	color: #FFFFFF;
-	 	line-height: 100rpx;
-	 	text-align: center;
-	 	margin-left: 50rpx;
-	 	position: fixed;
-	 	bottom:30rpx;
-	 }
-	}
-</style>

+ 0 - 242
pages_manage/gasList/gasUseDetail.vue

@@ -1,242 +0,0 @@
-<!--气瓶列表-->
-<template>
-    <view id="gasRecycle">
-		<view class="title">{{specificationName.airName}}-{{specificationName.gasLevel}}</view>
-		<view class="register_li">
-			<view class="register_li_min">
-				<view>实验地点:</view>
-				<input v-model="form.location" disabled  type="text" >
-			</view>
-			<view class="register_li_min" style="border: none;">
-				<view>编号:</view>
-				<input v-model="form.storageVo.airNumber" disabled  type="text" >
-			</view>
-		</view>
-		<view class="register_li">
-			<view class="register_li_min">
-				<view>使用人:</view>
-				<input v-model="form.contacts" disabled  type="text" >
-			</view>
-			<!-- 使用时间 -->
-			<view class="register_li_min2">
-				<view>使用时间:</view>
-				<picker mode="date" disabled @change="startChange($event)">
-					<input class="picker-text" v-model="form.useTimeApp" disabled  type="text"  placeholder="开始时间">
-				</picker>
-				<view>-</view>
-				<picker mode="date" disabled @change="endChange($event)">
-					<input class="picker-text2" v-model="form.backTimeApp" disabled  type="text"  placeholder="结束时间">
-				</picker>
-			</view>
-			<view class="register_li_min">
-				<view>使用量:</view>
-				<view>{{form.amount+'Mpa'}}</view>
-			</view>
-			<view v-if="form.beforeUse" class="register_li_min">
-				<view>使用前气压:</view>
-				<view>{{form.beforeUse+'Mpa'}}</view>
-			</view>
-			<view v-if="form.beforeUsePic" class="meter_img" :style="!form.afterUse?'border:none;':''" @click="lookItem(form.beforeUsePic)">
-				<view>气表照片:</view>
-				<img :src="baseUrl+form.beforeUsePic" >
-			</view>
-			<view v-if="form.afterUse" class="register_li_min">
-				<view>使用后气压:</view>
-				<view>{{form.afterUse+'Mpa'}}</view>
-			</view>
-			<view v-if="form.afterUsePic" class="meter_img" style="border:0;" @click="lookItem(form.afterUsePic)">
-				<view>气表照片:</view>
-				<img :src="baseUrl+form.afterUsePic" >
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import { gasDetailRecordDetail } from '@/api/index.js'
-	import { config } from '@/api/request/config.js'
-    export default {
-		
-        name: "gasRecycle",
-        data() {
-            return {
-				baseUrl:config.base_url,
-				pageType:0,
-				//列表请求参数
-				getData:{
-				    pageNum:1,
-					pageSize:20,
-				},
-				userType:uni.getStorageSync('userType'),
-				form:{
-					name:'C123(第一实验室)',
-				},
-                dataList:[],
-				item:{},
-				specificationName:{},
-            }
-        },
-        onLoad(option) {
-			this.item=JSON.parse(decodeURIComponent(option.item));
-			
-        },
-        onShow() {
-			
-        },
-		mounted(){
-		   this.getInfo();
-		},
-        methods: {  
-			lookItem(item){
-				//查看图片
-				wx.previewImage({
-					urls: [config.base_url+item], //需要预览的图片http链接列表,多张的时候,url直接写在后面就行了
-					current: '', // 当前显示图片的http链接,默认是第一个
-					success: function(res) {},
-					fail: function(res) {},
-					complete: function(res) {},
-				})
-			},
-			async getInfo(){
-				let _this=this;
-				const {data} = await gasDetailRecordDetail(_this.item.id);
-				if(data.code==200){
-					let res = data.data;
-					_this.form=res;
-					_this.specificationName=JSON.parse(res.storageVo.specificationName)
-				}
-			},	
-        }
-    }
-</script>
-
-<style lang="stylus" scoped>
-    #gasRecycle {
-        height: auto;
-        width: 100%;
-		flex :1;
-        display flex;
-        flex-direction column
-        overflow hidden;
-		padding-bottom: 220rpx;
-		.title{
-			width: 750rpx;
-			height: 100rpx;
-			background: #FFFFFF;
-			font-size: 28rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #333333;
-			line-height: 100rpx;
-			padding-left: 40rpx;
-		}
-		.register_li{
-			background #fff;
-			border-radius:20rpx;
-			margin:20rpx 20rpx 0;
-			padding:20rpx 0;
-			box-sizing: border-box;
-			.register_li_min{
-				margin:0 26rpx;
-				display flex;
-				align-items center;
-				border-bottom: 1px solid #F5F5F5;
-				.icon_img{
-					width: 30rpx;
-					height: 30rpx;
-					margin-right: 12rpx;
-				}
-				view{
-					//width:140rpx;
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #999999;
-					line-height: 100rpx;
-				}
-				>view:nth-child(2){
-					flex: 1;
-					text-align: right;
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-				}
-				>input{
-					flex:1;
-					text-align: right;
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-				}
-				
-				
-				
-			}
-			/* 时间 */
-			.register_li_min2{
-				margin:0 26rpx;
-				border-bottom: 1px solid #f5f5f5;
-				height: 100rpx;
-				display: flex;
-				justify-content: flex-start;
-				align-items: center;
-				>view:nth-child(1){
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #999999;
-					line-height: 100rpx;
-					margin-right: 46rpx;
-				}
-				.picker-text{
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-					line-height: 100rpx;
-					width: 240rpx;
-					
-				}
-				>view:nth-child(2){
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-					line-height: 100rpx;
-				}
-				.picker-text2{
-					font-size: 24rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-					line-height: 100rpx;
-					width: 240rpx;
-					text-align: right;
-				}
-			}
-			
-			.meter_img{
-				margin:0 26rpx;
-				display flex;
-				justify-content: space-between;
-				border-bottom: 1px solid #F5F5F5;
-				view{
-					//width:140rpx;
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #999999;
-					line-height: 100rpx;
-				}
-				>img{
-					width: 150rpx;
-					height: 150rpx;
-					border-radius: 10rpx;
-					margin:42rpx 0 20rpx 0;
-				}
-			}
-		}
-	}
-</style>

+ 0 - 358
pages_manage/gasManage/gasManage.vue

@@ -1,358 +0,0 @@
-<!-- 回收申请 -->
-<template>
-    <view id="register">
-		<view class="register_li" >
-			<view class="register_li_min" @click="handleClick('audit')" style="border-bottom:none;">
-				<view>资格审核</view>
-				<view></view>
-				<img src="@/pages_manage/images/icon_04.png">
-			</view>
-		</view>
-		<view class="register_li">
-			<view class="register_li_min" @click="handleClick('examination')">
-				<view>资格申请</view>
-				<view></view>
-				<img src="@/pages_manage/images/icon_04.png">
-			</view>
-			<view class="register_li_min" @click="handleClick('gas')" style="border: none;">
-				<view>用气申请</view>
-				<view></view>
-				<img src="@/pages_manage/images/icon_04.png">
-			</view>
-		</view>
-		<view v-if="dataList2.length>0" class="small_title" @click="handleClick('gasList')">气瓶信息<img src="@/pages_manage/images/icon_wdwg_gd.png"></view>
-		<view v-if="dataList2.length>0" class="register_li2" >
-			<viwe class="register_li2_min" @tap="goInfo2(item2)" v-for="(item2,index2) in dataList2" :key="index2">
-				<view class="register_li2_t">{{item2.airName}}-{{item2.configName}}</view>
-				<view class="register_li2_b">
-					<img src="@/pages_manage/images/Version3.0/icon_qpgl_syl.png">
-					<view>余量: {{item2.pressure==null?'-':item2.pressure}}Mpa</view>
-					<img src="@/pages_manage/images/Version2.2/icon_wtzg_sj.png">
-					<view>最近使用时间: {{item2.useTimeApp==null?'-':item2.useTimeApp}}</view>
-				</view>
-			</viwe>
-		</view>
-		<view v-if="dataList.length>0" class="small_title" @click="handleClick('useRecord')">使用记录<img src="@/pages_manage/images/icon_wdwg_gd.png"></view>
-		<view v-if="dataList.length>0" class="register_li2">
-			<viwe class="register_li2_min" @tap="goInfo(item)" v-for="(item,index) in dataList" :key="index">
-				<view class="register_li2_t">{{item.airName}}-{{item.configName}}</view>
-				<view class="register_li2_b" style="border:none">
-					<img src="@/pages_manage/images/Version3.0/icon_qpgl_syl.png">
-					<view>使用量: {{item.pressure==null?'-':item.pressure}}Mpa</view>
-				</view>
-				<view class="register_li2_b2" style="border-bottom: 1rpx solid #f5f5f5;">
-					<img src="@/pages_manage/images/Version2.2/icon_wtzg_sj.png">
-					<view>使用时间: {{item.useTimeApp==null?'-':item.useTimeApp}} - {{item.backTimeApp==null?'-':item.backTimeApp}}</view>
-				</view>
-			</viwe>
-		</view>
-		<view class="btn" v-if="userApplyNumberYq || userApplyNumberZg">
-			<view class="btn_l" @click="handleClick('gasApply')">气瓶申请</view>
-			<view class="btn_r" @click="handleClick('QRcode')">使用/归还</view>
-		</view>
-	</view>
-</template>
-
-<script>
-    import {useRecordList,listuseRecordByUserId,getUserApplyCount,useRegisterDetail } from '@/api/index.js'
-	import { config } from '@/api/request/config.js'
-    export default {
-        data() {
-            return {
-				form:{
-					name:'',
-				},
-				//列表请求参数
-				getData:{
-				    pageNum:1,
-					pageSize:3,
-				},
-				dataList:[],
-				dataList2:[],
-				yqCount:null,
-				zgCount:null,
-				userApplyNumberYq:null,//大于0显示使用人,等于零显示规格
-				userApplyNumberZg:null,//大于0显示使用人,等于零显示规格
-				electronicTag:'',
-            }
-        },
-        onLoad(option) {
-
-        },
-        onShow(){
-
-        },
-
-        methods: {
-
-			handleClick(doType) {
-				let _this=this;
-				if(doType=='examination'){//资格申请
-					uni.navigateTo({
-					    url:'/pages_manage/examination/examination'
-					});
-				}else if(doType=='gas'){//用气申请
-					uni.navigateTo({
-					    url:'/pages_manage/useGasApply/useGasApply'
-					});
-				}else if(doType=='audit'){//资格审核
-					uni.navigateTo({
-					    url:'/pages_manage/aptitudeAudit/aptitudeAudit'
-					});
-				}else if(doType=='useRecord'){//使用记录
-					uni.navigateTo({
-					    url:'/pages_manage/useRecord/useRecord'
-					});
-				}else if(doType=='gasApply'){//气瓶申请
-					uni.navigateTo({
-					    url:'/pages_manage/gasApply/gasApply'
-					});
-				}else if(doType=='gasList'){//气瓶列表
-					uni.navigateTo({
-					    url:'/pages_manage/gasList/gasList'
-					});
-				}else if(doType=='QRcode'){//
-					uni.scanCode({
-						onlyFromCamera: true,
-						success: function (res) {
-							_this.electronicTag=res.result
-							_this.getInfo()
-						}
-					});
-
-				}
-
-
-			},
-			//使用记录跳转详情
-			goInfo(d){
-				uni.navigateTo({
-				    url:'/pages_manage/useRecord/useRecordDetail?item='+encodeURIComponent(JSON.stringify(d))
-				});
-			},
-			//气瓶信息跳转详情
-			goInfo2(d){
-				uni.navigateTo({
-				    url:'/pages_manage/gasList/gasListDetail?item='+encodeURIComponent(JSON.stringify(d))
-				});
-			},
-			async getInfo(){
-				let _this=this;
-				const {data} = await useRegisterDetail({electronicTag:_this.electronicTag});
-				if(data.code==200 && data.data){
-					let res = data.data;
-					let userId=uni.getStorageSync('userId');
-					if(res.currentStatus==4 && res.currentUserId==userId){
-						uni.navigateTo({
-						    url:'/pages_manage/useRegister/giveRegister?code='+_this.electronicTag
-						});
-					}else{
-						uni.navigateTo({
-						    url:'/pages_manage/useRegister/useRegister?code='+_this.electronicTag
-						});
-					}
-				}else{
-					uni.showToast({
-					    title: '当前气瓶不存在!',
-					    icon:"none",
-					    mask:true,
-					    duration: 2000
-					});
-				}
-			},
-
-			//获取使用记录列表
-			async getList(){
-				let _this = this;
-				const {data} = await useRecordList(_this.getData)
-				if(data.code==200){
-					let res=data.rows
-					_this.dataList=res
-				}
-			},
-			//获取气瓶信息列表
-			async getList2(){
-				let _this = this;
-				const {data} = await listuseRecordByUserId(_this.getData)
-				if(data.code==200){
-					let res=data.rows
-					_this.dataList2=res
-				}
-			},
-			//获取数量
-			async getCount(){
-				let _this = this;
-				const {data} = await getUserApplyCount()
-				if(data.code==200){
-					let res=data.data
-					_this.yqCount=res.yqCount;
-					_this.zgCount=res.zgCount;
-					_this.userApplyNumberYq=res.userApplyNumberYq;
-					_this.userApplyNumberZg=res.userApplyNumberZg;
-				}
-			},
-
-        },
-		mounted() {
-			this.getList();
-			this.getList2();
-			this.getCount();
-		}
-    }
-</script>
-
-<style lang="stylus" scoped>
-    #register{
-        height:auto;
-        width:100%;
-        display flex;
-        flex-direction column;
-		padding-bottom: 220rpx;
-		.register_li{
-			background #fff;
-			border-radius:20rpx;
-			margin:20rpx 20rpx 0;
-			padding:20rpx 0;
-			box-sizing: border-box;
-			.register_li_min{
-				margin:0 26rpx;
-				display flex;
-				align-items center;
-				border-bottom: 1px solid #F5F5F5;
-				view{
-					line-height:100rpx;
-				}
-				view:nth-child(1){
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-					line-height:100rpx;
-				}
-				view:nth-child(2){
-					flex:1;
-					color: #0183FA;
-					text-align: right;
-					margin-right: 38rpx;
-				}
-				>img{
-					width: 12rpx;
-					height: 24rpx;
-				}
-			}
-		}
-		.small_title{
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #999999;
-			line-height: 100rpx;
-			margin: 0 40rpx;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			>img{
-				width: 24rpx;
-				height: 24rpx;
-			}
-		}
-
-		.register_li2{
-			background #fff;
-			border-radius:20rpx;
-			margin:0 20rpx 0;
-			padding:0 20rpx;
-			box-sizing: border-box;
-			.register_li2_min{
-				.register_li2_t{
-					font-size: 28rpx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #333333;
-					line-height: 28rpx;
-					margin-top: 28rpx;
-				}
-				.register_li2_b{
-					display: flex;
-					justify-content: flex-start;
-					align-items: center;
-					margin-top: 42rpx;
-					padding-bottom: 28rpx;
-					border-bottom: 1rpx solid #f5f5f5;
-					>img{
-						width: 28rpx;
-						height: 28rpx;
-						margin-right: 10rpx;
-					}
-					>view{
-						font-size: 24rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #666666;
-						line-height: 26rpx;
-					}
-					>view:nth-of-type(1){
-						width: 180rpx;
-					}
-					>view:nth-child(2){
-					}
-				}
-				.register_li2_b2{
-					display: flex;
-					justify-content: flex-start;
-					align-items: center;
-					padding-bottom: 28rpx;
-
-					>img{
-						width: 28rpx;
-						height: 28rpx;
-						margin-right: 10rpx;
-					}
-					>view{
-						font-size: 24rpx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #666666;
-						line-height: 26rpx;
-					}
-					>view:nth-child(1){
-						width: 200rpx;
-					}
-					>view:nth-child(2){
-						flex: 1;
-					}
-				}
-			}
-
-		}
-		/* 按钮 */
-		.btn{
-			display: flex;
-			position: fixed;
-			bottom: 0;
-			.btn_l{
-				width: 250rpx;
-				background: #F28E26;
-				font-size: 28rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #FFFFFF;
-				line-height: 100rpx;
-				text-align: center;
-			}
-			.btn_r{
-				width: 500rpx;
-				background: #0183FA;
-				font-size: 28rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #FFFFFF;
-				line-height: 100rpx;
-				text-align: center;
-			}
-		}
-	}
-	/deep/.input-value-border{
-		display :none !important;
-	}
-</style>

+ 0 - 290
pages_manage/gradingControl/gradingControl.vue

@@ -1,290 +0,0 @@
-<!-- 准入资格证书 -->
-<template>
-    <view id="accessQualification">
-        <scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
-			<view class="list">
-				<view class="list_li" v-for="(item,index) in infoList" :key="index">
-					<view class="list_li_t">
-						<view class="list_li_t_l" v-if="item.levelName" :style="'color:'+item.levelColor+';border-color:'+item.levelColor">{{item.levelName}}</view>
-						<view class="list_li_t_c">{{item.subName}}</view>
-						<view class="list_li_t_r">{{item.typeName}}</view>
-					</view>
-					<view class="list_li_b" >
-						<view class="list_li_b_t" @tap="goPageAdd(item,item2)" v-for="(item2,index2) in item.detailList" :key="index2" :style="index2==(item.detailList.length-1)?'border:none;':'border-bottom :1px dashed #cccccc;'">
-							<view class="list_li_b_t_t">
-								<view class="list_li_b_t_t_n">
-									<view class="list_li_b_t_t_l" :class="[item2.ruleType== '日管控' ? 'purple': '', item2.ruleType=='周管控'? 'blue': '',item2.ruleType=='月管控'? 'orange': '',item2.ruleType=='年管控'? 'green': '',]">{{item2.ruleType}}</view>
-									<view class="list_li_b_t_t_c">{{item2.ruleName}}</view>
-									<view class="list_li_b_t_t_r" v-if="item2.isExpired==1">(过期未完成)</view>
-									<view class="list_li_b_t_t_rr" >{{item2.endDate}}</view>
-								</view>
-							</view >
-							<view class="list_li_b_t_b">{{item2.ruleRemark}}</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<view class="get-null-box" v-if="infoList.length==0">暂无更多数据</view>
-        </scroll-view>
-        <view class="bottom-button-box" @click="goSafeAccess">完成记录</view>
-    </view>
-</template>
-
-<script>
-    import { gradingControl } from '@/api/index.js'
-    export default {
-        data() {
-            return {
-                infoList:{},
-            }
-        },
-        onLoad() {
-
-        },
-        onShow(){
-            this.clearData();
-            this.getList();
-        },
-        methods: {
-			goSafeAccess(){
-				uni.navigateTo({
-					url: '/pages_manage/gradingControl/gradingControlFinish',
-				});
-			},
-            //清除
-            clearData(){
-                this.infoList = {};
-
-            },
-            //去添加页面
-            goPageAdd(item,item2){
-                uni.navigateTo({
-                    url:'/pages_manage/gradingControl/gradingControlAdd?item='+encodeURIComponent(JSON.stringify(item))+'&item2='+encodeURIComponent(JSON.stringify(item2))
-                })
-            },
-            //滚动事件
-            scrollGet(){
-                this.getList();
-            },
-            //获取列表数据
-            async getList(){
-                let _this = this;
-                let obj = {
-
-                }
-                const {data} = await gradingControl(obj)
-                if(data.code==200){
-
-					 _this.infoList=data.data;
-                }
-
-            },
-        }
-    }
-</script>
-
-<style lang="stylus" scoped>
-    #accessQualification{
-        height:100%;
-        display flex
-        flex-direction column
-        .info-max-box{
-            flex:1;
-            overflow: scroll
-			.for-big-box:last-child{
-			    margin-bottom:180rpx;
-			}
-			/* 列表 */
-			.list{
-				padding 0 20rpx;
-				box-sizing border-box;
-				.list_li{
-					height:auto;
-					.list_li_t{
-						height :80rpx;
-						display flex;
-						justify-content flex-start;
-						align-items :center;
-						.list_li_t_l{
-							width: 80rpx;
-							height: 30rpx;
-							font-size: 24rpx;
-							font-family: PingFang SC;
-							font-weight: 500;
-							color: #EE3A3A;
-							line-height: 30rpx;
-							border: 2rpx solid #EE3A3A;
-							border-radius: 6rpx;
-							text-align center;
-						}
-						.list_li_t_c{
-							font-size: 28rpx;
-							font-family: PingFang SC;
-							font-weight: 500;
-							color: #333333;
-							line-height: 30rpx;
-							margin 0 32rpx 0 16rpx;
-						}
-						.list_li_t_r{
-							font-size: 28rpx;
-							font-family: PingFang SC;
-							font-weight: 500;
-							color: #999999;
-							line-height: 30rpx;
-						}
-					}
-					.list_li_b{
-						width 710rpx;
-						height auto;
-						background: #FFFFFF;
-						border-radius: 20rpx;
-						padding :0 14rpx;
-						box-sizing :border-box;
-						.list_li_b_t{
-							overflow :hidden;
-							border-bottom :1rpx dashed #cccccc;
-							.list_li_b_t_t{
-								display flex;
-								justify-content flex-start;
-								margin :24rpx 0 18rpx 0;
-								.list_li_b_t_t_n{
-									flex:1;
-									width:655rpx;
-									display flex;
-									justify-content flex-start;
-									.list_li_b_t_t_l{
-										width :100rpx;
-										height :30rpx;
-										font-size: 24rpx;
-										font-family: PingFang SC;
-										font-weight: 500;
-										/* color: #0183FA; */
-										line-height: 24rpx;
-										/* background: rgba(1,131,250,0.2); */
-										border-radius: 6rpx;
-										text-align :center;
-									}
-									.list_li_b_t_t_c{
-										font-size: 28rpx;
-										font-family: PingFang SC;
-										font-weight: 500;
-										color: #333333;
-										line-height: 28rpx;
-										margin :0 16rpx 0 12rpx;
-									}
-									.list_li_b_t_t_r{
-										font-size: 24rpx;
-										font-family: PingFang SC;
-										font-weight: 500;
-										color: #EE3A3A;
-										line-height: 24rpx;
-									}
-									.list_li_b_t_t_rr{
-										flex:1;
-										text-align:right;
-										font-family: PingFang SC;
-										font-weight: 500;
-										color:#999;
-										font-size: 24rpx;
-										line-height: 24rpx;
-									}
-								}
-								/* 日管控 */
-								.purple{
-									color: #AC20E0;
-									background: rgba(172,32,224,0.2);
-								}
-								/* 周管控 */
-								.blue{
-									color: #0183FA;
-									background: rgba(1,131,250,0.2);
-								}
-								/* 月管控 */
-								.orange{
-									color: #FA8801;
-									background: rgba(250,136,1,0.2);
-								}
-								/* 年管控 */
-								.green{
-									color: #11BA25;
-									background: rgba(17,186,37,0.2);
-								}
-
-								>img{
-									width: 12rpx;
-									height: 24rpx;
-								}
-							}
-							.list_li_b_t_b{
-								font-size: 28rpx;
-								font-family: PingFang SC;
-								font-weight: 500;
-								color: #999999;
-								line-height: 48rpx;
-								margin-bottom :14rpx;
-								display:block;
-								overflow:hidden;
-								text-overflow:ellipsis;
-								white-space:nowrap;
-							}
-						}
-						.list_li_b_b{
-
-							.list_li_b_b_t{
-								display :flex;
-								justify-content :flex-start;
-								margin :30rpx 0 18rpx;
-								.list_li_b_b_t_l{
-									width :100rpx;
-									height :30rpx;
-									border-radius: 6rpx;
-									font-size: 24rpx;
-									font-family: PingFang SC;
-									font-weight: 500;
-									color: #FA8801;
-									line-height: 30rpx;
-									background :rgba(250,136,1,0.2);
-									text-align :center;
-									margin-right :12rpx;
-								}
-								.list_li_b_b_t_r{
-									font-size: 28rpx;
-									font-family: PingFang SC;
-									font-weight: 500;
-									color: #333333;
-									line-height: 30rpx;
-								}
-							}
-							.list_li_b_b_b{
-								font-size: 28rpx;
-								font-family: PingFang SC;
-								font-weight: 500;
-								color: #999999;
-								line-height: 48rpx;
-							}
-						}
-					}
-				}
-			}
-
-			/*暂无数据*/
-            .get-null-box{
-                height:100rpx;
-                line-height:100rpx;
-                color:#999;
-                text-align center
-            }
-        }
-        .bottom-button-box{
-			border-radius:20rpx;
-			margin:20rpx 50rpx;
-            width: 650rpx;
-            height: 100rpx;
-            line-height: 100rpx;
-            background: #0183FA;
-            font-size: 30rpx;
-            color: #FFFFFF;
-            text-align center;
-        }
-    }
-</style>

+ 0 - 644
pages_manage/gradingControl/gradingControlAdd.vue

@@ -1,644 +0,0 @@
-<!-- 分级管控完成工作 -->
-<template>
-    <view id="accessQualification">
-        <scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
-			<view class="list">
-				<view class="list_li">
-					<view class="list_li_t">
-						<view class="list_li_t_l" :style="'color:'+labData.levelColor+';border-color:'+labData.levelColor">{{labData.levelName}}</view>
-						<view class="list_li_t_c">{{labData.subName}}</view>
-						<view class="list_li_t_r">{{labData.typeName}}</view>
-					</view>
-					<view class="list_li_b">
-						<view class="list_li_b_t">
-							<view class="list_li_b_t_t">
-								<view class="list_li_b_t_t_n">
-									<view class="list_li_b_t_t_l" :class="[control.ruleType== '日管控' ? 'purple': '', control.ruleType=='周管控'? 'blue': '',control.ruleType=='月管控'? 'orange': '',control.ruleType=='年管控'? 'green': '',]">{{control.ruleType}}</view>
-									<view class="list_li_b_t_t_c">{{control.ruleName}}</view>
-									<view class="list_li_b_t_t_r" v-if="control.isExpired==1">(过期未完成)</view>
-									<view class="list_li_b_t_t_rr" >{{control.endDate}}</view>
-								</view>
-							</view>
-						</view>
-						<view class="flex-view">
-							<view><text style="margin-right: 20rpx;"></text>执行方式:</view>
-							<view>{{control.isAll==1?'多人执行':'单人执行'}}</view>
-						</view>
-						<view class="flex-view">
-							<view><text style="margin-right: 20rpx;"></text>规则描述:</view>
-							<view>{{control.ruleRemark}}</view>
-						</view>
-						<view class="list_li_b_b2"><text style="position: relative;top: 4rpx;color: #f00;margin-right: 10rpx;">*</text>执行描述:</view>
-						<textarea class="list_li_b_b3" v-model="param.detail.remark" maxlength="30" placeholder-class="placeholder-style" placeholder="请输入执行描述"></textarea>
-						<view class="list_li_b_b4" v-if="control.isUpload==1"><text style="position: relative;top: 4rpx;color: #f00;margin-right: 10rpx;">*</text>执行材料:<label @click="itemUpData(item)">+ 请上传执行材料</label></view>
-
-						<view class="list_li_b_b6" v-if="upList.length>0" v-for="(item,index) in upList" :key="index">
-							<view @click="download(item)">{{item.name}}</view>
-							<view @click="delImg(index)">
-								<img src="@/images/icon_fjgk_sc.png"/>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-        </scroll-view>
-        <view class="bottom-button-box" @click="goSafeAccess">完成</view>
-    </view>
-</template>
-
-<script>
-    import { gradingControlAdd } from '@/api/index.js'
-	import { config } from '@/api/request/config.js'
-    export default {
-        data() {
-            return {
-				labData:{},
-				control:{},
-				upList:[],
-				param:{
-					subId:'',//实验室id
-					ruleId:'',//规则ID
-					ruleUserId:'',//规则细则
-					id:'',//记录id
-					ruleType:'',
-					endDate:'',
-					detail:{
-						imgName:'',//文件名
-						imgUrl:'',//文件路径
-						imgType:'',//文件类型
-						remark:'',
-					}
-				},
-				messageUserId:""
-            }
-        },
-        onLoad(option) {
-			if(option.item){
-				let item = JSON.parse(decodeURIComponent(option.item));
-				let item2 = JSON.parse(decodeURIComponent(option.item2));
-				this.labData=item
-				this.control=item2
-				this.param.subId=item.subId;
-				this.param.ruleId=item2.ruleId;
-				this.param.ruleUserId=item2.ruleUserId;
-				// this.param.id=item2.recordId;
-				 this.param.ruleType=item2.ruleType;
-				 this.param.endDate=item2.endDate;
-
-				if(option.messageUserId){
-					this.messageUserId = option.messageUserId;
-				}
-			}
-
-        },
-        onShow(){
-
-        },
-        methods: {
-			download(item){
-				if(item.type == 'png' || item.type == 'jpg' || item.type == 'jpeg' || item.type == 'gif'){
-					//查看图片
-					wx.previewImage({
-						urls: [config.base_url+item.url], //需要预览的图片http链接列表,多张的时候,url直接写在后面就行了
-						current: '', // 当前显示图片的http链接,默认是第一个
-						success: function(res) {},
-						fail: function(res) {},
-						complete: function(res) {},
-					})
-				}else if(item.type == 'pdf' || item.type == 'doc' || item.type == 'docx'){
-					uni.showLoading({
-					    title: '下载中'
-					});
-					//下载文档
-					wx.downloadFile({
-						url: config.base_url+item.url,
-						header: {
-							Authorization: uni.getStorageSync('token')
-						},
-						success: function (res) {
-							console.log("resresresresresres",res)
-							const fileManager = wx.getFileSystemManager()
-							console.log('wx.env.USER_DATA_PATH',wx.env.USER_DATA_PATH);
-							console.log('item.name',item.name);
-							console.log('item.type',item.type);
-							const filePath = wx.env.USER_DATA_PATH + '/' + item.name
-							console.log('filePath',filePath);
-							fileManager.saveFile({
-								tempFilePath: res.tempFilePath,
-								filePath,
-								success: () => {
-									uni.hideLoading();
-									wx.openDocument({
-										filePath: filePath,
-										showMenu: true,
-										fileType: item.type
-									})
-								},
-								fail: function (res){
-									uni.hideLoading();
-									uni.showToast({
-										title: '下载失败',
-										icon:"none",
-										mask:true,
-										duration: 2000
-									});
-								}
-							})
-						},
-						fail: function (res){
-							uni.hideLoading();
-							uni.showToast({
-								title: '下载失败',
-								icon:"none",
-								mask:true,
-								duration: 2000
-							});
-						}
-					})
-				}
-			},
-			delImg(index){
-				let self = this;
-				uni.showModal({
-				  title: '',
-				  cancelColor:'#999999',
-				  confirmColor:'#0183FA',
-				  content: '确定删除吗?',
-				  success (res) {
-					if (res.confirm) {
-					  self.upList.splice(index,1)
-					  self.$forceUpdate();
-					} else if (res.cancel) {
-
-					}
-				  }
-				})
-			},
-			//上传
-			itemUpData(item){
-				let self = this;
-				if(this.upList.length>4){
-					uni.showToast({
-						title: '最多只能上传5个',
-						icon:"none",
-						mask:true,
-						duration: 2000
-					});
-					return
-				}
-				uni.showActionSheet({
-				    itemList: ['上传文件', '上传图片'],
-				    success: function (res) {
-						if(res.tapIndex == 0){
-							//上传文件
-							self.upData(item);
-						}else if(res.tapIndex == 1){
-							//上传图片
-							self.upImg(item);
-						}
-				    },
-				    fail: function (res) {
-				        console.log(res.errMsg);
-				    }
-				});
-			},
-			upImg(item) {
-			    let self = this;
-			    wx.chooseImage({
-			        count: 1,
-			        sizeType: ["original", "compressed"],
-			        sourceType: ["album", "camera"],
-			        success: function(res) {
-						console.log(res)
-						let text = res.tempFilePaths[0].substring(res.tempFilePaths[0].lastIndexOf('.') + 1);
-						if(text != 'png' && text != 'jpg' && text != 'jpeg' && text != 'gif' && text != 'pdf' && text != 'doc' && text != 'docx'){
-							uni.showToast({
-								title: '仅支持png/jpg/jpeg/gif/pdf/doc/docx类型的文件上传',
-								icon:"none",
-								mask:true,
-								duration: 2000
-							});
-							return
-						}
-						let upObj = {
-							name:'照片.'+text,
-							path:res.tempFilePaths[0],
-							type:text,
-						}
-						self.upDataFunction(item,upObj);
-			            // let tempFilePaths = res.tempFilePaths[0];
-			            // self.upDataFunction(tempFilePaths,upObj);
-			        }
-			    });
-			},
-			//上传文件
-			upData(item){
-				let self = this;
-				wx.chooseMessageFile({
-				  count: 1,
-				  type: 'all',
-				  success (res) {
-					let text = res.tempFiles[0].path.substring(res.tempFiles[0].path.lastIndexOf('.') + 1);
-
-
-					if(text != 'png' && text != 'jpg' && text != 'jpeg' && text!= 'gif' && text != 'pdf' && text != 'doc' && text != 'docx'){
-						uni.showToast({
-							title: '仅支持png/jpg/jpeg/gif/pdf/doc/docx类型的文件上传',
-							icon:"none",
-							mask:true,
-							duration: 2000
-						});
-						return
-					}
-					let upObj = {
-						name:res.tempFiles[0].name,
-						path:res.tempFiles[0].path,
-						type:text,
-					}
-					self.upDataFunction(item,upObj);
-				  }
-				})
-			},
-			async upDataFunction(item,upObj){
-			    var self = this;
-			    uni.showLoading({
-			        title: '上传中',
-			        mask: true
-			    });
-			    uni.uploadFile({
-			        url: config.base_url+'/base/file/upload', //仅为示例,非真实的接口地址
-			        header:{'Authorization':uni.getStorageSync('token')},
-			        filePath: upObj.path,
-			        name: 'file',
-			        formData: {
-			            'user': 'test'
-			        },
-			        success: (uploadFileRes) => {
-			            let res = JSON.parse(uploadFileRes.data);
-						if(res.code == 200){
-							let obj = {
-								name:upObj.name,
-								url:config.base_url+res.data.url,
-								realUrl:res.data.url,
-								type:upObj.type
-							}
-							this.upList.push(obj);
-							this.$forceUpdate();
-
-							console.log(this.upList)
-						}else{
-							uni.showToast({
-								title: res.msg,
-								icon:"none",
-								mask:true,
-								duration: 2000
-							});
-						}
-			        },
-			        fail: err => {},
-			        complete: () => {
-			            uni.hideLoading()
-			        }
-			    });
-			},
-	       async goSafeAccess(){
-			   if(!this.param.detail.remark){
-			   	uni.showToast({
-			   		title: '请输入执行描述',
-			   		icon:"none",
-			   		mask:true,
-			   		duration: 2000
-			   	});
-			   	return
-			   }
-				if(this.control.isUpload==1){
-					if(!this.upList[0]){
-						uni.showToast({
-							title: '请上传执行材料',
-							icon:"none",
-							mask:true,
-							duration: 2000
-						});
-						return
-					}
-				}
-
-			   let _this = this;
-			   let obj = {
-
-			   }
-			   let imgName=[];
-			   let imgUrl=[];
-			   let imgType=[];
-			    _this.upList.forEach(function (item,index) {
-			           imgName.push(item.name)
-			           imgUrl.push(item.realUrl)
-			           imgType.push(item.type)
-			    })
-			   _this.param.detail.imgName=imgName.join(',')
-			   _this.param.detail.imgUrl=imgUrl.join(',')
-			   _this.param.detail.imgType=imgType.join(',')
-			   if(this.messageUserId){
-				   _this.param.messageUserId = this.messageUserId
-			   }
-			   console.log(_this.param)
-			   const {data} = await gradingControlAdd(_this.param)
-			   if(data.code==200){
-					uni.showToast({
-						title: '提交成功!',
-						icon:"none",
-						mask:true,
-						duration: 2000
-					});
-					setTimeout(function(){
-						uni.navigateBack();
-					},2000);
-			   }
-
-		   },
-        }
-    }
-</script>
-
-<style lang="stylus" scoped>
-    #accessQualification{
-        height:100%;
-        display flex
-        flex-direction column
-        .info-max-box{
-            flex:1;
-            overflow: scroll
-			.for-big-box:last-child{
-			    margin-bottom:180rpx;
-			}
-			/* 列表 */
-			.list{
-				padding 0 20rpx;
-				box-sizing border-box;
-				.list_li{
-					height auto;
-					.list_li_t{
-						height :80rpx;
-						display flex;
-						justify-content flex-start;
-						align-items :center;
-						.list_li_t_l{
-							width: 80rpx;
-							height: 30rpx;
-							font-size: 24rpx;
-							font-family: PingFang SC;
-							font-weight: 500;
-							color: #EE3A3A;
-							line-height: 30rpx;
-							border: 2rpx solid #EE3A3A;
-							border-radius: 6rpx;
-							text-align center;
-						}
-						.list_li_t_c{
-							font-size: 28rpx;
-							font-family: PingFang SC;
-							font-weight: 500;
-							color: #333333;
-							line-height: 30rpx;
-							margin 0 32rpx 0 16rpx;
-						}
-						.list_li_t_r{
-							font-size: 28rpx;
-							font-family: PingFang SC;
-							font-weight: 500;
-							color: #999999;
-							line-height: 30rpx;
-						}
-					}
-					.list_li_b{
-						overflow :hidden;
-						width 710rpx;
-						height auto;
-						background: #FFFFFF;
-						border-radius: 20rpx;
-						padding :0 14rpx;
-						box-sizing :border-box;
-						.list_li_b_t{
-							overflow :hidden;
-							.list_li_b_t_t{
-								display flex;
-								justify-content flex-start;
-								margin :24rpx 0 18rpx 0;
-								.list_li_b_t_t_n{
-									flex:1;
-									width:655rpx;
-									display flex;
-									justify-content flex-start;
-									.list_li_b_t_t_l{
-										width :100rpx;
-										height :30rpx;
-										font-size: 24rpx;
-										font-family: PingFang SC;
-										font-weight: 500;
-										/* color: #0183FA; */
-										line-height: 30rpx;
-										/* background: rgba(1,131,250,0.2); */
-										border-radius: 6rpx;
-										text-align :center;
-									}
-									.list_li_b_t_t_c{
-										font-size: 28rpx;
-										font-family: PingFang SC;
-										font-weight: 500;
-										color: #333333;
-										line-height: 28rpx;
-										margin :0 16rpx 0 12rpx;
-									}
-									.list_li_b_t_t_r{
-										font-size: 24rpx;
-										font-family: PingFang SC;
-										font-weight: 500;
-										color: #EE3A3A;
-										line-height: 24rpx;
-									}
-									.list_li_b_t_t_rr{
-										flex:1;
-										text-align:right;
-										font-family: PingFang SC;
-										font-weight: 500;
-										color:#999;
-										font-size: 24rpx;
-										line-height: 24rpx;
-									}
-								}
-								/* 日管控 */
-								.purple{
-									color: #AC20E0;
-									background: rgba(172,32,224,0.2);
-								}
-								/* 周管控 */
-								.blue{
-									color: #0183FA;
-									background: rgba(1,131,250,0.2);
-								}
-								/* 月管控 */
-								.orange{
-									color: #FA8801;
-									background: rgba(250,136,1,0.2);
-								}
-								/* 年管控 */
-								.green{
-									color: #11BA25;
-									background: rgba(17,186,37,0.2);
-								}
-								>img{
-									width: 12rpx;
-									height: 24rpx;
-								}
-							}
-							.list_li_b_t_b{
-								font-size: 28rpx;
-								font-family: PingFang SC;
-								font-weight: 500;
-								color: #999999;
-								line-height: 48rpx;
-								margin-bottom :14rpx;
-							}
-						}
-						.flex-view{
-							display:flex;
-							view{
-								font-size:28rpx;
-								line-height:28rpx;
-								margin-top:28rpx;
-							}
-							view:nth-child(1){
-								width:220rpx;
-							}
-							view:nth-child(2){
-								width:460rpx;
-								word-wrap:break-word;
-								word-break:break-all;
-								overflow: hidden;
-								color:#999;
-							}
-						}
-						.list_li_b_b{
-							font-size: 28rpx;
-							font-family: PingFang SC;
-							font-weight: 500;
-							color: #333333;
-							line-height: 28rpx;
-							>label{
-								font-size: 28rpx;
-								font-family: PingFang SC;
-								font-weight: 500;
-								color: #999999;
-								line-height: 28rpx;
-							}
-						}
-						.list_li_b_b2{
-							font-size: 28rpx;
-							font-family: PingFang SC;
-							font-weight: 500;
-							color: #333333;
-							line-height: 28rpx;
-							margin-top :32rpx;
-						}
-						.list_li_b_b3{
-							width: 640rpx;
-							height: 250rpx;
-							border: 1rpx solid #E0E0E0;
-							border-radius: 10rpx;
-							margin :32rpx 0 0 10rpx;
-							padding :25rpx 18rpx;
-							box-sizing :border-box;
-						}
-
-						.placeholder-style{
-							font-size: 24rpx;
-							font-family: PingFang SC;
-							font-weight: 500;
-							color: #CCCCCC;
-							line-height: 24rpx;
-						}
-						.list_li_b_b4{
-							font-size: 28rpx;
-							font-family: PingFang SC;
-							font-weight: 500;
-							color: #333333;
-							line-height: 60rpx;
-							margin-top :30rpx;
-							margin-bottom :52rpx;
-							>label{
-								display :inline-block;
-								width: 300rpx;
-								height: 60rpx;
-								border: 1rpx solid #0183FA;
-								border-radius: 10rpx;
-								text-align :center;
-								margin-left :22rpx;
-								font-size: 28rpx;
-								font-family: PingFang SC;
-								font-weight: 500;
-								color: #0183FA;
-								line-height: 60rpx;
-
-							}
-						}
-						.list_li_b_b5{
-							font-size: 28rpx;
-							font-family: PingFang SC;
-							font-weight: 500;
-							color: #333333;
-							line-height: 28rpx;
-							margin-top :30rpx;
-							margin-bottom 20rpx;
-							>label{
-								font-size: 28rpx;
-								font-family: PingFang SC;
-								font-weight: 500;
-								color: #999999;
-								line-height: 28rpx;
-
-							}
-						}
-						.list_li_b_b6{
-							display flex;
-							margin-bottom:20rpx;
-							view:nth-child(1){
-								flex:1;
-								line-height:30rpx;
-								margin:15rpx 0 15rpx 15rpx;
-							}
-							view:nth-child(2){
-								height:60rpx;
-								width:60rpx;
-								margin:0 20rpx 0 60rpx;
-								img{
-									height:30rpx;
-									width:30rpx;
-									margin:15rpx;
-								}
-							}
-						}
-					}
-				}
-			}
-
-			/*暂无数据*/
-            .get-null-box{
-                height:100rpx;
-                line-height:100rpx;
-                color:#999;
-                text-align center
-            }
-        }
-        .bottom-button-box{
-			border-radius:20rpx;
-			margin:20rpx 50rpx;
-            width: 650rpx;
-            height: 100rpx;
-            line-height: 100rpx;
-            background: #0183FA;
-            font-size: 30rpx;
-            color: #FFFFFF;
-            text-align center;
-        }
-    }
-</style>

+ 0 - 450
pages_manage/gradingControl/gradingControlDetail.vue

@@ -1,450 +0,0 @@
-<!-- 分级管控记录详情 -->
-<template>
-    <view id="accessQualification">
-        <scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
-			<view class="list">
-				<view class="list_li">
-					<view class="list_li_t">
-						<view class="list_li_t_l" :style="'color:'+infoList.fiedColor+';border-color:'+infoList.fiedColor">{{infoList.levelName}}</view>
-						<view class="list_li_t_c">{{infoList.subName}}</view>
-						<view class="list_li_t_r">{{infoList.typeName}}</view>
-					</view>
-					<view class="list_li_b">
-						<view class="list_li_b_t">
-							<view class="list_li_b_t_t">
-								<view class="list_li_b_t_t_n">
-									<view class="list_li_b_t_t_l" :class="[infoList.ruleType== '日管控' ? 'purple': '', infoList.ruleType=='周管控'? 'blue': '',infoList.ruleType=='月管控'? 'orange': '',infoList.ruleType=='年管控'? 'green': '',]">{{infoList.ruleType}}</view>
-									<view class="list_li_b_t_t_c">{{infoList.ruleName}}</view>
-								</view>
-								<view class="list_li_b_t_t_n_r">{{infoList.endDate}}</view>
-							</view>
-							<view class="list_li_b_t_b" style="display: flex;"><label style="width:150rpx;">执行方式:</label>{{infoList.isAll==1?'多人执行':'单人执行'}}</view>
-							<view class="list_li_b_t_b" style="display: flex;"><label style="width:150rpx;">规则描述:</label>{{infoList.ruleRemark}}</view>
-							<view class="list_li_b_t_b" style="display: flex;" v-if="infoList.status == 0">
-								<label style="width:200rpx;">指定执行人员:</label>
-								<view style="flex:1;word-wrap:break-word;word-break:break-all;overflow: hidden;">{{infoList.allUserName}}</view>
-							</view>
-							<view class="list_li_b_t_b" style="display: flex;" v-if="infoList.status == 2"><label style="width:150rpx;">执行人:</label>{{infoList.nickName}}</view>
-							<view class="list_li_b_t_b" style="display: flex;" v-if="infoList.status == 2"><label style="width:150rpx;">身份:</label>{{infoList.userPosition}}</view>
-							<view class="list_li_b_t_b" style="display: flex;" v-if="infoList.status == 2"><label style="width:150rpx;">执行时间:</label>{{infoList.carryTime}}</view>
-							<view class="list_li_b_t_b" style="display: flex;" v-if="infoList.status == 2">
-								<label style="width:150rpx;">执行描述:</label>
-								<view style="flex:1;word-wrap:break-word;word-break:break-all;overflow: hidden;">{{infoList.detail.remark}}</view>
-							</view>
-						</view>
-						<view class="list_li_b_b4" v-if="infoList.status == 2">
-							<label>执行材料:</label>
-							<view class="list_li_b_b4_n">
-								<view class="list_li_b_b4_r" v-for="(item,index) in upList" :key="index" @click="lookItem(item)">
-									<img src="@/images/Version2.3/icon_pdf.png" v-if="item.type == 'pdf'"/>
-									<img src="@/images/Version2.3/icon_word.png" v-if="item.type == 'doc' || item.type == 'docx'"/>
-									<img :src="item.url" v-if="item.type == 'png' || item.type == 'jpg' || item.type == 'jpeg' || item.type == 'gif'"/>
-									<view class="list_li_b_b4_r_r">{{item.name}}</view>
-								</view>
-							</view>
-						</view>
-
-
-					</view>
-				</view>
-			</view>
-
-        </scroll-view>
-    </view>
-</template>
-
-<script>
-    import { gradingControlDetail,readByLoginUser } from '@/api/index.js'
-    import { config } from '@/api/request/config.js'
-    export default {
-        data() {
-            return {
-
-                infoList:{},
-				id:'',
-				upList:[],
-            }
-        },
-        onLoad(option) {
-            if(option.item){
-				let item = JSON.parse(decodeURIComponent(option.item));
-				console.log(item)
-				this.id=item.recordId;
-				if(item.messageUserId){
-					this.readByLoginUser(item.messageUserId);
-				}
-			}else{
-
-			}
-        },
-        onShow(){
-            this.clearData();
-            this.getList();
-        },
-        methods: {
-			goSafeAccess(){
-				uni.navigateTo({
-					url: '/pages_student/workbench/safeAccess/safeAccess',
-				});
-			},
-            //清除
-            clearData(){
-                this.infoList = [];
-                this.upList = [];
-
-            },
-            //去详情页
-            goPageInfo(item){
-
-                uni.navigateTo({
-                    url:'/pages_manage/workbench/accessQualification/accessQualificationInfo?item='+encodeURIComponent(JSON.stringify(item))
-                })
-            },
-            //滚动事件
-            scrollGet(){
-                //this.getList();
-            },
-			lookItem(item){
-				console.log("item",item)
-				if(item.type == 'png' || item.type == 'jpg' || item.type == 'jpeg' || item.type == 'gif'){
-					//查看图片
-					wx.previewImage({
-						urls: [item.url], //需要预览的图片http链接列表,多张的时候,url直接写在后面就行了
-						current: '', // 当前显示图片的http链接,默认是第一个
-						success: function(res) {},
-						fail: function(res) {},
-						complete: function(res) {},
-					})
-				}else if(item.type == 'pdf' || item.type == 'doc' || item.type == 'docx'){
-					uni.showLoading({
-					    title: '下载中'
-					});
-					//下载文档
-					wx.downloadFile({
-						url: item.url,
-						header: {
-							Authorization: uni.getStorageSync('token')
-						},
-						success: function (res) {
-							console.log("resresresresresres",res)
-							const fileManager = wx.getFileSystemManager()
-							const filePath = wx.env.USER_DATA_PATH + '/' + item.name + '.docx'
-							fileManager.saveFile({
-								tempFilePath: res.tempFilePath,
-								filePath,
-								success: () => {
-									uni.hideLoading();
-									wx.openDocument({
-									filePath: filePath,
-									showMenu: true,
-									fileType: item.type
-									})
-								},
-								fail: function (res){
-									uni.hideLoading();
-									uni.showToast({
-										title: '下载失败',
-										icon:"none",
-										mask:true,
-										duration: 2000
-									});
-								}
-							})
-						},
-						fail: function (res){
-							uni.hideLoading();
-							uni.showToast({
-								title: '下载失败',
-								icon:"none",
-								mask:true,
-								duration: 2000
-							});
-						}
-					})
-				}
-			},
-			//查看图片
-			lockImg(list){
-				console.log(list)
-				/* if(!list[0]){
-					return
-				} */
-				let url=list.split(',')
-				wx.previewImage({
-					urls: url, //需要预览的图片http链接列表,多张的时候,url直接写在后面就行了
-					current: '', // 当前显示图片的http链接,默认是第一个
-					success: function(res) {},
-					fail: function(res) {},
-					complete: function(res) {},
-				})
-			},
-			async readByLoginUser(id){
-				let obj = {
-					id:id
-				}
-				const {data} = await readByLoginUser(obj)
-			},
-            //获取列表数据
-            async getList(){
-                let _this = this;
-				let listUrl=[];
-				let listName=[];
-
-                const {data} = await gradingControlDetail(this.id)
-                if(data.code==200){
-						this.infoList=data.data
-						console.log(data.data.detail.imgName)
-						console.log(data.data.detail.imgName.split(","))
-						listName=data.data.detail.imgName.split(",")
-						listUrl=data.data.detail.imgUrl.split(",")
-						for(var i=0;i<listName.length;i++){
-							if(listName[i]){
-								let type = listName[i].split(".")[1];
-								this.upList.push({'name':listName[i],'url':config.base_url+listUrl[i],'type':type,})
-							}
-						}
-
-						console.log(this.upList)
-
-
-                }
-
-            },
-        }
-    }
-</script>
-
-<style lang="stylus" scoped>
-    #accessQualification{
-        height:100%;
-        display flex
-        flex-direction column
-        .info-max-box{
-            flex:1;
-            overflow: scroll
-			.for-big-box:last-child{
-			    margin-bottom:180rpx;
-			}
-			/* 列表 */
-			.list{
-				padding 0 20rpx;
-				box-sizing border-box;
-				.list_li{
-					height 450rpx;
-					.list_li_t{
-						height :80rpx;
-						display flex;
-						justify-content flex-start;
-						align-items :center;
-						.list_li_t_l{
-							width: 80rpx;
-							height: 30rpx;
-							font-size: 24rpx;
-							font-family: PingFang SC;
-							font-weight: 500;
-							color: #EE3A3A;
-							line-height: 30rpx;
-							border: 2rpx solid #EE3A3A;
-							border-radius: 6rpx;
-							text-align center;
-						}
-						.list_li_t_c{
-							font-size: 28rpx;
-							font-family: PingFang SC;
-							font-weight: 500;
-							color: #333333;
-							line-height: 30rpx;
-							margin 0 32rpx 0 16rpx;
-						}
-						.list_li_t_r{
-							font-size: 28rpx;
-							font-family: PingFang SC;
-							font-weight: 500;
-							color: #999999;
-							line-height: 30rpx;
-						}
-					}
-					.list_li_b{
-						width 710rpx;
-						height auto;
-						background: #FFFFFF;
-						border-radius: 20rpx;
-						padding :0 14rpx;
-						box-sizing :border-box;
-						overflow hidden
-						.list_li_b_t{
-							overflow :hidden;
-							.list_li_b_t_t{
-								display flex;
-								justify-content flex-start;
-								margin :24rpx 0 18rpx 0;
-								.list_li_b_t_t_n{
-									flex:1;
-									display flex;
-									justify-content flex-start;
-									.list_li_b_t_t_l{
-										width :100rpx;
-										height :30rpx;
-										font-size: 24rpx;
-										font-family: PingFang SC;
-										font-weight: 500;
-										/* color: #0183FA; */
-										line-height: 30rpx;
-										/* background: rgba(1,131,250,0.2); */
-										border-radius: 6rpx;
-										text-align :center;
-									}
-									.list_li_b_t_t_c{
-										flex:1;
-										font-size: 28rpx;
-										font-family: PingFang SC;
-										font-weight: 500;
-										color: #333333;
-										line-height: 28rpx;
-										margin :0 16rpx 0 12rpx;
-									}
-									.list_li_b_t_t_r{
-										font-size: 24rpx;
-										font-family: PingFang SC;
-										font-weight: 500;
-										color: #EE3A3A;
-										line-height: 24rpx;
-									}
-								}
-								.list_li_b_t_t_n_r{
-									font-size: 24rpx;
-									line-height: 30rpx;
-									color: #999;
-								}
-								/* 日管控 */
-								.purple{
-									color: #AC20E0;
-									background: rgba(172,32,224,0.2);
-								}
-								/* 周管控 */
-								.blue{
-									color: #0183FA;
-									background: rgba(1,131,250,0.2);
-								}
-								/* 月管控 */
-								.orange{
-									color: #FA8801;
-									background: rgba(250,136,1,0.2);
-								}
-								/* 年管控 */
-								.green{
-									color: #11BA25;
-									background: rgba(17,186,37,0.2);
-								}
-								>img{
-									width: 12rpx;
-									height: 24rpx;
-								}
-							}
-							.list_li_b_t_b{
-								font-size: 28rpx;
-								font-family: PingFang SC;
-								font-weight: 500;
-								color: #999999;
-								line-height: 48rpx;
-								margin-bottom :14rpx;
-								>label{
-									color :#333333;
-								}
-							}
-						}
-						.list_li_b_b{
-							font-size: 28rpx;
-							font-family: PingFang SC;
-							font-weight: 500;
-							color: #333333;
-							line-height: 28rpx;
-							>label{
-								font-size: 28rpx;
-								font-family: PingFang SC;
-								font-weight: 500;
-								color: #999999;
-								line-height: 28rpx;
-							}
-						}
-						.list_li_b_b2{
-							font-size: 28rpx;
-							font-family: PingFang SC;
-							font-weight: 500;
-							color: #999999;
-							line-height: 48rpx;
-							margin-top :32rpx;
-							>label{
-								color :#333333;
-							}
-						}
-
-						.list_li_b_b4{
-							width :100%;
-							margin-top :10rpx;
-							margin-bottom 20rpx;
-							display :flex;
-							justify-content :flex-start;
-							>label{
-								display :inline-block;
-								font-size: 28rpx;
-								font-family: PingFang SC;
-								font-weight: 500;
-								color: #333333;
-								line-height: 28rpx;
-								width :150rpx;
-							}
-							.list_li_b_b4_n{
-								width :560rpx;
-								.list_li_b_b4_r{
-									height:60rpx;
-									width :100%;
-									margin-bottom :20rpx;
-									display :flex;
-									justify-content :flex-start;
-									align-items :center;
-									img{
-										height:60rpx;
-										width:60rpx;
-										margin-right :10rpx;
-									}
-									.list_li_b_b4_r_r{
-										height :50rpx;
-										white-space:nowrap;overflow:hidden;text-overflow:ellipsis;
-										width :100%;
-										font-size: 28rpx;
-										font-family: PingFang SC;
-										font-weight: 500;
-										color: #999999;
-										line-height: 50rpx;
-									}
-								}
-							}
-
-						}
-
-					}
-				}
-			}
-
-			/*暂无数据*/
-            .get-null-box{
-                height:100rpx;
-                line-height:100rpx;
-                color:#999;
-                text-align center
-            }
-        }
-        .bottom-button-box{
-			border-radius:20rpx;
-			margin:20rpx 50rpx;
-            width: 650rpx;
-            height: 100rpx;
-            line-height: 100rpx;
-            background: #0183FA;
-            font-size: 30rpx;
-            color: #FFFFFF;
-            text-align center;
-        }
-    }
-</style>

+ 0 - 306
pages_manage/gradingControl/gradingControlFinish.vue

@@ -1,306 +0,0 @@
-<!-- 准入资格证书 -->
-<template>
-    <view id="accessQualification">
-        <scroll-view scroll-y @scrolltolower="scrollGet" class="info-max-box">
-			<view class="list">
-				<view class="list_li" v-for="(item,index) in infoList" :key="index">
-					<view class="list_li_t">
-						<!-- <view class="list_li_t_l" :style="'color:'+item.levelColor+';border-color:'+item.levelColor">{{item.levelName}}</view> -->
-						<view class="list_li_t_c">{{item.subName}}</view>
-						<!-- <view class="list_li_t_r">{{item.typeName}}</view> -->
-					</view>
-					<view class="list_li_b" >
-						<view  class="list_li_b_t" @tap="goPageInfo(item2)" v-for="(item2,index2) in item.detailList" :key="index2" :style="index2==(item.detailList.length-1)?'border:none;':'border-bottom :1px dashed #cccccc;'">
-							<view class="list_li_b_t_t">
-								<view class="list_li_b_t_t_n">
-									<view class="list_li_b_t_t_l" :class="[item2.ruleType== '日管控' ? 'purple': '', item2.ruleType=='周管控'? 'blue': '',item2.ruleType=='月管控'? 'orange': '',item2.ruleType=='年管控'? 'green': '',]">{{item2.ruleType}}</view>
-									<view class="list_li_b_t_t_c">{{item2.ruleName}}</view>
-									<!-- <view class="list_li_b_t_t_r" v-if="item2.isExpired==1">(过期未完成)</view> -->
-								</view>
-								<view class="list_li_t_rr" :class="item2.status==0?'list_li_t_rr_color_a':(item2.status==2?'list_li_t_rr_color_b':'')">{{item2.status==0?'未执行':(item2.status==2?'已执行':'')}}</view>
-								<img class="list_li_b_t_t_img" src="@/images/icon_04.png" >
-							</view >
-							<!-- <view class="list_li_b_t_b">{{item2.ruleRemark}}</view> -->
-							<view class="list_li_b_t_b">截止执行时间:{{item2.endDate}}</view>
-						</view>
-					</view>
-				</view>
-			</view>
-           <view class="get-null-box" v-if="infoList.length==0">暂无更多数据</view>
-        </scroll-view>
-
-    </view>
-</template>
-
-<script>
-    import { gradingControlFinish } from '@/api/index.js'
-    export default {
-        data() {
-            return {
-                infoList:[],
-            }
-        },
-        onLoad() {
-
-        },
-
-        onShow(){
-            //this.clearData();
-			this.getList();
-        },
-        methods: {
-
-            //清除
-            clearData(){
-                this.infoList = [];
-
-            },
-            //去详情页
-            goPageInfo(item){
-
-                uni.navigateTo({
-                    url:'/pages_manage/gradingControl/gradingControlDetail?item='+encodeURIComponent(JSON.stringify(item))
-                })
-            },
-            //滚动事件
-            scrollGet(){
-               this.getList();
-            },
-
-
-            //获取列表数据
-            async getList(){
-                let _this = this;
-                let obj = {
-
-                }
-                const {data} = await gradingControlFinish(obj)
-                if(data.code==200){
-                      _this.infoList=data.data;
-                }
-
-            },
-        }
-    }
-</script>
-
-<style lang="stylus" scoped>
-    #accessQualification{
-        height:100%;
-        display flex
-        flex-direction column
-        .info-max-box{
-            flex:1;
-            overflow: scroll
-			.for-big-box:last-child{
-			    margin-bottom:180rpx;
-			}
-			/* 列表 */
-			.list{
-				padding 0 20rpx;
-				box-sizing border-box;
-				.list_li{
-					height auto;
-					.list_li_t{
-						height :80rpx;
-						display flex;
-						justify-content flex-start;
-						align-items :center;
-						.list_li_t_l{
-							width: 80rpx;
-							height: 30rpx;
-							font-size: 24rpx;
-							font-family: PingFang SC;
-							font-weight: 500;
-							color: #EE3A3A;
-							line-height: 30rpx;
-							border: 2rpx solid #EE3A3A;
-							border-radius: 6rpx;
-							text-align center;
-						}
-						.list_li_t_c{
-							font-size: 28rpx;
-							font-family: PingFang SC;
-							font-weight: 500;
-							color: #333333;
-							line-height: 30rpx;
-							margin 0 32rpx 0 16rpx;
-							flex:1;
-						}
-						.list_li_t_r{
-							font-size: 28rpx;
-							font-family: PingFang SC;
-							font-weight: 500;
-							color: #999999;
-							line-height: 30rpx;
-						}
-					}
-					.list_li_b{
-						width 710rpx;
-						height auto;
-						background: #FFFFFF;
-						border-radius: 20rpx;
-						padding :0 14rpx;
-						box-sizing :border-box;
-						.list_li_b_t{
-							overflow :hidden;
-							border-bottom :1rpx dashed #cccccc;
-							.list_li_b_t_t{
-								display flex;
-								flex:1;
-								justify-content flex-start;
-								margin :24rpx 0 18rpx 0;
-								.list_li_b_t_t_n{
-									width:655rpx;
-									display flex;
-									justify-content flex-start;
-									.list_li_b_t_t_l{
-										width :100rpx;
-										height :30rpx;
-										font-size: 24rpx;
-										font-family: PingFang SC;
-										font-weight: 500;
-										/* color: #0183FA; */
-										line-height: 24rpx;
-										/* background: rgba(1,131,250,0.2); */
-										border-radius: 6rpx;
-										text-align :center;
-									}
-									.list_li_b_t_t_c{
-										font-size: 28rpx;
-										font-family: PingFang SC;
-										flex:1;
-										font-weight: 500;
-										color: #333333;
-										line-height: 28rpx;
-										margin :0 16rpx 0 12rpx;
-									}
-									.list_li_b_t_t_r{
-										font-size: 24rpx;
-										font-family: PingFang SC;
-										font-weight: 500;
-										color: #EE3A3A;
-										line-height: 24rpx;
-									}
-								}
-								.list_li_t_rr{
-									width:100rpx;
-									font-size: 28rpx;
-									font-family: PingFang SC;
-									font-weight: 500;
-									color: #999999;
-									line-height: 28rpx;
-									margin-right:10rpx;
-								}
-								.list_li_t_rr_color_a{
-									color:#FF4E00;
-								}
-								.list_li_t_rr_color_b{
-									color:#14AE10;
-								}
-								/* 日管控 */
-								.purple{
-									color: #AC20E0;
-									background: rgba(172,32,224,0.2);
-								}
-								/* 周管控 */
-								.blue{
-									color: #0183FA;
-									background: rgba(1,131,250,0.2);
-								}
-								/* 月管控 */
-								.orange{
-									color: #FA8801;
-									background: rgba(250,136,1,0.2);
-								}
-								/* 年管控 */
-								.green{
-									color: #11BA25;
-									background: rgba(17,186,37,0.2);
-								}
-								>img{
-									width: 12rpx;
-									height: 24rpx;
-									margin-top:2rpx;
-								}
-							}
-							.list_li_b_t_b{
-								font-size: 28rpx;
-								font-family: PingFang SC;
-								font-weight: 500;
-								color: #999999;
-								line-height: 48rpx;
-								margin-bottom :14rpx;
-							}
-						}
-
-						.list_li_b_b{
-
-							.list_li_b_b_t{
-								display :flex;
-								justify-content :flex-start;
-								margin :30rpx 0 18rpx;
-								.list_li_b_b_t_n{
-									width:655rpx;
-									display flex;
-									justify-content flex-start;
-									.list_li_b_b_t_l{
-										width :100rpx;
-										height :30rpx;
-										border-radius: 6rpx;
-										font-size: 24rpx;
-										font-family: PingFang SC;
-										font-weight: 500;
-										color: #FA8801;
-										line-height: 30rpx;
-										background :rgba(250,136,1,0.2);
-										text-align :center;
-										margin-right :12rpx;
-									}
-									.list_li_b_b_t_r{
-										font-size: 28rpx;
-										font-family: PingFang SC;
-										font-weight: 500;
-										color: #333333;
-										line-height: 30rpx;
-									}
-								}
-								>img{
-									width: 12rpx;
-									height: 24rpx;
-								}
-
-							}
-							.list_li_b_b_b{
-								font-size: 28rpx;
-								font-family: PingFang SC;
-								font-weight: 500;
-								color: #999999;
-								line-height: 48rpx;
-							}
-						}
-					}
-				}
-			}
-
-			/*暂无数据*/
-            .get-null-box{
-                height:100rpx;
-                line-height:100rpx;
-                color:#999;
-                text-align center
-            }
-        }
-        .bottom-button-box{
-			border-radius:20rpx;
-			margin:20rpx 50rpx;
-            width: 650rpx;
-            height: 100rpx;
-            line-height: 100rpx;
-            background: #0183FA;
-            font-size: 30rpx;
-            color: #FFFFFF;
-            text-align center;
-        }
-    }
-</style>

BIN
pages_manage/images/Version2.2/for_min_bg.png


BIN
pages_manage/images/Version2.2/icon-aqjc_fzr.png


BIN
pages_manage/images/Version2.2/icon_aqjc_czwt.png


BIN
pages_manage/images/Version2.2/icon_aqjc_sm.png


BIN
pages_manage/images/Version2.2/icon_aqjc_sq.png


BIN
pages_manage/images/Version2.2/icon_aqjc_sq_two.png


BIN
pages_manage/images/Version2.2/icon_aqjc_sysxx.png


BIN
pages_manage/images/Version2.2/icon_aqjc_yhsl.png


BIN
pages_manage/images/Version2.2/icon_aqjc_zgxx.png


BIN
pages_manage/images/Version2.2/icon_bg_ywc.png


BIN
pages_manage/images/Version2.2/icon_jcjl_dh.png


BIN
pages_manage/images/Version2.2/icon_jcjl_xm.png


BIN
pages_manage/images/Version2.2/icon_wtj.png


BIN
pages_manage/images/Version2.2/icon_wtzg_sj.png


BIN
pages_manage/images/Version2.2/icon_wtzg_xx.png


BIN
pages_manage/images/Version2.2/icon_xzwt_kzt.png


BIN
pages_manage/images/Version2.3/icon_pdf.png


BIN
pages_manage/images/Version2.3/icon_sczl_sc.png


BIN
pages_manage/images/Version2.3/icon_word.png


BIN
pages_manage/images/Version3.0/icon_qpgl_syl.png


BIN
pages_manage/images/Version3.0/icon_sqqp_sqys.png


BIN
pages_manage/images/Version3.0/icon_sqxq_jsyy.png


BIN
pages_manage/images/Version3.0/icon_sydj_sqyqzg.png


BIN
pages_manage/images/Version3.0/icon_sydj_yubz.png


BIN
pages_manage/images/Version3.0/icon_xgzl_shz.png


BIN
pages_manage/images/Version3.0/icon_yqsq_sys.png


BIN
pages_manage/images/Version3.0/icon_ysclgl_cl.png


BIN
pages_manage/images/Version3.0/icon_zgsh_sysmph.png


BIN
pages_manage/images/Version3.0/icon_zgsq_dhh.png


BIN
pages_manage/images/Version3.0/icon_zgsq_j.png


BIN
pages_manage/images/Version3.0/icon_zgsq_jian.png


BIN
pages_manage/images/Version3.0/icon_zgsq_sqr.png


BIN
pages_manage/images/Version3.0/img_sydj_sltp.png


BIN
pages_manage/images/Version3.0/img_ysrygl_zwsj.png


BIN
pages_manage/images/icon_04.png


BIN
pages_manage/images/icon_06.png


BIN
pages_manage/images/icon_06_1.png


BIN
pages_manage/images/icon_07.png


BIN
pages_manage/images/icon_10.png


BIN
pages_manage/images/icon_11.png


BIN
pages_manage/images/icon_14.png


BIN
pages_manage/images/icon_15.png


BIN
pages_manage/images/icon_5.png


BIN
pages_manage/images/icon_6.png


BIN
pages_manage/images/icon_aqbj_sj.png


BIN
pages_manage/images/icon_aqjc_ss.png


BIN
pages_manage/images/icon_aqxxp_dxaq.png


BIN
pages_manage/images/icon_aqxxp_gbmc.png


BIN
pages_manage/images/icon_aqxxp_gbsd.png


BIN
pages_manage/images/icon_aqxxp_gzf.png


BIN
pages_manage/images/icon_aqxxp_jzxy.png


BIN
pages_manage/images/icon_aqxxp_jzys.png


BIN
pages_manage/images/icon_hy_yc.png


BIN
pages_manage/images/icon_hy_zc.png


BIN
pages_manage/images/icon_jlfgz_gb.png


BIN
pages_manage/images/icon_mh.png


BIN
pages_manage/images/icon_sskz_azsh.png


BIN
pages_manage/images/icon_sskz_skfs.png


BIN
pages_manage/images/icon_sskz_xz.png


BIN
pages_manage/images/icon_sskz_zc.png


BIN
pages_manage/images/icon_ssp_closure.png


BIN
pages_manage/images/icon_sy_mhwc.png


BIN
pages_manage/images/icon_sy_wt.png


BIN
pages_manage/images/icon_wd_yc.png


BIN
pages_manage/images/icon_wd_zc.png


BIN
pages_manage/images/icon_wdwg_gd.png


BIN
pages_manage/images/icon_yw_yc.png


+ 0 - 0
pages_manage/images/icon_yw_zc.png


Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä