dedsudiyu 2 jaren geleden
bovenliggende
commit
d4902b6a4d
100 gewijzigde bestanden met toevoegingen van 8 en 7 verwijderingen
  1. 1 0
      api/index.js
  2. 3 3
      api/request/config.js
  3. 1 1
      component/cropper.vue
  4. 3 3
      component/topWarn.vue
  5. BIN
      images/Version2.2/btn_sy_xz.png
  6. BIN
      images/Version2.2/btn_sy_zc.png
  7. BIN
      images/Version2.2/btn_wd_jfdh.png
  8. BIN
      images/Version2.2/btn_wd_xz.png
  9. BIN
      images/Version2.2/btn_wd_zc.png
  10. BIN
      images/Version2.2/btn_xx_xz.png
  11. BIN
      images/Version2.2/btn_xx_zc.png
  12. BIN
      images/Version2.2/icon-aqjc_fzr.png
  13. BIN
      images/Version2.2/icon_aqbj.png
  14. BIN
      images/Version2.2/icon_aqbj_sj.png
  15. BIN
      images/Version2.2/icon_aqjc_czwt.png
  16. BIN
      images/Version2.2/icon_aqjc_gd.png
  17. BIN
      images/Version2.2/icon_aqjc_sm.png
  18. BIN
      images/Version2.2/icon_aqjc_sq.png
  19. BIN
      images/Version2.2/icon_aqjc_sq_two.png
  20. BIN
      images/Version2.2/icon_aqjc_sysxx.png
  21. BIN
      images/Version2.2/icon_aqjc_xlan.png
  22. BIN
      images/Version2.2/icon_aqjc_yhsl.png
  23. BIN
      images/Version2.2/icon_aqjc_zgxx.png
  24. BIN
      images/Version2.2/icon_bg_ywc.png
  25. BIN
      images/Version2.2/icon_dhli.png
  26. BIN
      images/Version2.2/icon_dhlp_dhcg.png
  27. BIN
      images/Version2.2/icon_fh.png
  28. BIN
      images/Version2.2/icon_jcjl_dh.png
  29. BIN
      images/Version2.2/icon_jcjl_xm.png
  30. BIN
      images/Version2.2/icon_sy_aqbj.png
  31. BIN
      images/Version2.2/icon_sy_aqjc.png
  32. BIN
      images/Version2.2/icon_sy_aqxx.png
  33. BIN
      images/Version2.2/icon_sy_dz.png
  34. BIN
      images/Version2.2/icon_sy_ssp.png
  35. BIN
      images/Version2.2/icon_sy_wdsys.png
  36. BIN
      images/Version2.2/icon_sy_wdzs.png
  37. BIN
      images/Version2.2/icon_sy_wxy.png
  38. BIN
      images/Version2.2/icon_sy_zrsq.png
  39. BIN
      images/Version2.2/icon_tc_xl.png
  40. BIN
      images/Version2.2/icon_wdsys_gd.png
  41. BIN
      images/Version2.2/icon_wtj.png
  42. BIN
      images/Version2.2/icon_wtzg_sj.png
  43. BIN
      images/Version2.2/icon_wtzg_xx.png
  44. BIN
      images/Version2.2/icon_xzwt_kzt.png
  45. BIN
      images/Version2.2/icon_xzwt_xz.png
  46. BIN
      images/Version2.2/icon_zg_rq.png
  47. BIN
      images/Version2.2/img_bg_cjcx.png
  48. BIN
      images/Version2.2/img_bg_wgjl.png
  49. BIN
      images/Version2.2/ing_bg_banner.png
  50. BIN
      images/Version2.3/button_2.png
  51. BIN
      images/Version2.3/icon_30.png
  52. BIN
      images/Version2.3/icon_bj_syspmtcy.png
  53. BIN
      images/Version2.3/icon_bj_syspmtcy_jinan.png
  54. BIN
      images/Version2.3/icon_pdf.png
  55. BIN
      images/Version2.3/icon_sczl_sc.png
  56. BIN
      images/Version2.3/icon_sjt.gif
  57. BIN
      images/Version2.3/icon_sy_yjss.png
  58. BIN
      images/Version2.3/icon_word.png
  59. BIN
      images/Version2.3/icon_yjt.gif
  60. BIN
      images/Version2.3/icon_yjt.png
  61. BIN
      images/Version2.3/icon_zjt.gif
  62. BIN
      images/Version2.3/icon_zjt.png
  63. BIN
      images/Version2.3/img_zrsq_bg.png
  64. BIN
      images/Version3.0/icon_glpt_dbqd.png
  65. BIN
      images/Version3.0/icon_glpt_gqhsjl.png
  66. BIN
      images/Version3.0/icon_gysqpgl_xzqp.png
  67. BIN
      images/Version3.0/icon_qpgl_qp.png
  68. BIN
      images/Version3.0/icon_qpgl_syl.png
  69. BIN
      images/Version3.0/icon_sqqp_sqys.png
  70. BIN
      images/Version3.0/icon_sqxq_jsyy.png
  71. BIN
      images/Version3.0/icon_ssdl_qh.png
  72. BIN
      images/Version3.0/icon_sy_aqxx.png
  73. BIN
      images/Version3.0/icon_sy_hxp.png
  74. BIN
      images/Version3.0/icon_sy_qpgl.png
  75. BIN
      images/Version3.0/icon_sy_ssp.png
  76. BIN
      images/Version3.0/icon_sy_tzsb.png
  77. BIN
      images/Version3.0/icon_sydj_sqyqzg.png
  78. BIN
      images/Version3.0/icon_sydj_yubz.png
  79. BIN
      images/Version3.0/icon_xgzl_shz.png
  80. BIN
      images/Version3.0/icon_yqsq_sys.png
  81. BIN
      images/Version3.0/icon_ysclgl_cl.png
  82. BIN
      images/Version3.0/icon_ysry_ry.png
  83. BIN
      images/Version3.0/icon_zc_sc.png
  84. BIN
      images/Version3.0/icon_zc_scbg.png
  85. BIN
      images/Version3.0/icon_zgsh_sysmph.png
  86. BIN
      images/Version3.0/icon_zgsq_dhh.png
  87. BIN
      images/Version3.0/icon_zgsq_j.png
  88. BIN
      images/Version3.0/icon_zgsq_jian.png
  89. BIN
      images/Version3.0/icon_zgsq_sqr.png
  90. BIN
      images/Version3.0/img_gysglpt_bg.png
  91. BIN
      images/Version3.0/img_gysglpt_icom.png
  92. BIN
      images/Version3.0/img_sydj_sltp.png
  93. BIN
      images/Version3.0/img_xgzl_zgty.png
  94. BIN
      images/Version3.0/img_ysrygl_zwsj.png
  95. BIN
      images/Version3.0/img_zc_zccg.png
  96. BIN
      images/evacuation3_2/icon_aqtd_m.png
  97. BIN
      images/evacuation3_2/icon_shang_hs.png
  98. BIN
      images/evacuation3_2/icon_sjt.png
  99. BIN
      images/evacuation3_2/icon_sysbjt_m.png
  100. 0 0
      images/evacuation3_2/icon_xia_hs.png

