dedsudiyu il y a 1 an
Parent
commit
bed7e66b26
100 fichiers modifiés avec 150 ajouts et 150 suppressions
  1. 0 0
      src/api/integratedManagement/index.js
  2. 0 0
      src/assets/ZDimages/integratedManagement/guangqi.png
  3. 0 0
      src/assets/ZDimages/integratedManagement/icon_24.png
  4. 0 0
      src/assets/ZDimages/integratedManagement/icon_25.png
  5. 0 0
      src/assets/ZDimages/integratedManagement/icon_30.png
  6. 0 0
      src/assets/ZDimages/integratedManagement/icon_aqtd_m.png
  7. 0 0
      src/assets/ZDimages/integratedManagement/icon_aqxxp_dxaq.png
  8. 0 0
      src/assets/ZDimages/integratedManagement/icon_aqxxp_gbmc.png
  9. 0 0
      src/assets/ZDimages/integratedManagement/icon_aqxxp_gbsd.png
  10. 0 0
      src/assets/ZDimages/integratedManagement/icon_aqxxp_gzf.png
  11. 0 0
      src/assets/ZDimages/integratedManagement/icon_aqxxp_jzxy.png
  12. 0 0
      src/assets/ZDimages/integratedManagement/icon_aqxxp_jzys.png
  13. 0 0
      src/assets/ZDimages/integratedManagement/icon_bj_dqy.png
  14. 0 0
      src/assets/ZDimages/integratedManagement/icon_bj_eyht.png
  15. 0 0
      src/assets/ZDimages/integratedManagement/icon_bj_jwnd.png
  16. 0 0
      src/assets/ZDimages/integratedManagement/icon_bj_qq.png
  17. 0 0
      src/assets/ZDimages/integratedManagement/icon_bj_sd.png
  18. 0 0
      src/assets/ZDimages/integratedManagement/icon_bj_wd.png
  19. 0 0
      src/assets/ZDimages/integratedManagement/icon_bj_yg.png
  20. 0 0
      src/assets/ZDimages/integratedManagement/icon_bj_yyhd.png
  21. 0 0
      src/assets/ZDimages/integratedManagement/icon_bjgl_fj.png
  22. 0 0
      src/assets/ZDimages/integratedManagement/icon_bjgl_gd.png
  23. 0 0
      src/assets/ZDimages/integratedManagement/icon_bjgl_jt.png
  24. 0 0
      src/assets/ZDimages/integratedManagement/icon_bjgl_lcs.png
  25. 0 0
      src/assets/ZDimages/integratedManagement/icon_bjgl_td.png
  26. 0 0
      src/assets/ZDimages/integratedManagement/icon_bjgl_xjt.png
  27. 0 0
      src/assets/ZDimages/integratedManagement/icon_bjgl_zk.png
  28. 0 0
      src/assets/ZDimages/integratedManagement/icon_bjt_ssd.png
  29. 0 0
      src/assets/ZDimages/integratedManagement/icon_dr_sj.png
  30. 0 0
      src/assets/ZDimages/integratedManagement/icon_dr_wj.png
  31. 0 0
      src/assets/ZDimages/integratedManagement/icon_fxyj_wszys.png
  32. 0 0
      src/assets/ZDimages/integratedManagement/icon_jzggl_xljt.png
  33. 0 0
      src/assets/ZDimages/integratedManagement/icon_jzgxx_b_xz.png
  34. 0 0
      src/assets/ZDimages/integratedManagement/icon_jzgxx_bj.png
  35. 0 0
      src/assets/ZDimages/integratedManagement/icon_jzgxx_dr.png
  36. 0 0
      src/assets/ZDimages/integratedManagement/icon_jzgxx_sc.png
  37. 0 0
      src/assets/ZDimages/integratedManagement/icon_jzgxx_shanchu.png
  38. 0 0
      src/assets/ZDimages/integratedManagement/icon_jzgxx_shanchu_xz.png
  39. 0 0
      src/assets/ZDimages/integratedManagement/icon_jzgxx_tj.png
  40. 0 0
      src/assets/ZDimages/integratedManagement/icon_jzgxx_tj_xz.png
  41. 0 0
      src/assets/ZDimages/integratedManagement/icon_jzgxx_xs.png
  42. 0 0
      src/assets/ZDimages/integratedManagement/icon_jzgxx_xs_xz.png
  43. 0 0
      src/assets/ZDimages/integratedManagement/icon_jzgxx_xx.png
  44. 0 0
      src/assets/ZDimages/integratedManagement/icon_jzgxx_xx_xz.png
  45. 0 0
      src/assets/ZDimages/integratedManagement/icon_jzgxx_xzxjbm.png
  46. 0 0
      src/assets/ZDimages/integratedManagement/icon_jzgxx_xzxjbm_xz.png
  47. 0 0
      src/assets/ZDimages/integratedManagement/icon_shang_hs.png
  48. 0 0
      src/assets/ZDimages/integratedManagement/icon_sjt.png
  49. 0 0
      src/assets/ZDimages/integratedManagement/icon_sy_dqy.png
  50. 0 0
      src/assets/ZDimages/integratedManagement/icon_sy_mcnd.png
  51. 0 0
      src/assets/ZDimages/integratedManagement/icon_sy_yqnd.png
  52. 0 0
      src/assets/ZDimages/integratedManagement/icon_sysbjt_m.png
  53. 0 0
      src/assets/ZDimages/integratedManagement/icon_syspz_hwcw.png
  54. 0 0
      src/assets/ZDimages/integratedManagement/icon_syspz_jiaquan.png
  55. 0 0
      src/assets/ZDimages/integratedManagement/icon_syspz_tvoc.png
  56. 0 0
      src/assets/ZDimages/integratedManagement/icon_syspz_voc.png
  57. 0 0
      src/assets/ZDimages/integratedManagement/icon_wsctp.png
  58. 0 0
      src/assets/ZDimages/integratedManagement/icon_xia_hs.png
  59. 0 0
      src/assets/ZDimages/integratedManagement/icon_xjt.png
  60. 0 0
      src/assets/ZDimages/integratedManagement/icon_xxpz_aqxxlm.png
  61. 0 0
      src/assets/ZDimages/integratedManagement/icon_yjtd.png
  62. 0 0
      src/assets/ZDimages/integratedManagement/icon_you_hs.png
  63. 0 0
      src/assets/ZDimages/integratedManagement/icon_yuo.png
  64. 0 0
      src/assets/ZDimages/integratedManagement/icon_znmj_lx.png
  65. 0 0
      src/assets/ZDimages/integratedManagement/icon_znmj_zx.png
  66. 0 0
      src/assets/ZDimages/integratedManagement/icon_zou_hs.png
  67. 0 0
      src/assets/ZDimages/integratedManagement/icon_zuo.png
  68. 0 0
      src/assets/ZDimages/integratedManagement/img_syslb_znsgbjzx.png
  69. 0 0
      src/assets/ZDimages/integratedManagement/img_xgbj_ch.png
  70. 0 0
      src/assets/ZDimages/integratedManagement/img_xgbj_fj.png
  71. 0 0
      src/assets/ZDimages/integratedManagement/img_xgbj_fjm.png
  72. 0 0
      src/assets/ZDimages/integratedManagement/img_xgbj_gd.png
  73. 0 0
      src/assets/ZDimages/integratedManagement/img_xgbj_syl.png
  74. 0 0
      src/assets/ZDimages/integratedManagement/img_xgbj_yjck.png
  75. 0 0
      src/assets/ZDimages/integratedManagement/img_znwl_jt.png
  76. 0 0
      src/assets/ZDimages/integratedManagement/img_znwl_jtt.png
  77. 0 0
      src/assets/ZDimages/integratedManagement/lvqi.png
  78. 0 0
      src/assets/ZDimages/integratedManagement/romm_1.png
  79. 0 0
      src/assets/ZDimages/integratedManagement/romm_2.png
  80. 0 0
      src/assets/ZDimages/integratedManagement/romm_3.png
  81. 2 2
      src/store/modules/permission.js
  82. 8 8
      src/views/laboratoryManagement/buildingManagement/index.vue
  83. 1 1
      src/views/laboratoryManagement/classifiedGrading/classified.vue
  84. 1 1
      src/views/laboratoryManagement/classifiedGrading/classtype.vue
  85. 0 0
      src/views/integratedManagement/laboratoryManagement/classifiedGrading/index.vue
  86. 1 1
      src/views/laboratoryManagement/classifiedGrading/subjectClass.vue
  87. 44 44
      src/views/laboratoryManagement/layoutManagement/buildingDetails.vue
  88. 8 8
      src/views/laboratoryManagement/layoutManagement/buildingManagement.vue
  89. 48 48
      src/views/laboratoryManagement/layoutManagement/index.vue
  90. 0 0
      src/views/integratedManagement/laboratoryManagement/safetyInfoCategory/index.vue
  91. 1 1
      src/views/laboratoryManagement/safetyInfoCategory/infoConfig.vue
  92. 1 1
      src/views/laboratoryManagement/safetyInfoCategory/safetyInfoCategory.vue
  93. 2 2
      src/views/laboratoryManagement/safetyInfoCategory/safetyInfoConfig.vue
  94. 1 1
      src/views/laboratoryManagement/subject/addSubject.vue
  95. 1 1
      src/views/laboratoryManagement/subject/admissionConfiguration.vue
  96. 0 0
      src/views/integratedManagement/laboratoryManagement/subject/associationConfiguration.vue
  97. 1 1
      src/views/laboratoryManagement/subject/deviceList.vue
  98. 30 30
      src/views/laboratoryManagement/subject/index.vue
  99. 0 0
      src/views/integratedManagement/laboratoryManagement/subject/infoPage.vue
  100. 0 0
      src/views/laboratoryManagement/subject/video.vue

src/api/laboratoryManagement/index.js → src/api/integratedManagement/index.js


src/assets/ZDimages/laboratoryManagement/guangqi.png → src/assets/ZDimages/integratedManagement/guangqi.png


