zc

README.md

@@ -106,7 +106,7 @@
 | type == 8 | 化学品柜 | -- | 前端生成 |
 | type == 7 | 培训课程 | -- | 前端生成 |
 | type == 6 | 专项检查 | -- | 前端生成 |
-| type == 5 | 实验室详情 | -- | 后端生成 |
+| type == 5 | 实验室详情 | -- | 前端生成/公公扫码跳实验室详情,安全检查扫码跳安全检查 |
 | type == 3 | 危险源列表 | -- | 后端生成 |
 | type == 2 | 安全制度 | -- | 后端生成 |
 | type == 1 | MSDS说明书 | -- | 前端端生成 |

src/api/safetyCheck/indexTow.js

@@ -0,0 +1,36 @@
+import request from '@/utils/request'
+
+// 查询校级下实验室数量
+export function laboratorySubRelInfoGetAllSubNum(query) {
+  return request({
+    url: '/laboratory/subRelInfo/getAllSubNum',
+    method: 'get',
+    params: query
+  })
+}
+// 检查范围，选择学院，查询学院信息和实验室数量
+export function laboratorySubRelInfoConditionCollegeInfo(query) {
+  return request({
+    url: '/laboratory/subRelInfo/conditionCollegeInfo',
+    method: 'get',
+    params: query
+  })
+}
+
+// demo
+export function demo(data) {
+  return request({
+    url: '/demo/demo/demo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 查询危化品安全技术说明书列表
+export function listHazard_book(query) {
+  return request({
+    url: '/laboratory/hazard_book/list',
+    method: 'get',
+    params: query
+  })
+}

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

@@ -40,9 +40,8 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="安全分类"  prop="typeId" class="form-item">
-          <el-select v-model="form.typeId" multiple collapse-tags placeholder="请选择安全分类"
-                     :disabled="form.dynamicLeveling"  style="width: 320px">
+        <el-form-item label="安全分类"  prop="typeId" class="form-item" v-if="!form.dynamicLeveling">
+          <el-select v-model="form.typeId" multiple collapse-tags placeholder="请选择安全分类" style="width: 320px">
             <el-option
               v-for="dict in typeList"
               :key="dict.typeId"
@@ -51,7 +50,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="安全分级"  prop="levelId" class="form-item">
+        <el-form-item label="安全分级"  prop="levelId" class="form-item" v-if="!form.dynamicLeveling">
           <el-select v-model="form.levelId" placeholder="请选择安全分级"
                      :disabled="form.dynamicLeveling" clearable style="width:320px;">
             <el-option
@@ -62,7 +61,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="动态评级" class="form-item">
+        <el-form-item label="动态评级" class="form-item" style="width:440px;">
           <div class="tableListPaginationSwitch">
             <el-switch
               class="switch captcha-img"

src/views/integratedManagement/messageNotice/warningNotice/forewarningConfig.vue

@@ -1033,7 +1033,7 @@
       userSelectList(query) {
         let self = this
         if (query !== '' && query.length > 1) {
-          systemUserSelect({ 'userName': query, 'userType': '1', }).then(response => {
+          systemUserSelect({ 'searchValue': query, 'userType': '1', }).then(response => {
             this.$set(this, 'optionsUser', response.data)
           })
         } else {

src/views/safetyCheck/schoolInspection/inspectionGroup/index.vue

@@ -63,9 +63,9 @@
           <template slot-scope="scope">
             <div class="table-button-box">
               <p class="table-button-null"></p>
-              <p class="table-button-p" @click="addDialogOpen(3,scope.row)" v-hasPermi="['security:checkGroup:query']">详情</p>
-              <p class="table-button-p" @click="addDialogOpen(2,scope.row)" v-hasPermiAnd="['security:checkGroup:query','security:checkGroup:edit']">编辑</p>
-              <p class="table-button-p" @click="deleteObj(scope.row)" v-hasPermi="['security:checkGroup:remove']">删除</p>
+              <p class="table-button-p" @click="addDialogOpen(3,scope.row)" v-hasPermiRouter="['security:checkGroup:query']">详情</p>
+              <p class="table-button-p" @click="addDialogOpen(2,scope.row)" v-hasPermiRouter="['security:checkGroup:edit']">编辑</p>
+              <p class="table-button-p" @click="deleteObj(scope.row)" v-hasPermiRouter="['security:checkGroup:remove']">删除</p>
               <p class="table-button-null"></p>
             </div>
           </template>

src/views/safetyCheck/schoolInspection/inspectionManagement/index.vue

@@ -93,13 +93,13 @@
             <template slot-scope="scope">
               <div class="table-button-box">
                 <p class="table-button-null"></p>
-                <p class="table-button-p" v-hasPermi="['safety:checkManage:query']"
+                <p class="table-button-p" v-hasPermiRouter="['safety:checkManage:query']"
                    v-show="scope.row.manageStatus==0||scope.row.manageStatus==2" @click="goAddPage(3,scope.row.id)">详情</p>
-                <p class="table-button-p" v-hasPermiAnd="['safety:checkManage:query','safety:checkManage:edit']"
+                <p class="table-button-p" v-hasPermiRouter="['safety:checkManage:query','safety:checkManage:edit']"
                    v-show="scope.row.manageStatus==1 && scope.row.isCheck==1 && scope.row.isSelfData==1" @click="goAddPage(2,scope.row.id)">编辑</p>
-                <p class="table-button-p" v-hasPermiAnd="['safety:checkManage:query','safety:checkManage:edit']"
+                <p class="table-button-p" v-hasPermiRouter="['safety:checkManage:query','safety:checkManage:edit']"
                    v-show="scope.row.manageStatus==0 && scope.row.isCheck==1 && scope.row.isSelfData==1" @click="goAddPage(2,scope.row.id)">开始检查</p>
-                <p class="table-button-p" v-hasPermiAnd="['safety:checkManage:query','safety:checkManage:edit']"
+                <p class="table-button-p" v-hasPermiRouter="['safety:checkManage:query','safety:checkManage:edit']"
                    style="color:#999" v-show="scope.row.manageStatus==0 && scope.row.isCheck==0 && scope.row.isSelfData==1">开始检查</p>
                 <p class="table-button-p" v-show="scope.row.isEndProcess==1 && scope.row.checkResult==0" @click="lookDocumentButton(1,scope.row)">整改报告</p>
                 <p class="table-button-p" v-show="scope.row.isAttachment == 1" @click="lookDocumentListButton(1,scope.row)">查看附件</p>
@@ -188,8 +188,8 @@
           manageStatus:this.queryParams.manageStatus,
           searchValue:this.queryParams.searchValue,
           deptId:this.queryParams.deptId,
-          startTime:this.dateRange[0]?this.dateRange[0]:'',
-          endTime:this.dateRange[1]?this.dateRange[1]:'',
+          startTime:this.dateRange[0]?this.dateRange[0]+'T00:00:00':'',
+          endTime:this.dateRange[1]?this.dateRange[1]+'T23:59:59':'',
         }).then(response => {
           this.$set(this,'correlationNum',response.data.total>999?' 999+':(response.data.total<1?'':' '+response.data.total));
         });
@@ -241,13 +241,10 @@
       getList(){
         let obj = JSON.parse(JSON.stringify(this.queryParams))
         if(this.dateRange[0]){
-          obj.startTime = this.dateRange[0];
+          obj.startTime = this.dateRange[0]+'T00:00:00';
+          obj.endTime = this.dateRange[1]+'T23:59:59';
         }else{
           obj.startTime = "";
-        }
-        if(this.dateRange[1]){
-          obj.endTime = this.dateRange[1];
-        }else{
           obj.endTime = "";
         }
         let self = this;

src/views/safetyCheck/schoolInspection/inspectionPlan/addDialog.vue

@@ -62,8 +62,8 @@
                 </el-select>
               </div>
               <div class="dialog-range-text-box">
-                <p class="inquire-button-one button-p" :style="lookInfoType?'background:#0183FA;border:1px solid #0183FA;':''" v-if="dialogForm.checkRange == 2" @click="dialogClickType(2)">{{lookInfoType?'查看':'选择学院'}}</p>
-                <p class="inquire-button-one button-p" :style="lookInfoType?'background:#0183FA;border:1px solid #0183FA;':''" v-if="dialogForm.checkRange == 3" @click="dialogClickType(3)">{{lookInfoType?'查看':'选择实验室'}}</p>
+                <p class="page-submit-common-style-button button-p" :style="lookInfoType?'background:#0183FA;border:1px solid #0183FA;':''" v-if="dialogForm.checkRange == 2" @click="dialogClickType(2)">{{lookInfoType?'查看':'选择学院'}}</p>
+                <p class="page-submit-common-style-button button-p" :style="lookInfoType?'background:#0183FA;border:1px solid #0183FA;':''" v-if="dialogForm.checkRange == 3" @click="dialogClickType(3)">{{lookInfoType?'查看':'选择实验室'}}</p>
                 <p class="text-p" v-if="dialogForm.checkRange ==1 && dialogForm.schoolSubCheckNum>0">已选择{{dialogForm.schoolSubCheckNum}}间实验室</p>
                 <p class="text-p" v-if="dialogForm.checkRange == 2 && dialogForm.collegeNum>0">已选择{{dialogForm.collegeNum}}个学院，共{{dialogForm.collegeSubNum}}间实验室</p>
                 <p class="text-p" v-if="dialogForm.checkRange ==3 && dialogForm.subCheckNum>0">已选择{{dialogForm.subCheckNum}}间实验室</p>
@@ -84,7 +84,7 @@
                 </el-select>
               </div>
               <div class="dialog-range-text-box" v-if="dialogForm.checkCategory==2">
-                <p class="inquire-button-one button-p"  @click="dialogClickType(6)">选择检查内容</p>
+                <p class="page-submit-common-style-button button-p"  @click="dialogClickType(6)">选择检查内容</p>
                 <p class="text-p">已选择{{dialogForm.hazardNum}}种</p>
               </div>
             </div>
@@ -112,7 +112,7 @@
                   :on-success="(res)=>handleAvatarSuccess(res)"
                   :headers="headers"
                   :before-upload="beforeAvatarUpload">
-                  <p class="add-button-one-120">+  选择文件</p>
+                  <p class="page-add-common-style-button" style="width:120px;">+  选择文件</p>
                 </el-upload>
                 <p class="dialog-material-text">支持doc/docx/xls/xlsx/pdf格式文件</p>
               </div>
@@ -144,9 +144,9 @@
                 <div class="dialog-table-title-box">
                   <img src="@/assets/ZDimages/safetyCheck/icon_xyxc_cy.png">
                   <p class="dialog-table-title-p">巡查成员</p>
-                  <p v-if="!lookInfoType" class="inquire-button-one dialog-table-title-button" @click="dialogClickType(4)">+ 添加</p>
+                  <p v-if="!lookInfoType" class="page-submit-common-style-button dialog-table-title-button" @click="dialogClickType(4)">+ 添加</p>
                 </div>
-                <el-table border :data="dialogTableList">
+                <el-table class="table-box" border :data="dialogTableList">
                   <el-table-column label="序号" align="center"  type="index" width="140"/>
                   <el-table-column label="工号" align="center" prop="jobNum" show-overflow-tooltip/>
                   <el-table-column label="姓名" align="center" prop="name" show-overflow-tooltip width="150"/>
@@ -188,11 +188,11 @@
               </el-input>
             </el-form-item>
             <el-form-item style="margin-right:0;">
-              <p v-if="!lookInfoType" class="inquire-button-one" @click="deptResetQueryLeft" style="width:60px;margin-right:0;">重置</p>
-              <p v-if="lookInfoType" class="inquire-button-one" @click="lookDeptLeftReset" style="width:60px;margin-right:0;">重置</p>
+              <p v-if="!lookInfoType" class="page-submit-common-style-button" @click="deptResetQueryLeft" style="width:60px;margin-right:0;">重置</p>
+              <p v-if="lookInfoType" class="page-submit-common-style-button" @click="lookDeptLeftReset" style="width:60px;margin-right:0;">重置</p>
             </el-form-item>
           </el-form>
-          <el-table ref="leftDeptTable" border :data="deptTableListLeft" @select-all="deptChange" @select="deptChange" :row-key="getDeptRowKeys">
+          <el-table class="table-box" ref="leftDeptTable" border :data="deptTableListLeft" @select-all="deptChange" @select="deptChange" :row-key="getDeptRowKeys">
             <el-table-column v-if="!lookInfoType" type="selection" width="50" :reserve-selection="true" align="center"/>
             <el-table-column label="学院" align="center" prop="deptName" show-overflow-tooltip>
               <template slot-scope="scope">
@@ -216,9 +216,9 @@
               <el-select v-model="deptQueryParamsRight.typeId" clearable placeholder="选择分类" style="width: 120px">
                 <el-option
                   v-for="item in classTypeList"
-                  :key="item.id"
+                  :key="item.typeList"
                   :label="item.typeName"
-                  :value="item.id">
+                  :value="item.typeList">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -226,9 +226,9 @@
               <el-select v-model="deptQueryParamsRight.level" clearable placeholder="选择分级" style="width: 120px">
                 <el-option
                   v-for="item in classifiedList"
-                  :key="item.id"
-                  :label="item.classifiedName"
-                  :value="item.id">
+                  :key="item.levelId"
+                  :label="item.levelName"
+                  :value="item.levelId">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -254,11 +254,11 @@
               </el-input>
             </el-form-item>
             <el-form-item style="margin-right:0;">
-              <p v-if="!lookInfoType" class="inquire-button-one" @click="deptResetQueryRight" style="width:60px;margin-right:0;">重置</p>
-              <p v-if="lookInfoType" class="inquire-button-one" @click="lookDeptRightReset" style="width:60px;margin-right:0;">重置</p>
+              <p v-if="!lookInfoType" class="page-submit-common-style-button" @click="deptResetQueryRight" style="width:60px;margin-right:0;">重置</p>
+              <p v-if="lookInfoType" class="page-submit-common-style-button" @click="lookDeptRightReset" style="width:60px;margin-right:0;">重置</p>
             </el-form-item>
           </el-form>
-          <el-table  border :data="deptTableListRight">
+          <el-table class="table-box" border :data="deptTableListRight">
             <el-table-column label="序号" align="center"  type="index" width="60"/>
             <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip>
               <template slot-scope="scope">{{scope.row.roomNumber?scope.row.subjectName+'-'+scope.row.roomNumber:scope.row.subjectName}}</template>
@@ -266,9 +266,9 @@
             <el-table-column label="楼栋楼层" align="center" prop="buildName" show-overflow-tooltip width="150"/>
             <el-table-column label="分类分级" align="center" prop="deptName" show-overflow-tooltip width="150">
               <template slot-scope="scope">
-                <span v-for="item in classTypeList" v-if="item.id == scope.row.typeId">{{item.typeName}}</span>
+                <span v-for="item in classTypeList" v-if="item.typeId == scope.row.typeId">{{item.typeName}}</span>
                 <span style="border-right:1px solid #E0E0E0;margin:0 10px;"></span>
-                <span v-for="item in classifiedList" v-if="item.id == scope.row.level" :style="'color:'+item.classifiedColor+';'">{{item.classifiedName}}</span>
+                <span v-for="item in classifiedList" v-if="item.levelId == scope.row.level" :style="'color:'+item.levelColor+';'">{{item.levelName}}</span>
               </template>
             </el-table-column>
             <el-table-column label="学院" align="center" prop="collegeName" show-overflow-tooltip width="140"/>
@@ -295,9 +295,9 @@
               <el-select v-model="subQueryParamsLeft.typeId" clearable placeholder="选择分类" style="width: 110px">
                 <el-option
                   v-for="item in classTypeList"
-                  :key="item.id"
+                  :key="item.typeId"
                   :label="item.typeName"
-                  :value="item.id">
+                  :value="item.typeId">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -305,9 +305,9 @@
               <el-select v-model="subQueryParamsLeft.level" clearable placeholder="选择分级" style="width: 110px">
                 <el-option
                   v-for="item in classifiedList"
-                  :key="item.id"
-                  :label="item.classifiedName"
-                  :value="item.id">
+                  :key="item.levelId"
+                  :label="item.levelName"
+                  :value="item.levelId">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -332,19 +332,19 @@
               </el-input>
             </el-form-item>
             <el-form-item style="margin-right:0;">
-              <p class="inquire-button-one" @click="subResetQueryLeft" style="width:60px;margin-right:0;">重置</p>
+              <p class="page-submit-common-style-button" @click="subResetQueryLeft" style="width:60px;margin-right:0;">重置</p>
             </el-form-item>
           </el-form>
-          <el-table ref="leftSubTable" border :data="subTableListLeft" @selection-change="subChangeLeft" :row-key="getSubRowKeys">
+          <el-table class="table-box" ref="leftSubTable" border :data="subTableListLeft" @selection-change="subChangeLeft" :row-key="getSubRowKeys">
             <el-table-column type="selection" width="50" :reserve-selection="true" align="center"/>
             <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip>
               <template slot-scope="scope">{{scope.row.roomNumber?scope.row.subjectName+'-'+scope.row.roomNumber:scope.row.subjectName}}</template>
             </el-table-column>
             <el-table-column label="分类分级" align="center" prop="deptName" show-overflow-tooltip width="140">
               <template slot-scope="scope">
-                <span v-for="item in classTypeList" v-if="item.id == scope.row.typeId">{{item.typeName}}</span>
+                <span v-for="item in classTypeList" v-if="item.typeId == scope.row.typeId">{{item.typeName}}</span>
                 <span style="border-right:1px solid #E0E0E0;margin:0 10px;"></span>
-                <span v-for="item in classifiedList" v-if="item.id == scope.row.level" :style="'color:'+item.classifiedColor+';'">{{item.classifiedName}}</span>
+                <span v-for="item in classifiedList" v-if="item.levelId == scope.row.level" :style="'color:'+item.levelColor+';'">{{item.levelName}}</span>
               </template>
             </el-table-column>
             <el-table-column label="学院" align="center" prop="collegeName" show-overflow-tooltip width="150"/>
@@ -373,9 +373,9 @@
               <el-select v-model="subQueryParamsRight.typeId" clearable placeholder="选择分类" :style="!lookInfoType?'width:110px':'width:140px'">
                 <el-option
                   v-for="item in classTypeList"
-                  :key="item.id"
+                  :key="item.typeId"
                   :label="item.typeName"
-                  :value="item.id">
+                  :value="item.typeId">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -383,9 +383,9 @@
               <el-select v-model="subQueryParamsRight.level" clearable placeholder="选择分级" :style="!lookInfoType?'width:110px':'width:140px'">
                 <el-option
                   v-for="item in classifiedList"
-                  :key="item.id"
-                  :label="item.classifiedName"
-                  :value="item.id">
+                  :key="item.levelId"
+                  :label="item.levelName"
+                  :value="item.levelId">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -410,19 +410,19 @@
               </el-input>
             </el-form-item>
             <el-form-item style="margin-right:0;">
-              <p class="inquire-button-one" @click="subResetQueryRight" style="width:60px;margin-right:0;">重置</p>
+              <p class="page-submit-common-style-button" @click="subResetQueryRight" style="width:60px;margin-right:0;">重置</p>
             </el-form-item>
           </el-form>
-          <el-table ref="rightSubTable" border :data="subTableListRight" @selection-change="subChangeRight" :row-key="getSubRowKeys">
+          <el-table class="table-box" ref="rightSubTable" border :data="subTableListRight" @selection-change="subChangeRight" :row-key="getSubRowKeys">
             <el-table-column v-if="!lookInfoType" type="selection" width="50" :reserve-selection="true" align="center"/>
             <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip>
               <template slot-scope="scope">{{scope.row.roomNumber?scope.row.subjectName+'-'+scope.row.roomNumber:scope.row.subjectName}}</template>
             </el-table-column>
             <el-table-column label="分类分级" align="center" prop="deptName" show-overflow-tooltip width="140">
               <template slot-scope="scope">
-                <span v-for="item in classTypeList" v-if="item.id == scope.row.typeId">{{item.typeName}}</span>
+                <span v-for="item in classTypeList" v-if="item.typeId == scope.row.typeId">{{item.typeName}}</span>
                 <span style="border-right:1px solid #E0E0E0;margin:0 10px;"></span>
-                <span v-for="item in classifiedList" v-if="item.id == scope.row.level" :style="'color:'+item.classifiedColor+';'">{{item.classifiedName}}</span>
+                <span v-for="item in classifiedList" v-if="item.levelId == scope.row.level" :style="'color:'+item.levelColor+';'">{{item.levelName}}</span>
               </template>
             </el-table-column>
             <el-table-column label="学院" align="center" prop="collegeName" show-overflow-tooltip width="150"/>
@@ -468,7 +468,7 @@
               <p class="reset-button-one" @click="userResetQueryLeft" style="width:60px;">重置</p>
             </el-form-item>
           </el-form>
-          <el-table ref="leftUserTable" border :data="userTableListLeft" @selection-change="userChangeLeft" :row-key="getRowKeys">
+          <el-table class="table-box" ref="leftUserTable" border :data="userTableListLeft" @selection-change="userChangeLeft" :row-key="getRowKeys">
             <el-table-column type="selection" width="50" :reserve-selection="true" align="center"/>
             <el-table-column label="姓名" align="center" prop="nickName" show-overflow-tooltip/>
             <el-table-column label="工号" align="center" prop="userName" show-overflow-tooltip width="150"/>
@@ -518,7 +518,7 @@
               <p class="reset-button-one" @click="userResetQueryRight" style="width:60px;">重置</p>
             </el-form-item>
           </el-form>
-          <el-table ref="rightUserTable" border :data="userTableListRight" @selection-change="userChangeRight" :row-key="getRowKeys">
+          <el-table class="table-box" ref="rightUserTable" border :data="userTableListRight" @selection-change="userChangeRight" :row-key="getRowKeys">
             <el-table-column type="selection" width="50" :reserve-selection="true" align="center"/>
             <el-table-column label="姓名" align="center" prop="nickName" show-overflow-tooltip/>
             <el-table-column label="工号" align="center" prop="userName" show-overflow-tooltip width="150"/>
@@ -572,7 +572,7 @@
               <p class="reset-button-one" @click="deviceResetQueryLeft" style="width:60px;">重置</p>
             </el-form-item>
           </el-form>
-          <el-table ref="leftDeviceTable" border :data="deviceTableListLeft" @selection-change="deviceChangeLeft" :row-key="getDeviceRowKeys">
+          <el-table class="table-box" ref="leftDeviceTable" border :data="deviceTableListLeft" @selection-change="deviceChangeLeft" :row-key="getDeviceRowKeys">
             <el-table-column type="selection" width="50" :reserve-selection="true" align="center"/>
             <el-table-column label="名称" align="center" prop="chName" show-overflow-tooltip/>
             <el-table-column label="型号" align="center" prop="code" show-overflow-tooltip width="150"/>
@@ -622,7 +622,7 @@
               <p class="reset-button-one" @click="deviceResetQueryRight" style="width:60px;">重置</p>
             </el-form-item>
           </el-form>
-          <el-table ref="rightDeviceTable" border :data="deviceTableListRight" @selection-change="deviceChangeRight" :row-key="getDeviceRowKeys">
+          <el-table class="table-box" ref="rightDeviceTable" border :data="deviceTableListRight" @selection-change="deviceChangeRight" :row-key="getDeviceRowKeys">
             <el-table-column type="selection" width="50" :reserve-selection="true" align="center"/>
             <el-table-column label="名称" align="center" prop="chName" show-overflow-tooltip/>
             <el-table-column label="型号" align="center" prop="code" show-overflow-tooltip width="150"/>
@@ -648,17 +648,25 @@
 </template>
 
 <script>
-import { getToken } from "@/utils/auth";
-import { listDepartments } from "@/apiDemo/system/dept";
-import { listClassifiedAll } from "@/apiDemo/laboratory/classified";
-import { listClasstypeAll } from "@/apiDemo/laboratory/classtype";
 import {
   getHistoryPlanTitles, findGroupList, checkGroupFind, findUserList,
-  getAllSubNum, isSCollege, conditionCollegeInfo, findSubInfoByDeptIds,
+  getAllSubNum, isSCollege, findSubInfoByDeptIds,
   checkPlanAdd, conditionSubjectInfo, findCheckPlan, checkPlanUpdate,
   hideHistoryPlanTitle, findDeviceList,haveHazardInSub
 } from '@/apiDemo/safetyCheck/index'
 import { dangerList } from '@/apiDemo/gasManage3_0/gasManage'
+//                        V3
+import { getToken } from "@/utils/auth";
+import {
+  getDeptDropList,
+  laboratoryClassTypeGetList,
+  laboratoryClassLevelGetList,
+} from '@/api/commonality/permission'
+import {
+  laboratorySubRelInfoGetAllSubNum,
+  laboratorySubRelInfoConditionCollegeInfo
+} from '@/api/safetyCheck/indexTow'
+
 export default {
   name: 'addDialog',
   props:{
@@ -864,7 +872,7 @@ export default {
     this.$set(this,'lookInfoType',this.addDialogData.lookInfoType);
   },
   mounted(){
-    this.dangerList();
+    // this.dangerList();
     this.initializationInterface();
     this.deviceGetList();//查询所有设备
 
@@ -874,18 +882,18 @@ export default {
     initializationInterface(){
       //获取历史标题
       this.getHistoryPlanTitles();
-      //获取学院列表
-      listDepartments().then(response => {
-        this.deptSelectList = response.data;
-      });
+      //
+      getDeptDropList({ deptName: '', level: 2, deptType: 1 }).then(response => {
+        this.$set(this, 'deptSelectList', response.data)
+      })
       /**获取分级*/
-      listClassifiedAll().then(response=>{
-        this.classifiedList = response.data
+      laboratoryClassLevelGetList({}).then(response => {
+        this.$set(this, 'classifiedList', response.data)
       })
       /**获取分类*/
-      listClasstypeAll().then(response=>{
-        this.classTypeList = response.data;
-      });
+      laboratoryClassTypeGetList({}).then(response => {
+        this.$set(this, 'classTypeList', response.data)
+      })
       //查询当前用户是否是院级
       isSCollege().then(response=>{
         if(response.data.userFlg){
@@ -962,7 +970,7 @@ export default {
     rangeChange(val){
       if(val == 1){
         //全校
-        getAllSubNum().then(response => {
+        laboratorySubRelInfoGetAllSubNum().then(response => {
           this.$set(this.dialogForm,'schoolSubCheckNum',response.data.subCount);
         })
       }
@@ -1176,7 +1184,7 @@ export default {
         if(this.dialogForm.collegeIds[0]){
           this.$nextTick(() => {
             this.$set(this,'deptQueryParamsLeft',{ searchValue:"", });
-            conditionCollegeInfo(self.deptQueryParamsLeft).then(response => {
+            laboratorySubRelInfoConditionCollegeInfo(self.deptQueryParamsLeft).then(response => {
               if(this.lookInfoType){
                 //查看时
                 let list = [];
@@ -1309,7 +1317,7 @@ export default {
     },
     //查询接口
     deptGetListLeft(){
-      conditionCollegeInfo(this.deptQueryParamsLeft).then(response => {
+      laboratorySubRelInfoConditionCollegeInfo(this.deptQueryParamsLeft).then(response => {
         this.$set(this,'deptTableListLeft',response.data);
         this.$set(this,'deptTotalLeft',response.data.length);
       })
@@ -1856,7 +1864,7 @@ export default {
     //查看时学院左侧搜索
     lookDeptLeftSearch(){
       let self = this;
-      conditionCollegeInfo(self.deptQueryParamsLeft).then(response => {
+      laboratorySubRelInfoConditionCollegeInfo(self.deptQueryParamsLeft).then(response => {
         let list = [];
         for(let i=0;i<response.data.length;i++){
           for(let o=0;o<self.dialogForm.collegeIds.length;o++){
@@ -1894,7 +1902,7 @@ export default {
     lookDeptLeftReset(){
       let self = this;
       this.$set(this,'deptQueryParamsLeft',{ searchValue:"", });
-      conditionCollegeInfo(self.deptQueryParamsLeft).then(response => {
+      laboratorySubRelInfoConditionCollegeInfo(self.deptQueryParamsLeft).then(response => {
         //查看时
         for(let i=0;i<response.data.length;i++){
           let num = 0;

src/views/safetyCheck/schoolInspection/inspectionPlan/index.vue

@@ -82,13 +82,13 @@
             <template slot-scope="scope">
               <div class="table-button-box">
                 <p class="table-button-null"></p>
-                <p class="table-button-p" v-hasPermi="['security:checkPlan:query']"
+                <p class="table-button-p" v-hasPermiRouter="['security:checkPlan:query']"
                    v-show="scope.row.checkStatus!=1" @click="addDialogOpen(3,scope.row)">详情</p>
-                <p class="table-button-p" v-hasPermiAnd="['security:checkPlan:query','security:checkPlan:edit']"
+                <p class="table-button-p" v-hasPermiRouter="['security:checkPlan:edit']"
                    v-show="scope.row.checkStatus==1&&scope.row.isSelfData == 1" @click="addDialogOpen(2,scope.row)">编辑</p>
-                <p class="table-button-p" v-hasPermi="['security:checkManage_2:list']"
+                <p class="table-button-p" v-hasPermiRouter="['security:checkManage_2:list']"
                    @click="goPage(2,scope.row)">巡查管理</p>
-                <p class="table-button-p" v-hasPermi="['security:checkPlan:remove']"
+                <p class="table-button-p" v-hasPermiRouter="['security:checkPlan:remove']"
                    v-show="scope.row.checkStatus==1&&scope.row.isSelfData == 1" @click="deleteObj(scope.row)">删除</p>
                 <p class="table-button-p" v-show="scope.row.isAttachment == 1" @click="lookDocumentListButton(1,scope.row)">查看附件</p>
                 <p class="table-button-null"></p>
@@ -164,8 +164,8 @@
           myRelated:1,
           checkStatus:this.queryParams.checkStatus,
           searchValue:this.queryParams.searchValue,
-          cycleStartTime:this.dateRange[0]?this.dateRange[0]:'',
-          cycleEndTime:this.dateRange[1]?this.dateRange[1]:'',
+          cycleStartTime:this.dateRange[0]?this.dateRange[0]+'T00:00:00':'',
+          cycleEndTime:this.dateRange[1]?this.dateRange[1]+'T23:59:59':'',
         }).then(response => {
           this.$set(this,'correlationNum',response.data.total>999?' 999+':(response.data.total<1?'':' '+response.data.total));
         });
@@ -239,13 +239,10 @@
       getList(){
         let obj = JSON.parse(JSON.stringify(this.queryParams))
         if(this.dateRange[0]){
-          obj.cycleStartTime = this.dateRange[0];
+          obj.cycleStartTime = this.dateRange[0]+'T00:00:00';
+          obj.cycleEndTime = this.dateRange[1]+'T23:59:59';
         }else{
           obj.cycleStartTime = "";
-        }
-        if(this.dateRange[1]){
-          obj.cycleEndTime = this.dateRange[1];
-        }else{
           obj.cycleEndTime = "";
         }
         let self = this;

src/views/safetyCheck/schoolInspection/inspectionPlan/listPage.vue

@@ -101,13 +101,13 @@
             <template slot-scope="scope">
               <div class="table-button-box">
                 <p class="table-button-null"></p>
-                <p class="table-button-p" v-hasPermi="['security:checkManage_2:query']"
+                <p class="table-button-p" v-hasPermiRouter="['security:checkManage_2:query']"
                    v-show="scope.row.manageStatus==0||scope.row.manageStatus==2" @click="goAddPage(3,scope.row.id)">详情</p>
-                <p class="table-button-p" v-hasPermiAnd="['security:checkManage_2:query','security:checkManage_2:edit']"
+                <p class="table-button-p" v-hasPermiRouter="['security:checkManage_2:edit']"
                    v-show="scope.row.manageStatus==1 && scope.row.isCheck==1 && scope.row.isSelfData==1" @click="goAddPage(2,scope.row.id)">编辑</p>
-                <p class="table-button-p" v-hasPermiAnd="['security:checkManage_2:query','security:checkManage_2:edit']"
+                <p class="table-button-p" v-hasPermiRouter="['security:checkManage_2:edit']"
                    v-show="scope.row.manageStatus==0 && scope.row.isCheck==1 && scope.row.isSelfData==1" @click="goAddPage(2,scope.row.id)">开始检查</p>
-                <p class="table-button-p" v-hasPermiAnd="['security:checkManage_2:query','security:checkManage_2:edit']"
+                <p class="table-button-p" v-hasPermiRouter="['security:checkManage_2:edit']"
                    style="color:#999" v-show="scope.row.manageStatus==0 && scope.row.isCheck==0 && scope.row.isSelfData==1">开始检查</p>
                 <p class="table-button-p" v-show="scope.row.isEndProcess==1 && scope.row.checkResult==0" @click="lookDocumentButton(1,scope.row)">整改报告</p>
                 <p class="table-button-p" v-show="scope.row.isAttachment == 1" @click="lookDocumentListButton(1,scope.row)">查看附件</p>
@@ -230,13 +230,10 @@
         let obj = JSON.parse(JSON.stringify(this.queryParams))
         obj.checkPlanId = this.propsListPageData.id;
         if(this.dateRange[0]){
-          obj.startTime = this.dateRange[0];
+          obj.startTime = this.dateRange[0]+'T00:00:00';
+          obj.endTime = this.dateRange[1]+'T23:59:59';
         }else{
           obj.startTime = "";
-        }
-        if(this.dateRange[1]){
-          obj.endTime = this.dateRange[1];
-        }else{
           obj.endTime = "";
         }
         findByCheckPlanId(obj).then(response => {