+ 1 - 0
api/index.js

@@ -21,6 +21,7 @@ export const getDemoInfoList  = (data) => {
     })
 };
 
+
 //指纹-查询用户指纹录取数量
 export const fingerprintQuantity  = (data) => {
     return apiResquest({

+ 3 - 3
api/request/config.js

@@ -1,15 +1,15 @@
 const config = {
-     //  base_url: 'http://192.168.1.9:8080',//柴
+	//base_url: 'http://192.168.1.9:8080',//柴
 	// base_url: 'http://192.168.1.7:8080',//刘波
 	// base_url: 'http://192.168.1.17:8080',//小飞
 	// base_url: 'http://192.168.1.20:8080',//志伟
     // base_url: 'http://192.168.1.8:8080',//高升
 	// base_url: 'http://192.168.1.29:8080',//何成
-     //base_url: 'http://192.168.1.43:9800',//43服务器
+    // base_url: 'http://192.168.1.43:9800',//43服务器
 	// base_url: 'https://demo.sxitdlc.com/xzgd/',
 
 	// base_url: 'https://lab.sxitdlc.com/labNhSystem/',//43服务器高升测试
-	 //base_url: 'https://lab.sxitdlc.com/labAppTest',//43服务器线上
+	// base_url: 'https://lab.sxitdlc.com/labAppTest/',//43服务器线上
     // base_url: 'https://lab.sxitdlc.com/appTest/',//88服务器线上
 	 base_url: 'https://lab.sxitdlc.com/labSystem/', //矿大地址
 	// base_url: 'https://lab.sxitdlc.com/jdlabSystem/', //交大地址

+ 1 - 1
component/cropper.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="nice-cropper" :style="{height: height, width: width, background: background}" @touchstart="start" @touchmove.stop="move" @touchcancel="end" @touchend="end">
-    <image class="nice-cropper__image" :src="src" :style="{transform: transformMeta, width: image.width + 'px', height: image.height + 'px'}" />
+    <img class="nice-cropper__image" :src="src" :style="{transform: transformMeta, width: image.width + 'px', height: image.height + 'px'}" />
     <view class="nice-cropper__ctrls" :class="{'nice-cropper__ctrls--view' : view, 'nice-cropper__ctrls--border': showCtrlBorder, 'nice-cropper__ctrls--circle': view && circleView && maskType !== 'outline'}" :style="ctrlStyle">
       <view class="nice-cropper__corner nice-cropper__corner--lt" @touchstart="setCutMode('lt')" />
       <view class="nice-cropper__corner nice-cropper__corner--rt" @touchstart="setCutMode('rt')" />

+ 3 - 3
component/topWarn.vue

@@ -19,7 +19,7 @@
 				subId:"",
 				closePlan:false,//  true 火焰报警,false 没有火焰报警
 				whetherRoute:true,
-				
+
 				subjectId:"",
 				buildingId:"",
 				subjectName:"",
@@ -103,7 +103,7 @@
 				  groupId:this.groupId,
 				}
 				uni.navigateTo({
-					url:'/pages/emergencyEvacuationBig?item='+encodeURIComponent(JSON.stringify(obj))
+					url:'/pages_manage/emergencyEvacuationBig?item='+encodeURIComponent(JSON.stringify(obj))
 				});
 			},
 			//获取报警信息
@@ -145,7 +145,7 @@
 							  groupId:data.data[i].groupId,
 							}
 							uni.navigateTo({
-								url:'/pages/emergencyEvacuationBig?item='+encodeURIComponent(JSON.stringify(obj))
+								url:'/pages_manage/emergencyEvacuationBig?item='+encodeURIComponent(JSON.stringify(obj))
 							});
 							return
 						}