src/assets/ZDimages/laboratoryManagement/icon_24.png → src/assets/ZDimages/integratedManagement/icon_24.png


src/assets/ZDimages/laboratoryManagement/icon_25.png → src/assets/ZDimages/integratedManagement/icon_25.png


src/assets/ZDimages/laboratoryManagement/icon_30.png → src/assets/ZDimages/integratedManagement/icon_30.png


src/assets/ZDimages/laboratoryManagement/icon_aqtd_m.png → src/assets/ZDimages/integratedManagement/icon_aqtd_m.png


src/assets/ZDimages/laboratoryManagement/icon_aqxxp_dxaq.png → src/assets/ZDimages/integratedManagement/icon_aqxxp_dxaq.png


src/assets/ZDimages/laboratoryManagement/icon_aqxxp_gbmc.png → src/assets/ZDimages/integratedManagement/icon_aqxxp_gbmc.png


src/assets/ZDimages/laboratoryManagement/icon_aqxxp_gbsd.png → src/assets/ZDimages/integratedManagement/icon_aqxxp_gbsd.png


src/assets/ZDimages/laboratoryManagement/icon_aqxxp_gzf.png → src/assets/ZDimages/integratedManagement/icon_aqxxp_gzf.png


src/assets/ZDimages/laboratoryManagement/icon_aqxxp_jzxy.png → src/assets/ZDimages/integratedManagement/icon_aqxxp_jzxy.png


src/assets/ZDimages/laboratoryManagement/icon_aqxxp_jzys.png → src/assets/ZDimages/integratedManagement/icon_aqxxp_jzys.png


src/assets/ZDimages/laboratoryManagement/icon_bj_dqy.png → src/assets/ZDimages/integratedManagement/icon_bj_dqy.png


src/assets/ZDimages/laboratoryManagement/icon_bj_eyht.png → src/assets/ZDimages/integratedManagement/icon_bj_eyht.png


src/assets/ZDimages/laboratoryManagement/icon_bj_jwnd.png → src/assets/ZDimages/integratedManagement/icon_bj_jwnd.png


src/assets/ZDimages/laboratoryManagement/icon_bj_qq.png → src/assets/ZDimages/integratedManagement/icon_bj_qq.png


src/assets/ZDimages/laboratoryManagement/icon_bj_sd.png → src/assets/ZDimages/integratedManagement/icon_bj_sd.png


src/assets/ZDimages/laboratoryManagement/icon_bj_wd.png → src/assets/ZDimages/integratedManagement/icon_bj_wd.png


src/assets/ZDimages/laboratoryManagement/icon_bj_yg.png → src/assets/ZDimages/integratedManagement/icon_bj_yg.png


src/assets/ZDimages/laboratoryManagement/icon_bj_yyhd.png → src/assets/ZDimages/integratedManagement/icon_bj_yyhd.png


src/assets/ZDimages/laboratoryManagement/icon_bjgl_fj.png → src/assets/ZDimages/integratedManagement/icon_bjgl_fj.png


src/assets/ZDimages/laboratoryManagement/icon_bjgl_gd.png → src/assets/ZDimages/integratedManagement/icon_bjgl_gd.png


src/assets/ZDimages/laboratoryManagement/icon_bjgl_jt.png → src/assets/ZDimages/integratedManagement/icon_bjgl_jt.png


src/assets/ZDimages/laboratoryManagement/icon_bjgl_lcs.png → src/assets/ZDimages/integratedManagement/icon_bjgl_lcs.png


src/assets/ZDimages/laboratoryManagement/icon_bjgl_td.png → src/assets/ZDimages/integratedManagement/icon_bjgl_td.png


src/assets/ZDimages/laboratoryManagement/icon_bjgl_xjt.png → src/assets/ZDimages/integratedManagement/icon_bjgl_xjt.png


src/assets/ZDimages/laboratoryManagement/icon_bjgl_zk.png → src/assets/ZDimages/integratedManagement/icon_bjgl_zk.png


src/assets/ZDimages/laboratoryManagement/icon_bjt_ssd.png → src/assets/ZDimages/integratedManagement/icon_bjt_ssd.png


src/assets/ZDimages/laboratoryManagement/icon_dr_sj.png → src/assets/ZDimages/integratedManagement/icon_dr_sj.png


src/assets/ZDimages/laboratoryManagement/icon_dr_wj.png → src/assets/ZDimages/integratedManagement/icon_dr_wj.png


src/assets/ZDimages/laboratoryManagement/icon_fxyj_wszys.png → src/assets/ZDimages/integratedManagement/icon_fxyj_wszys.png


src/assets/ZDimages/laboratoryManagement/icon_jzggl_xljt.png → src/assets/ZDimages/integratedManagement/icon_jzggl_xljt.png


src/assets/ZDimages/laboratoryManagement/icon_jzgxx_b_xz.png → src/assets/ZDimages/integratedManagement/icon_jzgxx_b_xz.png


src/assets/ZDimages/laboratoryManagement/icon_jzgxx_bj.png → src/assets/ZDimages/integratedManagement/icon_jzgxx_bj.png


src/assets/ZDimages/laboratoryManagement/icon_jzgxx_dr.png → src/assets/ZDimages/integratedManagement/icon_jzgxx_dr.png


src/assets/ZDimages/laboratoryManagement/icon_jzgxx_sc.png → src/assets/ZDimages/integratedManagement/icon_jzgxx_sc.png


src/assets/ZDimages/laboratoryManagement/icon_jzgxx_shanchu.png → src/assets/ZDimages/integratedManagement/icon_jzgxx_shanchu.png


src/assets/ZDimages/laboratoryManagement/icon_jzgxx_shanchu_xz.png → src/assets/ZDimages/integratedManagement/icon_jzgxx_shanchu_xz.png


src/assets/ZDimages/laboratoryManagement/icon_jzgxx_tj.png → src/assets/ZDimages/integratedManagement/icon_jzgxx_tj.png


src/assets/ZDimages/laboratoryManagement/icon_jzgxx_tj_xz.png → src/assets/ZDimages/integratedManagement/icon_jzgxx_tj_xz.png


src/assets/ZDimages/laboratoryManagement/icon_jzgxx_xs.png → src/assets/ZDimages/integratedManagement/icon_jzgxx_xs.png


src/assets/ZDimages/laboratoryManagement/icon_jzgxx_xs_xz.png → src/assets/ZDimages/integratedManagement/icon_jzgxx_xs_xz.png


src/assets/ZDimages/laboratoryManagement/icon_jzgxx_xx.png → src/assets/ZDimages/integratedManagement/icon_jzgxx_xx.png


src/assets/ZDimages/laboratoryManagement/icon_jzgxx_xx_xz.png → src/assets/ZDimages/integratedManagement/icon_jzgxx_xx_xz.png


src/assets/ZDimages/laboratoryManagement/icon_jzgxx_xzxjbm.png → src/assets/ZDimages/integratedManagement/icon_jzgxx_xzxjbm.png


src/assets/ZDimages/laboratoryManagement/icon_jzgxx_xzxjbm_xz.png → src/assets/ZDimages/integratedManagement/icon_jzgxx_xzxjbm_xz.png


src/assets/ZDimages/laboratoryManagement/icon_shang_hs.png → src/assets/ZDimages/integratedManagement/icon_shang_hs.png


src/assets/ZDimages/laboratoryManagement/icon_sjt.png → src/assets/ZDimages/integratedManagement/icon_sjt.png


src/assets/ZDimages/laboratoryManagement/icon_sy_dqy.png → src/assets/ZDimages/integratedManagement/icon_sy_dqy.png


src/assets/ZDimages/laboratoryManagement/icon_sy_mcnd.png → src/assets/ZDimages/integratedManagement/icon_sy_mcnd.png


src/assets/ZDimages/laboratoryManagement/icon_sy_yqnd.png → src/assets/ZDimages/integratedManagement/icon_sy_yqnd.png


src/assets/ZDimages/laboratoryManagement/icon_sysbjt_m.png → src/assets/ZDimages/integratedManagement/icon_sysbjt_m.png


src/assets/ZDimages/laboratoryManagement/icon_syspz_hwcw.png → src/assets/ZDimages/integratedManagement/icon_syspz_hwcw.png


src/assets/ZDimages/laboratoryManagement/icon_syspz_jiaquan.png → src/assets/ZDimages/integratedManagement/icon_syspz_jiaquan.png


src/assets/ZDimages/laboratoryManagement/icon_syspz_tvoc.png → src/assets/ZDimages/integratedManagement/icon_syspz_tvoc.png


src/assets/ZDimages/laboratoryManagement/icon_syspz_voc.png → src/assets/ZDimages/integratedManagement/icon_syspz_voc.png


src/assets/ZDimages/laboratoryManagement/icon_wsctp.png → src/assets/ZDimages/integratedManagement/icon_wsctp.png


src/assets/ZDimages/laboratoryManagement/icon_xia_hs.png → src/assets/ZDimages/integratedManagement/icon_xia_hs.png


src/assets/ZDimages/laboratoryManagement/icon_xjt.png → src/assets/ZDimages/integratedManagement/icon_xjt.png


src/assets/ZDimages/laboratoryManagement/icon_xxpz_aqxxlm.png → src/assets/ZDimages/integratedManagement/icon_xxpz_aqxxlm.png


src/assets/ZDimages/laboratoryManagement/icon_yjtd.png → src/assets/ZDimages/integratedManagement/icon_yjtd.png


src/assets/ZDimages/laboratoryManagement/icon_you_hs.png → src/assets/ZDimages/integratedManagement/icon_you_hs.png


src/assets/ZDimages/laboratoryManagement/icon_yuo.png → src/assets/ZDimages/integratedManagement/icon_yuo.png


src/assets/ZDimages/laboratoryManagement/icon_znmj_lx.png → src/assets/ZDimages/integratedManagement/icon_znmj_lx.png


src/assets/ZDimages/laboratoryManagement/icon_znmj_zx.png → src/assets/ZDimages/integratedManagement/icon_znmj_zx.png


