Merge branch 'web-v2-temp' into web-v2-pro

src/api/laboratory/violation.js

@@ -149,7 +149,7 @@ export function getIntegralMatchingRules(query) {
   })
 }
 
-// 查询实验室字典列表
+// 根据院系ID查询实验室列表(无权限)
 export function getSubjectDictByViolation(data) {
   return request({
     url: '/laboratory/subject/getSubjectDictByViolation',

src/views/safetyCheck/snapshotManagement/index.vue

@@ -203,7 +203,7 @@
 
 <script>
   import { securityCheckClapList,checkClapAdd } from '@/api/safetyCheck/index'
-  import { getNoAdminSubjectListNopage } from "@/api/laboratory/subject";
+  import { getSubjectDictByViolation } from "@/api/laboratory/violation";
   import { listDepartments } from "@/api/system/dept";
   import listPage from './listPage.vue'
   import infoPage from './infoPage.vue'
@@ -429,7 +429,7 @@
         let obj = {
           deptId:val,
         }
-        getNoAdminSubjectListNopage(obj).then(response => {
+        getSubjectDictByViolation(obj).then(response => {
           this.$set(this,'dialogSubListData',response.data);
           this.$set(this,'dialogSubList',response.data);
           for(let i=0;i<self.deptSelectList.length;i++){