BIN
images/Version2.2/btn_sy_xz.png


BIN
images/Version2.2/btn_sy_zc.png


BIN
images/Version2.2/btn_wd_jfdh.png


BIN
images/Version2.2/btn_wd_xz.png


BIN
images/Version2.2/btn_wd_zc.png


BIN
images/Version2.2/btn_xx_xz.png


BIN
images/Version2.2/btn_xx_zc.png


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


BIN
images/Version2.2/icon_aqbj.png


BIN
images/Version2.2/icon_aqbj_sj.png


BIN
images/Version2.2/icon_aqjc_czwt.png


BIN
images/Version2.2/icon_aqjc_gd.png


BIN
images/Version2.2/icon_aqjc_sm.png


BIN
images/Version2.2/icon_aqjc_sq.png


BIN
images/Version2.2/icon_aqjc_sq_two.png


BIN
images/Version2.2/icon_aqjc_sysxx.png


BIN
images/Version2.2/icon_aqjc_xlan.png


BIN
images/Version2.2/icon_aqjc_yhsl.png


BIN
images/Version2.2/icon_aqjc_zgxx.png


BIN
images/Version2.2/icon_bg_ywc.png


BIN
images/Version2.2/icon_dhli.png


BIN
images/Version2.2/icon_dhlp_dhcg.png


BIN
images/Version2.2/icon_fh.png


BIN
images/Version2.2/icon_jcjl_dh.png


BIN
images/Version2.2/icon_jcjl_xm.png


BIN
images/Version2.2/icon_sy_aqbj.png


BIN
images/Version2.2/icon_sy_aqjc.png


BIN
images/Version2.2/icon_sy_aqxx.png


BIN
images/Version2.2/icon_sy_dz.png