src/assets/ZDimages/laboratoryManagement/icon_zou_hs.png → src/assets/ZDimages/integratedManagement/icon_zou_hs.png


src/assets/ZDimages/laboratoryManagement/icon_zuo.png → src/assets/ZDimages/integratedManagement/icon_zuo.png


src/assets/ZDimages/laboratoryManagement/img_syslb_znsgbjzx.png → src/assets/ZDimages/integratedManagement/img_syslb_znsgbjzx.png


src/assets/ZDimages/laboratoryManagement/img_xgbj_ch.png → src/assets/ZDimages/integratedManagement/img_xgbj_ch.png


src/assets/ZDimages/laboratoryManagement/img_xgbj_fj.png → src/assets/ZDimages/integratedManagement/img_xgbj_fj.png


src/assets/ZDimages/laboratoryManagement/img_xgbj_fjm.png → src/assets/ZDimages/integratedManagement/img_xgbj_fjm.png


src/assets/ZDimages/laboratoryManagement/img_xgbj_gd.png → src/assets/ZDimages/integratedManagement/img_xgbj_gd.png


src/assets/ZDimages/laboratoryManagement/img_xgbj_syl.png → src/assets/ZDimages/integratedManagement/img_xgbj_syl.png


src/assets/ZDimages/laboratoryManagement/img_xgbj_yjck.png → src/assets/ZDimages/integratedManagement/img_xgbj_yjck.png


src/assets/ZDimages/laboratoryManagement/img_znwl_jt.png → src/assets/ZDimages/integratedManagement/img_znwl_jt.png


src/assets/ZDimages/laboratoryManagement/img_znwl_jtt.png → src/assets/ZDimages/integratedManagement/img_znwl_jtt.png


src/assets/ZDimages/laboratoryManagement/lvqi.png → src/assets/ZDimages/integratedManagement/lvqi.png


src/assets/ZDimages/laboratoryManagement/romm_1.png → src/assets/ZDimages/integratedManagement/romm_1.png


src/assets/ZDimages/laboratoryManagement/romm_2.png → src/assets/ZDimages/integratedManagement/romm_2.png


src/assets/ZDimages/laboratoryManagement/romm_3.png → src/assets/ZDimages/integratedManagement/romm_3.png


+ 2 - 2
src/store/modules/permission.js

@@ -221,9 +221,9 @@ export const loadView = (view) => { // 路由懒加载
   }else if(pathName === 'systemManagement'){
     //系统管理
     return (resolve) => require([`@/views/systemManagement${pathUrl}`], resolve)
-  }else if(pathName === 'laboratoryManagement'){
+  }else if(pathName === 'integratedManagement'){
     //综合管理
-    return (resolve) => require([`@/views/laboratoryManagement${pathUrl}`], resolve)
+    return (resolve) => require([`@/views/integratedManagement${pathUrl}`], resolve)
   }else if(pathName === 'iotDevice'){
     //物联控制
     return (resolve) => require([`@/views/iotDevice${pathUrl}`], resolve)

+ 8 - 8
src/views/laboratoryManagement/buildingManagement/index.vue

@@ -9,7 +9,7 @@
             <p class="max-name" :class="checkTreeId==item.id?'check-color':''" @click="clickCheckTree(item,1)">
               {{item.name}}</p>
             <el-dropdown @command="(command)=>handleCommand(command,item)" trigger="click">
-              <img src="@/assets/ZDimages/laboratoryManagement/icon_bjgl_gd.png"
+              <img src="@/assets/ZDimages/integratedManagement/icon_bjgl_gd.png"
                    style="cursor:pointer;width:16px;height:4px;margin-top:7px;">
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item command="1">编辑</el-dropdown-item>
@@ -21,9 +21,9 @@
             <div class="big-name-box">
               <p v-if="!itemOne.buildFloorVoList[0]" style="width:16px;"></p>
               <img v-if="!itemOne.onType&&itemOne.buildFloorVoList[0]"
-                   src="@/assets/ZDimages/laboratoryManagement/icon_bjgl_jt.png" @click="terrClick(itemOne)">
+                   src="@/assets/ZDimages/integratedManagement/icon_bjgl_jt.png" @click="terrClick(itemOne)">
               <img v-if="itemOne.onType&&itemOne.buildFloorVoList[0]"
-                   src="@/assets/ZDimages/laboratoryManagement/icon_bjgl_xjt.png" @click="terrClick(itemOne)">
+                   src="@/assets/ZDimages/integratedManagement/icon_bjgl_xjt.png" @click="terrClick(itemOne)">
               <p class="name-p" :class="checkTreeId==itemOne.id?'check-color':''" @click="clickCheckTree(itemOne,2)">
                 {{itemOne.name}}</p>
             </div>
@@ -49,17 +49,17 @@
                @dragover.prevent="dragoverPrevent(item)">
             <div class="for-big-box">
               <div class="for-big-box-left">
-                <img src="@/assets/ZDimages/laboratoryManagement/icon_bjgl_td.png" class="for-img-one"
+                <img src="@/assets/ZDimages/integratedManagement/icon_bjgl_td.png" class="for-img-one"
                      draggable="true"
                      @dragstart="dragstartPlay($event)"
                      @dragend="dragEnterOver($event, item)">
                 <p class="for-text-one">{{item.name}}</p>
-                <img src="@/assets/ZDimages/laboratoryManagement/icon_bjgl_lcs.png" class="for-img-two">
+                <img src="@/assets/ZDimages/integratedManagement/icon_bjgl_lcs.png" class="for-img-two">
                 <div class="for-text-box-one">
                   <p>{{item.floorNum}}</p>
                   <p>楼层数</p>
                 </div>
-                <img src="@/assets/ZDimages/laboratoryManagement/icon_bjgl_fj.png" class="for-img-three">
+                <img src="@/assets/ZDimages/integratedManagement/icon_bjgl_fj.png" class="for-img-three">
                 <div class="for-text-box-two">
                   <p>{{item.roomNum}}</p>
                   <p>房间数</p>
@@ -93,7 +93,7 @@
                @dragover.prevent="dragoverPrevent(item)">
             <div class="for-big-box">
               <div class="for-big-box-left">
-                <img src="@/assets/ZDimages/laboratoryManagement/icon_bjgl_td.png" class="for-img-one"
+                <img src="@/assets/ZDimages/integratedManagement/icon_bjgl_td.png" class="for-img-one"
                      draggable="true"
                      @dragstart="dragstartPlay($event)"
                      @dragend="dragEnterOver($event, item)">
@@ -245,7 +245,7 @@
   import { systemBuildingGetTreeAdd,systemBuildingGetUpdate,
     systemBuildingGetList,systemBuildingEditSortNum,systemBuildingEditDelete,
     systemRoomInfoList,systemRoomInfoAdd,systemRoomInfoUpdate,
-    systemRoomInfoDelete,systemRoomInfoDetail} from "@/api/laboratoryManagement/index";
+    systemRoomInfoDelete,systemRoomInfoDetail} from "@/api/integratedManagement/index";
   export default {
     name: 'index',
     data(){

+ 1 - 1
src/views/laboratoryManagement/classifiedGrading/classified.vue

@@ -84,7 +84,7 @@
         laboratoryClassLevelDetail,
         laboratoryClassLevelList,
         laboratoryClassLevelUpdate
-    } from "@/api/laboratoryManagement/index";
+    } from "@/api/integratedManagement/index";
 
     export default {
   name: "Classified",

+ 1 - 1
src/views/laboratoryManagement/classifiedGrading/classtype.vue

@@ -78,7 +78,7 @@
     laboratoryClassTypeDelete,
     laboratoryClassTypeAdd,
     laboratoryClassTypeUpdate
-  } from "@/api/laboratoryManagement/index";
+  } from "@/api/integratedManagement/index";
 
 export default {
   name: "Classtype",

src/views/laboratoryManagement/classifiedGrading/index.vue → src/views/integratedManagement/laboratoryManagement/classifiedGrading/index.vue


+ 1 - 1
src/views/laboratoryManagement/classifiedGrading/subjectClass.vue

@@ -71,7 +71,7 @@
       laboratoryClassMoldUpdate,
       laboratoryClassMoldDelete,
       laboratoryClassMoldDetail
-    } from "@/api/laboratoryManagement/index";
+    } from "@/api/integratedManagement/index";
     export default {
       name: "subjectClass",
       data() {

+ 44 - 44
src/views/laboratoryManagement/layoutManagement/buildingDetails.vue

@@ -4,7 +4,7 @@
       <div class="max-left-box">
         <div class="max-left-box-one" v-if="!mapSrc">
           <div class="max-button-big-position-box">
-            <img src="@/assets/ZDimages/laboratoryManagement/img_xgbj_syl.png">
+            <img src="@/assets/ZDimages/integratedManagement/img_xgbj_syl.png">
             <el-upload
               class="up-img-button-box"
               style="height:40px;width:300px;"
@@ -234,7 +234,7 @@
     <!--引导遮罩层-->
     <div class="shade-max-big-box" v-if="shadeBoxType != 0">
       <div v-if="shadeBoxType == 1" class="shade-max-box-1">
-        <img class="shade-big-img" src="@/assets/ZDimages/laboratoryManagement/img_znwl_jt.png">
+        <img class="shade-big-img" src="@/assets/ZDimages/integratedManagement/img_znwl_jt.png">
         <p class="shade-big-1-text-1">更换图纸</p>
         <div class="shade-big-1-text-2">
           <p>-</p>
@@ -246,17 +246,17 @@
         <p class="shade-big-1-text-5" @click="shadeClick(2)">下一步</p>
       </div>
       <div v-if="shadeBoxType == 2" class="shade-max-box-2">
-        <img class="shade-big-img" src="@/assets/ZDimages/laboratoryManagement/img_znwl_jt.png">
+        <img class="shade-big-img" src="@/assets/ZDimages/integratedManagement/img_znwl_jt.png">
         <div class="shade-big-1-text-1">
-          <img src="@/assets/ZDimages/laboratoryManagement/img_xgbj_gd.png">
+          <img src="@/assets/ZDimages/integratedManagement/img_xgbj_gd.png">
           <p>楼道</p>
         </div>
         <div class="shade-big-1-text-2">
-          <img src="@/assets/ZDimages/laboratoryManagement/img_xgbj_yjck.png">
+          <img src="@/assets/ZDimages/integratedManagement/img_xgbj_yjck.png">
           <p>应急出口</p>
         </div>
         <div class="shade-big-1-text-3">
-          <img src="@/assets/ZDimages/laboratoryManagement/img_xgbj_fj.png">
+          <img src="@/assets/ZDimages/integratedManagement/img_xgbj_fj.png">
           <p>房间</p>
         </div>
         <p class="shade-big-1-text-4">楼道绘制方法为点击拖拽至绘制区域,鼠标左键选中楼道可以调整楼道的位置和尺寸。楼道支持与其他楼道衔接,衔接办法为选择矩形楼道中线上的点位与另外一个矩形过的中线进行结合即可。</p>
@@ -265,16 +265,16 @@
         <p class="shade-big-1-text-7" @click="shadeClick(3)">下一步</p>
       </div>
       <div v-if="shadeBoxType == 3" class="shade-max-box-3">
-        <img class="shade-big-img" src="@/assets/ZDimages/laboratoryManagement/img_znwl_jtt.png">
+        <img class="shade-big-img" src="@/assets/ZDimages/integratedManagement/img_znwl_jtt.png">
         <p class="shade-big-1-text-1">房门为固定尺寸,点击拖拽至绘制区域的房间内即可。</p>
         <p class="shade-big-1-text-2">疏散灯需要拖拽至绘制区域的走道中,请您确认疏散灯位置尽可能与实际安装位置一致。</p>
         <p class="shade-big-1-text-3" @click="shadeClick(4)">下一步</p>
         <div class="shade-big-1-text-4">
-          <img src="@/assets/ZDimages/laboratoryManagement/img_xgbj_fj.png">
+          <img src="@/assets/ZDimages/integratedManagement/img_xgbj_fj.png">
           <p>房间</p>
         </div>
         <div class="shade-big-1-text-5">
-          <img src="@/assets/ZDimages/laboratoryManagement/img_xgbj_fj.png">
+          <img src="@/assets/ZDimages/integratedManagement/img_xgbj_fj.png">
           <p>房间</p>
         </div>
       </div>
@@ -297,7 +297,7 @@
     fourEdgeZoom,setJsData,checkInstall} from "@/utils/evacuationLayout";
   import { subjectList,lineVertex} from "@/apiDemo/evacuation3_2/index";
   //V3
-  import { laboratoryBuildLayoutGetList,laboratoryExitLineAdd } from "@/api/laboratoryManagement/index";
+  import { laboratoryBuildLayoutGetList,laboratoryExitLineAdd } from "@/api/integratedManagement/index";
 
   export default {
     name: "builDingDetails",
@@ -357,17 +357,17 @@
           {
             name:"楼道",
             type: '2',
-            url:require('@/assets/ZDimages/laboratoryManagement/img_xgbj_gd.png'),
+            url:require('@/assets/ZDimages/integratedManagement/img_xgbj_gd.png'),
           },
           {
             name:"应急出口",
             type: '3',
-            url:require('@/assets/ZDimages/laboratoryManagement/img_xgbj_yjck.png'),
+            url:require('@/assets/ZDimages/integratedManagement/img_xgbj_yjck.png'),
           },
           {
             name:"房间",
             type: '1',
-            url:require('@/assets/ZDimages/laboratoryManagement/img_xgbj_fj.png'),
+            url:require('@/assets/ZDimages/integratedManagement/img_xgbj_fj.png'),
           },
         ],
         // 房间内配件列表 //4.房间 6.疏散灯
@@ -375,12 +375,12 @@
           {
             name:"房门",
             type: '4',
-            url:require('@/assets/ZDimages/laboratoryManagement/img_xgbj_fjm.png'),
+            url:require('@/assets/ZDimages/integratedManagement/img_xgbj_fjm.png'),
           },
           {
             name:"疏散灯",
             type: '6',
-            url:require('@/assets/ZDimages/laboratoryManagement/icon_bjt_ssd.png'),
+            url:require('@/assets/ZDimages/integratedManagement/icon_bjt_ssd.png'),
           },
         ],
         //************************弹层开关*******************************//
