zc

src/api/hazardManagement/index.js

@@ -1,100 +0,0 @@
-import request from '@/utils/request'
-
-//危险源-列表
-export function laboratoryHazardList(data) {
-  return request({
-    url: '/laboratory/hazard/list',
-    method: 'post',
-    data: data
-  })
-}
-//危险源-新增
-export function laboratoryHazardAdd(data) {
-  return request({
-    url: '/laboratory/hazard/add',
-    method: 'post',
-    data: data
-  })
-}
-//危险源-编辑
-export function laboratoryHazardUpdate(data) {
-  return request({
-    url: '/laboratory/hazard/update',
-    method: 'post',
-    data: data
-  })
-}
-//化学品-删除
-export function laboratoryHazardDelete(data) {
-  return request({
-    url: '/laboratory/hazard/delete',
-    method: 'post',
-    data: data
-  })
-}
-
-//化学品-详情
-export function laboratoryHazardDetail(query) {
-  return request({
-    url: '/laboratory/hazard/detail',
-    method: 'get',
-    params: query
-  })
-}
-
-
-
-// 查询危险源列表
-export function listHazard(query) {
-  return request({
-    url: '/laboratory/hazard/list',
-    method: 'get',
-    params: query
-  })
-}
-// 查询危险源详细
-export function getHazard(id) {
-  return request({
-    url: '/laboratory/hazard/' + id,
-    method: 'get'
-  })
-}
-// 删除危险源
-export function delHazard(id) {
-  return request({
-    url: '/laboratory/hazard/' + id,
-    method: 'delete'
-  })
-}
-// 新增危险源
-export function addHazard(data) {
-  return request({
-    url: '/laboratory/hazard',
-    method: 'post',
-    data: data
-  })
-}
-// 修改危险源
-export function updateHazard(data) {
-  return request({
-    url: '/laboratory/hazard/edit',
-    method: 'post',
-    data: data
-  })
-}
-//危险源类型-列表
-export function dangerList(query) {
-  return request({
-    url: '/system/dict/data/listNotPower?dictType=lab_hazard_type',
-    method: 'get',
-    params: query
-  })
-}
-//气瓶类目-列表
-export function gasCategoryList(query) {
-  return request({
-    url: '/system/dict/data/listNotPower?dictType=qp_specification_category',
-    method: 'get',
-    params: query
-  })
-}

src/api/integratedManagement/index.js

@@ -575,3 +575,45 @@ export function systemTopicEditMemberStart(data) {
     data: data
   })
 }
+
+//危险源-列表
+export function laboratoryHazardList(data) {
+  return request({
+    url: '/laboratory/hazard/list',
+    method: 'post',
+    data: data
+  })
+}
+//危险源-新增
+export function laboratoryHazardAdd(data) {
+  return request({
+    url: '/laboratory/hazard/add',
+    method: 'post',
+    data: data
+  })
+}
+//危险源-编辑
+export function laboratoryHazardUpdate(data) {
+  return request({
+    url: '/laboratory/hazard/update',
+    method: 'post',
+    data: data
+  })
+}
+//危险源-删除
+export function laboratoryHazardDelete(data) {
+  return request({
+    url: '/laboratory/hazard/delete',
+    method: 'post',
+    data: data
+  })
+}
+
+//危险源-详情
+export function laboratoryHazardDetail(query) {
+  return request({
+    url: '/laboratory/hazard/detail',
+    method: 'get',
+    params: query
+  })
+}

src/store/modules/permission.js

@@ -198,8 +198,6 @@ export const loadView = (view) => { // 路由懒加载
   }
   if(pathName === 'basicsModules'){
     return (resolve) => require([`@/views/basicsModules${pathUrl}`], resolve)
-  }else if(pathName === 'hazardManagement'){
-    return (resolve) => require([`@/views/hazardManagement${pathUrl}`], resolve)
   }else if(pathName === 'creditViolation'){
     return (resolve) => require([`@/views/creditViolation${pathUrl}`], resolve)
   }else if(pathName === 'secureAccess'){

src/views/hazardManagement/hazard/addLaboratory.vue

@@ -79,7 +79,7 @@
 <script>
 import {
   laboratoryHazardAdd, laboratoryHazardUpdate
-} from '@/api/hazardManagement/index'
+} from '@/api/integratedManagement/index'
 import { getDicts } from '@/api/commonality/noPermission'
 export default {
   props:{

src/views/hazardManagement/hazard/index.vue

@@ -23,10 +23,10 @@
         <el-table-column label="名称" align="left" prop="chName" />
         <el-table-column label="编号" align="left" prop="hazardCode" />
         <el-table-column label="类型" align="left" prop="smallTypeName" />
-        <el-table-column label="实验室危险源占比" align="left" prop="labScale">
+        <el-table-column label="实验室危险源占比" align="left" prop="labScale" width="300" >
           <template slot-scope="scope">
             <div class="progress-box" style="margin-top: 3px">
-            <el-progress :stroke-width="20" color="#52a1fe" :percentage="scope.row.labScale>100?100:scope.row.labScale" style="margin-right:74px;"></el-progress>
+              <el-progress :stroke-width="20" color="#52a1fe" :percentage="scope.row.labScale>100?100:scope.row.labScale"></el-progress>
             </div>
           </template>
         </el-table-column>
@@ -75,7 +75,7 @@
 import qrCodeDialog from "@/components/qrCodeDialog/index.vue"
 import {
   laboratoryHazardList, laboratoryHazardDelete, laboratoryHazardDetail
-} from '@/api/hazardManagement/index'
+} from '@/api/integratedManagement/index'
   import addLaboratory from "./addLaboratory.vue";
   import vueQr from 'vue-qr'
 export default {

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

@@ -202,7 +202,7 @@
   import { getBottleInfo} from "@/apiDemo/gasManage3_0/gasManage";
   import qrCodeDialog from "@/components/qrCodeDialog/index.vue"
   import { laboratorySubRelInfoUpdateHazardSubRel } from '@/api/integratedManagement'
-  import { laboratoryHazardList } from '@/api/hazardManagement'
+  import { laboratoryHazardList } from '@/api/integratedManagement'
   import { getDicts } from '@/api/commonality/noPermission'
   export default {
     name: "associationConfiguration",

vue.config.js

@@ -298,16 +298,6 @@ module.exports = {
           enforce:true,
           reuseExistingChunk: true
         },
-        //危险源管理
-        hazardManagement: {
-          name: 'chunk-hazardManagement',
-          test: resolve('src/views/hazardManagement'),
-          priority: 0,
-          minSize: 0,
-          minChunks: 1,
-          enforce:true,
-          reuseExistingChunk: true
-        },
         //信用管理
         creditViolation: {
           name: 'chunk-creditViolation',