BIN
images/Version2.2/icon_sy_ssp.png


BIN
images/Version2.2/icon_sy_wdsys.png


BIN
images/Version2.2/icon_sy_wdzs.png


BIN
images/Version2.2/icon_sy_wxy.png


BIN
images/Version2.2/icon_sy_zrsq.png


BIN
images/Version2.2/icon_tc_xl.png


BIN
images/Version2.2/icon_wdsys_gd.png


BIN
images/Version2.2/icon_wtj.png


BIN
images/Version2.2/icon_wtzg_sj.png


BIN
images/Version2.2/icon_wtzg_xx.png


BIN
images/Version2.2/icon_xzwt_kzt.png


BIN
images/Version2.2/icon_xzwt_xz.png


BIN
images/Version2.2/icon_zg_rq.png


BIN
images/Version2.2/img_bg_cjcx.png


BIN
images/Version2.2/img_bg_wgjl.png


BIN
images/Version2.2/ing_bg_banner.png


BIN
images/Version2.3/button_2.png


BIN
images/Version2.3/icon_30.png


BIN
images/Version2.3/icon_bj_syspmtcy.png


BIN
images/Version2.3/icon_bj_syspmtcy_jinan.png


BIN
images/Version2.3/icon_pdf.png


BIN
images/Version2.3/icon_sczl_sc.png


BIN
images/Version2.3/icon_sjt.gif


BIN
images/Version2.3/icon_sy_yjss.png


BIN
images/Version2.3/icon_word.png


BIN
images/Version2.3/icon_yjt.gif


BIN
images/Version2.3/icon_yjt.png


BIN
images/Version2.3/icon_zjt.gif


BIN
images/Version2.3/icon_zjt.png


BIN
images/Version2.3/img_zrsq_bg.png


BIN
images/Version3.0/icon_glpt_dbqd.png


BIN
images/Version3.0/icon_glpt_gqhsjl.png


BIN
images/Version3.0/icon_gysqpgl_xzqp.png


BIN
images/Version3.0/icon_qpgl_qp.png


BIN
images/Version3.0/icon_qpgl_syl.png


BIN
images/Version3.0/icon_sqqp_sqys.png


BIN
images/Version3.0/icon_sqxq_jsyy.png


BIN
images/Version3.0/icon_ssdl_qh.png


BIN
images/Version3.0/icon_sy_aqxx.png


BIN
images/Version3.0/icon_sy_hxp.png


BIN
images/Version3.0/icon_sy_qpgl.png


BIN
images/Version3.0/icon_sy_ssp.png


BIN
images/Version3.0/icon_sy_tzsb.png


BIN
images/Version3.0/icon_sydj_sqyqzg.png


BIN
images/Version3.0/icon_sydj_yubz.png


BIN
images/Version3.0/icon_xgzl_shz.png


BIN
images/Version3.0/icon_yqsq_sys.png


BIN
images/Version3.0/icon_ysclgl_cl.png


BIN
images/Version3.0/icon_ysry_ry.png


BIN
images/Version3.0/icon_zc_sc.png


BIN
images/Version3.0/icon_zc_scbg.png


BIN
images/Version3.0/icon_zgsh_sysmph.png


BIN
images/Version3.0/icon_zgsq_dhh.png


BIN
images/Version3.0/icon_zgsq_j.png


BIN
images/Version3.0/icon_zgsq_jian.png


BIN
images/Version3.0/icon_zgsq_sqr.png


BIN
images/Version3.0/img_gysglpt_bg.png


BIN
images/Version3.0/img_gysglpt_icom.png


BIN
images/Version3.0/img_sydj_sltp.png


BIN
images/Version3.0/img_xgzl_zgty.png


BIN
images/Version3.0/img_ysrygl_zwsj.png


BIN
images/Version3.0/img_zc_zccg.png


BIN
images/evacuation3_2/icon_aqtd_m.png


BIN
images/evacuation3_2/icon_shang_hs.png


BIN
images/evacuation3_2/icon_sjt.png


BIN
images/evacuation3_2/icon_sysbjt_m.png


+ 0 - 0
images/evacuation3_2/icon_xia_hs.png


Some files were not shown because too many files changed in this diff