@@ -987,15 +987,15 @@
         let self = this;
         //初始化抓取图样
         this.roomImg_1 = new Image();
-        this.roomImg_1.src = require('@/assets/ZDimages/laboratoryManagement/romm_1.png');
+        this.roomImg_1.src = require('@/assets/ZDimages/integratedManagement/romm_1.png');
         this.roomImg_2 = new Image();
-        this.roomImg_2.src = require('@/assets/ZDimages/laboratoryManagement/romm_2.png');
+        this.roomImg_2.src = require('@/assets/ZDimages/integratedManagement/romm_2.png');
         this.roomImg_3 = new Image();
-        this.roomImg_3.src = require('@/assets/ZDimages/laboratoryManagement/romm_3.png');
+        this.roomImg_3.src = require('@/assets/ZDimages/integratedManagement/romm_3.png');
         this.doorImg = new Image();
-        this.doorImg.src = require('@/assets/ZDimages/laboratoryManagement/icon_sysbjt_m.png');
+        this.doorImg.src = require('@/assets/ZDimages/integratedManagement/icon_sysbjt_m.png');
         this.lightImg = new Image();
-        this.lightImg.src = require('@/assets/ZDimages/laboratoryManagement/icon_fxyj_wszys.png');
+        this.lightImg.src = require('@/assets/ZDimages/integratedManagement/icon_fxyj_wszys.png');
         this.$set(this,'borderLeft', Math.round(this.$refs.maxBigBox.getBoundingClientRect().left));
         this.$set(this,'borderTop', Math.round(this.$refs.maxBigBox.getBoundingClientRect().top));
         let data = {
@@ -1378,23 +1378,23 @@
                 font-weight:500;
               }
               .lightNone{
-                background: url("../../../assets/ZDimages/laboratoryManagement/icon_fxyj_wszys.png");
+                background: url("../../../../assets/ZDimages/integratedManagement/icon_fxyj_wszys.png");
                 background-size: 100%;
               }
               .lightTop{
-                background: url("../../../assets/ZDimages/laboratoryManagement/icon_sjt.png");
+                background: url("../../../../assets/ZDimages/integratedManagement/icon_sjt.png");
                 background-size: 100%;
               }
               .lightBottom{
-                background: url("../../../assets/ZDimages/laboratoryManagement/icon_xjt.png");
+                background: url("../../../../assets/ZDimages/integratedManagement/icon_xjt.png");
                 background-size: 100%;
               }
               .lightLeft{
-                background: url("../../../assets/ZDimages/laboratoryManagement/icon_zuo.png");
+                background: url("../../../../assets/ZDimages/integratedManagement/icon_zuo.png");
                 background-size: 100%;
               }
               .lightRight{
-                background: url("../../../assets/ZDimages/laboratoryManagement/icon_yuo.png");
+                background: url("../../../../assets/ZDimages/integratedManagement/icon_yuo.png");
                 background-size: 100%;
               }
               .colorDoor{
@@ -1481,23 +1481,23 @@
                 font-weight:500;
               }
               .lightNone{
-                background: url("../../../assets/ZDimages/laboratoryManagement/icon_fxyj_wszys.png");
+                background: url("../../../../assets/ZDimages/integratedManagement/icon_fxyj_wszys.png");
                 background-size: 100%;
               }
               .lightTop{
-                background: url("../../../assets/ZDimages/laboratoryManagement/icon_sjt.png");
+                background: url("../../../../assets/ZDimages/integratedManagement/icon_sjt.png");
                 background-size: 100%;
               }
               .lightBottom{
-                background: url("../../../assets/ZDimages/laboratoryManagement/icon_xjt.png");
+                background: url("../../../../assets/ZDimages/integratedManagement/icon_xjt.png");
                 background-size: 100%;
               }
               .lightLeft{
-                background: url("../../../assets/ZDimages/laboratoryManagement/icon_zuo.png");
+                background: url("../../../../assets/ZDimages/integratedManagement/icon_zuo.png");
                 background-size: 100%;
               }
               .lightRight{
-                background: url("../../../assets/ZDimages/laboratoryManagement/icon_yuo.png");
+                background: url("../../../../assets/ZDimages/integratedManagement/icon_yuo.png");
                 background-size: 100%;
               }
               .colorDoor{
@@ -1515,7 +1515,7 @@
               position: absolute;
               display: flex;
               flex-direction: column;
-              background:url("../../../assets/ZDimages/laboratoryManagement/icon_yjtd.png") center center no-repeat #39AE36;
+              background:url("../../../../assets/ZDimages/integratedManagement/icon_yjtd.png") center center no-repeat #39AE36;
               background-size: 60px 60px;
               .top-big-box{
                 display: flex;
@@ -1589,23 +1589,23 @@
                 font-weight:500;
               }
               .lightNone{
-                background: url("../../../assets/ZDimages/laboratoryManagement/icon_fxyj_wszys.png");
+                background: url("../../../../assets/ZDimages/integratedManagement/icon_fxyj_wszys.png");
                 background-size: 100%;
               }
               .lightTop{
-                background: url("../../../assets/ZDimages/laboratoryManagement/icon_sjt.png");
+                background: url("../../../../assets/ZDimages/integratedManagement/icon_sjt.png");
                 background-size: 100%;
               }
               .lightBottom{
-                background: url("../../../assets/ZDimages/laboratoryManagement/icon_xjt.png");
+                background: url("../../../../assets/ZDimages/integratedManagement/icon_xjt.png");
                 background-size: 100%;
               }
               .lightLeft{
-                background: url("../../../assets/ZDimages/laboratoryManagement/icon_zuo.png");
+                background: url("../../../../assets/ZDimages/integratedManagement/icon_zuo.png");
                 background-size: 100%;
               }
               .lightRight{
-                background: url("../../../assets/ZDimages/laboratoryManagement/icon_yuo.png");
+                background: url("../../../../assets/ZDimages/integratedManagement/icon_yuo.png");
                 background-size: 100%;
               }
               .colorDoor{
@@ -1643,40 +1643,40 @@
               }
             }
             .center-move-door-p-t{
-              background: url("../../../assets/ZDimages/laboratoryManagement/icon_sysbjt_m.png")!important;
+              background: url("../../../../assets/ZDimages/integratedManagement/icon_sysbjt_m.png")!important;
               background-size: 100%!important;
               transform: rotate(180deg);
             }
             .center-move-door-p-b{
-              background: url("../../../assets/ZDimages/laboratoryManagement/icon_sysbjt_m.png")!important;
+              background: url("../../../../assets/ZDimages/integratedManagement/icon_sysbjt_m.png")!important;
               background-size: 100%!important;
             }
             .center-move-door-p-l{
-              background: url("../../../assets/ZDimages/laboratoryManagement/icon_sysbjt_m.png")!important;
+              background: url("../../../../assets/ZDimages/integratedManagement/icon_sysbjt_m.png")!important;
               background-size: 100%!important;
               transform: rotate(90deg);
             }
             .center-move-door-p-r{
-              background: url("../../../assets/ZDimages/laboratoryManagement/icon_sysbjt_m.png")!important;
+              background: url("../../../../assets/ZDimages/integratedManagement/icon_sysbjt_m.png")!important;
               background-size: 100%!important;
               transform: rotateZ(270deg);
             }
             .center-move-door-p-t-ss{
-              background: url("../../../assets/ZDimages/laboratoryManagement/icon_aqtd_m.png")!important;
+              background: url("../../../../assets/ZDimages/integratedManagement/icon_aqtd_m.png")!important;
               background-size: 100%!important;
               transform: rotate(180deg);
             }
             .center-move-door-p-b-ss{
-              background: url("../../../assets/ZDimages/laboratoryManagement/icon_aqtd_m.png")!important;
+              background: url("../../../../assets/ZDimages/integratedManagement/icon_aqtd_m.png")!important;
               background-size: 100%!important;
             }
             .center-move-door-p-l-ss{
-              background: url("../../../assets/ZDimages/laboratoryManagement/icon_aqtd_m.png")!important;
+              background: url("../../../../assets/ZDimages/integratedManagement/icon_aqtd_m.png")!important;
               background-size: 100%!important;
               transform: rotate(90deg);
             }
             .center-move-door-p-r-ss{
-              background: url("../../../assets/ZDimages/laboratoryManagement/icon_aqtd_m.png")!important;
+              background: url("../../../../assets/ZDimages/integratedManagement/icon_aqtd_m.png")!important;
               background-size: 100%!important;
               transform: rotateZ(270deg);
             }

