zc

src/api/hierarchicalControl/index.js

@@ -1,102 +1,53 @@
 import request from '@/utils/request'
 
-// 查询分级管控管理列表
-export function listGradeManage(query) {
+// 分级管控-列表
+export function laboratoryGradeManageList(data) {
   return request({
     url: '/laboratory/gradeManage/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 新增分级管控管理
-export function addGradeManage(data) {
-  return request({
-    url: '/laboratory/gradeManage',
     method: 'post',
     data: data
   })
 }
 
-// 查询分级管控管理详细
-export function getGradeManage(id) {
-  return request({
-    url: '/laboratory/gradeManage/' + id,
-    method: 'get'
-  })
-}
-// 修改分级管控管理
-export function updateGradeManage(data) {
+// 分级管控-新增
+export function laboratoryGradeManageAdd(data) {
   return request({
-    url: '/laboratory/gradeManage',
-    method: 'put',
+    url: '/laboratory/gradeManage/add',
+    method: 'post',
     data: data
   })
 }
 
-//查询分级管控管理工作详情
-export function gradeManageWorkInfo(recordId) {
-  return request({
-    url: '/laboratory/gradeManageWork/'+recordId,
-    method: 'get',
-  })
-}
-
-// 查询管控执行记录列表
-export function listGradeManageRecord(query) {
-  return request({
-    url: '/laboratory/gradeManageRecord/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询管控执行记录详细
-export function getGradeManageRecord(id) {
+// 分级管控-修改
+export function laboratoryGradeManageUpdate(data) {
   return request({
-    url: '/laboratory/gradeManageRecord/' + id,
-    method: 'get'
-  })
-}
-// 删除管控执行记录
-export function delGradeManageRecord(id) {
-  return request({
-    url: '/laboratory/gradeManageRecord/' + id,
-    method: 'delete'
-  })
-}
-
-// 新增管控执行记录
-export function addGradeManageRecord(data) {
-  return request({
-    url: '/laboratory/gradeManageRecord',
+    url: '/laboratory/gradeManage/update',
     method: 'post',
     data: data
   })
 }
 
-// 修改管控执行记录
-export function updateGradeManageRecord(data) {
+// 分级管控-执行
+export function laboratoryGradeManageExecute(data) {
   return request({
-    url: '/laboratory/gradeManageRecord',
-    method: 'put',
+    url: '/laboratory/gradeManage/execute',
+    method: 'post',
     data: data
   })
 }
 
-// 查询分级控管理工作-完成
-export function gradeManageWorkFinish(data) {
+// 分级管控-详情
+export function laboratoryGradeManageDetail(query) {
   return request({
-    url: '/laboratory/gradeManageWork/finish',
-    method: 'post',
-    data: data
+    url: '/laboratory/gradeManage/detail',
+    method: 'get',
+    params: query
   })
 }
-
-// 查询分级控管理列表
-export function gradeManageWorkList(query) {
+// 分级管控-删除
+export function laboratoryGradeManageDelete(query) {
   return request({
-    url: '/laboratory/gradeManageWork/list',
+    url: '/laboratory/gradeManage/delete',
     method: 'get',
     params: query
   })

src/utils/request.js

@@ -158,6 +158,15 @@ service.interceptors.response.use(res => {
             return
           }).catch(() => {});
         }
+      }else{
+        messageData = Message({
+          message: message,
+          type: 'error',
+          offset:100
+        })
+        setTimeout(function(){
+          messageData = null
+        },1000);
       }
       return Promise.reject(error)
     }

src/views/hierarchicalControl/conditionsSettings/addPage.vue

@@ -7,7 +7,7 @@
     </div>
     <div class="content-box scrollbar-box">
       <el-form class="add-form-box" :model="newData" ref="form" :rules="rules" label-width="110px">
-        <div>
+        <div style="margin-top:20px;">
           <el-form-item label="管控名称" prop="name">
             <el-input v-model="newData.name" placeholder="请输入管控名称" maxLength="20" style="width:260px;"></el-input>
           </el-form-item>
@@ -44,23 +44,44 @@
             </el-select>
           </el-form-item>
         </div>
-        <el-form-item label="管控描述" prop="describe">
+        <div>
+          <el-form-item label="执行人员" prop="executionUserId">
+            <el-select
+              style="width:260px;"
+              v-model="newData.executionUserId"
+              filterable
+              remote
+              clearable
+              reserve-keyword
+              @change="userChange"
+              placeholder="请输入姓名/工号/手机号"
+              :remote-method="userSelectList">
+              <el-option
+                v-for="item in optionsUser"
+                :key="item.userId"
+                :label="item.userName"
+                :value="item.userId">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </div>
+        <el-form-item label="管控描述" prop="manageDes">
           <el-input type="textarea" resize="none" style="width:630px;" show-word-limit
                     :rows="4"
-                    v-model="newData.describe" placeholder="请输入管控描述" maxlength="100"/>
-        </el-form-item>
-        <el-form-item label="执行人员" prop="userList">
-          <div class="max-big-user-box" style="width:1400px;">
-            <div class="for-user-box" style="display: inline-block;border:1px solid #0045AF;border-radius:4px;padding:0 10px;margin:5px 20px 5px 0;"
-                 v-for="(item,index) in newData.userList" :key="index">
-              <div class="for-user-min-box" style="display: flex;">
-                <p class="user-name-p" style="width:200px;line-height:30px;font-size:14px;color:#0045AF;">{{item.userName}}</p>
-                <p class="user-del-button el-icon-error"  style="cursor: pointer;line-height:30px;color:#999;" @click="delUser(index)"></p>
-              </div>
-            </div>
-          </div>
-          <p class="add-button-p" style="margin:5px 0 0 0;cursor: pointer;text-align: center;font-size:14px;border-radius:4px;width:140px;line-height:30px;color:#0183FA;border:1px solid #0183FA;" @click="shadeOpen" v-if="!newData.userList[9]">添加人员</p>
+                    v-model="newData.manageDes" placeholder="请输入管控描述" maxlength="100"/>
         </el-form-item>
+        <!--<el-form-item label="执行人员" prop="userList">-->
+        <!--<div class="max-big-user-box" style="width:1400px;">-->
+        <!--<div class="for-user-box" style="display: inline-block;border:1px solid #0045AF;border-radius:4px;padding:0 10px;margin:5px 20px 5px 0;"-->
+        <!--v-for="(item,index) in newData.userList" :key="index">-->
+        <!--<div class="for-user-min-box" style="display: flex;">-->
+        <!--<p class="user-name-p" style="width:200px;line-height:30px;font-size:14px;color:#0045AF;">{{item.userName}}</p>-->
+        <!--<p class="user-del-button el-icon-error"  style="cursor: pointer;line-height:30px;color:#999;" @click="delUser(index)"></p>-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--</div>-->
+        <!--<p class="add-button-p" style="margin:5px 0 0 0;cursor: pointer;text-align: center;font-size:14px;border-radius:4px;width:140px;line-height:30px;color:#0183FA;border:1px solid #0183FA;" @click="shadeOpen" v-if="!newData.userList[9]">添加人员</p>-->
+        <!--</el-form-item>-->
       </el-form>
     </div>
     <el-dialog class="conditionsSettings-dialog" title='添加人员' width="460px" append-to-body
@@ -106,81 +127,125 @@
     laboratoryClassLevelGetList,
     systemUserSelect
   } from '@/api/commonality/permission'
-  //import { getDicts } from "@/api/commonality/noPermission";
-  //import { systemUserSelect } from "@/api/commonality/permission";
-  //import { getInfo } from "@/api/basicsModules/index";
+  import { laboratoryGradeManageAdd,laboratoryGradeManageUpdate } from "@/api/hierarchicalControl/index";
   export default {
     name: 'addPage',
-    props:{
-      propsData:{},
+    props: {
+      propsData: {}
     },
-    data(){
-      return{
-        newData:{
-          name:'',
-          describe:'',
-          deptId:'',
-          typeId:'',
-          levelId:'',
-          userList:[],
+    data() {
+      return {
+        newData: {
+          name: '',
+          manageDes: '',
+          deptId: '',
+          typeId: '',
+          levelId: '',
+          executionUserId: '',
         },
         //下拉列表数据
-        deptOptions:[],
-        typeList:[],
-        levelList:[],
+        deptOptions: [],
+        typeList: [],
+        levelList: [],
         rules: {
           name: [
-            { required: true, message: "请输入管控名称", trigger: "blur" },
-            { required: true, message: "请输入管控名称", validator: this.spaceJudgment, trigger: "blur" }
+            { required: true, message: '请输入管控名称', trigger: 'blur' },
+            { required: true, message: '请输入管控名称', validator: this.spaceJudgment, trigger: 'blur' }
           ],
-          describe: [
-            { required: true, message: "请输入管控描述", trigger: "blur" },
-            { required: true, message: "请输入管控描述", validator: this.spaceJudgment, trigger: "blur" }
+          manageDes: [
+            { required: true, message: '请输入管控描述', trigger: 'blur' },
+            { required: true, message: '请输入管控描述', validator: this.spaceJudgment, trigger: 'blur' }
           ],
           deptId: [
-            { required: true, message: "请选择二级单位", trigger: "blur" },
+            { required: true, message: '请选择二级单位', trigger: 'blur' }
           ],
           typeId: [
-            { required: true, message: "请选择安全分类", trigger: "blur" },
+            { required: true, message: '请选择安全分类', trigger: 'blur' }
           ],
           levelId: [
-            { required: true, message: "请选择安全分级", trigger: "blur" },
-          ],
-          userList: [
-            { required: true, message: "请选择执行人员", trigger: "blur" },
+            { required: true, message: '请选择安全分级', trigger: 'blur' }
           ],
+          executionUserId: [
+            { required: true, message: '请选择执行人员', trigger: 'blur' }
+          ]
         },
         shadeRules: {
           userId: [
-            { required: true, message: "请选择人员", trigger: "blur" },
-          ],
+            { required: true, message: '请选择人员', trigger: 'blur' }
+          ]
         },
-        shadeType:false,
+        shadeType: false,
         // 人员查询列表
         userName: '',
         userId: '',
         optionsUser: [],
-        shadeForm:{},
+        shadeForm: {}
       }
     },
-    created(){
-      this.getDeptDropList();
-      this.laboratoryClassTypeGetList();
-      this.laboratoryClassLevelGetList();
+    created() {
+      this.getDeptDropList()
+      this.laboratoryClassTypeGetList()
+      this.laboratoryClassLevelGetList()
     },
-    mounted(){
-
+    mounted() {
+      if(this.propsData.id){
+        this.$set(this,'newData',this.propsData);
+        this.$set(this,'optionsUser',[{
+          userId:this.propsData.executionUserId,
+          userName:this.propsData.executionUser,
+        }]);
+      }
     },
-    methods:{
+    methods: {
       // 返回按钮
-      backPage(){
-        this.$parent.tableButton(6);
+      backPage() {
+        this.$parent.tableButton(6)
       },
       /** 提交按钮 */
       submitForm() {
-        this.$refs["form"].validate(valid => {
+        let self = this;
+        this.$refs['form'].validate(valid => {
           if (valid) {
-
+            let obj = {
+              name: this.newData.name, //管控名称
+              deptId: this.newData.deptId, //二级单位ID
+              typeId: this.newData.typeId, //分类ID
+              levelId: this.newData.levelId, //分级ID
+              executionUserId: this.newData.executionUserId, //执行人员ID
+              manageDes: this.newData.manageDes //管控描述
+            }
+            this.deptOptions.forEach((item)=>{
+              if(item.deptId == self.newData.deptId){
+                obj.deptName = item.deptName
+              }
+            })
+            this.typeList.forEach((item)=>{
+              if(item.typeId == self.newData.typeId){
+                obj.typeName = item.typeName
+              }
+            })
+            this.levelList.forEach((item)=>{
+              if(item.levelId == self.newData.levelId){
+                obj.levelName = item.levelName
+              }
+            })
+            this.optionsUser.forEach((item)=>{
+              if(item.userId == self.newData.executionUserId){
+                obj.executionUser = item.userName
+              }
+            })
+            if(this.newData.id){
+              obj.id = this.newData.id;
+              laboratoryGradeManageUpdate(obj).then(response => {
+                this.msgSuccess(response.message)
+                this.backPage();
+              })
+            }else{
+              laboratoryGradeManageAdd(obj).then(response => {
+                this.msgSuccess(response.message)
+                this.backPage();
+              })
+            }
           }
         })
       },
@@ -220,20 +285,20 @@
       },
       //弹窗确定
       shadeUp() {
-        let self = this;
+        let self = this
         this.$refs['shadeForm'].validate(valid => {
           if (valid) {
-            for (let i=0;i<self.newData.userList.length;i++){
-              if (self.newData.userList[i].userId == this.userId){
+            for (let i = 0; i < self.newData.userList.length; i++) {
+              if (self.newData.userList[i].userId == this.userId) {
                 this.msgError('人员已存在')
                 return
               }
             }
             this.newData.userList.push({
-              userName:this.userName,
-              userId:this.userId,
-            });
-            this.shadeOut();
+              userName: this.userName,
+              userId: this.userId
+            })
+            this.shadeOut()
           }
         })
       },
@@ -252,7 +317,7 @@
         if (query !== '' && query.length > 1) {
           systemUserSelect({
             'searchValue': query,
-            'userType': '',
+            'userType': ''
           }).then(response => {
             this.$set(this, 'optionsUser', response.data)
           })
@@ -260,21 +325,21 @@
           this.$set(this, 'optionsUser', [])
         }
       },
-      delUser(index){
-        this.newData.userList.splice(index,1)
-      },
-    },
+      delUser(index) {
+        this.newData.userList.splice(index, 1)
+      }
+    }
   }
 </script>
 
 <style scoped lang="scss">
-  .conditionsSettings-addPage{
-    .content-box{
-      flex:1;
+  .conditionsSettings-addPage {
+    .content-box {
+      flex: 1;
       display: flex;
-      padding:20px;
-      .add-form-box{
-        .el-form-item{
+      padding: 20px;
+      .add-form-box {
+        .el-form-item {
           display: inline-block;
         }
       }

src/views/hierarchicalControl/conditionsSettings/index.vue

@@ -5,10 +5,10 @@
       <div class="page-form-title-box">
         <el-form :model="queryParams" class="form-box" ref="queryForm"
                  :inline="true" style="width:100%;">
-          <el-form-item label="" prop="searchValue">
+          <el-form-item label="" prop="name">
             <el-input
               maxLength="30"
-              v-model="queryParams.searchValue"
+              v-model="queryParams.name"
               placeholder="管控名称"
               style="width: 200px"
             />
@@ -55,26 +55,31 @@
       <div class="page-content-box">
         <el-table class="table-box" v-loading="loading" border :data="dataList">
           <el-table-column label="管控名称" prop="name"  show-overflow-tooltip/>
-          <el-table-column label="学院" prop="content" width="200" show-overflow-tooltip/>
-          <el-table-column label="安全分类" prop="content" width="200" show-overflow-tooltip/>
-          <el-table-column label="安全分级" prop="content" width="200" show-overflow-tooltip/>
-          <el-table-column label="创建人" prop="content" width="200" show-overflow-tooltip/>
+          <el-table-column label="学院" prop="deptName" width="200" show-overflow-tooltip/>
+          <el-table-column label="安全分类" prop="typeName" width="200" show-overflow-tooltip/>
+          <el-table-column label="安全分级" prop="levelName" width="200" show-overflow-tooltip/>
+          <el-table-column label="执行状态" prop="status" width="120" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span :class="scope.row.status == 1?'colorA':'colorB'">{{scope.row.status == 1?'已执行':'未执行'}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="创建人" prop="createUser" width="200" show-overflow-tooltip/>
           <el-table-column label="创建时间" prop="createTime" width="200" show-overflow-tooltip>
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="200" show-overflow-tooltip v-if="tableButtonType">
+          <el-table-column label="操作" width="200" show-overflow-tooltip>
             <template slot-scope="scope">
               <div class="table-button-box">
                 <p class="table-button-null"></p>
                 <p class="table-button-p"
+                   v-if="scope.row.status == 0"
                    @click="tableButton(2,scope.row)"
-                   v-hasPermiRouter="['demo:demo:edit']"
                 >编辑</p>
                 <p class="table-button-p"
+                   v-if="scope.row.status == 0"
                    @click="tableButton(3,scope.row)"
-                   v-hasPermiRouter="['demo:demo:del']"
                 >删除</p>
                 <p class="table-button-null"></p>
               </div>
@@ -99,9 +104,7 @@
     laboratoryClassTypeGetList,
     laboratoryClassLevelGetList,
   } from '@/api/commonality/permission'
-  //import { getDicts } from "@/api/commonality/noPermission";
-  //import { systemUserSelect } from "@/api/commonality/permission";
-  //import { getInfo } from "@/api/basicsModules/index";
+  import { laboratoryGradeManageList,laboratoryGradeManageDelete } from "@/api/hierarchicalControl/index";
   import addPage from "./addPage.vue";
   export default {
     name: 'index',
@@ -110,7 +113,6 @@
     },
     data () {
       return {
-        tableButtonType:this.hasPermiDom(['demo:demo:edit','demo:demo:del',]),
         //页面状态
         pageType:1,
         //页面遮罩
@@ -123,7 +125,7 @@
         queryParams:{
           page:1,
           pageSize:20,
-          searchValue:"",
+          name:"",
           deptId :null,
           typeId :null,
           levelId :null,
@@ -157,7 +159,7 @@
         this.$set(this,'queryParams',{
           page:1,
           pageSize:20,
-          searchValue:"",
+          name:"",
           deptId :null,
           typeId :null,
           levelId :null,
@@ -166,12 +168,10 @@
       },
       //获取数据列表
       getList(){
-        this.$set(this,'dataList',[{}]);
-        this.$set(this,'total',1);
-        // getListFunction(this.queryParams).then(response => {
-        //   this.$set(this,'dataList',response.data.records);
-        //   this.$set(this,'total',response.data.total);
-        // });
+        laboratoryGradeManageList(this.queryParams).then(response => {
+          this.$set(this,'dataList',response.data.records);
+          this.$set(this,'total',response.data.total);
+        });
       },
       //操作按钮
       tableButton(type,row){
@@ -194,7 +194,7 @@
             type: "warning"
           }).then(function() {
           }).then(() => {
-            deleteFunction({id:row.id}).then(response => {
+            laboratoryGradeManageDelete({manageId:row.id}).then(response => {
               self.msgSuccess(response.message)
               self.getList();
             });
@@ -230,6 +230,12 @@
   .conditionsSettings{
     .conditionsSettingsPage{
 
+      .colorA{
+        color:#0183FA;
+      }
+      .colorB{
+        color: #c88400;
+      }
     }
   }
 </style>

src/views/hierarchicalControl/executeResult/index.vue

@@ -50,23 +50,26 @@
       <div class="page-content-box">
         <el-table class="table-box" v-loading="loading" border :data="dataList">
           <el-table-column label="管控名称" prop="name"  show-overflow-tooltip/>
-          <el-table-column label="学院" prop="content" width="200" show-overflow-tooltip/>
-          <el-table-column label="安全分类" prop="content" width="200" show-overflow-tooltip/>
-          <el-table-column label="安全分级" prop="content" width="200" show-overflow-tooltip/>
-          <el-table-column label="状态" prop="content" width="200" show-overflow-tooltip/>
-          <el-table-column label="执行人" prop="content" width="200" show-overflow-tooltip/>
-          <el-table-column label="执行时间" prop="createTime" width="200" show-overflow-tooltip>
+          <el-table-column label="学院" prop="deptName" width="200" show-overflow-tooltip/>
+          <el-table-column label="安全分类" prop="typeName" width="200" show-overflow-tooltip/>
+          <el-table-column label="安全分级" prop="levelName" width="200" show-overflow-tooltip/>
+          <el-table-column label="执行状态" prop="status" width="120" show-overflow-tooltip>
             <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
+              <span :class="scope.row.status == 1?'colorA':'colorB'">{{scope.row.status == 1?'已执行':'未执行'}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="200" show-overflow-tooltip v-if="tableButtonType">
+          <el-table-column label="执行人" prop="executionUser" width="200" show-overflow-tooltip/>
+          <el-table-column label="执行时间" prop="executionTime" width="200" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.executionTime,"{y}-{m}-{d} {h}:{i}") }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="200" show-overflow-tooltip >
             <template slot-scope="scope">
               <div class="table-button-box">
                 <p class="table-button-null"></p>
                 <p class="table-button-p"
                    @click="tableButton(2,scope.row)"
-                   v-hasPermiRouter="['demo:demo:detail']"
                 >详情</p>
                 <p class="table-button-null"></p>
               </div>
@@ -91,9 +94,7 @@
     laboratoryClassTypeGetList,
     laboratoryClassLevelGetList,
   } from '@/api/commonality/permission'
-  //import { getDicts } from "@/api/commonality/noPermission";
-  //import { systemUserSelect } from "@/api/commonality/permission";
-  //import { getInfo } from "@/api/basicsModules/index";
+  import { laboratoryGradeManageList } from "@/api/hierarchicalControl/index";
   import infoPage from "./infoPage.vue";
   export default {
     name: 'index',
@@ -102,7 +103,6 @@
     },
     data () {
       return {
-        tableButtonType:this.hasPermiDom(['demo:demo:detail','demo:demo:edit','demo:demo:del',]),
         //页面状态
         pageType:1,
         //页面遮罩
@@ -119,6 +119,7 @@
           deptId :null,
           typeId :null,
           levelId :null,
+          status :1,
         },
         //时间数据
         dateRange:[],
@@ -155,17 +156,16 @@
           deptId :null,
           typeId :null,
           levelId :null,
+          status :1,
         });
         this.getList();
       },
       //获取数据列表
       getList(){
-        this.$set(this,'dataList',[{}]);
-        this.$set(this,'total',1);
-        // getListFunction(this.queryParams).then(response => {
-        //   this.$set(this,'dataList',response.data.records);
-        //   this.$set(this,'total',response.data.total);
-        // });
+        laboratoryGradeManageList(this.queryParams).then(response => {
+          this.$set(this,'dataList',response.data.records);
+          this.$set(this,'total',response.data.total);
+        });
       },
       //操作按钮
       tableButton(type,row){
@@ -244,6 +244,12 @@
   .executeResult{
     .executeResultPage{
 
+      .colorA{
+        color:#0183FA;
+      }
+      .colorB{
+        color: #c88400;
+      }
     }
   }
 </style>

src/views/hierarchicalControl/executeResult/infoPage.vue

@@ -8,39 +8,39 @@
       <el-form class="add-form-box">
         <div class="text-max-box">
           <p>管控名称：</p>
-          <p>{{newData.data1}}</p>
+          <p>{{newData.name}}</p>
         </div>
         <div class="text-max-box">
           <p>管控描述：</p>
-          <p>{{newData.data2}}</p>
+          <p>{{newData.manageDes}}</p>
         </div>
         <div class="text-max-box">
           <p>二级单位：</p>
-          <p>{{newData.data3}}</p>
+          <p>{{newData.deptName}}</p>
         </div>
         <div class="text-max-box">
           <p>安全分类：</p>
-          <p>{{newData.data4}}</p>
+          <p>{{newData.typeName}}</p>
         </div>
         <div class="text-max-box">
           <p>安全分级：</p>
-          <p>{{newData.data5}}</p>
+          <p>{{newData.levelName}}</p>
         </div>
         <div class="text-max-box">
           <p>状态：</p>
-          <p>{{newData.data6?'已执行':'未执行'}}</p>
+          <p :class="newData.status == 1?'colorA':'colorB'">{{newData.status == 1?'已执行':'未执行'}}</p>
         </div>
-        <div class="text-max-box" v-if="newData.data6">
+        <div class="text-max-box" v-if="newData.status == 1">
           <p>执行人：</p>
-          <p>{{newData.data7}}</p>
+          <p>{{newData.executionUser}}</p>
         </div>
-        <div class="text-max-box" v-if="newData.data6">
+        <div class="text-max-box" v-if="newData.status == 1">
           <p>执行时间：</p>
-          <p>{{newData.data8}}</p>
+          <p>{{parseTime(newData.executionTime,"{y}-{m}-{d} {h}:{i}")}}</p>
         </div>
-        <div class="text-max-box" v-if="newData.data6">
+        <div class="text-max-box" v-if="newData.status == 1">
           <p>执行备注：</p>
-          <p>{{newData.data9}}</p>
+          <p>{{newData.remark}}</p>
         </div>
       </el-form>
     </div>
@@ -48,9 +48,6 @@
 </template>
 
 <script>
-  //import { getDicts } from "@/api/commonality/noPermission";
-  //import { systemUserSelect } from "@/api/commonality/permission";
-  //import { getInfo } from "@/api/basicsModules/index";
   export default {
     name: 'infoPage',
     props:{
@@ -58,38 +55,22 @@
     },
     data(){
       return{
-        newData:{
-          data1:'管控名称',
-          data2:'管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述',
-          data3:'二级单位',
-          data4:'安全分类',
-          data5:'安全分级',
-          data6: false,
-          data7:'执行人',
-          data8:'执行时间',
-          data9:'执行备注',
-        },
+        newData:{},
       }
     },
     created(){
 
     },
     mounted(){
-
+      if(this.propsData.id){
+        this.$set(this,'newData',this.propsData);
+      }
     },
     methods:{
       // 返回按钮
       backPage(){
         this.$parent.tableButton(6);
       },
-      /** 提交按钮 */
-      submitForm() {
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-
-          }
-        })
-      }
     },
   }
 </script>
@@ -115,6 +96,12 @@
           line-height:20px;
           padding:10px 0;
         }
+        .colorA{
+          color:#0183FA;
+        }
+        .colorB{
+          color: #c88400;
+        }
       }
     }
   }

src/views/hierarchicalControl/workExecute/index.vue

@@ -50,28 +50,32 @@
       <div class="page-content-box">
         <el-table class="table-box" v-loading="loading" border :data="dataList">
           <el-table-column label="管控名称" prop="name"  show-overflow-tooltip/>
-          <el-table-column label="学院" prop="content" width="200" show-overflow-tooltip/>
-          <el-table-column label="安全分类" prop="content" width="200" show-overflow-tooltip/>
-          <el-table-column label="安全分级" prop="content" width="200" show-overflow-tooltip/>
-          <el-table-column label="状态" prop="content" width="200" show-overflow-tooltip/>
-          <el-table-column label="执行人" prop="content" width="200" show-overflow-tooltip/>
-          <el-table-column label="执行时间" prop="createTime" width="200" show-overflow-tooltip>
+          <el-table-column label="学院" prop="deptName" width="200" show-overflow-tooltip/>
+          <el-table-column label="安全分类" prop="typeName" width="200" show-overflow-tooltip/>
+          <el-table-column label="安全分级" prop="levelName" width="200" show-overflow-tooltip/>
+          <el-table-column label="执行状态" prop="status" width="120" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span :class="scope.row.status == 1?'colorA':'colorB'">{{scope.row.status == 1?'已执行':'未执行'}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="创建人" prop="createUser" width="200" show-overflow-tooltip/>
+          <el-table-column label="创建时间" prop="createTime" width="200" show-overflow-tooltip>
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="200" show-overflow-tooltip v-if="tableButtonType">
+          <el-table-column label="操作" width="200" show-overflow-tooltip>
             <template slot-scope="scope">
               <div class="table-button-box">
                 <p class="table-button-null"></p>
                 <p class="table-button-p"
+                   v-if="scope.row.status == 1"
                    @click="tableButton(2,scope.row)"
-                   v-hasPermiRouter="['demo:demo:detail']"
                 >详情</p>
                 <p class="table-button-p"
+                   v-if="scope.row.status == 0"
                    @click="tableButton(3,scope.row)"
-                   v-hasPermiRouter="['demo:demo:edit']"
-                >完成</p>
+                >执行</p>
                 <p class="table-button-null"></p>
               </div>
             </template>
@@ -95,9 +99,7 @@
     laboratoryClassTypeGetList,
     laboratoryClassLevelGetList,
   } from '@/api/commonality/permission'
-  //import { getDicts } from "@/api/commonality/noPermission";
-  //import { systemUserSelect } from "@/api/commonality/permission";
-  //import { getInfo } from "@/api/basicsModules/index";
+  import { laboratoryGradeManageList } from "@/api/hierarchicalControl/index";
   import infoPage from "./infoPage.vue";
   export default {
     name: 'index',
@@ -106,7 +108,6 @@
     },
     data () {
       return {
-        tableButtonType:this.hasPermiDom(['demo:demo:detail','demo:demo:edit','demo:demo:del',]),
         //页面状态
         pageType:1,
         //页面遮罩
@@ -122,7 +123,9 @@
           deptId :null,
           typeId :null,
           levelId :null,
+          status :0,
         },
+        meUserId:localStorage.getItem('userId'),
         //时间数据
         dateRange:[],
         //列表数据
@@ -157,17 +160,18 @@
           deptId :null,
           typeId :null,
           levelId :null,
+          status :0,
         });
         this.getList();
       },
       //获取数据列表
       getList(){
-          this.$set(this,'dataList',[{}]);
-          this.$set(this,'total',1);
-        // getListFunction(this.queryParams).then(response => {
-        //   this.$set(this,'dataList',response.data.records);
-        //   this.$set(this,'total',response.data.total);
-        // });
+        let obj = JSON.parse(JSON.stringify(this.queryParams))
+        obj.executionUserId = this.meUserId;
+        laboratoryGradeManageList(obj).then(response => {
+          this.$set(this,'dataList',response.data.records);
+          this.$set(this,'total',response.data.total);
+        });
       },
       //操作按钮
       tableButton(type,row){
@@ -246,6 +250,12 @@
   .workExecute{
     .workExecutePage{
 
+      .colorA{
+        color:#0183FA;
+      }
+      .colorB{
+        color: #c88400;
+      }
     }
   }
 </style>

src/views/hierarchicalControl/workExecute/infoPage.vue

@@ -3,45 +3,45 @@
     <div class="page-top-title-box">
       <p class="page-top-title-name-p">工作执行</p>
       <p class="page-top-title-out-p" @click="backPage">返回</p>
-      <p class="page-top-title-add-p" v-if="!newData.data6" @click="openDialog">完成</p>
+      <p class="page-top-title-add-p" v-if="!newData.status" @click="openDialog">完成</p>
     </div>
     <div class="content-box scrollbar-box">
       <el-form class="add-form-box">
         <div class="text-max-box">
           <p>管控名称：</p>
-          <p>{{newData.data1}}</p>
+          <p>{{newData.name}}</p>
         </div>
         <div class="text-max-box">
           <p>管控描述：</p>
-          <p>{{newData.data2}}</p>
+          <p>{{newData.manageDes}}</p>
         </div>
         <div class="text-max-box">
           <p>二级单位：</p>
-          <p>{{newData.data3}}</p>
+          <p>{{newData.deptName}}</p>
         </div>
         <div class="text-max-box">
           <p>安全分类：</p>
-          <p>{{newData.data4}}</p>
+          <p>{{newData.typeName}}</p>
         </div>
         <div class="text-max-box">
           <p>安全分级：</p>
-          <p>{{newData.data5}}</p>
+          <p>{{newData.levelName}}</p>
         </div>
         <div class="text-max-box">
           <p>状态：</p>
-          <p>{{newData.data6?'已执行':'未执行'}}</p>
+          <p :class="newData.status == 1?'colorA':'colorB'">{{newData.status == 1?'已执行':'未执行'}}</p>
         </div>
-        <div class="text-max-box" v-if="newData.data6">
+        <div class="text-max-box" v-if="newData.status == 1">
           <p>执行人：</p>
-          <p>{{newData.data7}}</p>
+          <p>{{newData.executionUser}}</p>
         </div>
-        <div class="text-max-box" v-if="newData.data6">
+        <div class="text-max-box" v-if="newData.status == 1">
           <p>执行时间：</p>
-          <p>{{newData.data8}}</p>
+          <p>{{parseTime(newData.executionTime,"{y}-{m}-{d} {h}:{i}")}}</p>
         </div>
-        <div class="text-max-box" v-if="newData.data6">
+        <div class="text-max-box" v-if="newData.status == 1">
           <p>执行备注：</p>
-          <p>{{newData.data9}}</p>
+          <p>{{newData.remark}}</p>
         </div>
       </el-form>
     </div>
@@ -50,16 +50,16 @@
                :close-on-click-modal="false" :close-on-press-escape="false">
       <div>
         <el-form :model="addForm" ref="addForm" :inline="true" :rules="rules">
-          <el-form-item label="执行描述" prop="executeDescribe">
+          <el-form-item label="执行描述" prop="remark">
             <el-input type="textarea" resize="none" style="width:630px;" show-word-limit
                       :rows="4"
-                      v-model="addForm.describe" placeholder="请输入执行描述" maxlength="100"/>
+                      v-model="addForm.remark" placeholder="请输入执行描述" maxlength="100"/>
           </el-form-item>
         </el-form>
       </div>
       <div slot="footer" class="dialog-footer dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
-        <p class="dialog-footer-button-info" @click="shadeOut()">取消</p>
+        <p class="dialog-footer-button-info" @click="dialogOff()">取消</p>
         <p class="dialog-footer-button-primary" @click="submitForm">提交</p>
         <p class="dialog-footer-button-null"></p>
       </div>
@@ -68,9 +68,7 @@
 </template>
 
 <script>
-  //import { getDicts } from "@/api/commonality/noPermission";
-  //import { systemUserSelect } from "@/api/commonality/permission";
-  //import { getInfo } from "@/api/basicsModules/index";
+  import { laboratoryGradeManageExecute } from "@/api/hierarchicalControl/index";
   export default {
     name: 'infoPage',
     props:{
@@ -78,22 +76,12 @@
     },
     data(){
       return{
-        newData:{
-          data1:'管控名称',
-          data2:'管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述管控描述',
-          data3:'二级单位',
-          data4:'安全分类',
-          data5:'安全分级',
-          data6: true,
-          data7:'执行人',
-          data8:'执行时间',
-          data9:'执行备注',
-        },
+        newData:{},
         addForm:{
-          executeDescribe:'',
+          remark:'',
         },
         rules: {
-          executeDescribe: [
+          remark: [
             { required: true, message: "请输入执行描述", trigger: "blur" },
             { required: true, message: "请输入执行描述", validator: this.spaceJudgment, trigger: "blur" }
           ],
@@ -105,7 +93,9 @@
 
     },
     mounted(){
-
+      if(this.propsData.id){
+        this.$set(this,'newData',this.propsData);
+      }
     },
     methods:{
       // 返回按钮
@@ -116,7 +106,15 @@
       submitForm() {
         this.$refs["addForm"].validate(valid => {
           if (valid) {
-
+            let obj = {
+              id:this.newData.id,
+              remark:this.addForm.remark,
+              status:1,
+            }
+            laboratoryGradeManageExecute(obj).then(response => {
+              this.msgSuccess(response.message)
+              this.backPage();
+            })
           }
         })
       },
@@ -152,6 +150,12 @@
           line-height:20px;
           padding:10px 0;
         }
+        .colorA{
+          color:#0183FA;
+        }
+        .colorB{
+          color: #c88400;
+        }
       }
       .add-execute-describe-box{
         margin-top:10px;

src/views/safetyCheck/safetyHazard/batchAudit.vue

@@ -243,14 +243,14 @@
       getList(){
         let obj = JSON.parse(JSON.stringify(this.queryParams))
         if(this.dateRange[0]){
-          obj.beginTime = this.dateRange[0];
+          obj.beginTimeStr = this.dateRange[0];
         }else{
-          obj.beginTime = "";
+          obj.beginTimeStr = "";
         }
         if(this.dateRange[1]){
-          obj.endTime = this.dateRange[1];
+          obj.endTimeStr = this.dateRange[1];
         }else{
-          obj.endTime = "";
+          obj.endTimeStr = "";
         }
         obj.hazardType = this.propsBatchAuditData.hazardType
         batchApprovalList(obj).then(response => {