Merge branch 'zhy_20241128' into zhy_new_1203

20241203 增加的隐患来源，8 点检隐患
20241202 隐患排查页面
2024-12-26 15:45:01 +08:00 · 2024-12-03 11:26:17 +08:00 · 2024-12-02 16:06:20 +08:00
7 changed files with 1167 additions and 0 deletions
--- a/src/views/checkYr/checkJh/components/list.vue
+++ b/src/views/checkYr/checkJh/components/list.vue
@ -0,0 +1,193 @@
+<template>
+  <div class="app-container">
+    <div class="rightCont">
+      <el-form label-width="110px">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="计划名称：">
+              <el-input v-model="search.fjhname" style="width:206px" placeholder="请输入内容"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计划类型：">
+              <el-input v-model="search.ftypestr" style="width:206px" placeholder="请输入内容"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="班次：">
+              <el-input v-model="search.fbc" style="width:206px" placeholder="请输入内容"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="角色名称：">
+              <el-input v-model="search.froleidstr" style="width:206px" placeholder="请输入内容"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="审批状态：">
+              <el-input v-model="search.fspstatusstr" style="width:206px" placeholder="请输入内容"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计划生成日期：">
+              <el-date-picker v-model="search.CHECK_TIME" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd" style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label-width="10px">
+              <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
+                搜索
+              </el-button>
+              <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="goKeyReset">
+                重置
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div>
+        <el-table
+          ref="multipleTable"
+          :data="varList"
+          :row-key="getRowKey"
+          border
+          tooltip-effect="dark"
+          style="width: 100%">
+          <el-table-column type="selection" width="55" align="center"/>
+          <el-table-column type="index" label="序号" width="55" align="center"/>
+          <el-table-column prop="fjhname" label="计划名称"/>
+          <el-table-column prop="ftypestr" label="计划类型"/>
+          <el-table-column prop="fbc" label="班次"/>
+          <el-table-column prop="froleidstr" label="角色名称"/>
+          <el-table-column prop="fadddate" label="计划生成时间"/>
+          <el-table-column prop="freason" label="未点检原因"/>
+          <el-table-column prop="fdelReason" label="删除原因"/>
+          <el-table-column prop="fstatestr" label="点检状态"/>
+          <el-table-column prop="fspstatusstr" label="审批状态"/>
+          <el-table-column prop="fspTypeStr" label="审批类型"/>
+          <el-table-column prop="fsumitUserStr" label="提交人"/>
+          <el-table-column prop="fsubmitDate" label="提交时间"/>
+          <el-table-column prop="fspUserStr" label="审批人"/>
+          <el-table-column prop="fspDate" label="审批时间"/>
+          <el-table-column prop="fuserstr" label="接单人"/>
+          <el-table-column prop="fuserdate" label="接单时间"/>
+          <el-table-column prop="fcurrentdeptstr" label="部门"/>
+          <!--          <el-table-column prop="fmodiuserstr" label="修改时间"/>-->
+          <!--          <el-table-column prop="fmodidate" label="修改人"/>-->
+          <el-table-column label="操作" width="200px">
+            <template slot-scope="{row}">
+              <el-button
+                type="primary"
+                icon="el-icon-edit"
+                size="mini"
+                @click="handleShow(row)">查看详情
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="page-btn-group">
+          <div/>
+          <pagination
+            :total="total"
+            :page.sync="listQuery.page"
+            :limit.sync="listQuery.limit"
+            @pagination="getList()"/>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination'
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves'
+// waves directive
+import SelectTree from '@/components/SelectTree'
+
+export default {
+  components: { Pagination, SelectTree },
+  directives: { waves },
+  data() {
+    return {
+      config: config,
+      listLoading: false,
+      varList: [],
+      search: {
+        fjhname: '',
+        froleidstr: '',
+        ftypestr: '',
+        fspstatusstr: '',
+        CHECK_TIME: [],
+        fbc: '',
+        fuserstr: ''
+      },
+      total: 0,
+      listQuery: {
+        page: 1,
+        limit: 20
+      }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    handleShow(row) {
+      console.log(row)
+      this.$parent.activeName = 'RecordInfo'
+      this.$parent.FID = row.fid
+      console.log(this.$parent.FID)
+    },
+    getRowKey(row) {
+      return row.FIRE_DEVICE_ID
+    },
+    // 添加
+    // 搜索
+    getQuery() {
+      this.getList()
+    },
+    // 获取列表
+    getList() {
+      this.listLoading = true
+      requestFN(
+        '/app/ryCheck/getRyCheckJh?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          fjhname: this.search.fjhname,
+          fbc: this.search.fbc,
+          froleidstr: this.search.froleidstr,
+          ftypestr: this.search.ftypestr,
+          fspstatusstr: this.search.fspstatusstr,
+          startTime: this.search.CHECK_TIME[0],
+          endTime: this.search.CHECK_TIME[1],
+          fuserstr: this.search.fuserstr
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.varList
+        this.total = data.page.totalResult
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    goKeyReset() {
+      this.search = {
+        fjhname: '',
+        froleidstr: '',
+        ftypestr: '',
+        fspstatusstr: '',
+        CHECK_TIME: [],
+        fbc: '',
+        fuserstr: ''
+      }
+      this.getList()
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
--- a/src/views/checkYr/checkJh/components/recordInfo.vue
+++ b/src/views/checkYr/checkJh/components/recordInfo.vue
@ -0,0 +1,300 @@
+<template>
+  <div>
+    <div id="printTest" class="app-contprint print-midi">
+      <div class="level-title">
+        <h1>点检计划</h1>
+      </div>
+      <div class="mb-20">
+        <table class="table-ui">
+          <tr>
+            <td class="tbg">计划名称</td>
+            <td>{{ form.fjhname }}</td>
+            <td class="tbg">计划类型</td>
+            <td>{{ form.ftypestr }}</td>
+          </tr>
+          <tr>
+            <td class="tbg">班次</td>
+            <td>{{ form.fbc }}</td>
+            <td class="tbg">角色名称</td>
+            <td>{{ form.froleidstr }}</td>
+          </tr>
+          <tr>
+            <td class="tbg">计划生成时间</td>
+            <td>{{ form.fadddate }}</td>
+            <td class="tbg">未点检原因</td>
+            <td>{{ form.freason }}</td>
+          </tr>
+          <tr>
+            <td class="tbg">删除原因</td>
+            <td>{{ form.fdelReason }}</td>
+            <td class="tbg">点检状态</td>
+            <td>{{ form.fstatestr }}</td>
+          </tr>
+          <tr>
+            <td class="tbg">审批状态</td>
+            <td>{{ form.fspstatusstr }}</td>
+            <td class="tbg">审批类型</td>
+            <td>{{ form.fspTypeStr }}</td>
+          </tr>
+          <tr>
+            <td class="tbg">提交人</td>
+            <td>{{ form.fsumitUserStr }}</td>
+            <td class="tbg">提交时间</td>
+            <td>{{ form.fsubmitDate }}</td>
+          </tr>
+          <tr>
+            <td class="tbg">审批人</td>
+            <td>{{ form.fspUserStr }}</td>
+            <td class="tbg">审批时间</td>
+            <td>{{ form.fspDate }}</td>
+          </tr>
+          <tr>
+            <td class="tbg">接单人</td>
+            <td>{{ form.fuserstr }}</td>
+            <td class="tbg">接单时间</td>
+            <td>{{ form.fuserdate }}</td>
+          </tr>
+          <tr>
+            <td class="tbg">部门</td>
+            <td>{{ form.fcurrentdeptstr }}</td>
+          </tr>
+        </table>
+      </div>
+      <div class="level-title">
+        <h1>检查标准</h1>
+      </div>
+      <div class="mb-20">
+        <table class="table-ui">
+          <tr>
+            <th width="55" style="text-align:center">序号</th>
+            <th>点检标准名称</th>
+            <th>设备名称</th>
+            <th>点检点</th>
+            <th>检查部位</th>
+            <th>扫卡时间</th>
+          </tr>
+          <template v-if="varList.length !== 0">
+            <template v-for="(data,index) in varList">
+              <tr :key="index">
+                <td align="center">{{ index+1 }}</td>
+                <td>{{ data.djbzName }}</td>
+                <td>{{ data.machinename }}</td>
+                <td>{{ data.fdjname }}</td>
+                <td>{{ data.checkparts }}</td>
+                <td>{{ data.fscandate }}</td>
+              </tr>
+              <tr :key="index">
+                <td class="mb-20" colspan="6">
+                  <table class="table-ui">
+                    <tr>
+                      <th width="55" style="text-align:center">序号</th>
+                      <th>检查项目</th>
+                      <th>检查标准</th>
+                      <th>检查方法</th>
+                      <th>类型</th>
+                      <th>点检问题</th>
+                    </tr>
+                    <template v-if="data.childList.length !== 0">
+                      <tr v-for="(item,index) in data.childList" :key="index">
+                        <td align="center">{{ index+1 }}</td>
+                        <td>{{ item.fcheckproject }}</td>
+                        <td>{{ item.fcheckNote }}</td>
+                        <td>{{ item.fmethodsNote }}</td>
+                        <td>{{ item.ftype }}</td>
+                        <td>{{ item.fnote }}</td>
+                      </tr>
+                    </template>
+                  </table>
+                </td>
+              </tr>
+            </template>
+          </template>
+          <template v-else>
+            <tr>
+              <td colspan="7" style="text-align: center">暂无数据</td>
+            </tr>
+          </template>
+        </table>
+      </div>
+    </div>
+    <div class="ui-height" />
+    <div class="ui-foot">
+      <el-button v-print="'#printTest'" type="primary">打 印</el-button>
+      <el-button plain type="info" @click="back">返 回</el-button>
+    </div>
+    <!--  检查照片  -->
+    <el-dialog :visible.sync="dialogImgVisible" title="检查照片">
+      <el-form ref="imgForm" :model="imgForm" label-width="140px" style="padding:0 20px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="检查照片：">
+              <div class="disContent">
+                <div v-for="(item, index) in qualifiedImgs" :key="index" class="img-div">
+                  <img :src="config.fileUrl + item.FILEPATH" alt="">
+                  <div class="disContent-hide">
+                    <el-tooltip class="item" effect="dark" content="预览" placement="top">
+                      <span class="el-icon-zoom-in yuLan">
+                        <viewer :images="qualifiedImgs">
+                          <img :src="config.fileUrl + item.FILEPATH" alt="" class="yuLanImg">
+                        </viewer>
+                      </span>
+                    </el-tooltip>
+
+                  </div>
+                </div>
+
+              </div>
+
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogImgVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
+    <div v-html="styleText" />
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination'
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves'
+import SelectTree from '@/components/SelectTree'
+
+export default {
+  components: { Pagination, SelectTree },
+  directives: { waves },
+  data() {
+    return {
+      config: config,
+      qualifiedImgs: [],
+      styleText: '<style type="text/css" media="print">\n' + '  @page { size: landscape; }\n' + '</style>',
+      FID: '',	// 主键ID
+      form: {},
+      imgForm: {},
+      varList: [],
+      otherHiddenList: [],
+      dialogFormVisible: false,
+      dialogImgVisible: false
+    }
+  },
+
+  created() {
+    this.FID = this.$parent.FID
+    this.getData()
+  },
+  methods: {
+    back() {
+      this.$parent.FID = ''
+      this.$parent.activeName = 'List'
+    },
+    // 获取详情
+    getData() {
+      this.listLoading = true
+      requestFN(
+        '/app/ryCheck/findRyCheckJhById',
+        {
+          fid: this.FID
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.form = Object.assign({}, data.pd) // copy obj
+        this.varList = JSON.parse(data.pd.childList)
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style lang="sass" scoped>
+.avatar-uploader
+  ul
+    margin: 0
+    li
+      padding: 0
+.el-dialog__body
+  padding: 0
+.map-flex
+  display: flex
+  width: 500px
+  align-items: center
+
+.ud-flex
+  display: flex
+.form-group
+  display: flex
+  align-items: center
+  .form-label
+    padding: 0px 15px
+    font-size: 14px
+    width: 240px
+    font-weight: 400
+    text-align: right
+    margin-bottom: 18px
+    .star
+      color: red
+      padding-right: 4px
+  .input-block
+    display: flex
+
+.disContent
+  display: flex
+  align-items: center
+  flex-wrap: wrap
+  .img-div
+    position: relative
+    margin: 0 10px 0px 0
+    width: 108px
+    height: 108px
+    border-radius: 4px
+    overflow: hidden
+    &>img
+      width: 100%
+      height: 100%
+
+.disContent-hide
+  position: absolute
+  width: 100%
+  height: 100%
+  border-radius: 4px
+  background-color: rgba(48, 48, 48, 0.59)
+  display: none
+  top: 0
+  left: 0
+  line-height: 32px
+
+  .Delete
+    position: absolute
+    bottom: 14px
+    right: 10px
+    font-size: 16px
+    color: white
+    cursor: pointer
+  .yuLan
+    position: absolute
+    bottom: 23px
+    right: 50px
+    font-size: 16px
+    color: white
+    cursor: pointer
+    .yuLanImg
+      position: absolute
+      bottom: 0
+      right: 0
+      width: 100%
+      height: 100%
+      opacity: 0
+
+.img-div:hover .disContent-hide
+  display: block
+
+  .pitchCss
+    border: 1px solid #202e78
+    transition: all linear 0.1s
+    width: 116px
+    height: 116px
+</style>
--- a/src/views/checkYr/checkJh/index.vue
+++ b/src/views/checkYr/checkJh/index.vue
@ -0,0 +1,30 @@
+<template>
+  <component :is="activeName" />
+</template>
+
+<script>
+import List from './components/list'
+import RecordInfo from './components/recordInfo'
+export default {
+  components: {
+    List: List,
+    RecordInfo: RecordInfo
+  },
+  data() {
+    return {
+      activeName: 'List',
+      FID: 0
+    }
+  },
+  watch: {
+    activeName(val) {
+      if (val == 'List') {
+        // this.$refs.list.getList()
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>
--- a/src/views/checkYr/checkJl/index.vue
+++ b/src/views/checkYr/checkJl/index.vue
@ -0,0 +1,161 @@
+<template>
+  <div class="app-container">
+    <div class="rightCont">
+      <el-form label-width="50px">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="计划名称：" label-width="110px">
+              <el-input v-model="search.fjhname" style="width:206px" placeholder="请输入内容"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="工单编号：" label-width="110px">
+              <el-input v-model="search.fgdno" style="width:206px" placeholder="请输入内容"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="点检人：" label-width="110px">
+              <el-input v-model="search.fcluserStr" style="width:206px" placeholder="请输入内容"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label-width="10px">
+              <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
+                搜索
+              </el-button>
+              <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="goKeyReset">
+                重置
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div>
+        <el-table
+          ref="multipleTable"
+          :data="varList"
+          :row-key="getRowKey"
+          border
+          tooltip-effect="dark"
+          style="width: 100%">
+          <el-table-column type="selection" width="55" align="center"/>
+          <el-table-column type="index" label="序号" width="55" align="center"/>
+          <el-table-column prop="fjhname" label="计划名称"/>
+          <el-table-column prop="ftypeStr" label="计划类型"/>
+          <el-table-column prop="djbzName" label="点检标准名称"/>
+          <el-table-column prop="fsbidStr" label="所绑定的设备名称"/>
+          <el-table-column prop="fsbidStr" label="设备名称"/>
+          <el-table-column label="临时上报">
+            <template slot-scope="{row}">
+              <span>否</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="bzsFtype" label="类型"/>
+          <el-table-column prop="fdjstate" label="发现问题">
+            <template slot-scope="{row}">
+              <span >{{ row.fdjstate == 0?"否":'是' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="fnote" label="问题描述"/>
+          <el-table-column prop="fuserStr" label="点检人"/>
+          <el-table-column prop="fbc" label="班次"/>
+          <el-table-column prop="fdate" label="点检时间"/>
+          <el-table-column prop="fstateStr" label="处理结果"/>
+          <el-table-column prop="zxFstateStr" label="自修状态"/>
+          <el-table-column prop="fgdno" label="工单编号"/>
+          <el-table-column prop="FIRERESOURCES_TYPENAME" label="派单状态">
+            <template slot-scope="{row}">
+              <span v-if="row.fgdno">已派单</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="fclnote" label="处理意见"/>
+          <el-table-column prop="freason" label="未点检原因"/>
+          <el-table-column prop="fpj" label="评价打分"/>
+          <el-table-column prop="fcluserStr" label="处理操作人"/>
+          <el-table-column prop="fcldate" label="处理操作时间"/>
+        </el-table>
+        <div class="page-btn-group">
+          <div/>
+          <pagination
+            :total="total"
+            :page.sync="listQuery.page"
+            :limit.sync="listQuery.limit"
+            @pagination="getList()"/>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination'
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves'
+// waves directive
+import SelectTree from '@/components/SelectTree'
+
+export default {
+  components: { Pagination, SelectTree },
+  directives: { waves },
+  data() {
+    return {
+      config: config,
+      listLoading: false,
+      varList: [],
+      search: {
+        fgdno: '',
+        fjhname: '',
+        fcluserStr: ''
+      },
+      total: 0,
+      listQuery: {
+        page: 1,
+        limit: 20
+      }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    handleShow(row) {},
+    getRowKey(row) {
+      return row.FIRE_DEVICE_ID
+    },
+    // 添加
+    // 搜索
+    getQuery() {
+      this.getList()
+    },
+    // 获取列表
+    getList() {
+      this.listLoading = true
+      requestFN(
+        '/app/ryCheck/getRyCheckJl?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page, {
+          fgdno: this.search.fgdno,
+          fjhname: this.search.fjhname,
+          fcluserStr: this.search.fcluserStr
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.varList
+        this.total = data.page.totalResult
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    goKeyReset() {
+      this.search = {
+        fgdno: '',
+        fjhname: '',
+        fcluserStr: ''
+      }
+      this.getList()
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
--- a/src/views/checkYr/checkMb/components/list.vue
+++ b/src/views/checkYr/checkMb/components/list.vue
@ -0,0 +1,189 @@
+<template>
+  <div class="app-container">
+    <div class="rightCont">
+      <el-form label-width="130px">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="计划名称：">
+              <el-input v-model="search.fjhname" style="width:206px" placeholder="请输入内容"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计划类型：">
+              <el-input v-model="search.ftypestr" style="width:206px" placeholder="请输入内容"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计划周期：">
+              <el-input v-model="search.fdaytypeStr" style="width:206px" placeholder="请输入内容"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="角色名称：">
+              <el-input v-model="search.froleidstr" style="width:206px" placeholder="请输入内容"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="启停状态：">
+              <el-input v-model="search.fstatestr" style="width:206px" placeholder="请输入内容"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="首次执行时间：">
+              <el-date-picker v-model="search.FIRST_TIME" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd" style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="最新执行时间：">
+              <el-date-picker v-model="search.NOW_TIME" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd" style="width: 100%;" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label-width="10px">
+              <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
+                搜索
+              </el-button>
+              <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="goKeyReset">
+                重置
+              </el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div>
+        <el-table
+          ref="multipleTable"
+          :data="varList"
+          :row-key="getRowKey"
+          border
+          tooltip-effect="dark"
+          style="width: 100%">
+          <el-table-column type="selection" width="55" align="center"/>
+          <el-table-column type="index" label="序号" width="55" align="center"/>
+          <el-table-column prop="fjhname" label="计划名称"/>
+          <el-table-column prop="ftypestr" label="计划类型"/>
+          <el-table-column prop="fdaytypeStr" label="计划周期"/>
+          <el-table-column prop="froleidstr" label="角色名称"/>
+          <el-table-column prop="fstatestr" label="启停状态"/>
+          <el-table-column prop="isBusinessSystemStr" label="上传商务系统"/>
+          <el-table-column prop="ftimestr" label="首次执行时间"/>
+          <el-table-column prop="ftimenewstr" label="最新执行时间"/>
+          <el-table-column label="操作" width="200px">
+            <template slot-scope="{row}">
+              <el-button
+                type="primary"
+                icon="el-icon-edit"
+                size="mini"
+                @click="handleShow(row)">查看详情
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="page-btn-group">
+          <div/>
+          <pagination
+            :total="total"
+            :page.sync="listQuery.page"
+            :limit.sync="listQuery.limit"
+            @pagination="getList()"/>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination'
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves'
+// waves directive
+import SelectTree from '@/components/SelectTree'
+
+export default {
+  components: { Pagination, SelectTree },
+  directives: { waves },
+  data() {
+    return {
+      config: config,
+      listLoading: false,
+      varList: [],
+      search: {
+        fjhname: '',
+        ftypestr: '',
+        fdaytypeStr: '',
+        froleidstr: '',
+        fstatestr: '',
+        FIRST_TIME: [],
+        NOW_TIME: []
+      },
+      total: 0,
+      listQuery: {
+        page: 1,
+        limit: 20
+      }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    handleShow(row) {
+      console.log(row)
+      this.$parent.activeName = 'RecordInfo'
+      this.$parent.FID = row.fid
+      console.log(this.$parent.FID)
+    },
+    getRowKey(row) {
+      return row.FIRE_DEVICE_ID
+    },
+    // 添加
+    // 搜索
+    getQuery() {
+      this.getList()
+    },
+    // 获取列表
+    getList() {
+      this.listLoading = true
+      requestFN(
+        '/app/ryCheck/getRyCheckMb?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          fjhname: this.search.fjhname,
+          ftypestr: this.search.ftypestr,
+          fdaytypeStr: this.search.fdaytypeStr,
+          froleidstr: this.search.froleidstr,
+          fstatestr: this.search.fstatestr,
+          first_str: this.search.FIRST_TIME[0],
+          first_end: this.search.FIRST_TIME[1],
+          now_str: this.search.NOW_TIME[0],
+          now_end: this.search.NOW_TIME[1],
+          fuserstr: this.search.fuserstr
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.varList
+        this.total = data.page.totalResult
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    goKeyReset() {
+      this.search = {
+        fjhname: '',
+        ftypestr: '',
+        fdaytypeStr: '',
+        froleidstr: '',
+        fstatestr: '',
+        FIRST_TIME: [],
+        NOW_TIME: []
+      }
+      this.getList()
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
--- a/src/views/checkYr/checkMb/components/recordInfo.vue
+++ b/src/views/checkYr/checkMb/components/recordInfo.vue
@ -0,0 +1,264 @@
+<template>
+  <div>
+    <div id="printTest" class="app-contprint print-midi">
+      <div class="level-title">
+        <h1>点检计划</h1>
+      </div>
+      <div class="mb-20">
+        <table class="table-ui">
+          <tr>
+            <td class="tbg">计划名称</td>
+            <td>{{ form.fjhname }}</td>
+            <td class="tbg">计划类型</td>
+            <td>{{ form.ftypestr }}</td>
+          </tr>
+          <tr>
+            <td class="tbg">计划周期</td>
+            <td>{{ form.fdaytypeStr }}</td>
+            <td class="tbg">角色名称</td>
+            <td>{{ form.froleidstr }}</td>
+          </tr>
+          <tr>
+            <td class="tbg">启停状态</td>
+            <td>{{ form.fstatestr }}</td>
+            <td class="tbg">上传商务系统</td>
+            <td>{{ form.isBusinessSystemStr }}</td>
+          </tr>
+          <tr>
+            <td class="tbg">首次执行时间</td>
+            <td>{{ form.ftimestr }}</td>
+            <td class="tbg">最新执行时间</td>
+            <td>{{ form.ftimenewstr }}</td>
+          </tr>
+        </table>
+      </div>
+      <div class="level-title">
+        <h1>检查标准</h1>
+      </div>
+      <div class="mb-20">
+        <table class="table-ui">
+          <tr>
+            <th width="55" style="text-align:center">序号</th>
+            <th>点检标准名称</th>
+            <th>点检点</th>
+            <th>设备名称</th>
+          </tr>
+          <template v-if="varList.length !== 0">
+            <template v-for="(data,index) in varList">
+              <tr :key="index">
+                <td align="center">{{ index+1 }}</td>
+                <td>{{ data.fdjbzidstr }}</td>
+                <td>{{ data.fdjname }}</td>
+                <td>{{ data.fsbname }}</td>
+              </tr>
+              <tr :key="index">
+                <td class="mb-20" colspan="6">
+                  <table class="table-ui">
+                    <tr>
+                      <th width="55" style="text-align:center">序号</th>
+                      <th>检查项目</th>
+                      <th>检查标准</th>
+                      <th>检查方法</th>
+                    </tr>
+                    <template v-if="data.childList.length !== 0">
+                      <tr v-for="(item,index) in data.childList" :key="index">
+                        <td align="center">{{ index+1 }}</td>
+                        <td>{{ item.fcheckproject }}</td>
+                        <td>{{ item.fcheckNote }}</td>
+                        <td>{{ item.fmethodsNote }}</td>
+                      </tr>
+                    </template>
+                  </table>
+                </td>
+              </tr>
+            </template>
+          </template>
+          <template v-else>
+            <tr>
+              <td colspan="7" style="text-align: center">暂无数据</td>
+            </tr>
+          </template>
+        </table>
+      </div>
+    </div>
+    <div class="ui-height" />
+    <div class="ui-foot">
+      <el-button v-print="'#printTest'" type="primary">打 印</el-button>
+      <el-button plain type="info" @click="back">返 回</el-button>
+    </div>
+    <!--  检查照片  -->
+    <el-dialog :visible.sync="dialogImgVisible" title="检查照片">
+      <el-form ref="imgForm" :model="imgForm" label-width="140px" style="padding:0 20px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="检查照片：">
+              <div class="disContent">
+                <div v-for="(item, index) in qualifiedImgs" :key="index" class="img-div">
+                  <img :src="config.fileUrl + item.FILEPATH" alt="">
+                  <div class="disContent-hide">
+                    <el-tooltip class="item" effect="dark" content="预览" placement="top">
+                      <span class="el-icon-zoom-in yuLan">
+                        <viewer :images="qualifiedImgs">
+                          <img :src="config.fileUrl + item.FILEPATH" alt="" class="yuLanImg">
+                        </viewer>
+                      </span>
+                    </el-tooltip>
+
+                  </div>
+                </div>
+
+              </div>
+
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogImgVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
+    <div v-html="styleText" />
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination'
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves'
+import SelectTree from '@/components/SelectTree'
+
+export default {
+  components: { Pagination, SelectTree },
+  directives: { waves },
+  data() {
+    return {
+      config: config,
+      qualifiedImgs: [],
+      styleText: '<style type="text/css" media="print">\n' + '  @page { size: landscape; }\n' + '</style>',
+      FID: '',	// 主键ID
+      form: {},
+      imgForm: {},
+      varList: [],
+      otherHiddenList: [],
+      dialogFormVisible: false,
+      dialogImgVisible: false
+    }
+  },
+
+  created() {
+    this.FID = this.$parent.FID
+    this.getData()
+  },
+  methods: {
+    back() {
+      this.$parent.FID = ''
+      this.$parent.activeName = 'List'
+    },
+    // 获取详情
+    getData() {
+      this.listLoading = true
+      requestFN(
+        '/app/ryCheck/findRyCheckMbById',
+        {
+          fid: this.FID
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.form = Object.assign({}, data.pd) // copy obj
+        this.varList = JSON.parse(data.pd.childList)
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style lang="sass" scoped>
+.avatar-uploader
+  ul
+    margin: 0
+    li
+      padding: 0
+.el-dialog__body
+  padding: 0
+.map-flex
+  display: flex
+  width: 500px
+  align-items: center
+
+.ud-flex
+  display: flex
+.form-group
+  display: flex
+  align-items: center
+  .form-label
+    padding: 0px 15px
+    font-size: 14px
+    width: 240px
+    font-weight: 400
+    text-align: right
+    margin-bottom: 18px
+    .star
+      color: red
+      padding-right: 4px
+  .input-block
+    display: flex
+
+.disContent
+  display: flex
+  align-items: center
+  flex-wrap: wrap
+  .img-div
+    position: relative
+    margin: 0 10px 0px 0
+    width: 108px
+    height: 108px
+    border-radius: 4px
+    overflow: hidden
+    &>img
+      width: 100%
+      height: 100%
+
+.disContent-hide
+  position: absolute
+  width: 100%
+  height: 100%
+  border-radius: 4px
+  background-color: rgba(48, 48, 48, 0.59)
+  display: none
+  top: 0
+  left: 0
+  line-height: 32px
+
+  .Delete
+    position: absolute
+    bottom: 14px
+    right: 10px
+    font-size: 16px
+    color: white
+    cursor: pointer
+  .yuLan
+    position: absolute
+    bottom: 23px
+    right: 50px
+    font-size: 16px
+    color: white
+    cursor: pointer
+    .yuLanImg
+      position: absolute
+      bottom: 0
+      right: 0
+      width: 100%
+      height: 100%
+      opacity: 0
+
+.img-div:hover .disContent-hide
+  display: block
+
+  .pitchCss
+    border: 1px solid #202e78
+    transition: all linear 0.1s
+    width: 116px
+    height: 116px
+</style>
--- a/src/views/checkYr/checkMb/index.vue
+++ b/src/views/checkYr/checkMb/index.vue
@ -0,0 +1,30 @@
+<template>
+  <component :is="activeName" />
+</template>
+
+<script>
+import List from './components/list'
+import RecordInfo from './components/recordInfo'
+export default {
+  components: {
+    List: List,
+    RecordInfo: RecordInfo
+  },
+  data() {
+    return {
+      activeName: 'List',
+      FID: 0
+    }
+  },
+  watch: {
+    activeName(val) {
+      if (val == 'List') {
+        // this.$refs.list.getList()
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>
Author	SHA1	Message	Date
zhaohongyu	2950b233a9	Merge branch 'zhy_20241128' into zhy_new_1203	2024-12-26 15:45:01 +08:00
zhaohongyu	322f6332a6	20241203 增加的隐患来源，8 点检隐患	2024-12-03 11:26:17 +08:00
zhaohongyu	f7f2b4ceac	20241202 隐患排查页面	2024-12-02 16:06:20 +08:00