+ 8 - 8
src/views/laboratoryManagement/layoutManagement/buildingManagement.vue

@@ -6,7 +6,7 @@
           <div class="max-name-box">
             <p class="max-name" :class="checkTreeId==item.id?'check-color':''" @click="clickCheckTree(item.id,1)">{{item.name}}</p>
             <el-dropdown @command="(command)=>handleCommand(command,item)">
-              <img src="@/assets/ZDimages/laboratoryManagement/icon_bjgl_gd.png" style="cursor:pointer;width:16px;height:4px;margin-top:7px;">
+              <img src="@/assets/ZDimages/integratedManagement/icon_bjgl_gd.png" style="cursor:pointer;width:16px;height:4px;margin-top:7px;">
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item command="1">编辑</el-dropdown-item>
                 <el-dropdown-item command="2">删除</el-dropdown-item>
@@ -15,8 +15,8 @@
           </div>
           <div class="terr-big-box" v-for="(itemOne,indexOne) in item.childList" :key="indexOne">
             <div class="big-name-box">
-              <img v-if="!itemOne.type" src="@/assets/ZDimages/laboratoryManagement/icon_bjgl_jt.png" @click="terrClick(itemOne)">
-              <img v-if="itemOne.type" src="@/assets/ZDimages/laboratoryManagement/icon_bjgl_xjt.png" @click="terrClick(itemOne)">
+              <img v-if="!itemOne.type" src="@/assets/ZDimages/integratedManagement/icon_bjgl_jt.png" @click="terrClick(itemOne)">
+              <img v-if="itemOne.type" src="@/assets/ZDimages/integratedManagement/icon_bjgl_xjt.png" @click="terrClick(itemOne)">
               <p :class="checkTreeId==itemOne.id?'check-color':''" @click="clickCheckTree(itemOne.id,2)">{{itemOne.name}}</p>
             </div>
             <div v-if="itemOne.type" class="terr-min-box" v-for="(itemTwo,indexTwo) in itemOne.childList" :key="indexTwo">
@@ -38,17 +38,17 @@
                @dragover.prevent="dragoverPrevent(item)">
             <div class="for-big-box">
               <div class="for-big-box-left">
-                <img src="@/assets/ZDimages/laboratoryManagement/icon_bjgl_td.png" class="for-img-one"
+                <img src="@/assets/ZDimages/integratedManagement/icon_bjgl_td.png" class="for-img-one"
                      draggable="true"
                      @dragstart="dragstartPlay($event)"
                      @dragend="dragEnterOver($event, item)">
                 <p class="for-text-one">{{item.name}}</p>
-                <img src="@/assets/ZDimages/laboratoryManagement/icon_bjgl_lcs.png" class="for-img-two">
+                <img src="@/assets/ZDimages/integratedManagement/icon_bjgl_lcs.png" class="for-img-two">
                 <div class="for-text-box-one">
                   <p>6</p>
                   <p>楼层数</p>
                 </div>
-                <img src="@/assets/ZDimages/laboratoryManagement/icon_bjgl_fj.png" class="for-img-three">
+                <img src="@/assets/ZDimages/integratedManagement/icon_bjgl_fj.png" class="for-img-three">
                 <div class="for-text-box-two">
                   <p>160</p>
                   <p>房间数</p>
@@ -79,7 +79,7 @@
                @dragover.prevent="dragoverPrevent(item)">
             <div class="for-big-box">
               <div class="for-big-box-left">
-                <img src="@/assets/ZDimages/laboratoryManagement/icon_bjgl_td.png" class="for-img-one"
+                <img src="@/assets/ZDimages/integratedManagement/icon_bjgl_td.png" class="for-img-one"
                      draggable="true"
                      @dragstart="dragstartPlay($event)"
                      @dragend="dragEnterOver($event, item)">
@@ -95,7 +95,7 @@
                   <p @click="handleCommand(9)">删除</p>
                 </div>
                 <div>
-                  <img src="@/assets/ZDimages/laboratoryManagement/icon_bjgl_zk.png">
+                  <img src="@/assets/ZDimages/integratedManagement/icon_bjgl_zk.png">
                   <p @click="floorZK(2,index)">{{item.type?'收起':'展开'}}</p>
                 </div>
               </div>

+ 48 - 48
src/views/laboratoryManagement/layoutManagement/index.vue

@@ -13,9 +13,9 @@
               <div class="big-name-box">
                 <p v-if="!itemOne.buildFloorVoList[0]" style="width:16px;"></p>
                 <img v-if="!itemOne.onType&&itemOne.buildFloorVoList[0]"
-                     src="@/assets/ZDimages/laboratoryManagement/icon_bjgl_jt.png" @click="terrClick(itemOne)">
+                     src="@/assets/ZDimages/integratedManagement/icon_bjgl_jt.png" @click="terrClick(itemOne)">
                 <img v-if="itemOne.onType&&itemOne.buildFloorVoList[0]"
-                     src="@/assets/ZDimages/laboratoryManagement/icon_bjgl_xjt.png" @click="terrClick(itemOne)">
+                     src="@/assets/ZDimages/integratedManagement/icon_bjgl_xjt.png" @click="terrClick(itemOne)">
                 <p class="name-p" :class="checkTreeId==itemOne.id?'check-color':''" @click="clickCheckTree(itemOne,2)">
                   {{itemOne.name}}</p>
               </div>
@@ -39,12 +39,12 @@
               <div class="for-big-box">
                 <div class="for-big-box-left">
                   <p class="for-text-one">{{item.name}}</p>
-                  <img src="@/assets/ZDimages/laboratoryManagement/icon_bjgl_lcs.png" class="for-img-two">
+                  <img src="@/assets/ZDimages/integratedManagement/icon_bjgl_lcs.png" class="for-img-two">
                   <div class="for-text-box-one">
                     <p>{{item.floorNum}}</p>
                     <p>楼层数</p>
                   </div>
-                  <img src="@/assets/ZDimages/laboratoryManagement/icon_bjgl_fj.png" class="for-img-three">
+                  <img src="@/assets/ZDimages/integratedManagement/icon_bjgl_fj.png" class="for-img-three">
                   <div class="for-text-box-two">
                     <p>{{item.roomNum}}</p>
                     <p>房间数</p>
@@ -66,14 +66,14 @@
                 <div class="for-big-box-left">
                   <p class="for-text-one">{{item.name}}</p>
                 </div>
-                <img src="@/assets/ZDimages/laboratoryManagement/icon_bjgl_fj.png" class="for-img-three">
+                <img src="@/assets/ZDimages/integratedManagement/icon_bjgl_fj.png" class="for-img-three">
                 <div class="for-text-box-two" style="margin-right:40px;">
                   <p>{{item.roomNum}}</p>
                   <p>房间数</p>
                 </div>
                 <div class="for-button-min-box">
                   <div @click="floorZK(2,index)">
-                    <img src="@/assets/ZDimages/laboratoryManagement/icon_bjgl_zk.png">
+                    <img src="@/assets/ZDimages/integratedManagement/icon_bjgl_zk.png">
                     <p>{{item.onType?'收起':'展开'}}</p>
                   </div>
                 </div>
@@ -118,7 +118,7 @@
                   </div>
                 </div>
                 <div class="layout-data-max-big-null-box" v-else>
