zc

src/api/safetyCheck/indexDemoOne.js

@@ -341,6 +341,21 @@ export function securityCheckSetOptionUnCheckList(data) {
     data: data
   })
 }
+//检查管理/自查管理-开始检查第一次提交
+export function securityRecordCheckCommit(data) {
+  return request({
+    url: '/security/record/checkCommit',
+    method: 'post',
+    data: data
+  })
+}
+//检查管理/自查管理-流程详情
+export function securityCheckDangerDetailList(query) {
+  return request({
+    url: '/security/checkDanger/getDangerId/'+query.managerId+'/'+query.setOptionId,
+    method: 'get',
+  })
+}
 
 
 /**************************** 安全检查-公共部分 ****************************/

src/components/audioPlayer/audioPlayer.vue

@@ -0,0 +1,261 @@
+<template>
+  <div>
+    <audio @timeupdate="updateProgress" controls :ref="refId" style="display: none">
+      <source :src="fileurl" type="audio/mpeg" />
+      您的浏览器不支持音频播放
+    </audio>
+    <div class="audio-right">
+      <i :class="audioStatus !== 'pause' ? 'iconfont el-icon-video-play' : 'iconfont el-icon-video-pause'"
+         @click="playAudio" class="dialogAudioPlay"></i>
+      <div class="progress-bar-bg" :id="refId" v-dragto="setAudioIcon">
+        <div class="progress-bar" :id="refId+'bar'"></div>
+      </div>
+      <div class="audio-time" style="min-height: 10px">
+        <span class="audio-length-current" id="audioCurTime">{{ audioStart }}</span
+        >
+        <span style="padding:0 4px;">/</span>
+        <span class="audio-length-total">{{ duration }}</span>
+      </div>
+      <div class="volume">
+        <div
+          @click.stop="
+            () => {
+              return false
+            }
+          "
+          class="volume-progress"
+          v-show="audioHuds"
+        >
+          <div class="volume-bar-bg" id="volumeBarBg" v-adjuster="handleShowMuteIcon">
+            <div class="volume-bar" id="volumeBar"></div>
+          </div>
+        </div>
+        <i class="iconfont pl-1" :class="audioIcon" @click.stop="audioHuds = !audioHuds"> </i>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    props: {
+      fileurl: {
+        trpe: String
+      },
+      refId: {
+        trpe: String
+      }
+    },
+    data() {
+      return {
+        audioStatus: 'play',
+        audioStart: '0:00',
+        duration: '0:00',
+        audioVolume: 0.5,
+        audioHuds: false
+      }
+    },
+
+    directives: {
+      dragto: {
+        inserted: function (el, binding, vnode) {
+          el.addEventListener(
+            'click',
+            (e) => {
+              let wdiv = document.getElementById(this.refId).clientWidth
+              let audio = vnode.context.$refs[this.refId]
+              // 只有音乐开始播放后才可以调节，已经播放过但暂停了的也可以
+              let ratemin = e.offsetX / wdiv
+              let rate = ratemin * 100
+              document.getElementById(this.refId+'bar').style.width = rate + '%'
+              audio.currentTime = audio.duration * ratemin
+              audio.play()
+              binding.value()
+            },
+            false
+          )
+        }
+      },
+      adjuster: {
+        inserted: function (el, binding, vnode) {
+          el.addEventListener(
+            'click',
+            (e) => {
+              let hdiv = document.getElementById('volumeBarBg').clientHeight
+              let audio = vnode.context.$refs[this.refId]
+              // 只有音乐开始播放后才可以调节，已经播放过但暂停了的也可以
+              let ratemin = e.offsetY / hdiv
+              let rate = ratemin * 100
+              document.getElementById('volumeBar').style.height = rate + '%'
+              audio.volume = ratemin
+              binding.value(rate / 100)
+            },
+            false
+          )
+        }
+      }
+    },
+    computed: {
+      audioIcon() {
+        if (this.audioHuds) {
+          return this.audioVolume < 0.01 ? 'checked icon-jingyin' : 'checked icon-shengyin'
+        } else {
+          return 'icon-shengyin'
+        }
+      }
+    },
+    mounted() {
+      this.fetch()
+    },
+    methods: {
+      fetch() {
+        let that = this
+        var myVid = this.$refs[this.refId]
+        myVid.loop = false
+        // 监听音频播放完毕
+        myVid.addEventListener(
+          'ended',
+          function () {
+            that.audioStatus = 'play' // 显示播放icon
+            document.getElementById(this.refId+'bar').style.width = '0%' // 进度条初始化
+          },
+          false
+        )
+        if (myVid != null) {
+          myVid.oncanplay = function () {
+            that.duration = that.transTime(myVid.duration) // 计算音频时长
+          }
+          myVid.volume = 1 // 设置音量100%
+        }
+      },
+      // 播放暂停控制
+      playAudio() {
+        let recordAudio = this.$refs[this.refId] // 获取audio元素
+        if (recordAudio.paused) {
+          recordAudio.play()
+          this.audioStatus = 'pause'
+        } else {
+          recordAudio.pause()
+          this.audioStatus = 'play'
+        }
+      },
+      // 更新进度条与当前播放时间
+      updateProgress(e) {
+        var value = e.target.currentTime / e.target.duration
+        if (document.getElementById(this.refId+'bar')) {
+          document.getElementById(this.refId+'bar').style.width = value * 100 + '%'
+          if (e.target.currentTime === e.target.duration) {
+            this.audioStatus = 'pause'
+          }
+        } else {
+          this.audioStatus = 'pause'
+        }
+
+        this.audioStart = this.transTime(this.$refs[this.refId].currentTime)
+      },
+      /**
+       * 音频播放时间换算
+       * @param {number} value - 音频当前播放时间，单位秒
+       */
+      transTime(time) {
+        var duration = parseInt(time)
+        var minute = parseInt(duration / 60)
+        var sec = (duration % 60) + ''
+        var isM0 = ':'
+        if (minute === 0) {
+          minute = '00'
+        } else if (minute < 10) {
+          minute = '0' + minute
+        }
+        if (sec.length === 1) {
+          sec = '0' + sec
+        }
+        return minute + isM0 + sec
+      },
+      setAudioIcon() {
+        this.audioStatus = 'pause'
+      },
+      handleShowMuteIcon(val) {
+        this.audioVolume = val
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .volume {
+    position: relative;
+    .volume-progress {
+      position: absolute;
+      top: -150px;
+      width: 32px;
+      height: 140px;
+      background: #f6f6f6;
+      border-radius: 4px;
+      padding-top: 10px;
+    }
+    .volume-bar-bg {
+      margin: 0 auto;
+      width: 6px;
+      height: 120px;
+      background: #dcdcdc;
+      border-radius: 100px;
+      flex: 1;
+      position: relative;
+      transform: rotate(180deg);
+      cursor: pointer;
+      .volume-bar {
+        width: 6px;
+        height: 50%;
+        background: #585959;
+        border-radius: 100px;
+      }
+    }
+    .checked {
+      color: #585959;
+    }
+  }
+  .audio-right {
+    width: 100%;
+    height: 49px;
+    line-height: 49px;
+    background: #dcdcdc;
+    border-radius: 30px;
+    display: flex;
+    padding: 0 15px;
+    .dialogAudioPlay {
+      cursor: pointer;
+      color: #5c5e66;
+      font-size: 24px;
+      line-height:49px;
+    }
+    .progress-bar-bg {
+      background-color: #fff;
+      flex: 1;
+      position: relative;
+      height: 4px;
+      top: 50%;
+      transform: translateY(-50%);
+      margin-top: -1px;
+      cursor: pointer;
+      margin: 0 10px;
+    }
+    .progress-bar {
+      background-color: #585959;
+      width: 0%;
+      height: 4px;
+      border-radius: 5px;
+    }
+
+    .audio-time {
+      overflow: hidden;
+      font-size: 14px;
+      .audio-length-total {
+        float: right;
+      }
+      .audio-length-current {
+        float: left;
+      }
+    }
+  }
+</style>

src/views/safetyCheck/collegeInspect/hiddenDangersReview/index.vue

@@ -124,21 +124,21 @@
               <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="130" show-overflow-tooltip v-if="tableButtonType">
+          <el-table-column label="操作" width="130" 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-p"
                    @click="tableButton(3,scope.row)"
-                   v-hasPermiRouter="['demo:demo:edit']"
+
                 >编辑</p>
                 <p class="table-button-p"
                    @click="tableButton(4,scope.row)"
-                   v-hasPermiRouter="['demo:demo:del']"
+
                 >转移</p>
                 <p class="table-button-null"></p>
               </div>

src/views/safetyCheck/collegeInspect/selfInspectionManage/index.vue

@@ -120,17 +120,17 @@
               </template>
             </el-table-column>
             <el-table-column label="检查人" prop="content" width="230" show-overflow-tooltip/>
-            <el-table-column label="操作" width="180" show-overflow-tooltip v-if="tableButtonType">
+            <el-table-column label="操作" width="180" 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-p"
                      @click="tableButton(3,scope.row)"
-                     v-hasPermiRouter="['demo:demo:edit']"
+
                   >开始检查</p>
                   <p class="table-button-null"></p>
                 </div>

src/views/safetyCheck/collegeInspect/selfInspectionProject/index.vue

@@ -55,7 +55,6 @@
           <p class="page-submit-common-style-button"
              style="float: right;"
              @click="tableButton(1)"
-             v-hasPermiRouter="['demo:demo:add']"
           >创建计划</p>
         </el-form>
       </div>
@@ -92,23 +91,22 @@
               <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="130" show-overflow-tooltip v-if="tableButtonType">
+          <el-table-column label="操作" width="130" 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.planStatus!=0"
                    @click="tableButton(2,scope.row)"
-                   v-hasPermiRouter="['demo:demo:detail']"
                 >详情</p>
                 <p class="table-button-p"
                    v-if="scope.row.planStatus==0"
                    @click="tableButton(3,scope.row)"
-                   v-hasPermiRouter="['demo:demo:edit']"
+
                 >编辑</p>
                 <p class="table-button-p"
                    @click="tableButton(4,scope.row)"
-                   v-hasPermiRouter="['demo:demo:del']"
+
                 >删除</p>
                 <p class="table-button-null"></p>
               </div>

src/views/safetyCheck/components/checkItem.vue

@@ -87,26 +87,25 @@
                 <span>{{scope.row.checkStatus == '0'?'未开始':(scope.row.checkStatus == '1'?'已完成':(scope.row.checkStatus == '2'?'检查中':''))}}</span>
               </template>
             </el-table-column>
-            <el-table-column label="操作" width="150" show-overflow-tooltip v-if="tableButtonType">
+            <el-table-column label="操作" width="150" 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.checkStatus == 0"
                      @click="tableButton(1,scope.row)"
-                     v-hasPermiRouter="['demo:demo:detail']"
+
                   >开始检查</p>
                   <p class="table-button-p"
+                     v-if="scope.row.checkStatus == 1"
                      @click="tableButton(2,scope.row)"
-                     v-hasPermiRouter="['demo:demo:detail']"
+
                   >详情</p>
                   <p class="table-button-p"
+                     v-if="scope.row.checkStatus == 2"
                      @click="tableButton(3,scope.row)"
-                     v-hasPermiRouter="['demo:demo:edit']"
+
                   >编辑</p>
-                  <p class="table-button-p"
-                     @click="tableButton(4,scope.row)"
-                     v-hasPermiRouter="['demo:demo:del']"
-                  >删除</p>
                   <p class="table-button-null"></p>
                 </div>
               </template>
@@ -315,6 +314,7 @@
           this.$set(this,'pageType',2);
           let obj = JSON.parse(JSON.stringify(row))
           obj.manageId = this.propsData.manageId;
+          obj.processType = 'inspect';
           obj.showType = false;
           this.$set(this,'initiateInspectData',obj);
         }else if(type == 2){
@@ -329,35 +329,9 @@
           this.$set(this,'pageType',2);
           let obj = JSON.parse(JSON.stringify(row))
           obj.manageId = this.propsData.manageId;
+          obj.processType = 'inspect';
           obj.showType = false;
           this.$set(this,'initiateInspectData',obj);
-        }else if(type == 4){
-          //删除
-          this.$confirm('是否确认删除?', "警告", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(function() {
-          }).then(() => {
-            deleteFunction({id:row.id}).then(response => {
-              self.msgSuccess(response.message)
-              self.getList();
-            });
-          }).catch(() => {});
-        }else if(type == 5){
-          //启用&停用
-          let text = row.state  ? "停用" : "启用";
-          this.$confirm('是否确认' + text + '?', "警告", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(function() {
-          }).then(() => {
-            stateFunction({id:row.id,state:!row.state,}).then(response => {
-              self.msgSuccess(response.message)
-              self.getList();
-            });
-          }).catch(() => {});
         }else if(type == 6){
           //返回并刷新
           this.$set(this,'pageType',1);

src/views/safetyCheck/dataStatistics/hiddenDangerStatistics.vue

@@ -35,7 +35,7 @@
             <p class="page-submit-common-style-button"
                style="float: right;"
                @click="tableButton(1)"
-               v-hasPermiRouter="['demo:demo:add']"
+
             >数据刷新</p>
             <el-form-item style="float: right;">
               <export-component :exportConfig="exportConfig"></export-component>
@@ -52,13 +52,13 @@
             <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="操作" width="80" show-overflow-tooltip v-if="tableButtonType">
+            <el-table-column label="操作" width="80" 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>
@@ -86,13 +86,13 @@
             <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="操作" width="80" show-overflow-tooltip v-if="tableButtonType">
+            <el-table-column label="操作" width="80" 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>

src/views/safetyCheck/dataStatistics/index.vue

@@ -63,7 +63,7 @@
           <p class="page-submit-common-style-button"
              style="float: right;"
              @click="tableButton(1)"
-             v-hasPermiRouter="['demo:demo:add']"
+
           >数据刷新</p>
           <el-form-item style="float: right;">
             <export-component :exportConfig="exportConfig"></export-component>
@@ -89,21 +89,21 @@
             <template slot-scope="scope">
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="260" show-overflow-tooltip v-if="tableButtonType">
+          <el-table-column label="操作" width="260" 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-p"
                    @click="tableButton(3,scope.row)"
-                   v-hasPermiRouter="['demo:demo:edit']"
+
                 >隐患统计</p>
                 <p class="table-button-p"
                    @click="tableButton(4,scope.row)"
-                   v-hasPermiRouter="['demo:demo:del']"
+
                 >检查项统计</p>
                 <p class="table-button-null"></p>
               </div>

src/views/safetyCheck/dataStatistics/inspectStatistics.vue

@@ -58,7 +58,7 @@
             <p class="page-submit-common-style-button"
                style="float: right;"
                @click="tableButton(1)"
-               v-hasPermiRouter="['demo:demo:add']"
+
             >数据刷新</p>
             <el-form-item style="float: right;">
               <export-component :exportConfig="exportConfig"></export-component>
@@ -90,13 +90,13 @@
             </el-table-column>
             <el-table-column label="复查人" prop="content" width="120" show-overflow-tooltip/>
             <el-table-column label="复查结果" prop="content" width="120" show-overflow-tooltip/>
-            <el-table-column label="操作" width="80" show-overflow-tooltip v-if="tableButtonType">
+            <el-table-column label="操作" width="80" 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>
                 </div>
               </template>

src/views/safetyCheck/dataStatistics/inspectionItemsStatistics.vue

@@ -39,7 +39,7 @@
             <p class="page-submit-common-style-button"
                style="float: right;"
                @click="tableButton(1)"
-               v-hasPermiRouter="['demo:demo:add']"
+
             >数据刷新</p>
             <el-form-item style="float: right;">
               <export-component :exportConfig="exportConfig"></export-component>

src/views/safetyCheck/inspectJob/index.vue

@@ -0,0 +1,289 @@
+<!-- 检查作业 -->
+<template>
+  <div class="app-container inspectJob">
+    <div class="page-container inspectJobPage" v-if="pageType === 1">
+      <div class="page-form-title-box">
+        <el-form :model="queryParams" class="form-box" ref="queryForm"
+                 :inline="true" style="width:100%;">
+          <div class="table-school-college-toggle-box">
+            <p :class="planStatus===''?'p-check':''" @click="tableCheck('')">全部</p>
+            <p :class="planStatus===0?'p-check':''" @click="tableCheck(0)">未提交</p>
+            <p :class="planStatus===1?'p-check':''" @click="tableCheck(1)">已提交</p>
+          </div>
+          <el-form-item label="" prop="deptId">
+            <el-select v-model="queryParams.deptId" placeholder="学院单位" style="width: 200px">
+              <el-option
+                v-for="dict in deptOption"
+                :key="dict.deptId"
+                :label="dict.deptName"
+                :value="dict.deptId"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="queryParamsData1">
+            <el-input
+              maxLength="30"
+              v-model="queryParams.queryParamsData1"
+              placeholder="计划标题"
+              style="width: 200px"
+            />
+          </el-form-item>
+          <el-form-item label="" prop="state">
+            <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>
+          <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
+          <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+          <!--<p class="page-submit-common-style-button"-->
+             <!--style="float: right;"-->
+             <!--@click="tableButton(1)"-->
+          <!--&gt;新增</p>-->
+        </el-form>
+      </div>
+      <div class="page-content-box">
+        <el-table class="table-box" v-loading="loading" border :data="dataList">
+          <el-table-column label="序号" type="index" width="60"/>
+          <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="100" show-overflow-tooltip/>
+          <el-table-column label="学院单位" prop="content" width="200" show-overflow-tooltip/>
+          <el-table-column label="检查项数量" prop="content" width="100" show-overflow-tooltip/>
+          <el-table-column label="不符合数量" prop="content" width="100" show-overflow-tooltip/>
+          <el-table-column label="状态" prop="state" width="100" show-overflow-tooltip>
+            <template slot-scope="scope">
+
+            </template>
+          </el-table-column>
+          <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 >
+            <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)"
+
+                >详情</p>
+                <p class="table-button-p"
+                   @click="tableButton(3,scope.row)"
+
+                >编辑</p>
+                <p class="table-button-p"
+                   @click="tableButton(4,scope.row)"
+
+                >删除</p>
+                <p class="table-button-null"></p>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination :page-sizes="[20, 30, 40, 50]"
+                    v-show="total>0"
+                    :total="total"
+                    :page.sync="queryParams.page"
+                    :limit.sync="queryParams.pageSize"
+                    @pagination="getList"
+        />
+      </div>
+    </div>
+    <!--<add-page :propsData="propsData" v-if="pageType === 2"></add-page>-->
+  </div>
+</template>
+<script>
+  import {
+    getDeptDropList,
+  } from '@/api/commonality/permission'
+  //import { getDicts } from "@/api/commonality/noPermission";
+  //import { systemUserSelect } from "@/api/commonality/permission";
+  //import { getInfo } from "@/api/basicsModules/index";
+  //import addPage from "./addPage.vue";
+  export default {
+    name: 'index',
+    //components: {
+    //  addPage
+    //},
+    data () {
+      return {
+        tableButtonType:this.hasPermiDom(['demo:demo:detail','demo:demo:edit','demo:demo:del',]),
+        //页面状态
+        pageType:1,
+        //计划状态选项卡
+        planStatus:'',
+        //页面遮罩
+        loading:false,
+        //下拉列表数据
+        deptOption:[],
+        //查询条件
+        queryParams:{
+          page:1,
+          pageSize:20,
+          queryParamsData1:"",
+          deptId :null,
+        },
+        //时间数据
+        dateRange:[],
+        //列表数据
+        dataList:[],
+        //数据数量
+        total:0,
+        //组件传参
+        propsData:{},
+      }
+    },
+    created () {
+      this.getDeptDropList();
+    },
+    mounted () {
+      //this.getList();
+    },
+    methods: {
+      //整改状态选项卡切换
+      tableCheck(type){
+        if (this.planStatus !== type){
+          this.$set(this,'planStatus',type);
+          this.resetQuery();
+        }
+      },
+      //查询按钮
+      handleQuery(){
+        this.$set(this.queryParams,'page',1);
+        this.getList();
+      },
+      //重置按钮
+      resetQuery(){
+        this.$set(this,'dateRange',[])
+        this.$set(this,'queryParams',{
+          page:1,
+          pageSize:20,
+          queryParamsData1:"",
+          deptId :null,
+        });
+        this.getList();
+      },
+      //获取数据列表
+      getList(){
+        this.$set(this,'loading',true);
+        let obj = JSON.parse(JSON.stringify(this.queryParams))
+        if(this.dateRange[0]){
+          obj.startTime = this.dateRange[0]+'T00:00:00'
+          obj.endTime = this.dateRange[1]+'T23:59:59'
+        }else{
+          obj.startTime = "";
+          obj.endTime = "";
+        }
+        getListFunction(obj).then(response => {
+          this.$set(this,'loading',false);
+          this.$set(this,'dataList',response.data.records);
+          this.$set(this,'total',response.data.total);
+        });
+      },
+      //操作按钮
+      tableButton(type,row){
+        let self = this;
+        if(type == 1){
+          //新增
+          this.$set(this,'pageType',2);
+          this.$set(this,'propsData',{});
+        }else if(type == 2){
+          //详情
+          this.$set(this,'pageType',2);
+          let obj = JSON.parse(JSON.stringify(row))
+          obj.showType = true;
+          this.$set(this,'propsData',obj);
+        }else if(type == 3){
+          //编辑
+          this.$set(this,'pageType',2);
+          let obj = JSON.parse(JSON.stringify(row))
+          obj.showType = false;
+          this.$set(this,'propsData',obj);
+        }else if(type == 4){
+          //删除
+          this.$confirm('是否确认删除?', "警告", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(function() {
+          }).then(() => {
+            deleteFunction({id:row.id}).then(response => {
+              self.msgSuccess(response.message)
+              self.getList();
+            });
+          }).catch(() => {});
+        }else if(type == 5){
+          //启用&停用
+          let text = row.state  ? "停用" : "启用";
+          this.$confirm('是否确认' + text + '?', "警告", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(function() {
+          }).then(() => {
+            stateFunction({id:row.id,state:!row.state,}).then(response => {
+              self.msgSuccess(response.message)
+              self.getList();
+            });
+          }).catch(() => {});
+        }else if(type == 6){
+          //返回并刷新
+          this.$set(this,'pageType',1);
+          this.getList();
+        }
+      },//学院下拉列表
+      getDeptDropList(){
+        getDeptDropList({level: 2, deptType: 1 }).then(response => {
+          this.$set(this,'deptOption',response.data);
+        });
+      },
+    },
+  }
+</script>
+<style scoped lang="scss">
+  .inspectJob{
+    .inspectJobPage{
+      .table-school-college-toggle-box{
+        overflow: hidden;
+        display: inline-block;
+        margin-right:10px;
+        p{
+          display: inline-block;
+          text-align: center;
+          width:80px;
+          line-height:40px;
+          height:40px;
+          color:#333;
+          background-color: #fff;
+          border:1px solid #E0E0E0;
+          font-size:14px;
+          cursor: pointer;
+        }
+        p:nth-child(1){
+          border-top-left-radius: 4px;
+          border-bottom-left-radius: 4px;
+          /*border-right:none;*/
+        }
+        p:nth-child(3){
+          border-top-right-radius: 4px;
+          border-bottom-right-radius: 4px;
+          /*border-left:none;*/
+        }
+        .p-check{
+          border:1px solid #0183FA;
+          background-color: #0183FA;
+          color:#fff;
+        }
+      }
+    }
+  }
+</style>

src/views/safetyCheck/inspectProject/inspectProjectAccording/index.vue

@@ -41,7 +41,7 @@
           <p class="page-submit-common-style-button"
              style="float: right;"
              @click="tableButton(1)"
-             v-hasPermiRouter="['demo:demo:add']"
+
           >新增</p>
         </el-form>
       </div>
@@ -56,17 +56,17 @@
               <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="130" show-overflow-tooltip v-if="tableButtonType">
+          <el-table-column label="操作" width="130" 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-p"
                    @click="tableButton(4,scope.row)"
-                   v-hasPermiRouter="['demo:demo:del']"
+
                 >删除</p>
                 <p class="table-button-null"></p>
               </div>

src/views/safetyCheck/inspectProject/inspectProjectTable/index.vue

@@ -18,16 +18,16 @@
           <p class="page-inquire-common-style-button" @click="onSearch">查询</p>
           <p class="page-reset-common-style-button" @click="resetForm">重置</p>
         </el-form-item>
-        <el-form-item style="float: right;" v-hasPermiRouter="['check:option:add']">
+        <el-form-item style="float: right;" >
           <p class="page-save-common-style-button" style="width:80px;" @click="addDialogOpen(1)">添加</p>
         </el-form-item>
-        <el-form-item style="float: right;" v-hasPermiRouter="['check:option:del']">
+        <el-form-item style="float: right;" >
           <p class="page-add-common-style-button" style="width:100px;" @click="allDel">批量删除</p>
         </el-form-item>
-        <el-form-item style="float: right;" v-hasPermiRouter="['check:option:export']">
+        <el-form-item style="float: right;" >
           <export-component :exportConfig="exportConfig"></export-component>
         </el-form-item>
-        <el-form-item style="float: right;" v-hasPermiRouter="['check:option:import']">
+        <el-form-item style="float: right;" >
           <import-component :importConfig="importConfig"></import-component>
         </el-form-item>
       </el-form>
@@ -48,10 +48,8 @@
           <template slot-scope="scope">
             <div class="table-button-box">
               <p class="table-button-null"></p>
-              <!--<p class="table-button-p" v-if="scope.row.level != 4" v-hasPermiRouter="['check:option:add']"-->
-                 <!--@click="addDialogOpen(2,scope.row)">新增</p>-->
-              <p class="table-button-p" @click="addDialogOpen(3,scope.row)" v-hasPermiRouter="['check:option:edit']">编辑</p>
-              <p class="table-button-p" @click="delItem(scope.row)" v-hasPermiRouter="['check:option:del']">删除</p>
+              <p class="table-button-p" @click="addDialogOpen(3,scope.row)" >编辑</p>
+              <p class="table-button-p" @click="delItem(scope.row)" >删除</p>
               <p class="table-button-null"></p>
             </div>
           </template>

src/views/safetyCheck/inspectReport/index.vue

@@ -0,0 +1,290 @@
+<!-- 检查报告 -->
+<template>
+  <div class="app-container inspectReport">
+    <div class="page-container inspectReportPage" v-if="pageType === 1">
+      <div class="page-form-title-box">
+        <el-form :model="queryParams" class="form-box" ref="queryForm"
+                 :inline="true" style="width:100%;">
+          <div class="table-school-college-toggle-box">
+            <p :class="planStatus===''?'p-check':''" @click="tableCheck('')">全部</p>
+            <p :class="planStatus===0?'p-check':''" @click="tableCheck(0)">未提交</p>
+            <p :class="planStatus===1?'p-check':''" @click="tableCheck(1)">已提交</p>
+          </div>
+          <el-form-item label="" prop="deptId">
+            <el-select v-model="queryParams.deptId" placeholder="学院单位" style="width: 200px">
+              <el-option
+                v-for="dict in deptOption"
+                :key="dict.deptId"
+                :label="dict.deptName"
+                :value="dict.deptId"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="queryParamsData1">
+            <el-input
+              maxLength="30"
+              v-model="queryParams.queryParamsData1"
+              placeholder="计划标题"
+              style="width: 200px"
+            />
+          </el-form-item>
+          <el-form-item label="" prop="state">
+            <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>
+          <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
+          <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+          <p class="page-submit-common-style-button"
+             style="float: right;"
+             @click="tableButton(1)"
+
+          >批量提交</p>
+        </el-form>
+      </div>
+      <div class="page-content-box">
+        <el-table class="table-box" v-loading="loading" border :data="dataList">
+          <el-table-column label="序号" type="index" width="60"/>
+          <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="100" show-overflow-tooltip/>
+          <el-table-column label="学院单位" prop="content" width="200" show-overflow-tooltip/>
+          <el-table-column label="检查项数量" prop="content" width="100" show-overflow-tooltip/>
+          <el-table-column label="不符合数量" prop="content" width="100" show-overflow-tooltip/>
+          <el-table-column label="状态" prop="state" width="100" show-overflow-tooltip>
+            <template slot-scope="scope">
+
+            </template>
+          </el-table-column>
+          <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 >
+            <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)"
+
+                >详情</p>
+                <p class="table-button-p"
+                   @click="tableButton(3,scope.row)"
+
+                >编辑</p>
+                <p class="table-button-p"
+                   @click="tableButton(4,scope.row)"
+
+                >删除</p>
+                <p class="table-button-null"></p>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination :page-sizes="[20, 30, 40, 50]"
+                    v-show="total>0"
+                    :total="total"
+                    :page.sync="queryParams.page"
+                    :limit.sync="queryParams.pageSize"
+                    @pagination="getList"
+        />
+      </div>
+    </div>
+    <!--<add-page :propsData="propsData" v-if="pageType === 2"></add-page>-->
+  </div>
+</template>
+<script>
+  import {
+    getDeptDropList,
+  } from '@/api/commonality/permission'
+  //import { getDicts } from "@/api/commonality/noPermission";
+  //import { systemUserSelect } from "@/api/commonality/permission";
+  //import { getInfo } from "@/api/basicsModules/index";
+  //import addPage from "./addPage.vue";
+  export default {
+    name: 'index',
+    //components: {
+    //  addPage
+    //},
+    data () {
+      return {
+        tableButtonType:this.hasPermiDom(['demo:demo:detail','demo:demo:edit','demo:demo:del',]),
+        //页面状态
+        pageType:1,
+        //计划状态选项卡
+        planStatus:'',
+        //页面遮罩
+        loading:false,
+        //下拉列表数据
+        deptOption:[],
+        //查询条件
+        queryParams:{
+          page:1,
+          pageSize:20,
+          queryParamsData1:"",
+          deptId :null,
+        },
+        //时间数据
+        dateRange:[],
+        //列表数据
+        dataList:[],
+        //数据数量
+        total:0,
+        //组件传参
+        propsData:{},
+      }
+    },
+    created () {
+      this.getDeptDropList();
+    },
+    mounted () {
+      //this.getList();
+    },
+    methods: {
+      //整改状态选项卡切换
+      tableCheck(type){
+        if (this.planStatus !== type){
+          this.$set(this,'planStatus',type);
+          this.resetQuery();
+        }
+      },
+      //查询按钮
+      handleQuery(){
+        this.$set(this.queryParams,'page',1);
+        this.getList();
+      },
+      //重置按钮
+      resetQuery(){
+        this.$set(this,'dateRange',[])
+        this.$set(this,'queryParams',{
+          page:1,
+          pageSize:20,
+          queryParamsData1:"",
+          deptId :null,
+        });
+        this.getList();
+      },
+      //获取数据列表
+      getList(){
+        this.$set(this,'loading',true);
+        let obj = JSON.parse(JSON.stringify(this.queryParams))
+        if(this.dateRange[0]){
+          obj.startTime = this.dateRange[0]+'T00:00:00'
+          obj.endTime = this.dateRange[1]+'T23:59:59'
+        }else{
+          obj.startTime = "";
+          obj.endTime = "";
+        }
+        getListFunction(obj).then(response => {
+          this.$set(this,'loading',false);
+          this.$set(this,'dataList',response.data.records);
+          this.$set(this,'total',response.data.total);
+        });
+      },
+      //操作按钮
+      tableButton(type,row){
+        let self = this;
+        if(type == 1){
+          //新增
+          this.$set(this,'pageType',2);
+          this.$set(this,'propsData',{});
+        }else if(type == 2){
+          //详情
+          this.$set(this,'pageType',2);
+          let obj = JSON.parse(JSON.stringify(row))
+          obj.showType = true;
+          this.$set(this,'propsData',obj);
+        }else if(type == 3){
+          //编辑
+          this.$set(this,'pageType',2);
+          let obj = JSON.parse(JSON.stringify(row))
+          obj.showType = false;
+          this.$set(this,'propsData',obj);
+        }else if(type == 4){
+          //删除
+          this.$confirm('是否确认删除?', "警告", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(function() {
+          }).then(() => {
+            deleteFunction({id:row.id}).then(response => {
+              self.msgSuccess(response.message)
+              self.getList();
+            });
+          }).catch(() => {});
+        }else if(type == 5){
+          //启用&停用
+          let text = row.state  ? "停用" : "启用";
+          this.$confirm('是否确认' + text + '?', "警告", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(function() {
+          }).then(() => {
+            stateFunction({id:row.id,state:!row.state,}).then(response => {
+              self.msgSuccess(response.message)
+              self.getList();
+            });
+          }).catch(() => {});
+        }else if(type == 6){
+          //返回并刷新
+          this.$set(this,'pageType',1);
+          this.getList();
+        }
+      },
+      getDeptDropList(){
+        getDeptDropList({level: 2, deptType: 1 }).then(response => {
+          this.$set(this,'deptOption',response.data);
+        });
+      },
+    },
+  }
+</script>
+<style scoped lang="scss">
+  .inspectReport{
+    .inspectReportPage{
+      .table-school-college-toggle-box{
+        overflow: hidden;
+        display: inline-block;
+        margin-right:10px;
+        p{
+          display: inline-block;
+          text-align: center;
+          width:80px;
+          line-height:40px;
+          height:40px;
+          color:#333;
+          background-color: #fff;
+          border:1px solid #E0E0E0;
+          font-size:14px;
+          cursor: pointer;
+        }
+        p:nth-child(1){
+          border-top-left-radius: 4px;
+          border-bottom-left-radius: 4px;
+          /*border-right:none;*/
+        }
+        p:nth-child(3){
+          border-top-right-radius: 4px;
+          border-bottom-right-radius: 4px;
+          /*border-left:none;*/
+        }
+        .p-check{
+          border:1px solid #0183FA;
+          background-color: #0183FA;
+          color:#fff;
+        }
+      }
+    }
+  }
+</style>

src/views/safetyCheck/inspectSupervisorGroup/addPage.vue

@@ -238,6 +238,11 @@
       //督导组详情
       securityCheckGroupDetail(){
         securityCheckGroupDetail({groupId:this.propsData.groupId,userEnable:0}).then(response => {
+          for(let i=0;i<response.data.checkGroupMemberList.length;i++){
+            if (response.data.checkGroupMemberList[i].isAdmin){
+              this.$set(this,'isAdminUserId',response.data.checkGroupMemberList[i].userId);
+            }
+          }
           this.$set(this,'newData',response.data);
         });
       },

src/views/safetyCheck/inspectSupervisorGroup/index.vue

@@ -46,7 +46,7 @@
           <p class="page-submit-common-style-button"
              style="float: right;width:130px"
              @click="tableButton(1)"
-             v-hasPermiRouter="['demo:demo:add']"
+
           >创建督导组</p>
         </el-form>
       </div>
@@ -78,21 +78,21 @@
               <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"
                    @click="tableButton(2,scope.row)"
-                   v-hasPermiRouter="['demo:demo:detail']"
+
                 >查看</p>
                 <p class="table-button-p"
                    @click="tableButton(3,scope.row)"
-                   v-hasPermiRouter="['demo:demo:edit']"
+
                 >编辑</p>
                 <p class="table-button-p"
                    @click="tableButton(4,scope.row)"
-                   v-hasPermiRouter="['demo:demo:del']"
+
                 >删除</p>
                 <p class="table-button-null"></p>
               </div>

src/views/safetyCheck/inspectSupervisorGroup/userCheckComponent.vue

@@ -36,7 +36,7 @@
               </el-form-item>
             </el-form>
             <el-table class="table-box" ref="leftUserTable" border :data="userTableListLeft" @selection-change="userChangeLeft" :row-key="getRowKeys">
-              <el-table-column v-if="editType" type="selection" width="50" :reserve-selection="true" align="center"/>
+              <el-table-column type="selection" width="50" :reserve-selection="true" align="center"/>
               <el-table-column label="姓名" align="center" prop="userName" show-overflow-tooltip/>
               <el-table-column label="工号" align="center" prop="account" show-overflow-tooltip width="150"/>
               <el-table-column label="所在部门" align="center" prop="deptName" show-overflow-tooltip width="270"/>
@@ -50,8 +50,8 @@
           </div>
         </div>
         <div class="center-box">
-          <p class="el-icon-arrow-left" v-if="editType" @click="userArrowButton(1)">到左边</p>
-          <p class="el-icon-arrow-right" v-if="editType" @click="userArrowButton(2)">到右边</p>
+          <p class="el-icon-arrow-left" @click="userArrowButton(1)">到左边</p>
+          <p class="el-icon-arrow-right" @click="userArrowButton(2)">到右边</p>
         </div>
         <div class="right-max-box">
           <div class="dept-table-title-box">
@@ -98,7 +98,7 @@
           </div>
         </div>
       </div>
-      <div class="dialog-footer-box" v-hasPermiRouter="['check:set:edit']">
+      <div class="dialog-footer-box">
         <p class="dialog-footer-button-null"></p>
         <p class="dialog-footer-button-info" @click="addDialogAllOff">取消</p>
         <p class="dialog-footer-button-primary" @click="addUserButton">确定</p>
@@ -118,7 +118,6 @@
     },
     data(){
       return{
-        editType:this.hasPermiDom(['check:set:edit']),
         userCheckComponentType:true,
         checkDataList:[],
         checkList:[],

src/views/safetyCheck/safetyHazard/inspectHazard/index.vue

@@ -154,13 +154,13 @@
             </template>
           </el-table-column>
           <el-table-column label="复查结果" prop="content" width="130" show-overflow-tooltip/>
-          <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"
                    @click="tableButton(2,scope.row)"
-                   v-hasPermiRouter="['demo:demo:detail']"
+
                 >详情/整改</p>
                 <p class="table-button-null"></p>
               </div>

src/views/safetyCheck/safetyHazard/rectificationNotice/index.vue

@@ -127,21 +127,21 @@
 
             </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"
                    @click="tableButton(2,scope.row)"
-                   v-hasPermiRouter="['demo:demo:detail']"
+
                 >查看</p>
                 <p class="table-button-p"
                    @click="tableButton(3,scope.row)"
-                   v-hasPermiRouter="['demo:demo:edit']"
+
                 >下载</p>
                 <p class="table-button-p"
                    @click="tableButton(4,scope.row)"
-                   v-hasPermiRouter="['demo:demo:del']"
+
                 >整改情况</p>
                 <p class="table-button-null"></p>
               </div>

src/views/safetyCheck/safetyHazard/rectificationNotice/listPage.vue

@@ -130,17 +130,17 @@
               </template>
             </el-table-column>
             <el-table-column label="复查结果" prop="content" width="100" show-overflow-tooltip/>
-            <el-table-column label="操作" width="100" show-overflow-tooltip v-if="tableButtonType">
+            <el-table-column label="操作" width="100" 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-p"
                      @click="tableButton(2,scope.row)"
-                     v-hasPermiRouter="['demo:demo:detail']"
+
                   >详情</p>
                   <p class="table-button-null"></p>
                 </div>

src/views/safetyCheck/safetyHazard/rectificationReport/index.vue

@@ -107,21 +107,21 @@
               <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"
                    @click="tableButton(2,scope.row)"
-                   v-hasPermiRouter="['demo:demo:detail']"
+
                 >查看</p>
                 <p class="table-button-p"
                    @click="tableButton(3,scope.row)"
-                   v-hasPermiRouter="['demo:demo:edit']"
+
                 >下载</p>
                 <p class="table-button-p"
                    @click="tableButton(4,scope.row)"
-                   v-hasPermiRouter="['demo:demo:del']"
+
                 >整改情况</p>
                 <p class="table-button-null"></p>
               </div>

src/views/safetyCheck/safetyHazard/selfInspectionHazard/index.vue

@@ -154,13 +154,13 @@
             </template>
           </el-table-column>
           <el-table-column label="复查结果" prop="content" width="130" show-overflow-tooltip/>
-          <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"
                    @click="tableButton(2,scope.row)"
-                   v-hasPermiRouter="['demo:demo:detail']"
+
                 >详情/整改</p>
                 <p class="table-button-null"></p>
               </div>

src/views/safetyCheck/safetyHazard/snapshotHazard/index.vue

@@ -129,18 +129,18 @@
               <span>{{ parseTime(scope.row.rectifyTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="120" show-overflow-tooltip v-if="tableButtonType">
+          <el-table-column label="操作" width="120" 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(1,scope.row)"
-                   v-hasPermiRouter="['demo:demo:detail']"
+
                 >详情</p>
                 <p class="table-button-p"
                    v-if="scope.row.canRectify && scope.row.rectifyStatus == 0"
                    @click="tableButton(2,scope.row)"
-                   v-hasPermiRouter="['demo:demo:detail']"
+
                 >整改</p>
                 <p class="table-button-null"></p>
               </div>

src/views/safetyCheck/schoolInspect/inspectManage/index.vue

@@ -129,18 +129,18 @@
               </template>
             </el-table-column>
             <el-table-column label="检查人" prop="checkUserNames" width="230" show-overflow-tooltip/>
-            <el-table-column label="操作" width="180" show-overflow-tooltip v-if="tableButtonType">
+            <el-table-column label="操作" width="180" 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']"
+                     @click="tableButton(1,scope.row)"
+
                   >检查项</p>
                   <p class="table-button-p"
                      v-if='scope.row.manageStatus!=2'
-                     @click="tableButton(3,scope.row)"
-                     v-hasPermiRouter="['demo:demo:edit']"
+                     @click="tableButton(2,scope.row)"
+
                   >开始检查</p>
                   <p class="table-button-null"></p>
                 </div>
@@ -158,6 +158,7 @@
       </div>
     </div>
     <checkItem :propsData="propsData" v-if="pageType === 2"></checkItem>
+    <initiateInspect v-if="pageType == 3" :initiateInspectData="initiateInspectData"></initiateInspect>
   </div>
 </template>
 <script>
@@ -172,10 +173,12 @@
     securityCheckManageList,
   } from '@/api/safetyCheck/indexDemoOne'
   import checkItem from "@/views/safetyCheck/components/checkItem.vue";
+  import initiateInspect from "@/views/safetyCheck/components/initiateInspect/initiateInspect.vue";
   export default {
     name: 'index',
     components: {
-      checkItem
+      checkItem,
+      initiateInspect,
     },
     data () {
       return {
@@ -226,6 +229,8 @@
         leftBigCheckType:"0",
         leftCheckType:"0",
         leftListData:[],
+        //检查组件
+        initiateInspectData:{},
       }
     },
     created () {
@@ -334,48 +339,19 @@
       tableButton(type,row){
         let self = this;
         if(type == 1){
-          //新增
-          this.$set(this,'pageType',2);
-          this.$set(this,'propsData',{});
-        }else if(type == 2){
           //检查项列表
           this.$set(this,'pageType',2);
           let obj = JSON.parse(JSON.stringify(row))
           obj.showType = true;
           this.$set(this,'propsData',obj);
-        }else if(type == 3){
-          //编辑
-          this.$set(this,'pageType',2);
+        }else if(type == 2){
+          //开始检查
+          this.$set(this,'pageType',3);
           let obj = JSON.parse(JSON.stringify(row))
+          obj.freeChoiceType = true;
+          obj.processType = 'inspect';
           obj.showType = false;
-          this.$set(this,'propsData',obj);
-        }else if(type == 4){
-          //删除
-          this.$confirm('是否确认删除?', "警告", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(function() {
-          }).then(() => {
-            deleteFunction({id:row.id}).then(response => {
-              self.msgSuccess(response.message)
-              self.getList();
-            });
-          }).catch(() => {});
-        }else if(type == 5){
-          //启用&停用
-          let text = row.state  ? "停用" : "启用";
-          this.$confirm('是否确认' + text + '?', "警告", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          }).then(function() {
-          }).then(() => {
-            stateFunction({id:row.id,state:!row.state,}).then(response => {
-              self.msgSuccess(response.message)
-              self.getList();
-            });
-          }).catch(() => {});
+          this.$set(this,'initiateInspectData',obj);
         }else if(type == 6){
           //返回并刷新
           this.$set(this,'pageType',1);

src/views/safetyCheck/schoolInspect/inspectProject/index.vue

@@ -55,7 +55,7 @@
           <p class="page-submit-common-style-button"
              style="float: right;"
              @click="tableButton(1)"
-             v-hasPermiRouter="['demo:demo:add']"
+
           >创建计划</p>
         </el-form>
       </div>
@@ -92,23 +92,23 @@
               <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="130" show-overflow-tooltip v-if="tableButtonType">
+          <el-table-column label="操作" width="130" 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.planStatus!=0"
                    @click="tableButton(2,scope.row)"
-                   v-hasPermiRouter="['demo:demo:detail']"
+
                 >详情</p>
                 <p class="table-button-p"
                    v-if="scope.row.planStatus==0"
                    @click="tableButton(3,scope.row)"
-                   v-hasPermiRouter="['demo:demo:edit']"
+
                 >编辑</p>
                 <p class="table-button-p"
                    @click="tableButton(4,scope.row)"
-                   v-hasPermiRouter="['demo:demo:del']"
+
                 >删除</p>
                 <p class="table-button-null"></p>
               </div>

src/views/safetyCheck/schoolInspect/reviewManage/index.vue

@@ -134,21 +134,21 @@
               <span>{{ parseTime(scope.row.createTime,"{y}-{m}-{d} {h}:{i}") }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="130" show-overflow-tooltip v-if="tableButtonType">
+          <el-table-column label="操作" width="130" 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-p"
                    @click="tableButton(3,scope.row)"
-                   v-hasPermiRouter="['demo:demo:edit']"
+
                 >编辑</p>
                 <p class="table-button-p"
                    @click="tableButton(4,scope.row)"
-                   v-hasPermiRouter="['demo:demo:del']"
+
                 >转移</p>
                 <p class="table-button-null"></p>
               </div>

src/views/safetyCheck/snapshot/index.vue

@@ -47,7 +47,7 @@
           <p class="page-submit-common-style-button"
              style="float: right;"
              @click="tableButton(1)"
-             v-hasPermiRouter="['demo:demo:add']"
+
           >上报</p>
         </el-form>
       </div>
@@ -74,18 +74,18 @@
               {{scope.row.rectifyStatus == 0?'待整改':(scope.row.rectifyStatus == 1?'已完成':(scope.row.rectifyStatus == 2?'暂无法整改':''))}}
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="130" show-overflow-tooltip v-if="tableButtonType">
+          <el-table-column label="操作" width="130" 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-p"
                    v-if="scope.row.rectifyStatus == 0"
                    @click="tableButton(4,scope.row)"
-                   v-hasPermiRouter="['demo:demo:del']"
+
                 >删除</p>
                 <p class="table-button-null"></p>
               </div>