dedsudiyu 2 年之前
父节点
当前提交
a6a1ed3022

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

@@ -349,7 +349,6 @@
           }
           //根据学院获取楼栋
           buildFloorGetlist({type:2}).then(response => {
-            console.log('123')
             this.buildings = response.rows;
             //根据楼栋获取层
             buildFloorGetlist({type:3,parentId:this.form.buildId}).then(response=>{

+ 0 - 208
src/views/creditViolation/credit/blacklist/blackListInfo.vue

@@ -1,208 +0,0 @@
-<!--黑名单历史记录-->
-<template>
-    <div class="blackListInfo">
-      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item class="button-box">
-          <p class="reset-button-one" @click="backPage"><i class="el-icon-arrow-left"></i>返回</p>
-        </el-form-item>
-        <el-form-item label="状态" prop="overStatus" label-width="50px">
-          <el-select v-model="queryParams.overStatus" clearable placeholder="请选择状态">
-            <el-option
-              v-for="dict in overStatusOptions"
-              :key="dict.id"
-              :label="dict.name"
-              :value="dict.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="学期" prop="semesterId" label-width="50px">
-          <el-select v-model="queryParams.semesterId" clearable placeholder="请选择学期">
-            <el-option
-              v-for="dict in semesterOptions"
-              :key="dict.id"
-              :label="dict.semesterName"
-              :value="dict.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="创建时间" prop="dateRange" style="margin-left:10px;">
-          <el-date-picker
-            :clearable="false"
-            v-model="dateRange"
-            size="small"
-            style="width: 240px"
-            value-format="yyyy-MM-dd"
-            type="daterange"
-            range-separator="-"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
-        </el-form-item>
-        <el-form-item>
-          <p class="inquire-button-one" @click="handleQuery">查询</p>
-          <p class="reset-button-one" @click="resetQuery">重置</p>
-        </el-form-item>
-      </el-form>
-      <el-table v-loading="loading" border :data="recordList">
-        <el-table-column label="姓名" align="left" prop="nickName" />
-        <el-table-column label="原因" align="left" prop="reason" />
-        <el-table-column label="时间" align="left" prop="createTime" />
-        <el-table-column label="处理方式" align="left"  prop="treatmentMethod" />
-        <el-table-column label="处理状态" align="left"  prop="surplusPoints">
-          <template slot-scope="scope">
-            <div class="scope-big-box" v-if="scope.row.learnStatus == 0 || scope.row.learnStatus == 1">
-              <p>学习</p>
-              <p :class="scope.row.learnStatus == 0 ?'scopeColorA':(scope.row.learnStatus == 1 ?'scopeColorB':'')">{{scope.row.learnStatus == 0 ?'未完成':(scope.row.learnStatus == 1 ?'已完成':'')}}</p>
-            </div>
-            <div class="scope-big-box" v-if="scope.row.practiceStatus == 0 || scope.row.practiceStatus == 1">
-              <p>做题</p>
-              <p :class="scope.row.practiceStatus == 0 ?'scopeColorA':(scope.row.practiceStatus == 1 ?'scopeColorB':'')">{{scope.row.practiceStatus == 0 ?'未完成':(scope.row.practiceStatus == 1 ?'已完成':'')}}</p>
-            </div>
-            <div class="scope-big-box" v-if="scope.row.testStatus == 0 || scope.row.testStatus == 1">
-              <p>考试</p>
-              <p :class="scope.row.testStatus == 0 ?'scopeColorA':(scope.row.testStatus == 1 ?'scopeColorB':'')">{{scope.row.testStatus == 0 ?'未完成':(scope.row.testStatus == 1 ?'已完成':'')}}</p>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column label="信用分" align="left"  prop="creditScore" />
-      </el-table>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        layout="total, prev, pager, next, sizes, jumper"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-    </div>
-</template>
-
-<script>
-  import { getBlackDetail } from "@/api/laboratory/blacklist";
-  import { getSemesterList } from "@/api/laboratory/semester";
-    export default {
-      props: {
-        propsData:{},
-      },
-      name: "blackListInfo",
-      data() {
-        return {
-          //加载状态
-          loading:false,
-          // 显示搜索条件
-          showSearch: true,
-          // 查询参数
-          queryParams: {
-            pageNum: 1,
-            pageSize:20,
-            points: null,
-            joinUserId: null,
-            mode: null,
-            deptName: null,
-            deptId: null,
-            userId: null,
-            semesterId: null,
-            overStatus: null
-          },
-          //状态条件
-          overStatusOptions:[
-            {id:1,name:"已完成"},
-            {id:0,name:"未完成"},
-          ],
-          //列表数据
-          recordList:[],
-          total:0,
-          // 日期范围
-          dateRange: [],
-          //学期列表
-          semesterOptions:[],
-        }
-      },
-      created(){
-        this.getList()
-      },
-      mounted(){
-        this.getSemesterList()
-      },
-      methods:{
-        //返回上级页面
-        backPage(){
-          this.$parent.goPage(1);
-        },
-        /** 查询数据 */
-        getList() {
-          this.loading = true;
-          if(this.dateRange&&this.dateRange.length>0)
-          {
-            this.queryParams.beginTime=this.dateRange[0]
-            this.queryParams.endTime=this.dateRange[1]
-          }
-          else
-          {
-            this.queryParams.beginTime=null;
-            this.queryParams.endTime=null
-          }
-          this.queryParams.blackId = this.propsData.userId;
-          getBlackDetail(this.queryParams).then( response => {
-            this.recordList =  response.rows;
-            this.total =  response.total;
-            this.loading = false;
-          });
-        },
-        /** 查询学期列表 */
-        getSemesterList() {
-          getSemesterList().then(response => {
-            this.$set(this, 'semesterOptions', response.data)
-          });
-        },
-        /** 搜索按钮操作 */
-        handleQuery() {
-          this.queryParams.pageNum = 1;
-          this.getList();
-        },
-        /** 重置按钮操作 */
-        resetQuery() {
-          this.resetForm("queryParams");
-          this.dateRange = [];
-          this.queryParams = {};
-          this.recordList = [];
-          this.handleQuery();
-        },
-      },
-    }
-</script>
-
-<style scoped lang="scss">
-  .blackListInfo{
-    flex:1;
-    display: flex!important;
-    flex-direction: column;
-    .scope-big-box{
-      display: flex;
-      p{
-        font-size:14px;
-        height:20px;
-        line-height:20px;
-        margin:4px 0;
-      }
-      p:nth-child(1){
-        margin-right:10px;
-      }
-      p:nth-child(2){
-
-      }
-      .scopeColorA{
-        padding:0 4px;
-        border-radius:4px;
-        color:#999;
-        background: #dedede;
-      }
-      .scopeColorB{
-        padding:0 4px;
-        border-radius:4px;
-        color:#fff;
-        background: #39A922;
-      }
-    }
-  }
-</style>

+ 0 - 354
src/views/creditViolation/credit/blacklist/index.vue

@@ -1,354 +0,0 @@
-<!--黑名单-->
-<template>
-  <div class="app-container blacklist">
-    <div class="blacklist-page" v-if="pageType == 1">
-      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item label="学院" prop="deptId" style="margin-left:-30px;">
-          <el-select v-model="queryParams.deptId" placeholder="请选择学院" clearable size="small">
-            <el-option
-              v-for="dict in deptOptions"
-              :key="dict.deptId"
-              :label="dict.deptName"
-              :value="dict.deptId"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="关键字" prop="searchValue">
-          <el-input
-            v-model="queryParams.searchValue"
-            placeholder="请输入姓名/学号"
-            clearable
-            size="small"
-          />
-        </el-form-item>
-        <el-form-item>
-          <p class="inquire-button-one" @click="handleQuery">查询</p>
-          <p class="reset-button-one" @click="resetQuery">重置</p>
-        </el-form-item>
-      </el-form>
-      <el-table v-loading="loading" border :data="blacklistList" @sort-change="handleSelectionChange">
-        <el-table-column label="姓名" align="left" prop="userName" />
-        <el-table-column label="学号" align="left" prop="number" />
-        <el-table-column label="学院" align="left" prop="deptName" />
-        <el-table-column label="违规次数" align="left" sortable="custom" prop="total" />
-        <el-table-column label="负面清单次数" align="left" sortable="custom" prop="negativeNum" />
-        <el-table-column label="黑名单次数" align="left" sortable="custom" prop="blackNum" />
-        <el-table-column label="信用分" align="left" prop="creditScore" />
-        <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="230" v-if="tableButtonType">
-          <template slot-scope="scope">
-            <div class="table-button-box">
-              <p class="table-button-null"></p>
-              <p class="table-button-p"
-                 @click="goPage(2,scope.row)"
-                 v-hasPermi="['laboratory:blackdetail:list']"
-              >历史记录</p>
-              <p class="table-button-p"
-                 v-if="scope.row.blacklistStatus == 1"
-                 @click="handleDelete(scope.row)"
-                 v-hasPermi="['laboratory:blacklist:remove']"
-              >移除黑名单</p>
-              <p class="table-button-null"></p>
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        layout="total, prev, pager, next, sizes, jumper"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-    </div>
-    <black-list-info v-if="pageType == 2" :propsData="propsData"></black-list-info>
-    <!-- 移除黑名单 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="90px">
-        <el-form-item label="姓名:">
-          <el-input v-model="form.userName" :disabled="true" placeholder="请输入姓名" />
-        </el-form-item>
-        <el-form-item label="学号:">
-          <el-input v-model="form.number" :disabled="true" placeholder="请输入学号" />
-        </el-form-item>
-        <el-form-item label="学院:">
-          <el-input v-model="form.deptName" :disabled="true" placeholder="请输入姓名" />
-        </el-form-item>
-        <el-form-item label="原因:" prop="reason">
-          <el-input
-            type="textarea"
-            :autosize="{ minRows: 6, maxRows: 6}"
-            placeholder="请输入原因"
-            resize="none"
-            v-model="form.reason">
-          </el-input>
-        </el-form-item>
-        <el-form-item label="">
-          <p style="font-size:14px;color:#999;margin:0;">提交后,该人员信用分自动恢复到合格分。</p>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="cancel">取 消</el-button>
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listBlacklist, getBlacklist, delBlacklist, addBlacklist, updateBlacklist, removeBlacklist } from "@/api/laboratory/blacklist";
-import { selectListUser } from "@/api/system/user";
-import { listDepartments,listbuildings } from "@/api/system/dept";
-import blackListInfo from "./blackListInfo.vue";
-export default {
-  name: "Blacklist",
-  components: {
-    blackListInfo,
-  },
-  data() {
-    return {
-      tableButtonType:this.hasPermiDom(['laboratory:blackdetail:list','laboratory:blacklist:remove']),
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 黑名单表格数据
-      blacklistList: [
-        {
-          id:"id",
-          joinUserId:"joinUserId",
-          blacklistStatus:"blacklistStatus",
-          deptId:"deptId",
-
-        },
-      ],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize:20,
-        searchValue: null,
-        joinUserId: null,
-        blacklistStatus: null,
-        deptId: null,
-        deptName: null,
-        userId: null,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        reason:[
-           {required: true, message: '请输入原因', trigger: 'blur'},
-          { required: true, message: "请输入原因", validator: this.spaceJudgment, trigger: "blur" }
-        ],
-      },
-      //新增-编辑状态
-      disabledType:true,
-      //人员
-      optionsUser: [],
-      //处置方案
-      optionsTwo: [],
-      // 日期范围
-      dateRange: [],
-      deptOptions:[],
-      //页面状态
-      pageType:1,
-      propsData:{},
-    };
-  },
-  created() {
-    this.getList();
-    this.getDicts("penaltyType").then(response => {
-      this.optionsTwo = response.data;
-    });
-  },
-  mounted(){
-    this.getDeptList();
-  },
-  methods: {
-    goPage(type,row){
-      if(this.pageType!=type){
-        if(type == 1){
-          this.pageType = type;
-          this.getList();
-        }else if(type == 2){
-          this.propsData.userId = row.id
-          this.pageType = type;
-        }
-      }
-    },
-    /** 查询黑名单列表 */
-    getList() {
-      this.loading = true;
-       if(this.dateRange&&this.dateRange.length>0)
-      {
-        this.queryParams.startTime=this.dateRange[0]
-        this.queryParams.endTime=this.dateRange[1]
-      }
-      else
-      {
-        this.queryParams.startTime=null;
-        this.queryParams.endTime=null
-      }
-
-      listBlacklist(this.queryParams).then(response => {
-        this.blacklistList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    /** 查询学院列表 */
-    getDeptList()
-    {
-      listDepartments().then(response => {
-        // this.deptOptions = response.data;
-        this.$set(this, 'deptOptions', response.data)
-      });
-    },
-    // 处置类型字典翻译
-    statusFormat(row, column) {
-      return this.selectDictLabel(this.optionsTwo, row.penaltyType);
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        joinUserId: null,
-        blacklistStatus: 0,
-        deptId: null,
-        deptName: null,
-        userId: null,
-        remark: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      // this.resetForm("queryForm");
-      this.$set(this,'queryParams',{
-        pageNum: 1,
-        pageSize:20,
-        deptId:"",
-        searchValue: '',
-      });
-      this.dateRange = null;
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(type) {
-      if(type.order == 'ascending'){
-        this.queryParams.order = type.prop;//降
-        this.queryParams.orderType = 'asc';//升ascending
-      }else if(type.order == 'descending'){
-        this.queryParams.order = type.prop;//降
-        this.queryParams.orderType = 'desc';//降
-      }else{
-        this.queryParams.order = null;//无
-        this.queryParams.orderType = null;//无
-      }
-      this.getList();
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.disabledType = false;
-      this.open = true;
-      this.title = "添加黑名单";
-    },
-    /** 修改按钮操作 */
-    // handleUpdate(row) {
-    //   this.reset();
-    //   const id = row.id || this.ids.join()
-    //   getBlacklist(id).then(response => {
-    //     this.form = response.data;
-    //     this.disabledType = true;
-    //     this.open = true;
-    //     this.title = "修改黑名单";
-    //   });
-    // },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          removeBlacklist(this.form).then(response => {
-              this.msgSuccess("操作成功");
-              this.open = false;
-              this.getList();
-            });
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      this.$set(this,'form',row);
-      this.title = "移除黑名单";
-      this.open = true;
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('laboratory/blacklist/export', {
-        ...this.queryParams
-      }, `laboratory_blacklist.xlsx`)
-    },
-    /** 下列人员-懒加载 */
-    userSelectList(query) {
-        if (query !== '' && query.length>1) {
-          this.loading = true;
-          this.userSelectList.nickName=query;
-          selectListUser(this.userSelectList).then(response => {
-            this.optionsUser = response.data;
-            this.loading = false;
-          });
-        } else {
-          this.optionsUser = [];
-        }
-      }
-  }
-};
-</script>
-<style scoped lang="scss">
-  .blacklist {
-    display: flex!important;
-    flex-direction: column;
-    box-shadow: 0 0 8px 2px rgba(0, 0, 0, 0.1);
-    padding:20px!important;
-    overflow: hidden;
-    .blacklist-page{
-      flex:1;
-      display: flex!important;
-      flex-direction: column;
-      overflow: hidden;
-      .button-box{
-        display: flex;
-        width:250px;
-        margin:0 auto;
-      }
-    }
-  }
-</style>

+ 5 - 4
src/views/emergencyManagement/evacuation/sparseHardware/index.vue

@@ -11,7 +11,7 @@
         </el-form-item>
         <el-form-item label="楼栋" prop="buildId">
           <el-select v-model="queryParams.buildId" placeholder="请选择楼栋" clearable @change="deptChange">
-            <el-option v-for="(item,index) in buildsDataList" :key="index" :label="item.deptName" :value="item.deptId" />
+            <el-option v-for="(item,index) in buildsDataList" :key="index" :label="item.name" :value="item.id" />
           </el-select>
         </el-form-item>
         <!--<el-form-item label="实验室" prop="type">-->
@@ -126,7 +126,8 @@
 </template>
 
 <script>
-import { listSparseHardware, getSparseHardware, delSparseHardware, addSparseHardware, updateSparseHardware,buildsList,getNoAdminSubjectListNopage } from "@/api/laboratory/sparseHardware";
+  import { buildFloorGetlist } from "@/api/laboratory/building";
+  import { listSparseHardware, getSparseHardware, delSparseHardware, addSparseHardware, updateSparseHardware,getNoAdminSubjectListNopage } from "@/api/laboratory/sparseHardware";
 import addPage from "./addPage.vue"
 export default {
   name: "SparseHardware",
@@ -214,8 +215,8 @@ export default {
     },
     //查询楼栋
     buildsList(){
-      buildsList().then( response => {
-        this.buildsDataList = response.data;
+      buildFloorGetlist({type:2}).then( response => {
+        this.buildsDataList = response.rows;
       });
     },
     //选择学院获取实验室

+ 0 - 15
src/views/gasManage3_0/manage/labCenterPerson/labCenterPerson.vue

@@ -116,22 +116,7 @@ export default {
           this.$set(this, 'deptOptions', response.data)
         });
       },
-      /** 查询楼栋列表  */
-      getBuildings(id) {
-        if(id) {
-          this.$set(this.form, 'buildId', '');//楼栋
-          this.buildings = [];
-          this.$set(this.form, 'floorId', '');//楼层
-          this.floors = [];
-          this.$set(this.form, 'layoutId', '');//房间
-          this.layoutLists = [];
-          listbuildings(id).then(response => {
-            this.buildings = response.data;
-          });
-        }
-      },
       handleClick(index,row,doType){
-
         let _this=this;
         if(doType=='add'){//添加
           _this.pageType=2;

+ 11 - 12
src/views/safetyCheck/startInspection/index.vue

@@ -23,9 +23,9 @@
                            @change="buildingsChange" style="width: 500px">
                   <el-option
                     v-for="item in buildingsSelectList"
-                    :key="item.deptId"
-                    :label="item.deptName"
-                    :value="item.deptId">
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -66,7 +66,7 @@
             </div>
             <div class="top-form-right-box">
               <el-form-item label="学院" prop="deptId">
-                <el-select v-model="addForm.deptId" placeholder="请选择学院"
+                <el-select disabled v-model="addForm.deptId" placeholder="请选择学院"
                            @change="deptChange" style="width: 500px">
                   <el-option
                     v-for="item in deptSelectList"
@@ -221,7 +221,8 @@
 <script>
   import { getToken } from "@/utils/auth";
   import lookImgDialog from '@/components/lookImgDialog/lookImgDialog.vue'
-  import { listDepartments,listbuildings } from "@/api/system/dept";
+  import { listDepartments } from "@/api/system/dept";
+  import { buildFloorGetlist } from "@/api/laboratory/building";
   import { buildBySubList,getCheckPlanBySubId,findCheckManage,checkOptionList,
            checkManageUpdate,checkManageAdd,countHazardNum,getGentle } from "@/api/safetyCheck/index";
   export default {
@@ -333,6 +334,7 @@
       this.checkOptionList();
       this.listDepartments();
       this.getGentle();
+      this.buildFloorGetlist();
     },
     methods:{
       //获取权限范围
@@ -534,9 +536,9 @@
         });
       },
       //根据学院id查询楼栋列表
-      listbuildings(id){
-        listbuildings(id).then(response => {
-          this.buildingsSelectList = response.data;
+      buildFloorGetlist(){
+        buildFloorGetlist({type:2}).then(response => {
+          this.buildingsSelectList = response.rows;
         });
       },
       //根据楼栋id查询实验室列表
@@ -554,11 +556,11 @@
         this.initializationAddFormData();
         this.$set(this,'planType',1);
         this.$set(this,'planList',[]);
-        this.listbuildings(val);
       },
       //选择楼栋触发
       buildingsChange(val){
         this.$set(this,'subId','');
+        this.$set(this.addForm,'subId','');
         this.initializationAddFormData();
         this.$set(this,'planType',1);
         this.$set(this,'planList',[]);
@@ -571,7 +573,6 @@
           if(self.subSelectList[i].id == val){
             this.$set(this.addForm,'deptId',self.subSelectList[i].deptId);
             this.$set(this.addForm,'buildId',self.subSelectList[i].buildId);
-            this.listbuildings(self.subSelectList[i].deptId);
             this.getCheckPlanBySubId(val);
             return
           }
@@ -581,7 +582,6 @@
       getSubList(val){
         this.$set(this.addForm,'deptId','');
         this.$set(this.addForm,'buildId','');
-        this.$set(this,'buildingsSelectList',[]);
         this.$set(this.addForm,'subId','');
         this.$set(this,'subSelectList',[]);
         this.initializationAddFormData();
@@ -638,7 +638,6 @@
           for(let i=0;i<response.data.checkHazardDtoList.length;i++){
             response.data.checkHazardDtoList[i].lookType = true;
           }
-          this.listbuildings(response.data.deptId);
           this.buildBySubList(response.data.buildId,1);
           this.$set(this,'addForm',{
             id:response.data.id,

+ 1 - 1
src/views/secureAccess/approval_handle/addPage.vue

@@ -365,7 +365,7 @@
       },
       /** 导师-懒加载 */
       selectUserListByName(query) {
-        if (query !== '' && query.length>1) {
+        if (query !== '' && query) {
           let obj={
             nickName:query,
             userType:'11',

+ 0 - 180
src/views/secureAccess/approval_handle/index.vue

@@ -55,71 +55,6 @@
     </div>
     <add-page v-if="pageType == 2" :infoData="infoData" :infoType="infoType"></add-page>
     <info-page v-if="pageType == 3" :infoData="infoData"></info-page>
-    <!--新增/修改-->
-    <el-drawer
-      class="approval_handle-drawer"
-      :visible.sync="drawer"
-      direction="rtl"
-      ref="drawer"
-      :with-header="false"
-      :show-close="false"
-      :before-close="handleClose">
-      <el-form :model="drawerForm" ref="drawerForm" :rules="rules" :inline="true" class="approval_handle-drawer-form-box">
-        <el-form-item label="学院" prop="deptId" label-width="50px" >
-          <el-select v-model="drawerForm.deptId" placeholder="请选择学院" :disabled="disabledType" clearable size="small"
-            @change="getBuildings(drawerForm.deptId)">
-            <el-option
-              v-for="dict in deptOptions"
-              :key="dict.deptId"
-              :label="dict.deptName"
-              :value="dict.deptId"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="楼栋" prop="buildId">
-          <el-select v-model="drawerForm.buildId" placeholder="请选择楼栋" :disabled="disabledType" clearable size="small"
-            @change="getSubjectDictList(drawerForm.buildId)">
-            <el-option
-              v-for="dict in buildings"
-              :key="dict.deptId"
-              :label="dict.deptName"
-              :value="dict.deptId"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="实验室" prop="subjectId">
-          <el-select v-model="drawerForm.subjectId" placeholder="请选择实验室" :disabled="disabledType" clearable size="small"
-            @change="securityBySubjectId(drawerForm.subjectId)">
-            <el-option
-              v-for="item in subjects"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <div class="upload-box" v-for="(item,index) in drawerForm.approvalDetails" :key="index">
-          <p>{{item.materialName}}</p>
-          <el-upload
-            class="avatar-uploader"
-            :action="uploadImgUrl"
-            accept="image/jpeg,image/gif,image/png"
-            :show-file-list="false"
-            :disabled="disabledImgType"
-            :on-success="(response, file)=>handleAvatarSuccess(response,file,index)"
-            :headers="headers"
-            :before-upload="beforeAvatarUpload">
-            <img v-if="item.materialUrl" :src="item.materialUrl" class="avatar">
-            <i v-if="!item.materialUrl" class="el-icon-plus avatar-uploader-icon"></i>
-          </el-upload>
-        </div>
-      </el-form>
-      <div class="bottom-button-box">
-        <p class="null-p"></p>
-        <p class="reset-button-one" style="margin-right:20px;" @click="offDrawer">{{disabledImgType?'关闭':'取消'}}</p>
-        <p class="inquire-button-one" v-if="!disabledImgType" @click="submitForm">提交</p>
-      </div>
-    </el-drawer>
   </div>
 </template>
 
@@ -184,9 +119,6 @@ export default {
         deptId:[
           {required: true, message: '请选择学院', trigger: 'blur'}
         ],
-        buildId:[
-          {required: true, message: '请选择楼栋', trigger: 'blur'}
-        ],
         subjectId:[
           {required: true, message: '请选择实验室', trigger: 'blur'}
         ],
@@ -271,30 +203,6 @@ export default {
         this.deptOptions = response.data;
       });
     },
-    /** 根据学院查询楼栋列表  */
-    getBuildings(id,type) {
-      if(id) {
-        this.subjects = [];
-        this.$set(this.drawerForm, 'buildId', '')
-        this.$set(this.drawerForm, 'subjectId', '')
-        listbuildings(id).then(response => {
-          this.buildings = response.data;
-          if(!type){
-            this.drawerForm.approvalDetails = [];
-          }
-        });
-      }
-    },
-    /** 根据学院楼栋查询实验室列表  */
-    getSubjectDictList (buildId,type) {
-      this.$set(this.drawerForm, 'subjectId', '')
-      subjectDictList({buildId: buildId}).then(response => {
-        this.subjects = response.data;
-        if(!type){
-          this.drawerForm.approvalDetails = [];
-        }
-      });
-    },
     /** 通过实验室 查询对应的安全准入规则 */
     securityBySubjectId(subjectId) {
       securityBySubjectId(subjectId).then(response => {
@@ -417,94 +325,6 @@ export default {
       this.open = true;
       this.title = "添加审批记录";
     },
-    /** 修改按钮操作 */
-    handleUpdate(type,row) {
-      this.reset();
-      const id = row.id
-      getApproval(id).then(response => {
-        if(response.data.deptId){
-          this.getBuildings(response.data.deptId,true)
-        }
-        if(response.data.buildId){
-          this.getSubjectDictList(response.data.buildId,true)
-        }
-        this.drawerForm = response.data;
-        let list = response.data.approvalDetails;
-        let newList = [];
-        let listData = [];
-        if(type==1){
-          this.disabledType = true;
-          this.disabledImgType = true;
-          this.drawerForm.recordContent = "";
-          this.drawer = true;
-          this.$forceUpdate();
-        }else{
-          securityBySubjectId(response.data.subjectId).then(response => {
-            if(response.data && response.data.materialNames){
-              let materialNames = response.data.materialNames;
-              this.drawerForm.approvalDetails =[];
-              this.drawerForm.securityGroupId = response.data.id;
-              const names = materialNames.split(",")
-              names.forEach(v => {
-                newList.push({materialName: v, materialUrl: ''})
-              })
-              this.disabledType = true;
-              this.disabledImgType = false;
-              for(let i=0;i<newList.length;i++){
-                let num = 0;
-                for(let o=0;o<list.length;o++){
-                  if(newList[i].materialName == list[o].materialName){
-                    listData.push(list[o]);
-                    num++
-                  }
-                }
-                if(num==0){
-                  listData.push(newList[i]);
-                }
-              }
-              this.drawerForm.approvalDetails = listData;
-              this.drawer = true;
-              this.$forceUpdate();
-            }else {
-              this.drawerForm.approvalDetails = [];
-              this.$message.error("实验室暂无安全准入配置!");
-            }
-          });
-        }
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      let self = this;
-      if(!self.drawerForm.approvalDetails[0]){
-        this.$message.error("该实验室未配置安全准入规则,无法办理!");
-        return
-      }
-      for (let i=0;i<self.drawerForm.approvalDetails.length;i++){
-        if(self.drawerForm.approvalDetails[i].materialUrl == ""){
-          this.$message.error("请上传相关凭证!");
-          return
-        }
-      }
-      this.$refs["drawerForm"].validate(valid => {
-        if (valid) {
-          if (this.drawerForm.id != null) {
-            this.drawerForm.recordContent = "2";
-            updateApproval(this.drawerForm).then(response => {
-              this.msgSuccess("修改成功");
-              this.drawer = false;
-              this.newGetList();
-            });
-          } else{
-            addApproval(this.drawerForm).then(response => {
-              this.msgSuccess("新增成功");
-              this.drawer = false;
-              this.newGetList();
-            });
-          }
-        }
-      });
-    },
     /** 删除按钮操作 */
     handleDelete(row) {
       let self = this;