-                  <img src="@/assets/ZDimages/laboratoryManagement/icon_wsctp.png">
+                  <img src="@/assets/ZDimages/integratedManagement/icon_wsctp.png">
                   <div>
                     <p></p>
                     <p>暂未设置房间布局</p>
@@ -171,7 +171,7 @@
               </div>
             </div>
             <div class="layout-data-max-big-null-box" v-else>
-              <img src="@/assets/ZDimages/laboratoryManagement/icon_wsctp.png">
+              <img src="@/assets/ZDimages/integratedManagement/icon_wsctp.png">
               <div>
                 <p></p>
                 <p>暂未设置房间布局</p>
@@ -353,7 +353,7 @@
   //v3
   import { getDicts,} from "@/api/commonality/noPermission";
   import { systemBuildingGetTreeList,} from "@/api/commonality/permission";
-  import { laboratoryBuildLayoutGetTreeSonList,laboratoryBuildLayoutList } from "@/api/laboratoryManagement/index";
+  import { laboratoryBuildLayoutGetTreeSonList,laboratoryBuildLayoutList } from "@/api/integratedManagement/index";
   export default {
     name: 'newIndex',
     components: {
@@ -1160,57 +1160,57 @@
                             position: absolute
                           }
                           .center-move-door-p-t {
-                            background: url("../../../assets/ZDimages/laboratoryManagement/icon_sysbjt_m.png") !important;
+                            background: url("../../../../assets/ZDimages/integratedManagement/icon_sysbjt_m.png") !important;
                             background-size: 100% !important;
                             transform: rotate(180deg);
                           }
                           .center-move-door-p-b {
-                            background: url("../../../assets/ZDimages/laboratoryManagement/icon_sysbjt_m.png") !important;
+                            background: url("../../../../assets/ZDimages/integratedManagement/icon_sysbjt_m.png") !important;
                             background-size: 100% !important;
                           }
                           .center-move-door-p-l {
-                            background: url("../../../assets/ZDimages/laboratoryManagement/icon_sysbjt_m.png") !important;
+                            background: url("../../../../assets/ZDimages/integratedManagement/icon_sysbjt_m.png") !important;
                             background-size: 100% !important;
                             transform: rotate(90deg);
                           }
                           .center-move-door-p-r {
-                            background: url("../../../assets/ZDimages/laboratoryManagement/icon_sysbjt_m.png") !important;
+                            background: url("../../../../assets/ZDimages/integratedManagement/icon_sysbjt_m.png") !important;
                             background-size: 100% !important;
                             transform: rotateZ(270deg);
                           }
                           .center-move-door-p-t-ss {
-                            background: url("../../../assets/ZDimages/laboratoryManagement/icon_aqtd_m.png") !important;
+                            background: url("../../../../assets/ZDimages/integratedManagement/icon_aqtd_m.png") !important;
                             background-size: 100% !important;
                             transform: rotate(180deg);
                           }
                           .center-move-door-p-b-ss {
-                            background: url("../../../assets/ZDimages/laboratoryManagement/icon_aqtd_m.png") !important;
+                            background: url("../../../../assets/ZDimages/integratedManagement/icon_aqtd_m.png") !important;
                             background-size: 100% !important;
                           }
                           .center-move-door-p-l-ss {
-                            background: url("../../../assets/ZDimages/laboratoryManagement/icon_aqtd_m.png") !important;
+                            background: url("../../../../assets/ZDimages/integratedManagement/icon_aqtd_m.png") !important;
                             background-size: 100% !important;
                             transform: rotate(90deg);
                           }
                           .center-move-door-p-r-ss {
-                            background: url("../../../assets/ZDimages/laboratoryManagement/icon_aqtd_m.png") !important;
+                            background: url("../../../../assets/ZDimages/integratedManagement/icon_aqtd_m.png") !important;
                             background-size: 100% !important;
                             transform: rotateZ(270deg);
                           }
                           .lightTop {
-                            background: url("../../../assets/ZDimages/laboratoryManagement/icon_sjt.png");
+                            background: url("../../../../assets/ZDimages/integratedManagement/icon_sjt.png");
                             background-size: 100%;
                           }
                           .lightBottom {
-                            background: url("../../../assets/ZDimages/laboratoryManagement/icon_xjt.png");
+                            background: url("../../../../assets/ZDimages/integratedManagement/icon_xjt.png");
                             background-size: 100%;
                           }
                           .lightLeft {
-                            background: url("../../../assets/ZDimages/laboratoryManagement/icon_zuo.png");
+                            background: url("../../../../assets/ZDimages/integratedManagement/icon_zuo.png");
                             background-size: 100%;
                           }
                           .lightRight {
-                            background: url("../../../assets/ZDimages/laboratoryManagement/icon_yuo.png");
+                            background: url("../../../../assets/ZDimages/integratedManagement/icon_yuo.png");
                             background-size: 100%;
                           }
                         }
@@ -1235,7 +1235,7 @@
                       background: #CEFDD5;
                     }
                     .for-map-box-two {
-                      background: url("../../../assets/ZDimages/laboratoryManagement/icon_yjtd.png") center center no-repeat #39AE36;
+                      background: url("../../../../assets/ZDimages/integratedManagement/icon_yjtd.png") center center no-repeat #39AE36;
                       background-size: 60px 60px;
                     }
                   }
@@ -1345,57 +1345,57 @@
                           position: absolute
                         }
                         .center-move-door-p-t {
-                          background: url("../../../assets/ZDimages/laboratoryManagement/icon_sysbjt_m.png") !important;
+                          background: url("../../../../assets/ZDimages/integratedManagement/icon_sysbjt_m.png") !important;
                           background-size: 100% !important;
                           transform: rotate(180deg);
                         }
                         .center-move-door-p-b {
-                          background: url("../../../assets/ZDimages/laboratoryManagement/icon_sysbjt_m.png") !important;
+                          background: url("../../../../assets/ZDimages/integratedManagement/icon_sysbjt_m.png") !important;
                           background-size: 100% !important;
                         }
                         .center-move-door-p-l {
-                          background: url("../../../assets/ZDimages/laboratoryManagement/icon_sysbjt_m.png") !important;
+                          background: url("../../../../assets/ZDimages/integratedManagement/icon_sysbjt_m.png") !important;
                           background-size: 100% !important;
                           transform: rotate(90deg);
                         }
                         .center-move-door-p-r {
-                          background: url("../../../assets/ZDimages/laboratoryManagement/icon_sysbjt_m.png") !important;
+                          background: url("../../../../assets/ZDimages/integratedManagement/icon_sysbjt_m.png") !important;
                           background-size: 100% !important;
                           transform: rotateZ(270deg);
                         }
                         .center-move-door-p-t-ss {
-                          background: url("../../../assets/ZDimages/laboratoryManagement/icon_aqtd_m.png") !important;
+                          background: url("../../../../assets/ZDimages/integratedManagement/icon_aqtd_m.png") !important;
                           background-size: 100% !important;
                           transform: rotate(180deg);
                         }
                         .center-move-door-p-b-ss {
-                          background: url("../../../assets/ZDimages/laboratoryManagement/icon_aqtd_m.png") !important;
+                          background: url("../../../../assets/ZDimages/integratedManagement/icon_aqtd_m.png") !important;
                           background-size: 100% !important;
                         }
                         .center-move-door-p-l-ss {
-                          background: url("../../../assets/ZDimages/laboratoryManagement/icon_aqtd_m.png") !important;
+                          background: url("../../../../assets/ZDimages/integratedManagement/icon_aqtd_m.png") !important;
                           background-size: 100% !important;
                           transform: rotate(90deg);
                         }
                         .center-move-door-p-r-ss {
-                          background: url("../../../assets/ZDimages/laboratoryManagement/icon_aqtd_m.png") !important;
+                          background: url("../../../../assets/ZDimages/integratedManagement/icon_aqtd_m.png") !important;
                           background-size: 100% !important;
                           transform: rotateZ(270deg);
                         }
                         .lightTop {
-                          background: url("../../../assets/ZDimages/laboratoryManagement/icon_sjt.png");
+                          background: url("../../../../assets/ZDimages/integratedManagement/icon_sjt.png");
                           background-size: 100%;
                         }
                         .lightBottom {
-                          background: url("../../../assets/ZDimages/laboratoryManagement/icon_xjt.png");
+                          background: url("../../../../assets/ZDimages/integratedManagement/icon_xjt.png");
                           background-size: 100%;
                         }
                         .lightLeft {
-                          background: url("../../../assets/ZDimages/laboratoryManagement/icon_zuo.png");
+                          background: url("../../../../assets/ZDimages/integratedManagement/icon_zuo.png");
                           background-size: 100%;
                         }
                         .lightRight {
-                          background: url("../../../assets/ZDimages/laboratoryManagement/icon_yuo.png");
+                          background: url("../../../../assets/ZDimages/integratedManagement/icon_yuo.png");
                           background-size: 100%;
                         }
                       }
@@ -1420,7 +1420,7 @@
                     background: #CEFDD5;
                   }
                   .for-map-box-two {
-                    background: url("../../../assets/ZDimages/laboratoryManagement/icon_yjtd.png") center center no-repeat #39AE36;
+                    background: url("../../../../assets/ZDimages/integratedManagement/icon_yjtd.png") center center no-repeat #39AE36;
                     background-size: 60px 60px;
                   }
                 }
@@ -1540,57 +1540,57 @@
                     position: absolute
                   }
                   .center-move-door-p-t {
-                    background: url("../../../assets/ZDimages/laboratoryManagement/icon_sysbjt_m.png") !important;
+                    background: url("../../../../assets/ZDimages/integratedManagement/icon_sysbjt_m.png") !important;
                     background-size: 100% !important;
                     transform: rotate(180deg);
                   }
                   .center-move-door-p-b {
-                    background: url("../../../assets/ZDimages/laboratoryManagement/icon_sysbjt_m.png") !important;
+                    background: url("../../../../assets/ZDimages/integratedManagement/icon_sysbjt_m.png") !important;
                     background-size: 100% !important;
                   }
                   .center-move-door-p-l {
-                    background: url("../../../assets/ZDimages/laboratoryManagement/icon_sysbjt_m.png") !important;
+                    background: url("../../../../assets/ZDimages/integratedManagement/icon_sysbjt_m.png") !important;
                     background-size: 100% !important;
                     transform: rotate(90deg);
                   }
                   .center-move-door-p-r {
-                    background: url("../../../assets/ZDimages/laboratoryManagement/icon_sysbjt_m.png") !important;
+                    background: url("../../../../assets/ZDimages/integratedManagement/icon_sysbjt_m.png") !important;
                     background-size: 100% !important;
                     transform: rotateZ(270deg);
                   }
                   .center-move-door-p-t-ss {
-                    background: url("../../../assets/ZDimages/laboratoryManagement/icon_aqtd_m.png") !important;
+                    background: url("../../../../assets/ZDimages/integratedManagement/icon_aqtd_m.png") !important;
                     background-size: 100% !important;
                     transform: rotate(180deg);
                   }
                   .center-move-door-p-b-ss {
-                    background: url("../../../assets/ZDimages/laboratoryManagement/icon_aqtd_m.png") !important;
+                    background: url("../../../../assets/ZDimages/integratedManagement/icon_aqtd_m.png") !important;
                     background-size: 100% !important;
                   }
                   .center-move-door-p-l-ss {
-                    background: url("../../../assets/ZDimages/laboratoryManagement/icon_aqtd_m.png") !important;
+                    background: url("../../../../assets/ZDimages/integratedManagement/icon_aqtd_m.png") !important;
                     background-size: 100% !important;
                     transform: rotate(90deg);
                   }
                   .center-move-door-p-r-ss {
-                    background: url("../../../assets/ZDimages/laboratoryManagement/icon_aqtd_m.png") !important;
+                    background: url("../../../../assets/ZDimages/integratedManagement/icon_aqtd_m.png") !important;
                     background-size: 100% !important;
                     transform: rotateZ(270deg);
                   }
                   .lightTop {
-                    background: url("../../../assets/ZDimages/laboratoryManagement/icon_sjt.png");
+                    background: url("../../../../assets/ZDimages/integratedManagement/icon_sjt.png");
                     background-size: 100%;
                   }
                   .lightBottom {
-                    background: url("../../../assets/ZDimages/laboratoryManagement/icon_xjt.png");
+                    background: url("../../../../assets/ZDimages/integratedManagement/icon_xjt.png");
                     background-size: 100%;
                   }
                   .lightLeft {
-                    background: url("../../../assets/ZDimages/laboratoryManagement/icon_zuo.png");
+                    background: url("../../../../assets/ZDimages/integratedManagement/icon_zuo.png");
                     background-size: 100%;
                   }
                   .lightRight {
-                    background: url("../../../assets/ZDimages/laboratoryManagement/icon_yuo.png");
+                    background: url("../../../../assets/ZDimages/integratedManagement/icon_yuo.png");
                     background-size: 100%;
                   }
                 }
@@ -1615,7 +1615,7 @@
               background: #CEFDD5;
             }
             .for-map-box-two {
-              background: url("../../../assets/ZDimages/laboratoryManagement/icon_yjtd.png") center center no-repeat #39AE36;
+              background: url("../../../../assets/ZDimages/integratedManagement/icon_yjtd.png") center center no-repeat #39AE36;
               background-size: 60px 60px;
             }
             .for-map-box-three {

src/views/laboratoryManagement/safetyInfoCategory/index.vue → src/views/integratedManagement/laboratoryManagement/safetyInfoCategory/index.vue


+ 1 - 1
src/views/laboratoryManagement/safetyInfoCategory/infoConfig.vue

@@ -70,7 +70,7 @@
 
 <script>
 import { creditScoreList } from "@/apiDemo/exam/record";
-import { laboratoryInfoBrandAdd, laboratoryInfoBrandDelete, laboratoryInfoBrandList, laboratoryInfoBrandUpdate } from '@/api/laboratoryManagement/index'
+import { laboratoryInfoBrandAdd, laboratoryInfoBrandDelete, laboratoryInfoBrandList, laboratoryInfoBrandUpdate } from '@/api/integratedManagement/index'
 export default {
   name: "creditScoreList",
   props: {

+ 1 - 1
src/views/laboratoryManagement/safetyInfoCategory/safetyInfoCategory.vue

@@ -132,7 +132,7 @@
 
 <script>
 import { getToken } from "@/utils/auth";
-import { laboratoryInfoBrandAdd, laboratoryInfoBrandDelete, laboratoryInfoBrandList, laboratoryInfoBrandUpdate } from '@/api/laboratoryManagement/index'
+import { laboratoryInfoBrandAdd, laboratoryInfoBrandDelete, laboratoryInfoBrandList, laboratoryInfoBrandUpdate } from '@/api/integratedManagement/index'
 import infoConfig from "./infoConfig.vue"
 export default {
   name: "Approval",

+ 2 - 2
src/views/laboratoryManagement/safetyInfoCategory/safetyInfoConfig.vue

@@ -14,7 +14,7 @@
     <div class="config_main">
       <div class="config_main_l scrollbar-box">
         <div class="config_main_l_title">
-          <img  src="@/assets/ZDimages/laboratoryManagement/icon_xxpz_aqxxlm.png">
+          <img  src="@/assets/ZDimages/integratedManagement/icon_xxpz_aqxxlm.png">
           安全信息类目
         </div>
         <div :class='currentIndex==index?"active":""' class="config_main_l_li"
@@ -145,7 +145,7 @@
 
 <script>
 import { getToken } from "@/utils/auth";
-import { laboratoryInfoBrandList , laboratoryBrandDetailAdd, laboratoryBrandDetailList, laboratoryBrandDetailUpdate, laboratoryBrandDetailDelete } from '@/api/laboratoryManagement/index'
+import { laboratoryInfoBrandList , laboratoryBrandDetailAdd, laboratoryBrandDetailList, laboratoryBrandDetailUpdate, laboratoryBrandDetailDelete } from '@/api/integratedManagement/index'
 export default {
   name: "Approval",
   data() {

+ 1 - 1
src/views/laboratoryManagement/subject/addSubject.vue

@@ -277,7 +277,7 @@
     import { getDeptDropList,systemBuildingGetOptList,laboratoryClassMoldGetList,
       laboratoryClassLevelGetList,laboratoryClassTypeGetList,systemRoomInfoGetList,
       systemUserSelectUser} from "@/api/commonality/permission";
-    import { laboratoryInfoBrandGetClassifyBySubId,laboratorySubRelInfoAdd,laboratorySubRelInfoUpdate,laboratorySubRelInfoGetDetailInfo } from "@/api/laboratoryManagement/index";
+    import { laboratoryInfoBrandGetClassifyBySubId,laboratorySubRelInfoAdd,laboratorySubRelInfoUpdate,laboratorySubRelInfoGetDetailInfo } from "@/api/integratedManagement/index";
     export default {
       name: "addSubject",
       props:{

+ 1 - 1
src/views/laboratoryManagement/subject/admissionConfiguration.vue

@@ -46,7 +46,7 @@
     <div class="max-for-box">
       <div class="for-box" v-for="(item,index) in listStudent" :key="index" :class="item.checkType?'for-border-two':'for-border-one'" @click="forListClick(item)">
         <div><span>{{item.materialName}}</span><span>{{item.materialDescribe}}</span></div>
-        <img class="position-img" v-if="item.checkType" src="@/assets/ZDimages/laboratoryManagement/icon_30.png" alt="">
+        <img class="position-img" v-if="item.checkType" src="@/assets/ZDimages/integratedManagement/icon_30.png" alt="">
       </div>
     </div>
     <p class="page-submit-common-style-button button-p" @click="upDataButton">{{newUpDataType?'提交':'修改'}}</p>

src/views/laboratoryManagement/subject/associationConfiguration.vue → src/views/integratedManagement/laboratoryManagement/subject/associationConfiguration.vue


+ 1 - 1
src/views/laboratoryManagement/subject/deviceList.vue

@@ -946,7 +946,7 @@ export default {
             type: "warning"
           }).then(() => {
             //  确定
-            this.$router.push({ path: '/comprehensive/laboratoryManagement/accessAuthorization' });
+            this.$router.push({ path: '/comprehensive/integratedManagement/accessAuthorization' });
           }).catch(function() {
             //  取消
           });

+ 30 - 30
src/views/laboratoryManagement/subject/index.vue

@@ -45,9 +45,9 @@
             <el-form-item style="float: right;margin-right:20px;" v-hasPermi="['laboratory:subject:import']">
               <el-dropdown @command="importButton">
                 <div class="form-dropdown-box">
-                  <img src="@/assets/ZDimages/laboratoryManagement/icon_jzgxx_dr.png">
+                  <img src="@/assets/ZDimages/integratedManagement/icon_jzgxx_dr.png">
                   <p>导入</p>
-                  <img src="@/assets/ZDimages/laboratoryManagement/icon_jzggl_xljt.png">
+                  <img src="@/assets/ZDimages/integratedManagement/icon_jzggl_xljt.png">
                 </div>
                 <el-dropdown-menu slot="dropdown">
                   <!--<el-dropdown-item style="border-bottom:1px solid #E0E0E0;margin:0 10px;color:#333;" :command="{command:1}">下载模板</el-dropdown-item>-->
@@ -144,28 +144,28 @@
                      v-if="item.funNum != 'huoyan'"
                      v-for="(item,index) in checkedSubject.sensorFunctionStatusList" :key="index">
                   <div class="sensor-for-min-box">
-                    <img src="@/assets/ZDimages/laboratoryManagement/icon_bj_wd.png" v-if="item.funNum == 'wendu'">
-                    <img src="@/assets/ZDimages/laboratoryManagement/icon_bj_wd.png" v-if="item.funNum == 'fbwendu'">
-                    <img src="@/assets/ZDimages/laboratoryManagement/icon_bj_sd.png" v-if="item.funNum == 'shidu'">
-                    <img src="@/assets/ZDimages/laboratoryManagement/icon_bj_sd.png" v-if="item.funNum == 'fbshidu'">
-                    <img src="@/assets/ZDimages/laboratoryManagement/icon_bj_eyht.png" v-if="item.funNum == 'co'">
-                    <img src="@/assets/ZDimages/laboratoryManagement/icon_bj_eyht.png" v-if="item.funNum == 'fbco'">
-                    <img src="@/assets/ZDimages/laboratoryManagement/icon_bj_jwnd.png" v-if="item.funNum == 'jiawan'">
-                    <img src="@/assets/ZDimages/laboratoryManagement/icon_sy_yqnd.png" v-if="item.funNum == 'o2'">
-                    <img src="@/assets/ZDimages/laboratoryManagement/icon_sy_yqnd.png" v-if="item.funNum == 'fbo2'">
-                    <img src="@/assets/ZDimages/laboratoryManagement/icon_bj_yg.png" v-if="item.funNum == 'yanwu'">
-                    <img src="@/assets/ZDimages/laboratoryManagement/icon_sy_dqy.png" v-if="item.funNum == 'daqiya'">
-                    <img src="@/assets/ZDimages/laboratoryManagement/icon_syspz_voc.png" v-if="item.funNum == 'voc'">
-                    <img src="@/assets/ZDimages/laboratoryManagement/icon_syspz_voc.png" v-if="item.funNum == 'fbvoc'">
-                    <img src="@/assets/ZDimages/laboratoryManagement/icon_syspz_tvoc.png" v-if="item.funNum == 'tvoc'">
-                    <img src="@/assets/ZDimages/laboratoryManagement/icon_sy_mcnd.png" v-if="item.funNum == 'so2'">
-                    <img src="@/assets/ZDimages/laboratoryManagement/icon_bj_yyhd.png" v-if="item.funNum == 'no1'">
-                    <img src="@/assets/ZDimages/laboratoryManagement/icon_bj_dqy.png" v-if="item.funNum == 'fenchen'">
-                    <img src="@/assets/ZDimages/laboratoryManagement/icon_bj_qq.png" v-if="item.funNum == 'H2'">
-                    <img src="@/assets/ZDimages/laboratoryManagement/guangqi.png" v-if="item.funNum == 'guangqi'">
-                    <img src="@/assets/ZDimages/laboratoryManagement/lvqi.png" v-if="item.funNum == 'lvqi'">
-                    <img src="@/assets/ZDimages/laboratoryManagement/icon_syspz_jiaquan.png" v-if="item.funNum == 'jiaquan'">
-                    <img src="@/assets/ZDimages/laboratoryManagement/icon_syspz_hwcw.png" v-if="item.funNum == 'hwcwy'">
+                    <img src="@/assets/ZDimages/integratedManagement/icon_bj_wd.png" v-if="item.funNum == 'wendu'">
+                    <img src="@/assets/ZDimages/integratedManagement/icon_bj_wd.png" v-if="item.funNum == 'fbwendu'">
+                    <img src="@/assets/ZDimages/integratedManagement/icon_bj_sd.png" v-if="item.funNum == 'shidu'">
+                    <img src="@/assets/ZDimages/integratedManagement/icon_bj_sd.png" v-if="item.funNum == 'fbshidu'">
+                    <img src="@/assets/ZDimages/integratedManagement/icon_bj_eyht.png" v-if="item.funNum == 'co'">
+                    <img src="@/assets/ZDimages/integratedManagement/icon_bj_eyht.png" v-if="item.funNum == 'fbco'">
+                    <img src="@/assets/ZDimages/integratedManagement/icon_bj_jwnd.png" v-if="item.funNum == 'jiawan'">
+                    <img src="@/assets/ZDimages/integratedManagement/icon_sy_yqnd.png" v-if="item.funNum == 'o2'">
+                    <img src="@/assets/ZDimages/integratedManagement/icon_sy_yqnd.png" v-if="item.funNum == 'fbo2'">
+                    <img src="@/assets/ZDimages/integratedManagement/icon_bj_yg.png" v-if="item.funNum == 'yanwu'">
+                    <img src="@/assets/ZDimages/integratedManagement/icon_sy_dqy.png" v-if="item.funNum == 'daqiya'">
+                    <img src="@/assets/ZDimages/integratedManagement/icon_syspz_voc.png" v-if="item.funNum == 'voc'">
+                    <img src="@/assets/ZDimages/integratedManagement/icon_syspz_voc.png" v-if="item.funNum == 'fbvoc'">
+                    <img src="@/assets/ZDimages/integratedManagement/icon_syspz_tvoc.png" v-if="item.funNum == 'tvoc'">
+                    <img src="@/assets/ZDimages/integratedManagement/icon_sy_mcnd.png" v-if="item.funNum == 'so2'">
+                    <img src="@/assets/ZDimages/integratedManagement/icon_bj_yyhd.png" v-if="item.funNum == 'no1'">
+                    <img src="@/assets/ZDimages/integratedManagement/icon_bj_dqy.png" v-if="item.funNum == 'fenchen'">
+                    <img src="@/assets/ZDimages/integratedManagement/icon_bj_qq.png" v-if="item.funNum == 'H2'">
+                    <img src="@/assets/ZDimages/integratedManagement/guangqi.png" v-if="item.funNum == 'guangqi'">
+                    <img src="@/assets/ZDimages/integratedManagement/lvqi.png" v-if="item.funNum == 'lvqi'">
+                    <img src="@/assets/ZDimages/integratedManagement/icon_syspz_jiaquan.png" v-if="item.funNum == 'jiaquan'">
+                    <img src="@/assets/ZDimages/integratedManagement/icon_syspz_hwcw.png" v-if="item.funNum == 'hwcwy'">
                     <div>
                       <el-tooltip class="item" effect="dark" :content="item.describe" placement="bottom">
                         <p>{{item.describe|ellipsis}}</p>
@@ -267,7 +267,7 @@
                 </el-tooltip>
               </p>
               <div class="alarm-max-box" :class="hardwareData[0]?hardwareData[0].status==3||hardwareData[0].status==4?'BGcolorTypeA':'BGcolorTypeB':''">
-                <img  v-if="hardwareData[0]?hardwareData[0].status == 3:''" src="@/assets/ZDimages/laboratoryManagement/img_syslb_znsgbjzx.png" class="alarm-img">
+                <img  v-if="hardwareData[0]?hardwareData[0].status == 3:''" src="@/assets/ZDimages/integratedManagement/img_syslb_znsgbjzx.png" class="alarm-img">
                 <div class="alarm-big-box" v-if="hardwareData[0]">
                   <p>报警器编号:{{hardwareData[0].hardwareNum}}</p>
                   <div class="alarm-position-box" >
@@ -319,8 +319,8 @@
                 </el-tooltip>
               </p>
               <div class="entrance" :class="item.operate.code==2?'BGentrance_l_yes':'BGentrance_l_no'" v-for="(item,index) in entranceList" v-if="item.operate">
-                <img class="entrance_c" v-if="item.operate.code==2" src="@/assets/ZDimages/laboratoryManagement/icon_znmj_zx.png">
-                <img class="entrance_c" v-if="item.operate.code!=2"  src="@/assets/ZDimages/laboratoryManagement/icon_znmj_lx.png">
+                <img class="entrance_c" v-if="item.operate.code==2" src="@/assets/ZDimages/integratedManagement/icon_znmj_zx.png">
+                <img class="entrance_c" v-if="item.operate.code!=2"  src="@/assets/ZDimages/integratedManagement/icon_znmj_lx.png">
                 <div class="entrance_r">门禁编号:{{item.hardwareNum}}</div>
                 <p :class="item.operate.code==2?'entrance_l_yes':'entrance_l_no'">{{item.operate.code==2?'在线':'离线'}}</p>
               </div>
@@ -372,12 +372,12 @@
         <div class="el-upload__tip" slot="tip">仅允许导入xls、xlsx、格式文件。<span style="color:#0183FA;cursor: pointer" v-hasPermi="['system:user_teacher:exceltemplate']" @click="importTemplate">下载模板</span></div>
         <div class="el-upload-text-box" slot="tip" v-if="getImportData.downFile">
           <div class="img-text-box">
-            <img src="@/assets/ZDimages/laboratoryManagement/icon_dr_wj.png">
+            <img src="@/assets/ZDimages/integratedManagement/icon_dr_wj.png">
             <p>{{getImportData.textName}}</p>
           </div>
           <p class="text-p">数据导入成功 <span style="color:#0183FA;">{{getImportData.successNum}}</span> 条,失败 <span style="color:#FF6464 ;">{{getImportData.failureNum}}</span> 条</p>
           <div class="img-text-box" v-if="getImportData.failureNum">
-            <img src="@/assets/ZDimages/laboratoryManagement/icon_dr_sj.png">
+            <img src="@/assets/ZDimages/integratedManagement/icon_dr_sj.png">
             <p style="color:#0183FA;cursor: pointer;" @click="failureExcel">点击下载失败数据报表</p>
           </div>
         </div>
@@ -420,7 +420,7 @@ import store from '@/store'
 
 /********************** V3 **********************/
 import { getDeptDropList,laboratoryClassTypeGetList,laboratoryClassLevelGetList } from "@/api/commonality/permission";
-import { laboratorySubRelInfoList,laboratorySubRelInfoGetDetailInfo,laboratorySubRelInfoGetDetailDelete } from "@/api/laboratoryManagement/index";
+import { laboratorySubRelInfoList,laboratorySubRelInfoGetDetailInfo,laboratorySubRelInfoGetDetailDelete } from "@/api/integratedManagement/index";
 
 export default {
   filters:{

src/views/laboratoryManagement/subject/infoPage.vue → src/views/integratedManagement/laboratoryManagement/subject/infoPage.vue


+ 0 - 0
src/views/laboratoryManagement/subject/video.vue


Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff