From 053a39279cfd298d8d4cee596346b35e9e39e6cd Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Fri, 12 Jan 2024 14:44:44 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=B6=88=E9=98=B2=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=8A=9F=E8=83=BD=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/index.js                               |  10 +-
 .../fireReport/components/fireControlRoom.vue | 169 ++++++++++++++++++
 .../fireReport/components/firePumpRoom.vue    | 169 ++++++++++++++++++
 .../fireReport/components/fireResources.vue   | 169 ++++++++++++++++++
 .../fireReport/components/list.vue            | 131 ++++++++++++++
 src/views/firefighting/fireReport/index.vue   |  46 +++++
 static/config.js                              |   2 +-
 7 files changed, 694 insertions(+), 2 deletions(-)
 create mode 100644 src/views/firefighting/fireReport/components/fireControlRoom.vue
 create mode 100644 src/views/firefighting/fireReport/components/firePumpRoom.vue
 create mode 100644 src/views/firefighting/fireReport/components/fireResources.vue
 create mode 100644 src/views/firefighting/fireReport/components/list.vue
 create mode 100644 src/views/firefighting/fireReport/index.vue

diff --git a/config/index.js b/config/index.js
index f6ea675..89bb041 100644
--- a/config/index.js
+++ b/config/index.js
@@ -9,7 +9,15 @@ module.exports = {
     // Paths
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
-    proxyTable: {},
+    proxyTable: {
+      '/api': {
+        target: 'http://192.168.151.56:8092/',
+        changeOrigin: true,
+        pathRewrite: {
+          '^/api': ''
+        }
+      }
+    },
 
     // Various Dev Server settings
     host: 'localhost', // can be overwritten by process.env.HOST
diff --git a/src/views/firefighting/fireReport/components/fireControlRoom.vue b/src/views/firefighting/fireReport/components/fireControlRoom.vue
new file mode 100644
index 0000000..80d63ce
--- /dev/null
+++ b/src/views/firefighting/fireReport/components/fireControlRoom.vue
@@ -0,0 +1,169 @@
+<template>
+  <div class="app-container">
+    <div class="rightCont">
+      <el-form label-width="50px">
+        <el-col :span="5">
+          <el-form-item label="名称：" label-width="110px">
+            <el-input v-model="form.FIRERESOURCES_NAME" style="width:206px" placeholder="请输入内容"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <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-form>
+      <div>
+        <el-table
+          v-loading="listLoading"
+          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="FIRERESOURCES_NAME" label="名称"/>
+          <el-table-column prop="FIRERESOURCES_TYPENAME" label="消防资源类型"/>
+          <el-table-column prop="LONGTITUDE" label="消防资源经纬度">
+            <template slot-scope="{row}">
+              {{ row.LONGTITUDE }} -- {{ row.LATITUDE }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="CREATIME" label="创建时间"/>
+        </el-table>
+        <div class="page-btn-group">
+          <div>
+            <el-button @click="getBack">返回</el-button>
+          </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'
+import TiandiMap from '../../../../components/TianMap/TiandiMap'
+
+export default {
+  components: { Pagination, SelectTree, TiandiMap },
+  directives: { waves },
+  inject: ['setActiveName', 'getInfo', 'setInfo'],
+  data() {
+    return {
+      config: config,
+      firekzsImgs: [],
+      waitForDeleteImgs: [],
+      dialogImageUrl: '',
+      dialogVisible: false,
+      dialogFormMap: false,
+      map: null,
+      corpList: [],
+      marker: null,
+      describeList: [
+        {
+          code: '',
+          palce: '',
+          name: '',
+          type: '',
+          corp: '',
+          ramake: ''
+        }
+      ],
+      addBtnType: true,
+      FIRE_RESOURCES_TYPE: '',
+      listLoading: true,
+      form: {
+        FIRERESOURCES_NAME: '',
+        FIRERESOURCES_TYPE: 'xfkzs01',
+        CORPINFO_ID: ''
+      },
+      diaLoading: false,
+      LONGTITUDE: '', // 经度
+      LATITUDE: '', // 纬度
+      treeData: [],
+      typeData: [],
+      listQuery: {
+        page: 1,
+        limit: 20
+      },
+      ls: [],
+      dates: [],
+      total: 0,
+      KEYWORDS: '',
+      // 树形菜单
+      varList: []
+    }
+  },
+  created() {
+    this.form.CORPINFO_ID = this.getInfo().CORPINFO_ID
+    this.getList()
+  },
+  methods: {
+    getRowKey(row) {
+      return row.FIRE_DEVICE_ID
+    },
+    getQuery() {
+      this.getList()
+    },
+    // 获取列表
+    getList() {
+      this.listLoading = true
+      this.varList = []
+      requestFN(
+        '/fireResources/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page, this.form
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.varList
+        this.total = data.page.totalResult
+        this.hasButton()
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    goKeyReset() {
+      this.form.FIRERESOURCES_NAME = ''
+
+      this.getList()
+    },
+    getBack() {
+      this.setActiveName('List')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.returnBtn {
+  float: right;
+}
+
+.app-container {
+  display: flex; /**/
+  align-items: baseline;
+}
+
+.rightCont {
+  width: 100%
+}
+
+#map {
+  width: 1000px;
+  height: 500px;
+}
+</style>
diff --git a/src/views/firefighting/fireReport/components/firePumpRoom.vue b/src/views/firefighting/fireReport/components/firePumpRoom.vue
new file mode 100644
index 0000000..5dd6147
--- /dev/null
+++ b/src/views/firefighting/fireReport/components/firePumpRoom.vue
@@ -0,0 +1,169 @@
+<template>
+  <div class="app-container">
+    <div class="rightCont">
+      <el-form label-width="50px">
+        <el-col :span="5">
+          <el-form-item label="名称：" label-width="110px">
+            <el-input v-model="form.FIRERESOURCES_NAME" style="width:206px" placeholder="请输入内容"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <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-form>
+      <div>
+        <el-table
+          v-loading="listLoading"
+          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="FIRERESOURCES_NAME" label="名称"/>
+          <el-table-column prop="FIRERESOURCES_TYPENAME" label="消防资源类型"/>
+          <el-table-column prop="LONGTITUDE" label="消防资源经纬度">
+            <template slot-scope="{row}">
+              {{ row.LONGTITUDE }} -- {{ row.LATITUDE }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="CREATIME" label="创建时间"/>
+        </el-table>
+        <div class="page-btn-group">
+          <div>
+            <el-button @click="getBack">返回</el-button>
+          </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'
+import TiandiMap from '../../../../components/TianMap/TiandiMap'
+
+export default {
+  components: { Pagination, SelectTree, TiandiMap },
+  directives: { waves },
+  inject: ['setActiveName', 'getInfo', 'setInfo'],
+  data() {
+    return {
+      config: config,
+      firekzsImgs: [],
+      waitForDeleteImgs: [],
+      dialogImageUrl: '',
+      dialogVisible: false,
+      dialogFormMap: false,
+      map: null,
+      corpList: [],
+      marker: null,
+      describeList: [
+        {
+          code: '',
+          palce: '',
+          name: '',
+          type: '',
+          corp: '',
+          ramake: ''
+        }
+      ],
+      addBtnType: true,
+      FIRE_RESOURCES_TYPE: '',
+      listLoading: true,
+      form: {
+        FIRERESOURCES_NAME: '',
+        FIRERESOURCES_TYPE: 'xfbf01',
+        CORPINFO_ID: ''
+      },
+      diaLoading: false,
+      LONGTITUDE: '', // 经度
+      LATITUDE: '', // 纬度
+      treeData: [],
+      typeData: [],
+      listQuery: {
+        page: 1,
+        limit: 20
+      },
+      ls: [],
+      dates: [],
+      total: 0,
+      KEYWORDS: '',
+      // 树形菜单
+      varList: []
+    }
+  },
+  created() {
+    this.form.CORPINFO_ID = this.getInfo().CORPINFO_ID
+    this.getList()
+  },
+  methods: {
+    getRowKey(row) {
+      return row.FIRE_DEVICE_ID
+    },
+    getQuery() {
+      this.getList()
+    },
+    // 获取列表
+    getList() {
+      this.listLoading = true
+      this.varList = []
+      requestFN(
+        '/fireResources/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page, this.form
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.varList
+        this.total = data.page.totalResult
+        this.hasButton()
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    goKeyReset() {
+      this.form.FIRERESOURCES_NAME = ''
+
+      this.getList()
+    },
+    getBack() {
+      this.setActiveName('List')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.returnBtn {
+  float: right;
+}
+
+.app-container {
+  display: flex; /**/
+  align-items: baseline;
+}
+
+.rightCont {
+  width: 100%
+}
+
+#map {
+  width: 1000px;
+  height: 500px;
+}
+</style>
diff --git a/src/views/firefighting/fireReport/components/fireResources.vue b/src/views/firefighting/fireReport/components/fireResources.vue
new file mode 100644
index 0000000..b434a2d
--- /dev/null
+++ b/src/views/firefighting/fireReport/components/fireResources.vue
@@ -0,0 +1,169 @@
+<template>
+  <div class="app-container">
+    <div class="rightCont">
+      <el-form label-width="50px">
+        <el-col :span="5">
+          <el-form-item label="名称：" label-width="110px">
+            <el-input v-model="form.FIRERESOURCES_NAME" style="width:206px" placeholder="请输入内容"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <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-form>
+      <div>
+        <el-table
+          v-loading="listLoading"
+          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="FIRERESOURCES_NAME" label="名称"/>
+          <el-table-column prop="FIRERESOURCES_TYPENAME" label="消防资源类型"/>
+          <el-table-column prop="LONGTITUDE" label="消防资源经纬度">
+            <template slot-scope="{row}">
+              {{ row.LONGTITUDE }} -- {{ row.LATITUDE }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="CREATIME" label="创建时间"/>
+        </el-table>
+        <div class="page-btn-group">
+          <div>
+            <el-button @click="getBack">返回</el-button>
+          </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'
+import TiandiMap from '../../../../components/TianMap/TiandiMap'
+
+export default {
+  components: { Pagination, SelectTree, TiandiMap },
+  directives: { waves },
+  inject: ['setActiveName', 'getInfo', 'setInfo'],
+  data() {
+    return {
+      config: config,
+      firekzsImgs: [],
+      waitForDeleteImgs: [],
+      dialogImageUrl: '',
+      dialogVisible: false,
+      dialogFormMap: false,
+      map: null,
+      corpList: [],
+      marker: null,
+      describeList: [
+        {
+          code: '',
+          palce: '',
+          name: '',
+          type: '',
+          corp: '',
+          ramake: ''
+        }
+      ],
+      addBtnType: true,
+      FIRE_RESOURCES_TYPE: '',
+      listLoading: true,
+      form: {
+        FIRERESOURCES_NAME: '',
+        FIRERESOURCES_TYPE: 'xfsy01',
+        CORPINFO_ID: ''
+      },
+      diaLoading: false,
+      LONGTITUDE: '', // 经度
+      LATITUDE: '', // 纬度
+      treeData: [],
+      typeData: [],
+      listQuery: {
+        page: 1,
+        limit: 20
+      },
+      ls: [],
+      dates: [],
+      total: 0,
+      KEYWORDS: '',
+      // 树形菜单
+      varList: []
+    }
+  },
+  created() {
+    this.form.CORPINFO_ID = this.getInfo().CORPINFO_ID
+    this.getList()
+  },
+  methods: {
+    getRowKey(row) {
+      return row.FIRE_DEVICE_ID
+    },
+    getQuery() {
+      this.getList()
+    },
+    // 获取列表
+    getList() {
+      this.listLoading = true
+      this.varList = []
+      requestFN(
+        '/fireResources/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page, this.form
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.varList
+        this.total = data.page.totalResult
+        this.hasButton()
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    goKeyReset() {
+      this.form.FIRERESOURCES_NAME = ''
+
+      this.getList()
+    },
+    getBack() {
+      this.setActiveName('List')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.returnBtn {
+  float: right;
+}
+
+.app-container {
+  display: flex; /**/
+  align-items: baseline;
+}
+
+.rightCont {
+  width: 100%
+}
+
+#map {
+  width: 1000px;
+  height: 500px;
+}
+</style>
diff --git a/src/views/firefighting/fireReport/components/list.vue b/src/views/firefighting/fireReport/components/list.vue
new file mode 100644
index 0000000..e29f4bf
--- /dev/null
+++ b/src/views/firefighting/fireReport/components/list.vue
@@ -0,0 +1,131 @@
+<template>
+  <div class="app-container">
+    <el-form label-width="80px">
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="企业名称">
+            <el-input v-model="form.KEYWORDS" placeholder="请输入企业名称..."/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label-width="10px">
+            <el-button v-waves type="primary" icon="el-icon-search" class="ml-10" @click="getList">
+              搜索
+            </el-button>
+            <el-button v-waves type="success" icon="el-icon-refresh" @click="resetting">
+              重置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-table
+      v-loading="loading"
+      ref="multipleTable"
+      :data="list"
+      :row-key="getRowKey"
+      :header-cell-style="{'font-weight': 'bold','color': '#000'}"
+      tooltip-effect="dark"
+      border
+      fit
+      highlight-current-row>
+      <el-table-column :reserve-selection="true" type="selection" width="55" align="center"/>
+      <el-table-column type="index" label="序号" width="50" align="center"/>
+      <el-table-column label="企业名称" align="center" prop="CORP_NAME"/>
+      <el-table-column label="属地" align="center" prop="COMPANY_AREA"/>
+      <el-table-column label="消防控制室数" align="center">
+        <template slot-scope="{row}">
+          <div class="link-type" @click="goControlRoomInfo({CORPINFO_ID:row.CORPINFO_ID,TYPE:'FireControlRoom'})">
+            {{ row.xiaoFangKongZhiShiNum }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="消防泵房数" align="center">
+        <template slot-scope="{row}">
+          <div class="link-type" @click="goControlRoomInfo({CORPINFO_ID:row.CORPINFO_ID,TYPE:'FirePumpRoom'})">
+            {{ row.xiaoFangBengFangNum }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="消防水源数" align="center">
+        <template slot-scope="{row}">
+          <div class="link-type" @click="goControlRoomInfo({CORPINFO_ID:row.CORPINFO_ID,TYPE:'FireResources'})">
+            {{ row.xiaoFangShuiYuanNum }}
+          </div>
+        </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>
+</template>
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves' // waves directive
+
+export default {
+  components: { Pagination },
+  directives: { waves },
+  inject: ['setActiveName', 'getInfo', 'setInfo'],
+  data() {
+    return {
+      loading: true,
+      list: [],
+      listQuery: {
+        page: 1,
+        limit: 20
+      },
+      total: 0,
+      authority: {
+        add: false,
+        del: false,
+        edit: false
+      },
+      form: {
+        KEYWORDS: ''
+      }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    getList() {
+      this.loading = true
+      requestFN(
+        '/fireReport/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page, this.form
+      ).then((data) => {
+        this.list = data.list
+        this.total = data.page.totalResult
+        this.loading = false
+      }).catch((e) => {
+        this.loading = false
+      })
+    },
+    getRowKey(row) {
+      return row.CORPINFO_ID
+    },
+    resetting() {
+      this.form.KEYWORDS = ''
+      this.getList()
+    },
+    goControlRoomInfo(e) {
+      this.setActiveName(e.TYPE)
+      this.setInfo(e)
+    }
+  }
+}
+
+</script>
+<style>
+.tree_dialog .selectTree {
+  width: 300px;
+}
+
+.hide .el-upload--picture-card {
+  display: none;
+}
+</style>
diff --git a/src/views/firefighting/fireReport/index.vue b/src/views/firefighting/fireReport/index.vue
new file mode 100644
index 0000000..fa086b6
--- /dev/null
+++ b/src/views/firefighting/fireReport/index.vue
@@ -0,0 +1,46 @@
+<template>
+  <component :is="parentObj.activeName"/>
+</template>
+<script>
+import List from './components/list'
+import FirePumpRoom from './components/firePumpRoom'
+import FireResources from './components/fireResources.vue'
+import FireControlRoom from './components/fireControlRoom.vue'
+export default {
+  components: {
+    List, FirePumpRoom, FireResources, FireControlRoom
+  },
+  data() {
+    return {
+      parentObj: {
+        activeName: 'List',
+        CORPINFO_ID: ''
+      },
+      info: {}
+    }
+  },
+  methods: {
+    setActiveName(activeName) {
+      this.parentObj.activeName = activeName
+    },
+    getInfo() {
+      return this.info
+    },
+    setInfo(e) {
+      this.info = e
+    }
+  },
+  provide() {
+    return {
+      parentObj: this.parentObj,
+      setActiveName: this.setActiveName,
+      getInfo: this.getInfo,
+      setInfo: this.setInfo
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/static/config.js b/static/config.js
index 486543a..42076b5 100644
--- a/static/config.js
+++ b/static/config.js
@@ -1,6 +1,6 @@
 const config = {
   weburl: 'http://192.168.0.45:8082/', // 前台地址
-  httpurl: 'http://192.168.151.56:8092/', // 后台地址
+  httpurl: '/api', // 后台地址
   qyurl: 'http://192.168.0.45:8080/', // 企业前台
   fileUrl: 'http://192.168.192.201:8991/file/', // 附件服务器地址
   publicKey: 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC2zCyUYSD0pNrbtaYdvGfHfWoRV+fo/2N9O2PLLz/jZvMkigkq4eAq4JO+Ek0wDHI9WxP6iTSLYCHhIOs9CQTPvyldJFm8riZtQZlBTD8Plkb3rjrgwTqbBi3w3+HKYdkSvGFXJIdSOPbpXnj5BzN8vlVaybs24R/vpUzG9178lwIDAQAB',
-- 
2.42.0.windows.1


From 7e4ba6c7140c347974a88654fb2b72441a1b7705 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Mon, 15 Jan 2024 12:21:18 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=B6=88=E9=98=B2?=
 =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fireInfoReport/components/fireDevice.vue  | 326 +++++++++++++++++
 .../fireInfoReport/components/firePoint.vue   | 333 ++++++++++++++++++
 .../fireInfoReport/components/fireRegion.vue  | 188 ++++++++++
 .../fireInfoReport/components/list.vue        | 131 +++++++
 .../firefighting/fireInfoReport/index.vue     |  46 +++
 .../components/fireControlRoom.vue            | 169 +++++++++
 .../components/firePumpRoom.vue               | 169 +++++++++
 .../components/fireResources.vue              | 169 +++++++++
 .../fireUtilReport/components/list.vue        | 131 +++++++
 .../firefighting/fireUtilReport/index.vue     |  46 +++
 src/views/map/index.vue                       |  20 +-
 11 files changed, 1718 insertions(+), 10 deletions(-)
 create mode 100644 src/views/firefighting/fireInfoReport/components/fireDevice.vue
 create mode 100644 src/views/firefighting/fireInfoReport/components/firePoint.vue
 create mode 100644 src/views/firefighting/fireInfoReport/components/fireRegion.vue
 create mode 100644 src/views/firefighting/fireInfoReport/components/list.vue
 create mode 100644 src/views/firefighting/fireInfoReport/index.vue
 create mode 100644 src/views/firefighting/fireUtilReport/components/fireControlRoom.vue
 create mode 100644 src/views/firefighting/fireUtilReport/components/firePumpRoom.vue
 create mode 100644 src/views/firefighting/fireUtilReport/components/fireResources.vue
 create mode 100644 src/views/firefighting/fireUtilReport/components/list.vue
 create mode 100644 src/views/firefighting/fireUtilReport/index.vue

diff --git a/src/views/firefighting/fireInfoReport/components/fireDevice.vue b/src/views/firefighting/fireInfoReport/components/fireDevice.vue
new file mode 100644
index 0000000..5cad7d8
--- /dev/null
+++ b/src/views/firefighting/fireInfoReport/components/fireDevice.vue
@@ -0,0 +1,326 @@
+<template>
+  <div class="app-container">
+    <div class="rightCont">
+      <el-form label-width="50px">
+        <el-col :span="4">
+          <el-form-item label="消防器材类型：" label-width="110px">
+            <el-select v-model="keySelect.FIRE_DEVICE_TYPE_ID" placeholder="请选择">
+              <el-option
+                v-for="item in typeData"
+                :key="item.NAME"
+                :label="item.NAME"
+                :value="item.BIANMA"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="消防区域" label-width="110px">
+            <el-select v-model="keySelect.FIRE_REGION_ID" placeholder="请选择" class="filter-item">
+              <el-option
+                v-for="item in varRegionList"
+                :key="item.FIRE_REGION_ID"
+                :label="item.FIRE_REGION_NAME"
+                :value="item.FIRE_REGION_ID"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="消防点位" label-width="110px">
+            <el-input v-model="keySelect.FIRE_POINT_NAME" placeholder="请输入关键字"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="器材编号" label-width="110px">
+            <el-input v-model="keySelect.FIRE_DEVICE_CODE" placeholder="请输入关键字"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <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-form>
+      <div>
+        <el-table
+          v-loading="listLoading"
+          ref="multipleTable"
+          :data="varList"
+          :row-key="getRowKey"
+          border
+          tooltip-effect="dark"
+          style="width: 100%">
+          <el-table-column
+            type="selection"
+            width="55"
+            reserve-selection
+            align="center"/>
+          <el-table-column type="index" label="序号" width="55" align="center"/>
+          <el-table-column prop="FIRE_DEVICE_TYPE_NAME" label="器材类型"/>
+          <el-table-column prop="FIRE_DEVICE_CODE" label="器材编号"/>
+          <el-table-column prop="FIRE_REGION_NAME" label="消防区域名称"/>
+          <el-table-column prop="FIRE_POINT_NAME" label="消防点位名称"/>
+          <el-table-column prop="FIRE_REGION_CODE" label="消防区域编码"/>
+          <el-table-column prop="FIRE_POINT_CODE" label="消防点位编码"/>
+          <el-table-column prop="VALIDITY_START_TIME" label="有效期开始时间"/>
+          <el-table-column prop="VALIDITY_END_TIME" label="有效期结束时间"/>
+          <el-table-column prop="REMAKE" label="存放地点"/>
+          <el-table-column prop="DEPARTMENTNAME" width ="170" label="负责部门"/>
+          <el-table-column prop="USERNAME" label="点位负责人"/>
+        </el-table>
+        <div class="page-btn-group">
+          <div>
+            <el-button @click = "goBack()">返 回</el-button>
+          </div>
+          <pagination
+            :total="total"
+            :page.sync="listQuery.page"
+            :limit.sync="listQuery.limit"
+            @pagination="getList(FIRE_DEVICE_ID)"/>
+        </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'
+import { upload } from '@/utils/upload'
+export default {
+  components: { Pagination, SelectTree },
+  directives: { waves },
+  inject: ['setActiveName', 'getInfo', 'setInfo'],
+  data() {
+    return {
+      addBtnType: true,
+      listLoading: true,
+      add: false,
+      del: false,
+      edit: false,
+      form: {
+        FIRE_DEVICE_TYPE_ID: '',
+        FIRE_REGION_ID: ''
+      },
+      keySelect: {
+        FIRE_DEVICE_TYPE_ID: '',
+        FIRE_REGION_ID: '',
+        FIRE_POINT_NAME: '',
+        FIRE_DEVICE_CODE: ''
+      },
+      treeData: [],
+      typeData: [],
+      varRegionList: [],
+      listQuery: {
+        page: 1,
+        limit: 20
+      },
+      ls: [],
+      dates: [],
+      total: 0,
+      KEYWORDS: '',
+      FIRE_POINT_NAME: '',
+      FIRE_POINT_CODE: '',
+      // 树形菜单
+      filterText: '',
+      varList: [],
+      pd: [],
+      defaultProps: {
+        value: 'id',
+        children: 'children',
+        label: 'name'
+      },
+      daoruFrom: {
+        FFILEName: '',
+        FFILE: ''
+      }
+    }
+  },
+  watch: {
+    filterText(val) {
+      console.log(val)
+      this.$refs.tree.filter(val)
+    }
+  },
+  created() {
+    this.getList()
+    this.hasButton()
+    this.getDict()
+    this.getTreeData()
+    this.getFireRegion()
+  },
+  methods: {
+    getTreeData() {
+      requestFN(
+        '/department/listTree',
+        {}
+      ).then((data) => {
+        this.treeData = JSON.parse(data.zTreeNodes)
+      }).catch((e) => {
+      })
+    },
+    // 获取区域
+    getFireRegion() {
+      requestFN(
+        '/fireregion/getAllRegionName',
+        {}
+      ).then((data) => {
+        this.varRegionList = data.varList
+      }).catch((e) => {
+      })
+    },
+    goImportStand(FIRE_DEVICE_ID) {
+      this.$parent.FIRE_DEVICE_ID = FIRE_DEVICE_ID
+      this.$parent.activeName = 'Info'
+    },
+    getRowKey(row) {
+      return row.FIRE_DEVICE_ID
+    },
+    // 搜索
+    getQuery() {
+      this.getList()
+    },
+    // 获取列表
+    getList(pid) {
+      this.listLoading = true
+      this.varList = []
+      this.FIRE_POINT_ID = pid
+      requestFN(
+        '/fireDevice/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          FIRE_REGION_ID: this.keySelect.FIRE_REGION_ID,
+          FIRE_DEVICE_TYPE_ID: this.keySelect.FIRE_DEVICE_TYPE_ID,
+          FIRE_POINT_NAME: this.keySelect.FIRE_POINT_NAME,
+          FIRE_DEVICE_CODE: this.keySelect.FIRE_DEVICE_CODE,
+          CORPINFO_ID: this.getInfo().CORPINFO_ID
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.varList
+        this.total = data.page.totalResult
+        this.hasButton()
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    goKeyReset() {
+      this.keySelect.FIRE_DEVICE_TYPE_ID = ''
+      this.keySelect.FIRE_REGION_ID = ''
+      this.keySelect.FIRE_DEVICE_CODE = ''
+      this.getList()
+    },
+    getDict() {
+      requestFN(
+        'dictionaries/getLevels',
+        {
+          DICTIONARIES_ID: '4a3d0d99b0ea4e268c11dd0b18866917'
+        }
+      ).then((data) => {
+        this.typeList = data.list
+      })
+        .catch((e) => {
+          this.listLoading = false
+        })
+      requestFN(
+        'dictionaries/getLevels',
+        {
+          DICTIONARIES_ID: '249151f04fd64132a949fdd430a7b9c5'
+        }
+      ).then((data) => {
+        this.typeData = data.list
+        console.log(this.typeData)
+      })
+        .catch((e) => {
+          this.listLoading = false
+        })
+
+      requestFN(
+        'dictionaries/getLevels',
+        {
+          DICTIONARIES_ID: 'f60cf0e8315b4993b6d6049dd29f2ba5'
+        }
+      ).then((data) => {
+        this.periodList = data.list
+      })
+        .catch((e) => {
+          this.listLoading = false
+        })
+
+      requestFN(
+        'dictionaries/getLevels',
+        {
+          DICTIONARIES_ID: '4a661fa8aedc4d158c9cddaa9d2ec47e'
+        }
+      ).then((data) => {
+        this.listingLevelList = this.listingLevelList.concat(data.list)
+      })
+        .catch((e) => {
+          this.listLoading = false
+        })
+    },
+
+    hasButton: function() {
+      var keys = 'listmanager:add,listmanager:del,listmanager:edit,toExcel'
+      requestFN(
+        '/head/hasButton',
+        {
+          keys: keys
+        }
+      ).then((data) => {
+        this.add = data.listmanagerfhadminadd		// 新增权限
+        this.del = data.listmanagerfhadmindel		// 删除权限
+        this.edit = data.listmanagerfhadminedit	// 修改权限
+        this.toExcel = data.toExcel // 导出到excel权限
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    goBack() {
+      this.setActiveName('List')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.returnBtn {
+  float: right;
+}
+
+.app-container {
+  display: flex; /**/
+  align-items: baseline;
+}
+
+.rightCont {
+  width: 100%
+}
+
+</style>
+<style lang="sass" scoped>
+.table-qrcode
+  text-align: center
+  padding-top: 20px
+  width: 100%
+.filter-container
+  position: relative
+  .filter-flot
+    position: absolute
+    right: 0
+    top: 0
+.uploader
+  width: 570px
+  display: flex
+  align-items: center
+.el-form-item__content
+  line-height: 1
+
+.ud-flex
+  display: flex
+</style>
diff --git a/src/views/firefighting/fireInfoReport/components/firePoint.vue b/src/views/firefighting/fireInfoReport/components/firePoint.vue
new file mode 100644
index 0000000..ed2a17a
--- /dev/null
+++ b/src/views/firefighting/fireInfoReport/components/firePoint.vue
@@ -0,0 +1,333 @@
+<template>
+  <div class="app-container">
+    <div class="rightCont">
+      <el-form label-width="50px">
+        <el-row>
+          <el-col :span="4">
+            <el-form-item label="点位名称" label-width="110px">
+              <el-input v-model="FIRE_POINT_NAME" placeholder="请输入关键字"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item label="点位编码" label-width="110px">
+              <el-input v-model="FIRE_POINT_CODE" placeholder="请输入关键字"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <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
+          v-loading="listLoading"
+          ref="multipleTable"
+          :data="varList"
+          :row-key="getRowKey"
+          border
+          tooltip-effect="dark"
+          style="width: 100%">
+          <el-table-column
+            :selectable="selectable"
+            type="selection"
+            reserve-selection
+            width="55"
+            align="center"/>
+          <el-table-column type="index" label="序号" width="55" align="center"/>
+          <el-table-column prop="FIRE_REGION_NAME" label="区域名称"/>
+          <el-table-column prop="FIRE_POINT_NAME" label="点位名称"/>
+          <el-table-column prop="FIRE_POINT_CODE" label="编码"/>
+          <el-table-column prop="DEVICE_COUNT" label="点位下消防器材数"/>
+          <el-table-column prop="DEPARTMENT_NAME" label="负责部门"/>
+          <el-table-column prop="USERNAME" label="负责人"/>
+          <el-table-column label="操作">
+            <template slot-scope="{row}">
+              <el-button
+                v-show="true"
+                class="tiffany-btn"
+                icon="el-icon-picture"
+                type="primary"
+                size="mini"
+                @click="handleShowQr(row)">点位二维码
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="page-btn-group">
+          <div>
+            <el-button icon="el-icon-plus" @click="goBack()">返 回</el-button>
+          </div>
+          <pagination
+            :total="total"
+            :page.sync="listQuery.page"
+            :limit.sync="listQuery.limit"
+            @pagination="getList(FIRE_POINT_ID)"/>
+        </div>
+      </div>
+    </div>
+
+    <el-dialog :visible.sync="dialogFormShow" title="查看二维码" width="680px" class="top-dialog">
+      <div id="printTest" style="border: 1px solid #fff;">
+        <div class="level-title" style="margin-top:20px">
+          <h1>消防点位信息</h1>
+        </div>
+        <table class="table-ui">
+          <tr>
+            <td class="tbg">消防区域</td>
+            <td >{{ qrInfo.FIRE_REGION_NAME }}</td>
+            <td class="tbg">消防点位</td>
+            <td>{{ qrInfo.FIRE_POINT_NAME }}</td>
+          </tr>
+          <tr>
+            <td class="tbg">负责部门</td>
+            <td>{{ qrInfo.DEPARTMENT_NAME }}</td>
+            <td class="tbg">负责人</td>
+            <td>{{ qrInfo.USERNAME }}</td>
+          </tr>
+        </table>
+        <div class="table-qrcode">
+          <vue-qr :text="qrcodeStr" :margin="0" :size="300" color-dark="#000" color-light="#fff" />
+        </div>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormShow = false">关 闭</el-button>
+        <el-button v-print="'#printTest'" type="primary">打 印</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination'
+import { requestFN } from '@/utils/request'
+
+import vueQr from 'vue-qr'
+import waves from '@/directive/waves' // waves directive
+import SelectTree from '@/components/SelectTree'
+
+export default {
+
+  components: { Pagination, SelectTree, vueQr },
+  inject: ['setActiveName', 'getInfo', 'setInfo'],
+  directives: { waves },
+  data() {
+    return {
+      config: config,
+      addBtnType: true,
+      listLoading: true,
+      dialogFormShow: false,
+      qrcodeStr: '',
+      qrInfo: {},
+      add: false,
+      del: false,
+      edit: false,
+      listQuery: {
+        page: 1,
+        limit: 20
+      },
+      ls: [],
+      dates: [],
+      total: 0,
+      KEYWORDS: '',
+      FIRE_POINT_NAME: '',
+      FIRE_POINT_CODE: '',
+      // 树形菜单
+      filterText: '',
+      varList: [],
+      pd: [],
+      defaultProps: {
+        value: 'id',
+        children: 'nodes',
+        label: 'name'
+      }
+    }
+  },
+  watch: {
+    filterText(val) {
+      console.log(val)
+      this.$refs.tree.filter(val)
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    handleShowQr(ROW) {
+      this.dialogFormShow = true
+      this.qrInfo = ROW
+      this.qrcodeStr = this.config.weburlWaiwang + 'static/qrcode/views/bsbw/point_list.html?id=' + ROW.FIRE_POINT_ID
+    },
+    handleEdit(FIRE_POINT_ID) {
+      this.$parent.FIRE_POINT_ID = FIRE_POINT_ID
+      this.$parent.activeName = 'Edit'
+    },
+    selectable(row, index) {
+      return row.DEVICE_COUNT == 0
+    },
+    getRowKey(row) {
+      return row.FIRE_POINT_ID
+    },
+    // 添加
+    handleAdd() {
+      this.$parent.activeName = 'Edit'
+      this.$parent.FIRE_POINT_ID = ''
+      this.$parent.FIRE_POINT_CODE = ''
+      this.$parent.FIRE_POINT_NAME = ''
+    },
+    // 搜索
+    getQuery() {
+      this.getList()
+    },
+    // 获取列表
+    getList(pid) {
+      this.listLoading = true
+      this.varList = []
+      this.FIRE_POINT_ID = pid
+      requestFN(
+        '/firePoint/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          FIRE_POINT_NAME: this.FIRE_POINT_NAME,
+          FIRE_POINT_CODE: this.FIRE_POINT_CODE,
+          CORPINFO_ID: this.getInfo().CORPINFO_ID
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.varList
+        this.total = data.page.totalResult
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    }, goKeyReset() {
+      this.FIRE_POINT_NAME = ''
+      this.FIRE_POINT_CODE = ''
+      this.getList()
+    },
+    getDict() {
+      requestFN(
+        'dictionaries/getLevels',
+        {
+          DICTIONARIES_ID: '4a3d0d99b0ea4e268c11dd0b18866917'
+        }
+      ).then((data) => {
+        this.typeList = data.list
+      })
+        .catch((e) => {
+          this.listLoading = false
+        })
+
+      requestFN(
+        'dictionaries/getLevels',
+        {
+          DICTIONARIES_ID: 'f60cf0e8315b4993b6d6049dd29f2ba5'
+        }
+      ).then((data) => {
+        this.periodList = data.list
+      })
+        .catch((e) => {
+          this.listLoading = false
+        })
+
+      requestFN(
+        'dictionaries/getLevels',
+        {
+          DICTIONARIES_ID: '4a661fa8aedc4d158c9cddaa9d2ec47e'
+        }
+      ).then((data) => {
+        this.listingLevelList = this.listingLevelList.concat(data.list)
+      })
+        .catch((e) => {
+          this.listLoading = false
+        })
+    },
+    handleDelete(row) {
+      const DATA_IDS = []
+      if (row.FIRE_POINT_ID) {
+        DATA_IDS.push(row.FIRE_POINT_ID)
+      } else {
+        const selection = this.$refs.multipleTable.selection
+        if (!selection.length > 0) {
+          this.$message({
+            type: 'warning',
+            message: '请选择要删除的数据'
+          })
+          return
+        }
+        selection.forEach(item => {
+          DATA_IDS.push(item.FIRE_POINT_ID)
+        })
+      }
+      this.$confirm('确定要删除吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.listLoading = true
+        requestFN(
+          '/firePoint/removeFirePointByIds',
+          {
+            DATA_IDS: DATA_IDS.join(',')
+          }
+        ).then(() => {
+          this.$message({
+            message: '删除成功',
+            type: 'success'
+          })
+          this.$refs.multipleTable.clearSelection()
+          this.listLoading = false
+          this.varList = []
+          this.listQuery.page = 1
+          this.getList(this.FIRE_POINT_ID)
+        }).catch((e) => {
+          this.listLoading = false
+        })
+      }).catch(() => {
+      })
+    },
+    hasButton: function() {
+      var keys = 'listmanager:add,listmanager:del,listmanager:edit,toExcel'
+      requestFN(
+        '/head/hasButton',
+        {
+          keys: keys
+        }
+      ).then((data) => {
+        this.add = data.listmanagerfhadminadd		// 新增权限
+        this.del = data.listmanagerfhadmindel		// 删除权限
+        this.edit = data.listmanagerfhadminedit	// 修改权限
+        this.toExcel = data.toExcel // 导出到excel权限
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    goBack() {
+      this.setActiveName('List')
+    }
+  }
+}
+</script>
+
+<style scoped >
+.returnBtn {
+  float: right;
+}
+.app-container {
+  display: flex; /**/
+  align-items: baseline;
+}
+.table-qrcode{
+  text-align: center;
+  padding-top: 20px;
+  width: 100%;
+}
+
+.rightCont {
+  width: 100%
+}
+</style>
diff --git a/src/views/firefighting/fireInfoReport/components/fireRegion.vue b/src/views/firefighting/fireInfoReport/components/fireRegion.vue
new file mode 100644
index 0000000..111846f
--- /dev/null
+++ b/src/views/firefighting/fireInfoReport/components/fireRegion.vue
@@ -0,0 +1,188 @@
+<template>
+  <div class="app-container">
+    <div class="rightCont">
+      <el-form label-width="50px">
+        <el-row>
+          <el-col :span="4">
+            <el-form-item label="区域名称/编码" label-width="110px">
+              <el-input v-model="KEYWORDS" placeholder="请输入关键字"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="4"/>
+          <el-col :span="4">
+            <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
+          v-loading="listLoading"
+          ref="multipleTable"
+          :data="varList"
+          :row-key="getRowKey"
+          border
+          tooltip-effect="dark"
+          style="width: 100%">
+          <el-table-column :selectable="selectable" type="selection" reserve-selection width="55" align="center"/>
+          <el-table-column type="index" label="序号" width="55" align="center"/>
+          <el-table-column prop="FIRE_REGION_NAME" label="区域名称"/>
+          <el-table-column prop="DEPARTMENT_NAME" label="负责部门"/>
+          <el-table-column prop="FIRE_REGION_CODE" label="编码"/>
+          <el-table-column prop="ITEMCOUNT" label="区域下点位数"/>
+          <el-table-column prop="STATE" label="状态">
+            <template slot-scope="{row}">
+              <span v-if="row.STATE === 1" class="color-red">禁用</span>
+              <span v-if="row.STATE === 0" class="color-green">启用</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="REMAKE" label="备注"/>
+        </el-table>
+        <div class="page-btn-group">
+          <div>
+            <el-button @click="goBack">返 回</el-button>
+          </div>
+          <pagination
+            :total="total"
+            :page.sync="listQuery.page"
+            :limit.sync="listQuery.limit"
+            @pagination="getList(HIDDENREGION_ID)"/>
+        </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 },
+  inject: ['setActiveName', 'getInfo', 'setInfo'],
+  directives: { waves },
+  data() {
+    return {
+      addBtnType: true,
+      listLoading: true,
+      add: false,
+      del: false,
+      edit: false,
+      listQuery: {
+        page: 1,
+        limit: 20
+      },
+      ls: [],
+      dates: [],
+      total: 0,
+      KEYWORDS: '',
+      // 树形菜单
+      filterText: '',
+      varList: []
+    }
+  },
+  watch: {
+    filterText(val) {
+      console.log(val)
+      this.$refs.tree.filter(val)
+    }
+  },
+  created() {
+    this.getList()
+    this.hasButton()
+    this.getTreeList()
+  },
+  methods: {
+    getRowKey(row) {
+      return row.FIRE_REGION_ID
+    },
+    selectable(row, index) {
+      return row.ITEMCOUNT == 0
+    },
+    // 搜索
+    getQuery() {
+      this.getList()
+    },
+    // 获取列表
+    getList(pid) {
+      this.listLoading = true
+      this.varList = []
+      this.HIDDENREGION_ID = pid
+      requestFN(
+        '/fireregion/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          KEYWORDS: this.KEYWORDS,
+          CORPINFO_ID: this.getInfo().CORPINFO_ID
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.varList
+        this.total = data.page.totalResult
+        this.hasButton()
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    }, goKeyReset() {
+      this.KEYWORDS = ''
+      this.getList()
+    },
+    hasButton: function() {
+      var keys = 'listmanager:add,listmanager:del,listmanager:edit,toExcel'
+      requestFN(
+        '/head/hasButton',
+        {
+          keys: keys
+        }
+      ).then((data) => {
+        this.add = data.listmanagerfhadminadd		// 新增权限
+        this.del = data.listmanagerfhadmindel		// 删除权限
+        this.edit = data.listmanagerfhadminedit	// 修改权限
+        this.toExcel = data.toExcel // 导出到excel权限
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    getTreeList() {
+      this.treeLoading = true
+      requestFN(
+        '/hiddenRegion/listAll',
+        {}
+      ).then((data) => {
+        this.treeLoading = false
+        this.treeData = JSON.parse(data.zTreeNodes)
+      }).catch((e) => {
+        this.treeLoading = false
+      })
+    },
+    goBack() {
+      this.setActiveName('List')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.returnBtn {
+  float: right;
+}
+
+.app-container {
+  display: flex; /**/
+  align-items: baseline;
+}
+
+.rightCont {
+  width: 100%
+}
+</style>
diff --git a/src/views/firefighting/fireInfoReport/components/list.vue b/src/views/firefighting/fireInfoReport/components/list.vue
new file mode 100644
index 0000000..18c1cc3
--- /dev/null
+++ b/src/views/firefighting/fireInfoReport/components/list.vue
@@ -0,0 +1,131 @@
+<template>
+  <div class="app-container">
+    <el-form label-width="80px">
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="企业名称">
+            <el-input v-model="form.KEYWORDS" placeholder="请输入企业名称..."/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label-width="10px">
+            <el-button v-waves type="primary" icon="el-icon-search" class="ml-10" @click="getList">
+              搜索
+            </el-button>
+            <el-button v-waves type="success" icon="el-icon-refresh" @click="resetting">
+              重置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-table
+      v-loading="loading"
+      ref="multipleTable"
+      :data="list"
+      :row-key="getRowKey"
+      :header-cell-style="{'font-weight': 'bold','color': '#000'}"
+      tooltip-effect="dark"
+      border
+      fit
+      highlight-current-row>
+      <el-table-column :reserve-selection="true" type="selection" width="55" align="center"/>
+      <el-table-column type="index" label="序号" width="50" align="center"/>
+      <el-table-column label="企业名称" align="center" prop="CORP_NAME"/>
+      <el-table-column label="属地" align="center" prop="COMPANY_AREA"/>
+      <el-table-column label="消防区域数" align="center">
+        <template slot-scope="{row}">
+          <div class="link-type" @click="goControlRoomInfo({CORPINFO_ID:row.CORPINFO_ID,TYPE:'FireRegion'})">
+            {{ row.xiaoFangQuYuNum }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="消防点位数" align="center">
+        <template slot-scope="{row}">
+          <div class="link-type" @click="goControlRoomInfo({CORPINFO_ID:row.CORPINFO_ID,TYPE:'FirePoint'})">
+            {{ row.xiaoFangDianWeiNum }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="消防器材数" align="center">
+        <template slot-scope="{row}">
+          <div class="link-type" @click="goControlRoomInfo({CORPINFO_ID:row.CORPINFO_ID,TYPE:'FireDevice'})">
+            {{ row.xiaoFangQiCaiNum }}
+          </div>
+        </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>
+</template>
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves' // waves directive
+
+export default {
+  components: { Pagination },
+  directives: { waves },
+  inject: ['setActiveName', 'getInfo', 'setInfo'],
+  data() {
+    return {
+      loading: true,
+      list: [],
+      listQuery: {
+        page: 1,
+        limit: 20
+      },
+      total: 0,
+      authority: {
+        add: false,
+        del: false,
+        edit: false
+      },
+      form: {
+        KEYWORDS: ''
+      }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    getList() {
+      this.loading = true
+      requestFN(
+        '/fireReport/utilList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page, this.form
+      ).then((data) => {
+        this.list = data.list
+        this.total = data.page.totalResult
+        this.loading = false
+      }).catch((e) => {
+        this.loading = false
+      })
+    },
+    getRowKey(row) {
+      return row.CORPINFO_ID
+    },
+    resetting() {
+      this.form.KEYWORDS = ''
+      this.getList()
+    },
+    goControlRoomInfo(e) {
+      this.setActiveName(e.TYPE)
+      this.setInfo(e)
+    }
+  }
+}
+
+</script>
+<style>
+.tree_dialog .selectTree {
+  width: 300px;
+}
+
+.hide .el-upload--picture-card {
+  display: none;
+}
+</style>
diff --git a/src/views/firefighting/fireInfoReport/index.vue b/src/views/firefighting/fireInfoReport/index.vue
new file mode 100644
index 0000000..ac31013
--- /dev/null
+++ b/src/views/firefighting/fireInfoReport/index.vue
@@ -0,0 +1,46 @@
+<template>
+  <component :is="parentObj.activeName"/>
+</template>
+<script>
+import List from './components/list'
+import FireRegion from './components/fireRegion'
+import FirePoint from './components/firePoint.vue'
+import FireDevice from './components/fireDevice.vue'
+export default {
+  components: {
+    List, FireRegion, FirePoint, FireDevice
+  },
+  data() {
+    return {
+      parentObj: {
+        activeName: 'List',
+        CORPINFO_ID: ''
+      },
+      info: {}
+    }
+  },
+  methods: {
+    setActiveName(activeName) {
+      this.parentObj.activeName = activeName
+    },
+    getInfo() {
+      return this.info
+    },
+    setInfo(e) {
+      this.info = e
+    }
+  },
+  provide() {
+    return {
+      parentObj: this.parentObj,
+      setActiveName: this.setActiveName,
+      getInfo: this.getInfo,
+      setInfo: this.setInfo
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/firefighting/fireUtilReport/components/fireControlRoom.vue b/src/views/firefighting/fireUtilReport/components/fireControlRoom.vue
new file mode 100644
index 0000000..80d63ce
--- /dev/null
+++ b/src/views/firefighting/fireUtilReport/components/fireControlRoom.vue
@@ -0,0 +1,169 @@
+<template>
+  <div class="app-container">
+    <div class="rightCont">
+      <el-form label-width="50px">
+        <el-col :span="5">
+          <el-form-item label="名称：" label-width="110px">
+            <el-input v-model="form.FIRERESOURCES_NAME" style="width:206px" placeholder="请输入内容"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <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-form>
+      <div>
+        <el-table
+          v-loading="listLoading"
+          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="FIRERESOURCES_NAME" label="名称"/>
+          <el-table-column prop="FIRERESOURCES_TYPENAME" label="消防资源类型"/>
+          <el-table-column prop="LONGTITUDE" label="消防资源经纬度">
+            <template slot-scope="{row}">
+              {{ row.LONGTITUDE }} -- {{ row.LATITUDE }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="CREATIME" label="创建时间"/>
+        </el-table>
+        <div class="page-btn-group">
+          <div>
+            <el-button @click="getBack">返回</el-button>
+          </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'
+import TiandiMap from '../../../../components/TianMap/TiandiMap'
+
+export default {
+  components: { Pagination, SelectTree, TiandiMap },
+  directives: { waves },
+  inject: ['setActiveName', 'getInfo', 'setInfo'],
+  data() {
+    return {
+      config: config,
+      firekzsImgs: [],
+      waitForDeleteImgs: [],
+      dialogImageUrl: '',
+      dialogVisible: false,
+      dialogFormMap: false,
+      map: null,
+      corpList: [],
+      marker: null,
+      describeList: [
+        {
+          code: '',
+          palce: '',
+          name: '',
+          type: '',
+          corp: '',
+          ramake: ''
+        }
+      ],
+      addBtnType: true,
+      FIRE_RESOURCES_TYPE: '',
+      listLoading: true,
+      form: {
+        FIRERESOURCES_NAME: '',
+        FIRERESOURCES_TYPE: 'xfkzs01',
+        CORPINFO_ID: ''
+      },
+      diaLoading: false,
+      LONGTITUDE: '', // 经度
+      LATITUDE: '', // 纬度
+      treeData: [],
+      typeData: [],
+      listQuery: {
+        page: 1,
+        limit: 20
+      },
+      ls: [],
+      dates: [],
+      total: 0,
+      KEYWORDS: '',
+      // 树形菜单
+      varList: []
+    }
+  },
+  created() {
+    this.form.CORPINFO_ID = this.getInfo().CORPINFO_ID
+    this.getList()
+  },
+  methods: {
+    getRowKey(row) {
+      return row.FIRE_DEVICE_ID
+    },
+    getQuery() {
+      this.getList()
+    },
+    // 获取列表
+    getList() {
+      this.listLoading = true
+      this.varList = []
+      requestFN(
+        '/fireResources/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page, this.form
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.varList
+        this.total = data.page.totalResult
+        this.hasButton()
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    goKeyReset() {
+      this.form.FIRERESOURCES_NAME = ''
+
+      this.getList()
+    },
+    getBack() {
+      this.setActiveName('List')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.returnBtn {
+  float: right;
+}
+
+.app-container {
+  display: flex; /**/
+  align-items: baseline;
+}
+
+.rightCont {
+  width: 100%
+}
+
+#map {
+  width: 1000px;
+  height: 500px;
+}
+</style>
diff --git a/src/views/firefighting/fireUtilReport/components/firePumpRoom.vue b/src/views/firefighting/fireUtilReport/components/firePumpRoom.vue
new file mode 100644
index 0000000..5dd6147
--- /dev/null
+++ b/src/views/firefighting/fireUtilReport/components/firePumpRoom.vue
@@ -0,0 +1,169 @@
+<template>
+  <div class="app-container">
+    <div class="rightCont">
+      <el-form label-width="50px">
+        <el-col :span="5">
+          <el-form-item label="名称：" label-width="110px">
+            <el-input v-model="form.FIRERESOURCES_NAME" style="width:206px" placeholder="请输入内容"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <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-form>
+      <div>
+        <el-table
+          v-loading="listLoading"
+          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="FIRERESOURCES_NAME" label="名称"/>
+          <el-table-column prop="FIRERESOURCES_TYPENAME" label="消防资源类型"/>
+          <el-table-column prop="LONGTITUDE" label="消防资源经纬度">
+            <template slot-scope="{row}">
+              {{ row.LONGTITUDE }} -- {{ row.LATITUDE }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="CREATIME" label="创建时间"/>
+        </el-table>
+        <div class="page-btn-group">
+          <div>
+            <el-button @click="getBack">返回</el-button>
+          </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'
+import TiandiMap from '../../../../components/TianMap/TiandiMap'
+
+export default {
+  components: { Pagination, SelectTree, TiandiMap },
+  directives: { waves },
+  inject: ['setActiveName', 'getInfo', 'setInfo'],
+  data() {
+    return {
+      config: config,
+      firekzsImgs: [],
+      waitForDeleteImgs: [],
+      dialogImageUrl: '',
+      dialogVisible: false,
+      dialogFormMap: false,
+      map: null,
+      corpList: [],
+      marker: null,
+      describeList: [
+        {
+          code: '',
+          palce: '',
+          name: '',
+          type: '',
+          corp: '',
+          ramake: ''
+        }
+      ],
+      addBtnType: true,
+      FIRE_RESOURCES_TYPE: '',
+      listLoading: true,
+      form: {
+        FIRERESOURCES_NAME: '',
+        FIRERESOURCES_TYPE: 'xfbf01',
+        CORPINFO_ID: ''
+      },
+      diaLoading: false,
+      LONGTITUDE: '', // 经度
+      LATITUDE: '', // 纬度
+      treeData: [],
+      typeData: [],
+      listQuery: {
+        page: 1,
+        limit: 20
+      },
+      ls: [],
+      dates: [],
+      total: 0,
+      KEYWORDS: '',
+      // 树形菜单
+      varList: []
+    }
+  },
+  created() {
+    this.form.CORPINFO_ID = this.getInfo().CORPINFO_ID
+    this.getList()
+  },
+  methods: {
+    getRowKey(row) {
+      return row.FIRE_DEVICE_ID
+    },
+    getQuery() {
+      this.getList()
+    },
+    // 获取列表
+    getList() {
+      this.listLoading = true
+      this.varList = []
+      requestFN(
+        '/fireResources/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page, this.form
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.varList
+        this.total = data.page.totalResult
+        this.hasButton()
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    goKeyReset() {
+      this.form.FIRERESOURCES_NAME = ''
+
+      this.getList()
+    },
+    getBack() {
+      this.setActiveName('List')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.returnBtn {
+  float: right;
+}
+
+.app-container {
+  display: flex; /**/
+  align-items: baseline;
+}
+
+.rightCont {
+  width: 100%
+}
+
+#map {
+  width: 1000px;
+  height: 500px;
+}
+</style>
diff --git a/src/views/firefighting/fireUtilReport/components/fireResources.vue b/src/views/firefighting/fireUtilReport/components/fireResources.vue
new file mode 100644
index 0000000..b434a2d
--- /dev/null
+++ b/src/views/firefighting/fireUtilReport/components/fireResources.vue
@@ -0,0 +1,169 @@
+<template>
+  <div class="app-container">
+    <div class="rightCont">
+      <el-form label-width="50px">
+        <el-col :span="5">
+          <el-form-item label="名称：" label-width="110px">
+            <el-input v-model="form.FIRERESOURCES_NAME" style="width:206px" placeholder="请输入内容"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <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-form>
+      <div>
+        <el-table
+          v-loading="listLoading"
+          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="FIRERESOURCES_NAME" label="名称"/>
+          <el-table-column prop="FIRERESOURCES_TYPENAME" label="消防资源类型"/>
+          <el-table-column prop="LONGTITUDE" label="消防资源经纬度">
+            <template slot-scope="{row}">
+              {{ row.LONGTITUDE }} -- {{ row.LATITUDE }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="CREATIME" label="创建时间"/>
+        </el-table>
+        <div class="page-btn-group">
+          <div>
+            <el-button @click="getBack">返回</el-button>
+          </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'
+import TiandiMap from '../../../../components/TianMap/TiandiMap'
+
+export default {
+  components: { Pagination, SelectTree, TiandiMap },
+  directives: { waves },
+  inject: ['setActiveName', 'getInfo', 'setInfo'],
+  data() {
+    return {
+      config: config,
+      firekzsImgs: [],
+      waitForDeleteImgs: [],
+      dialogImageUrl: '',
+      dialogVisible: false,
+      dialogFormMap: false,
+      map: null,
+      corpList: [],
+      marker: null,
+      describeList: [
+        {
+          code: '',
+          palce: '',
+          name: '',
+          type: '',
+          corp: '',
+          ramake: ''
+        }
+      ],
+      addBtnType: true,
+      FIRE_RESOURCES_TYPE: '',
+      listLoading: true,
+      form: {
+        FIRERESOURCES_NAME: '',
+        FIRERESOURCES_TYPE: 'xfsy01',
+        CORPINFO_ID: ''
+      },
+      diaLoading: false,
+      LONGTITUDE: '', // 经度
+      LATITUDE: '', // 纬度
+      treeData: [],
+      typeData: [],
+      listQuery: {
+        page: 1,
+        limit: 20
+      },
+      ls: [],
+      dates: [],
+      total: 0,
+      KEYWORDS: '',
+      // 树形菜单
+      varList: []
+    }
+  },
+  created() {
+    this.form.CORPINFO_ID = this.getInfo().CORPINFO_ID
+    this.getList()
+  },
+  methods: {
+    getRowKey(row) {
+      return row.FIRE_DEVICE_ID
+    },
+    getQuery() {
+      this.getList()
+    },
+    // 获取列表
+    getList() {
+      this.listLoading = true
+      this.varList = []
+      requestFN(
+        '/fireResources/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page, this.form
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.varList
+        this.total = data.page.totalResult
+        this.hasButton()
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    goKeyReset() {
+      this.form.FIRERESOURCES_NAME = ''
+
+      this.getList()
+    },
+    getBack() {
+      this.setActiveName('List')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.returnBtn {
+  float: right;
+}
+
+.app-container {
+  display: flex; /**/
+  align-items: baseline;
+}
+
+.rightCont {
+  width: 100%
+}
+
+#map {
+  width: 1000px;
+  height: 500px;
+}
+</style>
diff --git a/src/views/firefighting/fireUtilReport/components/list.vue b/src/views/firefighting/fireUtilReport/components/list.vue
new file mode 100644
index 0000000..e29f4bf
--- /dev/null
+++ b/src/views/firefighting/fireUtilReport/components/list.vue
@@ -0,0 +1,131 @@
+<template>
+  <div class="app-container">
+    <el-form label-width="80px">
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="企业名称">
+            <el-input v-model="form.KEYWORDS" placeholder="请输入企业名称..."/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label-width="10px">
+            <el-button v-waves type="primary" icon="el-icon-search" class="ml-10" @click="getList">
+              搜索
+            </el-button>
+            <el-button v-waves type="success" icon="el-icon-refresh" @click="resetting">
+              重置
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-table
+      v-loading="loading"
+      ref="multipleTable"
+      :data="list"
+      :row-key="getRowKey"
+      :header-cell-style="{'font-weight': 'bold','color': '#000'}"
+      tooltip-effect="dark"
+      border
+      fit
+      highlight-current-row>
+      <el-table-column :reserve-selection="true" type="selection" width="55" align="center"/>
+      <el-table-column type="index" label="序号" width="50" align="center"/>
+      <el-table-column label="企业名称" align="center" prop="CORP_NAME"/>
+      <el-table-column label="属地" align="center" prop="COMPANY_AREA"/>
+      <el-table-column label="消防控制室数" align="center">
+        <template slot-scope="{row}">
+          <div class="link-type" @click="goControlRoomInfo({CORPINFO_ID:row.CORPINFO_ID,TYPE:'FireControlRoom'})">
+            {{ row.xiaoFangKongZhiShiNum }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="消防泵房数" align="center">
+        <template slot-scope="{row}">
+          <div class="link-type" @click="goControlRoomInfo({CORPINFO_ID:row.CORPINFO_ID,TYPE:'FirePumpRoom'})">
+            {{ row.xiaoFangBengFangNum }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="消防水源数" align="center">
+        <template slot-scope="{row}">
+          <div class="link-type" @click="goControlRoomInfo({CORPINFO_ID:row.CORPINFO_ID,TYPE:'FireResources'})">
+            {{ row.xiaoFangShuiYuanNum }}
+          </div>
+        </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>
+</template>
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves' // waves directive
+
+export default {
+  components: { Pagination },
+  directives: { waves },
+  inject: ['setActiveName', 'getInfo', 'setInfo'],
+  data() {
+    return {
+      loading: true,
+      list: [],
+      listQuery: {
+        page: 1,
+        limit: 20
+      },
+      total: 0,
+      authority: {
+        add: false,
+        del: false,
+        edit: false
+      },
+      form: {
+        KEYWORDS: ''
+      }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    getList() {
+      this.loading = true
+      requestFN(
+        '/fireReport/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page, this.form
+      ).then((data) => {
+        this.list = data.list
+        this.total = data.page.totalResult
+        this.loading = false
+      }).catch((e) => {
+        this.loading = false
+      })
+    },
+    getRowKey(row) {
+      return row.CORPINFO_ID
+    },
+    resetting() {
+      this.form.KEYWORDS = ''
+      this.getList()
+    },
+    goControlRoomInfo(e) {
+      this.setActiveName(e.TYPE)
+      this.setInfo(e)
+    }
+  }
+}
+
+</script>
+<style>
+.tree_dialog .selectTree {
+  width: 300px;
+}
+
+.hide .el-upload--picture-card {
+  display: none;
+}
+</style>
diff --git a/src/views/firefighting/fireUtilReport/index.vue b/src/views/firefighting/fireUtilReport/index.vue
new file mode 100644
index 0000000..fa086b6
--- /dev/null
+++ b/src/views/firefighting/fireUtilReport/index.vue
@@ -0,0 +1,46 @@
+<template>
+  <component :is="parentObj.activeName"/>
+</template>
+<script>
+import List from './components/list'
+import FirePumpRoom from './components/firePumpRoom'
+import FireResources from './components/fireResources.vue'
+import FireControlRoom from './components/fireControlRoom.vue'
+export default {
+  components: {
+    List, FirePumpRoom, FireResources, FireControlRoom
+  },
+  data() {
+    return {
+      parentObj: {
+        activeName: 'List',
+        CORPINFO_ID: ''
+      },
+      info: {}
+    }
+  },
+  methods: {
+    setActiveName(activeName) {
+      this.parentObj.activeName = activeName
+    },
+    getInfo() {
+      return this.info
+    },
+    setInfo(e) {
+      this.info = e
+    }
+  },
+  provide() {
+    return {
+      parentObj: this.parentObj,
+      setActiveName: this.setActiveName,
+      getInfo: this.getInfo,
+      setInfo: this.setInfo
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index 7151670..7f41d02 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -464,16 +464,16 @@ export default {
               containAuthorization: [],
               eliminateAuthorization: []
             },
-            // {
-            //   label: '消防水源',
-            //   dialog_width: '600px',
-            //   check: false,
-            //   type: 'xfsy01',
-            //   img: require('../../assets/map/gangkou_index/buttom/ico7.png'),
-            //   checkImg: require('../../assets/map/gangkou_index/buttom/ico7_on.png'),
-            //   containAuthorization: [],
-            //   eliminateAuthorization: []
-            // },
+            {
+              label: '消防水源',
+              dialog_width: '600px',
+              check: false,
+              type: 'xfsy01',
+              img: require('../../assets/map/gangkou_index/buttom/ico7.png'),
+              checkImg: require('../../assets/map/gangkou_index/buttom/ico7_on.png'),
+              containAuthorization: [],
+              eliminateAuthorization: []
+            },
             {
               label: '消防点位',
               dialog_width: '600px',
-- 
2.42.0.windows.1


From 10dfc04e47254a188ae4fe48794791339064861e Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 17 Jan 2024 09:10:55 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=B6=88=E9=98=B2=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=8A=9F=E8=83=BD=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/fireControlRoom.vue            |  169 --
 .../fireUtilReport/components/fireList.vue    |  485 ++++
 .../components/firePumpRoom.vue               |  169 --
 .../fireUtilReport/components/fireRecord.vue  |  315 +++
 .../components/fireResources.vue              |  169 --
 .../fireUtilReport/components/list.vue        |   22 +-
 .../fireUtilReport/components/recordInfo.vue  |  431 ++++
 .../fireUtilReport/components/recordList.vue  |  233 ++
 .../fireUtilReport/components/recording.vue   | 1971 +++++++++++++++++
 .../firefighting/fireUtilReport/index.vue     |    8 +-
 10 files changed, 3443 insertions(+), 529 deletions(-)
 delete mode 100644 src/views/firefighting/fireUtilReport/components/fireControlRoom.vue
 create mode 100644 src/views/firefighting/fireUtilReport/components/fireList.vue
 delete mode 100644 src/views/firefighting/fireUtilReport/components/firePumpRoom.vue
 create mode 100644 src/views/firefighting/fireUtilReport/components/fireRecord.vue
 delete mode 100644 src/views/firefighting/fireUtilReport/components/fireResources.vue
 create mode 100644 src/views/firefighting/fireUtilReport/components/recordInfo.vue
 create mode 100644 src/views/firefighting/fireUtilReport/components/recordList.vue
 create mode 100644 src/views/firefighting/fireUtilReport/components/recording.vue

diff --git a/src/views/firefighting/fireUtilReport/components/fireControlRoom.vue b/src/views/firefighting/fireUtilReport/components/fireControlRoom.vue
deleted file mode 100644
index 80d63ce..0000000
--- a/src/views/firefighting/fireUtilReport/components/fireControlRoom.vue
+++ /dev/null
@@ -1,169 +0,0 @@
-<template>
-  <div class="app-container">
-    <div class="rightCont">
-      <el-form label-width="50px">
-        <el-col :span="5">
-          <el-form-item label="名称：" label-width="110px">
-            <el-input v-model="form.FIRERESOURCES_NAME" style="width:206px" placeholder="请输入内容"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="4">
-          <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-form>
-      <div>
-        <el-table
-          v-loading="listLoading"
-          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="FIRERESOURCES_NAME" label="名称"/>
-          <el-table-column prop="FIRERESOURCES_TYPENAME" label="消防资源类型"/>
-          <el-table-column prop="LONGTITUDE" label="消防资源经纬度">
-            <template slot-scope="{row}">
-              {{ row.LONGTITUDE }} -- {{ row.LATITUDE }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="CREATIME" label="创建时间"/>
-        </el-table>
-        <div class="page-btn-group">
-          <div>
-            <el-button @click="getBack">返回</el-button>
-          </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'
-import TiandiMap from '../../../../components/TianMap/TiandiMap'
-
-export default {
-  components: { Pagination, SelectTree, TiandiMap },
-  directives: { waves },
-  inject: ['setActiveName', 'getInfo', 'setInfo'],
-  data() {
-    return {
-      config: config,
-      firekzsImgs: [],
-      waitForDeleteImgs: [],
-      dialogImageUrl: '',
-      dialogVisible: false,
-      dialogFormMap: false,
-      map: null,
-      corpList: [],
-      marker: null,
-      describeList: [
-        {
-          code: '',
-          palce: '',
-          name: '',
-          type: '',
-          corp: '',
-          ramake: ''
-        }
-      ],
-      addBtnType: true,
-      FIRE_RESOURCES_TYPE: '',
-      listLoading: true,
-      form: {
-        FIRERESOURCES_NAME: '',
-        FIRERESOURCES_TYPE: 'xfkzs01',
-        CORPINFO_ID: ''
-      },
-      diaLoading: false,
-      LONGTITUDE: '', // 经度
-      LATITUDE: '', // 纬度
-      treeData: [],
-      typeData: [],
-      listQuery: {
-        page: 1,
-        limit: 20
-      },
-      ls: [],
-      dates: [],
-      total: 0,
-      KEYWORDS: '',
-      // 树形菜单
-      varList: []
-    }
-  },
-  created() {
-    this.form.CORPINFO_ID = this.getInfo().CORPINFO_ID
-    this.getList()
-  },
-  methods: {
-    getRowKey(row) {
-      return row.FIRE_DEVICE_ID
-    },
-    getQuery() {
-      this.getList()
-    },
-    // 获取列表
-    getList() {
-      this.listLoading = true
-      this.varList = []
-      requestFN(
-        '/fireResources/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page, this.form
-      ).then((data) => {
-        this.listLoading = false
-        this.varList = data.varList
-        this.total = data.page.totalResult
-        this.hasButton()
-      }).catch((e) => {
-        this.listLoading = false
-      })
-    },
-    goKeyReset() {
-      this.form.FIRERESOURCES_NAME = ''
-
-      this.getList()
-    },
-    getBack() {
-      this.setActiveName('List')
-    }
-  }
-}
-</script>
-
-<style scoped>
-.returnBtn {
-  float: right;
-}
-
-.app-container {
-  display: flex; /**/
-  align-items: baseline;
-}
-
-.rightCont {
-  width: 100%
-}
-
-#map {
-  width: 1000px;
-  height: 500px;
-}
-</style>
diff --git a/src/views/firefighting/fireUtilReport/components/fireList.vue b/src/views/firefighting/fireUtilReport/components/fireList.vue
new file mode 100644
index 0000000..f767c26
--- /dev/null
+++ b/src/views/firefighting/fireUtilReport/components/fireList.vue
@@ -0,0 +1,485 @@
+<template>
+  <div class="app-container">
+    <el-form label-width="120px">
+      <el-row>
+        <el-col :span="4">
+          <el-form-item label="检查项关键字" label-width="120px">
+            <el-input v-model="KEYWORDS" placeholder="搜索"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label="消防器材类型">
+            <el-select v-model="FIRE_DEVICE_TYPE" placeholder="请选择">
+              <el-option
+                v-for="item in typeData"
+                :key="item.NAME"
+                :label="item.NAME"
+                :value="item.BIANMA"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item label-width="20px">
+            <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-col :span="12">
+          <el-form-item style="text-align: right">
+            <el-button v-waves class="filter-item" type="info" icon="el-icon-bottom-right" size="mini" plain @click="dialogFormDaoru = true">
+              导入
+            </el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-table v-loading="listLoading" ref="multipleTable" :data="varList" :row-key="getRowKey" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
+      <el-table-column :reserve-selection="true" type="selection" width="55" align="center" />
+      <el-table-column type="index" label="序号" width="50" align="center" />
+      <el-table-column prop="DEVICE_NAME" label="消防器材名称" />
+      <el-table-column prop="DEVICE_TYPE_NAME" label="消防器材类型" />
+      <el-table-column prop="FIRE_CHECK_STANDARD_ITEM" label="检查项" />
+      <el-table-column prop="EMPLOYER" label="单位名称" />
+      <el-table-column prop="OPERATTIME" label="导入时间" />
+      <el-table-column label="操作" align="center" width="450">
+        <template slot-scope="{row}">
+          <el-button v-show="edit" type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row.FIRE_CHECK_STANDARD_ID)">编辑</el-button>
+          <el-button v-show="del" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.FIRE_CHECK_STANDARD_ID)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="page-btn-group">
+      <div>
+        <el-button v-show="add" type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
+        <el-button v-show="del" type="danger" icon="el-icon-delete" plain @click="batchDel">删除</el-button>
+      </div>
+      <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
+    </div>
+
+    <el-dialog :visible.sync="dialogFormEdit" :title="dialogType==='edit'?'修改':'新增'" width="600px">
+      <el-form ref="form" :rules="rules" :model="form" label-width="120px" style="width: 500px;">
+        <el-form-item label="请选择设备类型" prop="FIRE_DEVICE_TYPE">
+          <el-select v-model="form.FIRE_DEVICE_TYPE" placeholder="请选择">
+            <el-option
+              v-for="item in typeData"
+              :key="item.NAME"
+              :label="item.NAME"
+              :value="item.BIANMA"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="消防器材名称" prop="DEVICE_NAME">
+          <el-input id="DEVICE_NAME" ref="DEVICE_NAME" v-model="form.DEVICE_NAME" maxlength="255" placeholder="这里输入..." />
+        </el-form-item>
+        <el-form-item label="单位名称" prop="EMPLOYER">
+          <el-input id="EMPLOYER" ref="EMPLOYER" v-model="form.EMPLOYER" maxlength="255" placeholder="这里输入..." />
+        </el-form-item>
+        <el-form-item label="检查项" prop="FIRE_CHECK_STANDARD_ITEM">
+          <el-input id="FIRE_CHECK_STANDARD_ITEM" ref="FIRE_CHECK_STANDARD_ITEM" v-model="form.FIRE_CHECK_STANDARD_ITEM" type="textarea"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormEdit = false">取 消</el-button>
+        <el-button type="primary" @click="confirm">确 定</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :visible.sync="dialogFormDaoru" title="导入" width="800px">
+      <template>
+        <div class="app-container">
+          <el-form ref="form" :model="daoruFrom" :rules="rules" label-width="120px" class="in-uploader">
+            <el-form-item label="请选择设备类型" prop="importType">
+              <el-select v-model="daoruFrom.FIRE_DEVICE_TYPE" placeholder="请选择">
+                <el-option
+                  v-for="item in typeData"
+                  :key="item.NAME"
+                  :label="item.NAME"
+                  :value="item.BIANMA"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="上传附件" prop="FIELDS">
+              <div class="uploader">
+                <el-input v-model="daoruFrom.FFILEName" :disabled="true" />
+                <el-upload :before-upload="beforeFileUpload" class="avatar-uploader" action="#">
+                  <el-button type="primary" icon="el-icon-upload" style="margin-left:10px">上传附件</el-button>
+                </el-upload>
+                <el-button v-waves type="success" icon="el-icon-right" style="margin-left:10px;width:150px" @click="getExcelModel">
+                  导出模板
+                </el-button>
+              </div>
+            </el-form-item>
+          </el-form>
+        </div>
+      </template>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormDaoru = false">取 消</el-button>
+        <el-button type="primary" @click="goUpload">确 定</el-button>
+      </div>
+    </el-dialog>
+    <div v-html="styleText" />
+  </div>
+</template>
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import SelectTree from '@/components/SelectTree'
+import waves from '@/directive/waves' // waves directive
+import vueQr from 'vue-qr'
+import { upload } from '@/utils/upload'
+import { Message } from 'element-ui'
+export default {
+  components: { Pagination, SelectTree, vueQr },
+  directives: { waves },
+  inject: ['setActiveName', 'getInfo', 'setInfo'],
+  data() {
+    return {
+      styleText: '<style type="text/css" media="print">\n' + '  @page { size: landscape; }\n' + '</style>',
+      config: config,
+      listLoading: true,
+      add: false,
+      del: false,
+      edit: false,
+      listQuery: {
+        page: 1,
+        limit: 20
+      },
+      total: 0,
+      KEYWORDS: this.$route.query.KEYWORDS || '',
+      DEPARTMENT_ID: '',
+      varList: [],
+      pd: {
+        RISKUNITNAME: '',
+        DEPT_NAME: '',
+        HEADMAN: '',
+        CORP_NAME: ''
+      },
+      qrcodeStr: '',
+      form: {
+        FIRE_CHECK_STANDARD_ID: '',
+        EMPLOYER: '',
+        FIRE_CHECK_STANDARD_ITEM: '',
+        DEVICE_NAME: '',
+        FIRE_DEVICE_TYPE: ''
+      },
+      rules: {
+        FIRE_DEVICE_TYPE: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
+        DEVICE_NAME: [{ required: true, message: '设备名不能为空', trigger: 'blur' }],
+        importType: [{ required: true, message: '请选择器材类型', trigger: 'blur' }],
+        FIELDS: [{ required: true, message: '请选择文件', trigger: 'blur' }],
+        FIRE_CHECK_STANDARD_ITEM: [{ required: true, message: '检查标准不能为空', trigger: 'blur' }],
+        EMPLOYER: [{ required: true, message: '单位名称不能为空', trigger: 'blur' }]
+      },
+      defaultProps: {
+        value: 'id',
+        children: 'nodes',
+        label: 'name'
+      },
+      treeData: [],
+      typeData: [],
+      multipleSelectionAll: [], // 所有选中的数据包含跨页数据
+      multipleSelection: [], // 当前页选中的数据
+      dialogFormEdit: false,
+      dialogFormShow: false,
+      dialogType: 'add',
+      FIRE_DEVICE_TYPE: '',
+      dialogFormDaoru: false,
+      daoruFrom: {
+        FFILE: '',
+        FFILEName: '',
+        FIRE_DEVICE_TYPE: ''
+      }
+    }
+  },
+  created() {
+    this.getList()
+    this.getDict()
+    this.getTreeList()
+  },
+  methods: {
+    getQuery() {
+      this.getList()
+    },
+    getRowKey(row) {
+      return row.FIRE_CHECK_STANDARD_ID
+    },
+    getTreeList() {
+      requestFN(
+        '/department/listTree',
+        {}
+      ).then((data) => {
+        this.treeData = JSON.parse(data.zTreeNodes)
+      }).catch((e) => {
+      })
+    },
+    // 搜索
+    getuery() {
+      this.getList()
+    },
+    goKeyReset() {
+      this.KEYWORDS = ''
+      this.FIRE_DEVICE_TYPE = ''
+      this.getQuery()
+    },
+    // 获取列表
+    getList() {
+      this.listLoading = true
+      requestFN(
+        '/fireCheckStandard/getList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          KEYWORDS: this.KEYWORDS,
+          FIRE_DEVICE_TYPE: this.FIRE_DEVICE_TYPE,
+          CORPINFO_ID: this.getInfo().CORPINFO_ID
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.varList
+        this.total = data.page.totalResult
+        this.hasButton()
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    // 添加
+    handleAdd() {
+      this.dialogType = 'add'
+      this.dialogFormEdit = true
+      this.resetForm()
+      this.$refs.deptTree.clearHandle()
+      this.getDict()
+    },
+    // 修改
+    handleEdit(ID) {
+      this.getDict()
+      this.dialogType = 'edit'
+      console.log(ID)
+      requestFN(
+        '/fireCheckStandard/getInfo',
+        {
+          FIRE_CHECK_STANDARD_ID: ID
+        }
+      ).then((data) => {
+        this.form = Object.assign({}, data.res) // copy obj
+        const node = {}
+        node.id = this.form.FIRE_DEVICE_TYPE
+        this.dialogFormEdit = true
+        this.$refs.deptTree.clearHandle()
+        this.$nextTick(() => { // 此处使用这个可以等节点渲染后再获取节点
+          this.$refs.deptTree.handleNodeClick(node)
+        })
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    // 保存
+    confirm() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.listLoading = true
+          requestFN(
+            '/fireCheckStandard/' + this.dialogType,
+            this.form
+          ).then((data) => {
+            this.listLoading = false
+            this.dialogFormEdit = false
+            this.getList()
+          }).catch((e) => {
+            this.listLoading = false
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    beforeFileUpload(file) {
+      this.daoruFrom.FFILE = file
+      this.daoruFrom.FFILEName = file.name
+      this.$forceUpdate()
+      return false
+    },
+    goUpload() {
+      if (this.daoruFrom.FFILE === '') {
+        this.$message({
+          message: '必须选择文件',
+          type: 'error'
+        })
+        return false
+      }
+      if (this.daoruFrom.FIRE_DEVICE_TYPE === '') {
+        this.$message({
+          message: '必须选择设备类型',
+          type: 'error'
+        })
+        return false
+      }
+      const formData = new FormData()
+      Object.keys(this.daoruFrom).map(key => {
+        formData.append(key, this.daoruFrom[key])
+      })
+      upload(
+        '/fireCheckStandard/importExcelTemplate',
+        formData
+      ).then((data) => {
+        if (data.msg) {
+          Message({
+            message: data.msg,
+            type: data.type,
+            duration: 5 * 1000
+          })
+        }
+        this.dialogFormDaoru = false
+        this.getList()
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    getExcelModel() {
+      this.$confirm('确定要下载excel模板吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.listLoading = false
+        window.location.href = config.httpurl + 'fireCheckStandard/excelModel'
+      }).catch(() => {
+        this.listLoading = false
+      })
+      this.listLoading = false
+    },
+    handleDelete(id) {
+      this.$confirm('确定要删除吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.listLoading = true
+        requestFN(
+          '/fireCheckStandard/delByIds',
+          {
+            DATA_IDS: id
+          }
+        ).then((res) => {
+          if (res.result === 'success') {
+            this.$message({
+              message: '删除成功',
+              type: 'success'
+            })
+          }
+          this.listLoading = false
+          this.varList = []
+          this.listQuery.page = 1
+          this.getList()
+        }).catch((e) => {
+          this.listLoading = false
+        })
+      }).catch(() => {
+      })
+    },
+
+    batchDel() {
+      const _selectData = this.$refs.multipleTable.selection
+      if (_selectData == null || _selectData.length == 0) {
+        this.$message({
+          message: '请选中要删除的项...',
+          type: 'error'
+        })
+        return false
+      }
+      const ids = _selectData.map((item, index) => {
+        return item.FIRE_CHECK_STANDARD_ID
+      }).join(',')
+
+      this.$confirm('确定要删除选中的数据吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.listLoading = true
+        requestFN(
+          '/fireCheckStandard/delByIds',
+          {
+            DATA_IDS: ids
+          }
+        ).then(() => {
+          this.$message({
+            message: '删除成功',
+            type: 'success'
+          })
+          this.listLoading = false
+          this.varList = []
+          this.listQuery.page = 1
+          this.$refs.multipleTable.clearSelection()
+          this.getList()
+        }).catch((e) => {
+          this.listLoading = false
+        })
+      }).catch(() => {
+      })
+    },
+    // 判断按钮权限，用于是否显示按钮
+    hasButton() {
+      var keys = 'riskunit:add,riskunit:del,riskunit:edit,toExcel'
+      requestFN(
+        '/head/hasButton',
+        {
+          keys: keys
+        }
+      ).then((data) => {
+        this.add = data.riskunitfhadminadd		// 新增权限
+        this.del = data.riskunitfhadmindel		// 删除权限
+        this.edit = data.riskunitfhadminedit	// 修改权限
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    // 获取数据字典数据
+    getDict() {
+      requestFN(
+        'dictionaries/getLevels',
+        {
+          DICTIONARIES_ID: '249151f04fd64132a949fdd430a7b9c5'
+        }
+      ).then((data) => {
+        this.typeData = data.list
+        console.log(this.typeData)
+      })
+    },
+    resetForm() {
+      this.form = {
+        FIRE_CHECK_STANDARD_ID: '',
+        EMPLOYER: '',
+        FIRE_CHECK_STANDARD_ITEM: '',
+        DEVICE_NAME: '',
+        FIRE_DEVICE_TYPE: ''
+      }
+    },
+    goDetail(row) {
+      this.$parent.activeName = 'Info'
+      this.$parent.RISKUNIT_ID = row.RISKUNIT_ID
+      this.$parent.RISKUNITNAME = row.RISKUNITNAME
+      this.$parent.DEPT_NAME = row.DEPT_NAME
+    }
+  }
+}
+
+</script>
+<style lang="sass" scoped>
+.table-qrcode
+  text-align: center
+  padding-top: 20px
+  width: 100%
+.filter-container
+  position: relative
+  .filter-flot
+    position: absolute
+    right: 0
+    top: 0
+.uploader
+  width: 570px
+  display: flex
+  align-items: center
+.el-form-item__content
+  line-height: 1
+</style>
diff --git a/src/views/firefighting/fireUtilReport/components/firePumpRoom.vue b/src/views/firefighting/fireUtilReport/components/firePumpRoom.vue
deleted file mode 100644
index 5dd6147..0000000
--- a/src/views/firefighting/fireUtilReport/components/firePumpRoom.vue
+++ /dev/null
@@ -1,169 +0,0 @@
-<template>
-  <div class="app-container">
-    <div class="rightCont">
-      <el-form label-width="50px">
-        <el-col :span="5">
-          <el-form-item label="名称：" label-width="110px">
-            <el-input v-model="form.FIRERESOURCES_NAME" style="width:206px" placeholder="请输入内容"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="4">
-          <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-form>
-      <div>
-        <el-table
-          v-loading="listLoading"
-          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="FIRERESOURCES_NAME" label="名称"/>
-          <el-table-column prop="FIRERESOURCES_TYPENAME" label="消防资源类型"/>
-          <el-table-column prop="LONGTITUDE" label="消防资源经纬度">
-            <template slot-scope="{row}">
-              {{ row.LONGTITUDE }} -- {{ row.LATITUDE }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="CREATIME" label="创建时间"/>
-        </el-table>
-        <div class="page-btn-group">
-          <div>
-            <el-button @click="getBack">返回</el-button>
-          </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'
-import TiandiMap from '../../../../components/TianMap/TiandiMap'
-
-export default {
-  components: { Pagination, SelectTree, TiandiMap },
-  directives: { waves },
-  inject: ['setActiveName', 'getInfo', 'setInfo'],
-  data() {
-    return {
-      config: config,
-      firekzsImgs: [],
-      waitForDeleteImgs: [],
-      dialogImageUrl: '',
-      dialogVisible: false,
-      dialogFormMap: false,
-      map: null,
-      corpList: [],
-      marker: null,
-      describeList: [
-        {
-          code: '',
-          palce: '',
-          name: '',
-          type: '',
-          corp: '',
-          ramake: ''
-        }
-      ],
-      addBtnType: true,
-      FIRE_RESOURCES_TYPE: '',
-      listLoading: true,
-      form: {
-        FIRERESOURCES_NAME: '',
-        FIRERESOURCES_TYPE: 'xfbf01',
-        CORPINFO_ID: ''
-      },
-      diaLoading: false,
-      LONGTITUDE: '', // 经度
-      LATITUDE: '', // 纬度
-      treeData: [],
-      typeData: [],
-      listQuery: {
-        page: 1,
-        limit: 20
-      },
-      ls: [],
-      dates: [],
-      total: 0,
-      KEYWORDS: '',
-      // 树形菜单
-      varList: []
-    }
-  },
-  created() {
-    this.form.CORPINFO_ID = this.getInfo().CORPINFO_ID
-    this.getList()
-  },
-  methods: {
-    getRowKey(row) {
-      return row.FIRE_DEVICE_ID
-    },
-    getQuery() {
-      this.getList()
-    },
-    // 获取列表
-    getList() {
-      this.listLoading = true
-      this.varList = []
-      requestFN(
-        '/fireResources/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page, this.form
-      ).then((data) => {
-        this.listLoading = false
-        this.varList = data.varList
-        this.total = data.page.totalResult
-        this.hasButton()
-      }).catch((e) => {
-        this.listLoading = false
-      })
-    },
-    goKeyReset() {
-      this.form.FIRERESOURCES_NAME = ''
-
-      this.getList()
-    },
-    getBack() {
-      this.setActiveName('List')
-    }
-  }
-}
-</script>
-
-<style scoped>
-.returnBtn {
-  float: right;
-}
-
-.app-container {
-  display: flex; /**/
-  align-items: baseline;
-}
-
-.rightCont {
-  width: 100%
-}
-
-#map {
-  width: 1000px;
-  height: 500px;
-}
-</style>
diff --git a/src/views/firefighting/fireUtilReport/components/fireRecord.vue b/src/views/firefighting/fireUtilReport/components/fireRecord.vue
new file mode 100644
index 0000000..541eb93
--- /dev/null
+++ b/src/views/firefighting/fireUtilReport/components/fireRecord.vue
@@ -0,0 +1,315 @@
+<template>
+  <div class="app-container">
+    <el-form label-width="120px">
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="检查表名称">
+            <el-input v-model="KEYWORDS" placeholder="请输入关键字" class="filter-item" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="周期内检查状态">
+            <el-select v-model="STATUS" placeholder="请选择" style="width: 100%;">
+              <el-option v-for="item in statusList" :key="item.ID" :label="item.NAME" :value="item.ID" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="部门">
+            <SelectTree ref="deptTree_Select" :clearable="false" :options="treeData" :props="defaultProps" v-model="DEPARTMENT_ID" placeholder="请选择部门" style="width: 100%;" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="人员">
+            <el-input v-model="USERNAME" placeholder="这里输入人员" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="排查周期">
+            <el-select v-model="PERIOD" placeholder="请选择" style="width: 100%;">
+              <el-option v-for="item in periodList" :key="item.BIANMA" :label="item.NAME" :value="item.BIANMA" />
+            </el-select>
+          </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 v-loading="listLoading" ref="multipleTable" :data="varList" :row-key="getRowKey" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
+        <el-table-column :reserve-selection="true" :selectable="selectable" type="selection" width="55" align="center" />
+        <el-table-column type="index" label="序号" width="50" align="center" />
+        <el-table-column prop="FIRE_CHECK_STANDARD_NAME" label="检查表名称" />
+        <el-table-column prop="DEPARTMENT_NAME" label="部门" />
+        <el-table-column prop="USER_NAME" label="人员" width="90" align="center" show-overflow-tooltip />
+        <el-table-column prop="PERIODNAME" label="排查周期" width="90" align="center" />
+        <el-table-column prop="DATESTART" label="周期" width="260" align="center"/>
+        <el-table-column prop="COUNT" label="检查次数" width="90" align="center" />
+        <el-table-column prop="checkCount" label="周期内次数" width="120" align="center" show-overflow-tooltip>
+          <template slot-scope="{row}">
+            <template v-if="row.checkCount == 0">
+              <span class="color-red">{{ row.checkCount }}/1</span>
+            </template>
+            <template v-if="row.checkCount != 0">
+              <span>{{ row.checkCount }}/1</span>
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column prop="STATE" label="清单状态" width="90" align="center">
+          <template slot-scope="{row}">
+            <template v-if="row.STATE == 1">
+              禁用
+            </template>
+            <template v-if="row.STATE == 0">
+              启用
+            </template>
+            <template v-if="row.STATE == 2">
+              已删除
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="false" label="操作" align="center">
+          <template slot-scope="{row}">
+            <el-button type="primary" icon="el-icon-tickets" size="mini" @click="goDetail(row.FIRE_CHECK_ID,row.FIRE_RECORD_ID)">检查记录</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="page-btn-group">
+        <div >
+          <el-button @click="getBack">返 回</el-button>
+        </div>
+        <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
+      </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 },
+  inject: ['setActiveName', 'getInfo', 'setInfo'],
+  directives: { waves },
+  data() {
+    return {
+      listLoading: true,
+      add: false,
+      del: false,
+      edit: false,
+      listQuery: {
+        page: 1,
+        limit: 20
+      },
+      ls: [],
+      dates: [],
+      total: 0,
+      KEYWORDS: '',
+      varList: [],
+      pd: [],
+      defaultProps: {
+        value: 'id',
+        children: 'nodes',
+        label: 'name'
+      },
+      tableData: [{
+        number: '1',
+        listname: '菜市场上厕所从上次说',
+        bm: '海洋肥料车间(一期)	',
+        gw: '海洋肥料车间(一期)班长',
+        ry: '',
+        pczq: '	每周',
+        zq: '2021-06-07 00:00:00-2021-06-13 23:59:59',
+        jccs: '1',
+        yhs: '1',
+        qdlx: '日常',
+        qdzt: '启用'
+      }],
+      STARTTIME: '',
+      ENDTIME: '',
+      DEPARTMENT_ID: '',
+      USERNAME: '',
+      periodList: [],
+      typeList: [],
+      PERIOD: '',
+      OVERTIME: '',
+      TYPE: '',
+      statusList: [
+        { ID: '', NAME: '请选择' },
+        { ID: '0', NAME: '未检查' },
+        { ID: '1', NAME: '已检查' }
+      ],
+      STATUS: '',
+      hasHiddenList: [
+        { ID: '', NAME: '请选择' },
+        { ID: '0', NAME: '无隐患' },
+        { ID: '1', NAME: '有隐患' }
+      ],
+      HASHIDDEN: '',
+      listingLevelList: [
+        { 'BIANMA': '', 'NAME': '请选择' },
+        { 'BIANMA': '1', 'NAME': '公司' }
+      ],
+      overTimeList: [
+        { ID: '', NAME: '请选择' },
+        { ID: '1', NAME: '无超期' },
+        { ID: '0', NAME: '有超期' }
+      ],
+      LISTINGLEVEL: '',
+      treeData: []
+    }
+  },
+  created() {
+    this.getList()
+    this.getTreeData()
+    this.getDict()
+  },
+  methods: {
+    getRowKey(row) {
+      return row.FIRE_CHECK_ID
+    },
+    selectable(row, index) {
+      return row.STATE == 2
+    },
+    // 搜索
+    getQuery() {
+      this.$refs.multipleTable.clearSelection()
+      this.getList()
+    },
+    getTreeData() {
+      requestFN(
+        '/department/listTree',
+        {}
+      ).then((data) => {
+        this.treeData = JSON.parse(data.zTreeNodes)
+      }).catch((e) => {
+      })
+    },
+    // 获取列表
+    getList() {
+      this.listLoading = true
+      requestFN(
+        '/fireRecord/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          STARTTIME: this.dates[0],
+          ENDTIME: this.dates[1],
+          DEPARTMENT_ID: this.DEPARTMENT_ID,
+          USERNAME: this.USERNAME,
+          PERIOD: this.PERIOD,
+          TYPE: this.TYPE,
+          STATUS: this.STATUS,
+          OVERTIME: this.OVERTIME,
+          HASHIDDEN: this.HASHIDDEN,
+          LISTINGLEVEL: this.LISTINGLEVEL,
+          KEYWORDS: this.KEYWORDS,
+          tm: new Date().getTime(),
+          CORPINFO_ID: this.getInfo().CORPINFO_ID
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.varList
+        this.ls = data.ls
+        this.total = data.page.totalResult
+        this.hasButton()
+        this.pd = data.pd
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    }, goKeyReset() {
+      this.KEYWORDS = ''
+      this.USERNAME = ''
+      this.PERIOD = ''
+      this.STATUS = ''
+      this.LISTINGLEVEL = ''
+      this.OVERTIME = ''
+      this.TYPE = ''
+      this.STARTTIME = ''
+      this.ENDTIME = ''
+      this.dates = []
+      this.$refs.deptTree_Select.clearHandle()
+      this.DEPARTMENT_ID = ''
+      this.getList()
+      this.getTreeData()
+      this.getDict()
+    }, getDict() {
+      requestFN(
+        'dictionaries/getLevels',
+        {
+          DICTIONARIES_ID: '4a3d0d99b0ea4e268c11dd0b18866917'
+        }
+      ).then((data) => {
+        this.typeList = data.list
+      })
+        .catch((e) => {
+          this.listLoading = false
+        })
+
+      requestFN(
+        'dictionaries/getLevels',
+        {
+          DICTIONARIES_ID: 'f60cf0e8315b4993b6d6049dd29f2ba5'
+        }
+      ).then((data) => {
+        this.periodList = data.list
+      })
+        .catch((e) => {
+          this.listLoading = false
+        })
+
+      requestFN(
+        'dictionaries/getLevels',
+        {
+          DICTIONARIES_ID: '4a661fa8aedc4d158c9cddaa9d2ec47e'
+        }
+      ).then((data) => {
+        this.listingLevelList = this.listingLevelList.concat(data.list)
+      })
+        .catch((e) => {
+          this.listLoading = false
+        })
+    },
+
+    goDetail(id, FIRE_RECORD_ID) {
+      this.setActiveName('RecordInfo')
+      const info = this.getInfo()
+      info.FIRE_CHECK_ID = id
+      info.FIRE_RECORD_ID = FIRE_RECORD_ID
+      this.setInfo(info)
+    },
+    hasButton: function() {
+      var keys = 'checkrecord:add,checkrecord:del,checkrecord:edit,toExcel'
+      requestFN(
+        '/head/hasButton',
+        {
+          keys: keys
+        }
+      ).then((data) => {
+        this.add = data.checkrecordfhadminadd		// 新增权限
+        this.del = data.checkrecordfhadmindel		// 删除权限
+        this.edit = data.checkrecordfhadminedit	// 修改权限
+        this.toExcel = data.toExcel // 导出到excel权限
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    getBack() {
+      this.setActiveName('List')
+    }
+  }
+}
+</script>
+
+<style>
+</style>
diff --git a/src/views/firefighting/fireUtilReport/components/fireResources.vue b/src/views/firefighting/fireUtilReport/components/fireResources.vue
deleted file mode 100644
index b434a2d..0000000
--- a/src/views/firefighting/fireUtilReport/components/fireResources.vue
+++ /dev/null
@@ -1,169 +0,0 @@
-<template>
-  <div class="app-container">
-    <div class="rightCont">
-      <el-form label-width="50px">
-        <el-col :span="5">
-          <el-form-item label="名称：" label-width="110px">
-            <el-input v-model="form.FIRERESOURCES_NAME" style="width:206px" placeholder="请输入内容"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="4">
-          <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-form>
-      <div>
-        <el-table
-          v-loading="listLoading"
-          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="FIRERESOURCES_NAME" label="名称"/>
-          <el-table-column prop="FIRERESOURCES_TYPENAME" label="消防资源类型"/>
-          <el-table-column prop="LONGTITUDE" label="消防资源经纬度">
-            <template slot-scope="{row}">
-              {{ row.LONGTITUDE }} -- {{ row.LATITUDE }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="CREATIME" label="创建时间"/>
-        </el-table>
-        <div class="page-btn-group">
-          <div>
-            <el-button @click="getBack">返回</el-button>
-          </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'
-import TiandiMap from '../../../../components/TianMap/TiandiMap'
-
-export default {
-  components: { Pagination, SelectTree, TiandiMap },
-  directives: { waves },
-  inject: ['setActiveName', 'getInfo', 'setInfo'],
-  data() {
-    return {
-      config: config,
-      firekzsImgs: [],
-      waitForDeleteImgs: [],
-      dialogImageUrl: '',
-      dialogVisible: false,
-      dialogFormMap: false,
-      map: null,
-      corpList: [],
-      marker: null,
-      describeList: [
-        {
-          code: '',
-          palce: '',
-          name: '',
-          type: '',
-          corp: '',
-          ramake: ''
-        }
-      ],
-      addBtnType: true,
-      FIRE_RESOURCES_TYPE: '',
-      listLoading: true,
-      form: {
-        FIRERESOURCES_NAME: '',
-        FIRERESOURCES_TYPE: 'xfsy01',
-        CORPINFO_ID: ''
-      },
-      diaLoading: false,
-      LONGTITUDE: '', // 经度
-      LATITUDE: '', // 纬度
-      treeData: [],
-      typeData: [],
-      listQuery: {
-        page: 1,
-        limit: 20
-      },
-      ls: [],
-      dates: [],
-      total: 0,
-      KEYWORDS: '',
-      // 树形菜单
-      varList: []
-    }
-  },
-  created() {
-    this.form.CORPINFO_ID = this.getInfo().CORPINFO_ID
-    this.getList()
-  },
-  methods: {
-    getRowKey(row) {
-      return row.FIRE_DEVICE_ID
-    },
-    getQuery() {
-      this.getList()
-    },
-    // 获取列表
-    getList() {
-      this.listLoading = true
-      this.varList = []
-      requestFN(
-        '/fireResources/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page, this.form
-      ).then((data) => {
-        this.listLoading = false
-        this.varList = data.varList
-        this.total = data.page.totalResult
-        this.hasButton()
-      }).catch((e) => {
-        this.listLoading = false
-      })
-    },
-    goKeyReset() {
-      this.form.FIRERESOURCES_NAME = ''
-
-      this.getList()
-    },
-    getBack() {
-      this.setActiveName('List')
-    }
-  }
-}
-</script>
-
-<style scoped>
-.returnBtn {
-  float: right;
-}
-
-.app-container {
-  display: flex; /**/
-  align-items: baseline;
-}
-
-.rightCont {
-  width: 100%
-}
-
-#map {
-  width: 1000px;
-  height: 500px;
-}
-</style>
diff --git a/src/views/firefighting/fireUtilReport/components/list.vue b/src/views/firefighting/fireUtilReport/components/list.vue
index e29f4bf..ea5a935 100644
--- a/src/views/firefighting/fireUtilReport/components/list.vue
+++ b/src/views/firefighting/fireUtilReport/components/list.vue
@@ -33,24 +33,10 @@
       <el-table-column type="index" label="序号" width="50" align="center"/>
       <el-table-column label="企业名称" align="center" prop="CORP_NAME"/>
       <el-table-column label="属地" align="center" prop="COMPANY_AREA"/>
-      <el-table-column label="消防控制室数" align="center">
+      <el-table-column label="检查次数" align="center">
         <template slot-scope="{row}">
-          <div class="link-type" @click="goControlRoomInfo({CORPINFO_ID:row.CORPINFO_ID,TYPE:'FireControlRoom'})">
-            {{ row.xiaoFangKongZhiShiNum }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="消防泵房数" align="center">
-        <template slot-scope="{row}">
-          <div class="link-type" @click="goControlRoomInfo({CORPINFO_ID:row.CORPINFO_ID,TYPE:'FirePumpRoom'})">
-            {{ row.xiaoFangBengFangNum }}
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="消防水源数" align="center">
-        <template slot-scope="{row}">
-          <div class="link-type" @click="goControlRoomInfo({CORPINFO_ID:row.CORPINFO_ID,TYPE:'FireResources'})">
-            {{ row.xiaoFangShuiYuanNum }}
+          <div class="link-type" @click="goControlRoomInfo({CORPINFO_ID:row.CORPINFO_ID,TYPE:'fireRecord'})">
+            {{ row.xiaoJianChaNum }}
           </div>
         </template>
       </el-table-column>
@@ -96,7 +82,7 @@ export default {
     getList() {
       this.loading = true
       requestFN(
-        '/fireReport/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page, this.form
+        '/fireReport/recordList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page, this.form
       ).then((data) => {
         this.list = data.list
         this.total = data.page.totalResult
diff --git a/src/views/firefighting/fireUtilReport/components/recordInfo.vue b/src/views/firefighting/fireUtilReport/components/recordInfo.vue
new file mode 100644
index 0000000..f5ab0a5
--- /dev/null
+++ b/src/views/firefighting/fireUtilReport/components/recordInfo.vue
@@ -0,0 +1,431 @@
+<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 colspan="3">{{ form.FIRE_CHECK_STANDARD_NAME }}</td>
+          </tr>
+          <tr>
+            <td class="tbg">所属部门</td>
+            <td>{{ form.DEPARTMENTNAME }}</td>
+            <td class="tbg">所属岗位</td>
+            <td>{{ form.POSTNAME }}</td>
+          </tr>
+          <tr>
+            <td class="tbg">排查周期</td>
+            <td>{{ form.FIRE_CHECK_TYPE_NAME }}</td>
+            <td class="tbg">责任人</td>
+            <td>{{ form.USERNAME }}</td>
+          </tr>
+          <tr>
+            <td class="tbg">检查时间</td>
+            <td>{{ recordBase.CHECK_TIME }}</td>
+            <td class="tbg">检查周期</td>
+            <td v-if="form.FIRE_CHECK_TYPE !== 'checkPeriod0001'"> {{ recordBase.PERIODSTART.split(" ")[0] }}~{{ recordBase.PERIODEND.split(" ")[0] }}</td>
+            <td v-else> {{ recordBase.PERIODSTART.split(" ")[0] }}</td>
+          </tr>
+          <tr>
+            <td class="tbg">检查情况</td>
+            <td>
+              <template v-if="recordBase.FINISHED===1">
+                已检查
+              </template>
+              <template v-else>
+                未检查
+              </template>
+            </td>
+            <td class="tbg">检查人</td>
+            <td>{{ recordBase.USER_NAME }}</td>
+          </tr>
+          <tr v-if="qianming != ''">
+            <td class="tbg">签字</td>
+            <td colspan="3">
+              <img :src="qianming" style="width: 200px;height: 97px;">
+            </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>
+            <!--            <th>点位合格照片</th>-->
+          </tr>
+          <template v-if="varList.length !== 0">
+            <tr v-for="(data,index) in varList" :key="index">
+              <td align="center">{{ index+1 }}</td>
+              <td>{{ data.FIRE_REGION_NAME }}</td>
+              <td>{{ data.FIRE_POINT_NAME }}</td>
+              <td>{{ data.FIRE_DEVICE_CODE }}</td>
+              <template v-if="data.ISNORMAL==0">
+                <template>
+                  <td class="text-center" >
+                    <a style="text-decoration: underline" @click="handelShowCheck(data.fireDeviceTypeList)">合格</a>
+                  </td>
+                </template>
+              </template>
+              <template v-else-if="data.ISNORMAL==1 || data.ISNORMAL==3">
+                <td class="text-center" ><a style="text-decoration: underline" @click="goHidden(data.HIDDEN_ID)">不合格</a></td>
+              </template>
+              <template v-else-if="data.ISNORMAL==2">
+                <td class="text-center" ><a style="text-decoration: underline">不涉及</a></td>
+              </template>
+              <template v-else-if="data.ISNORMAL==2">
+                <td class="text-center" ><a style="text-decoration: underline">不涉及</a></td>
+              </template>
+              <template v-else>
+                <td class="text-center" />
+              </template>
+              <template>
+                <td v-if="data.INDEX_F == '1'" :rowspan="data.ROWSPAN" class="text-center">
+                  <a style="text-decoration: underline" @click="qualified(data.EQUIPMENT_POINT_ID,14)">点位检查照片</a>
+                </td>
+              </template>
+              <!--              <template>-->
+              <!--                <td v-if="data.INDEX_F == '1'" :rowspan="data.ROWSPAN" class="text-center">-->
+              <!--                  <a style="text-decoration: underline" @click="qualified(data.QUALIFIED_PHOTOS_ID,115)">点位合格照片</a>-->
+              <!--                </td>-->
+              <!--              </template>-->
+            </tr>
+          </template>
+          <template v-else>
+            <tr>
+              <td colspan="7" style="text-align: center">暂无数据</td>
+            </tr>
+          </template>
+        </table>
+      </div>
+      <div class="mb-20">
+        <table class="table-ui">
+          <tr>
+            <th width="55" style="text-align:center">序号</th>
+            <th width="100">设备编号</th>
+            <th>隐患描述</th>
+            <th v-if="otherHiddenList.length !== 0" width="200">操作</th>
+          </tr>
+          <template v-if="otherHiddenList.length !== 0">
+            <tr v-for="(data,index) in otherHiddenList" :key="index">
+              <td align="center">{{ index+1 }}</td>
+              <td>{{ data.FIRE_DEVICE_CODE }}</td>
+              <td>{{ data.HIDDENDESCR }}</td>
+              <td class="noprint">
+                <el-button icon="el-icon-view" size="mini" @click="goHidden(data.HIDDEN_ID)">查看</el-button>
+              </td>
+            </tr>
+          </template>
+          <template v-else>
+            <tr>
+              <td colspan="3" 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="checkShow" title="检查项列表" width="80%">
+      <div>
+        <el-table
+          ref="multipleTableRisk"
+          :data="csList"
+          border
+          tooltip-effect="dark"
+          style="width: 100%;">
+          <el-table-column type="index" label="序号" width="55" align="center"/>
+          <el-table-column prop="FIRE_CHECK_STANDARD_ITEM" label="检查项"/>
+        </el-table>
+      </div>
+      <div class="page-btn-group">
+        <div>
+          <el-button plain type="info" @click="closAddOtherPoint">返 回</el-button>
+        </div>
+      </div>
+    </el-dialog>
+    <!--检查照片-->
+    <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>
+    <information ref="information"/>
+    <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'
+import information from '../../../hiddenUtil/information.vue'
+export default {
+  components: { Pagination, SelectTree, information },
+  inject: ['setActiveName', 'getInfo', 'setInfo'],
+  directives: { waves },
+  data() {
+    return {
+      styleText: '<style type="text/css" media="print">\n' + '  @page { size: landscape; }\n' + '</style>',
+      SHOW_OR_EDIT: '',
+      treeData: [],
+      FIRE_RECORD_ID: '',
+      config: config,
+      imgForm: {},
+      checkShow: false,
+      csList: [],
+      qualifiedImgs: [],
+      qualifiedFiles: [],
+      dialogImgVisible: false,
+      defaultProps: {
+        value: 'id',
+        children: 'nodes',
+        label: 'name'
+      },
+      form: '',
+      pd: {
+        CHECK_TIME: '',
+        DEPARTMENT_ID: '',
+        USER_ID: ''
+      },
+      recordBase: '',
+      qianming: '',
+      otherHiddenList: [],
+      varList: [],
+      // myself
+      FIRE_CHECK_ID: '',
+      expireTimeOPtion: {
+        disabledDate(time) {
+          return time.getTime() > Date.now() // 如果没有后面的-8.64e7就是不可以选择今天的
+        }
+      }
+    }
+  },
+
+  created() {
+    this.FIRE_CHECK_ID = this.getInfo().FIRE_CHECK_ID
+    this.FIRE_RECORD_ID = this.getInfo().FIRE_RECORD_ID
+    this.SHOW_OR_EDIT = this.$parent.SHOW_OR_EDIT
+    this.recordBase = Object.assign({}, this.$parent.row)
+    this.getData()
+    this.getSignImgs(this.FIRE_RECORD_ID)
+  },
+  methods: {
+    // 合格上传照片
+    qualified(id, TYPE) {
+      if (id) {
+        this.qualifiedImgs = [] // 合格检查项照片
+        this.getQualifiedImgs(id, TYPE)
+      } else {
+        this.$message.warning('暂无照片')
+      }
+    },
+    handelShowCheck(varList) {
+      this.checkShow = true
+      this.csList = []
+      this.csList = varList
+    },
+    closAddOtherPoint() {
+      this.checkShow = false
+    },
+    getQualifiedImgs(EQUIPMENT_RECORD_ID, TYPE) {
+      this.listLoading = true
+      requestFN(
+        '/imgfiles/listImgs',
+        {
+          FOREIGN_KEY: EQUIPMENT_RECORD_ID,
+          TYPE: TYPE
+        }
+      ).then((data) => {
+        this.qualifiedImgs = data.imgs
+        if (this.qualifiedImgs.length > 0) {
+          // 有照片 展示
+          this.dialogImgVisible = true
+        } else {
+          // 无照片 提示
+          this.$message({
+            message: '无检查照片',
+            type: 'error'
+          })
+        }
+        this.listLoading = false
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    getSignImgs(FIRE_RECORD_ID) {
+      this.listLoading = true
+      requestFN(
+        '/imgfiles/listImgs',
+        {
+          FOREIGN_KEY: FIRE_RECORD_ID,
+          TYPE: '13'
+        }
+      ).then((data) => {
+        this.qianming = this.config.fileUrl + data.imgs[0].FILEPATH
+        this.listLoading = false
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    goHidden(id) {
+      this.$refs.information.init(id)
+    },
+    back() {
+      this.$parent.activeName = 'RecordList'
+    },
+    // 获取详情
+    getData() {
+      this.listLoading = true
+      // 获取基础信息
+      requestFN(
+        '/fireRecord/getInfo',
+        {
+          FIRE_CHECK_ID: this.FIRE_CHECK_ID,
+          FIRE_RECORD_ID: this.FIRE_RECORD_ID,
+          CORPINFO_ID: this.getInfo().CORPINFO_ID
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.form = data.res// copy obj
+        this.varList = data.varList
+        if (data.otherHiddenList !== null) {
+          this.otherHiddenList = data.otherHiddenList
+        }
+
+        // 隐患待添加
+      }).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>
diff --git a/src/views/firefighting/fireUtilReport/components/recordList.vue b/src/views/firefighting/fireUtilReport/components/recordList.vue
new file mode 100644
index 0000000..c10fe85
--- /dev/null
+++ b/src/views/firefighting/fireUtilReport/components/recordList.vue
@@ -0,0 +1,233 @@
+<template>
+  <div class="app-container">
+    <el-form label-width="90px">
+      <el-row>
+        <el-col :span="4">
+          <el-form-item label="清单名称">
+            <el-input v-model="KEYWORDS" placeholder="请输入关键字" class="filter-item" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="检查日期">
+            <el-date-picker
+              :default-time="['00:00:00', '23:59:59']"
+              v-model="dates"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+        <!--        <el-col :span="4">-->
+        <!--          <el-form-item label="检查状态">-->
+        <!--            <el-select v-model="STATUS" placeholder="请选择">-->
+        <!--              <el-option v-for="item in statusList" :key="item.ID" :label="item.NAME" :value="item.ID" />-->
+        <!--            </el-select>-->
+        <!--          </el-form-item>-->
+        <!--        </el-col>-->
+        <el-col :span="4">
+          <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" :row-key="getRowKey" :data="varList" border tooltip-effect="dark" style="width: 100%">
+        <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column prop="FIRE_CHECK_STANDARD_NAME" label="清单名称"/>
+        <el-table-column prop="USER_NAME" label="检查人" width="90" align="center" show-overflow-tooltip />
+        <el-table-column prop="CHECK_TIME" label="检查时间" />
+        <el-table-column label="检查周期">
+          <template slot-scope="{row}">
+            <template v-if="row.PERIODSTART && row.PERIODEND">
+              {{ row.PERIODSTART }}-{{ row.PERIODEND }}
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column prop="qdlx" label="检查状态" width="120" align="center">
+          <template slot-scope="{row}">
+            <template v-if="row.FINISHED===1">
+              已检查
+            </template>
+            <template v-else>
+              未检查
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column prop="" label="操作" width="240" align="center">
+          <template slot-scope="{row}">
+            <template v-if="row.FINISHED === 1">
+              <el-button type="primary" icon="el-icon-tickets" size="mini" @click="goCheck(row,row.FIRE_CHECK_ID,row.FIRE_RECORD_ID)" >检查记录</el-button>
+              <el-button v-show="del" type="danger" icon="el-icon-delete" size="mini" @click="delById(row.FIRE_RECORD_ID)">删除</el-button>
+            </template>
+            <template v-else>
+              <el-button type="success" icon="el-icon-edit" size="mini" @click="goRecording(row,row.PERIODSTART,row.PERIODEND)">补录</el-button>
+            </template>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="ui-foot" style="width:100%">
+        <el-button plain type="info" @click="back">返 回</el-button>
+      </div>
+      <div class="page-btn-group">
+        <div/>
+        <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination'
+import { requestFN } from '@/utils/request'
+
+import waves from '@/directive/waves' // waves directive
+export default {
+  components: { Pagination },
+
+  directives: { waves },
+  data() {
+    return {
+      listLoading: true,
+      add: false,
+      del: false,
+      edit: false,
+      listQuery: {
+        page: 1,
+        limit: 20
+      },
+      dates: [],
+      total: 0,
+      KEYWORDS: '',
+      varList: [],
+      pd: [],
+      STARTTIME: '',
+      ENDTIME: '',
+      statusList: [
+        { 'ID': '1', 'NAME': '已检查' },
+        { 'ID': '0', 'NAME': '超期未检查' }
+      ],
+      STATUS: '',
+      ls: {}
+    }
+  },
+  created() {
+    this.getList()
+    this.hasButton()
+  },
+  methods: {
+    getRowKey(row) {
+      return row.CHECKRECORD_ID
+    },
+    // 搜索
+    getQuery() {
+      this.$refs.multipleTable.clearSelection()
+      this.getList()
+    },
+    // 获取列表
+    getList() {
+      this.listLoading = true
+      requestFN(
+        '/fireRecord/getRecordListById?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          STARTTIME: this.dates[0],
+          ENDTIME: this.dates[1],
+          FIRE_CHECK_ID: this.$parent.FIRE_CHECK_ID,
+          KEYWORDS: this.KEYWORDS,
+          STATUS: this.STATUS
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.varList
+        this.total = data.page.totalResult
+        // this.hasButton()
+        this.ls = data.ls
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    goKeyReset() {
+      this.KEYWORDS = ''
+      this.STATUS = ''
+      this.dates = []
+      this.$refs.multipleTable.clearSelection()
+      this.getList()
+    },
+    goRecording(row, startTime, endTime) {
+      this.$parent.row = row
+      this.$parent.activeName = 'Recording'
+      this.$parent.startTime = startTime
+      this.$parent.endTime = endTime
+      this.$parent.FIRE_CHECK_ID = row.FIRE_CHECK_ID
+      this.$parent.FIRE_RECORD_ID = row.FIRE_RECORD_ID
+    },
+    // 删除记录
+    delById(FIRE_RECORD_ID) {
+      this.$confirm('确定要删除吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.listLoading = true
+        requestFN(
+          'fireRecord/delByIds',
+          {
+            FIRE_RECORD_ID: FIRE_RECORD_ID
+          }
+        ).then((data) => {
+          this.listLoading = false
+          this.$message({
+            message: '删除成功',
+            type: 'success'
+          })
+          this.getList()
+        }).catch((e) => {
+          this.listLoading = false
+        })
+      })
+    },
+    // 检查记录
+    goCheck(row, id, FIRE_RECORD_ID) {
+      this.$parent.FIRE_CHECK_ID = id
+      this.$parent.FIRE_RECORD_ID = FIRE_RECORD_ID
+      this.$parent.SHOW_OR_EDIT = 'SHOW'
+      this.$parent.row = row
+      this.$parent.activeName = 'RecordInfo'
+    },
+    // 返回
+    back() {
+      this.$parent.activeName = 'List'
+    },
+    hasButton: function() {
+      var keys = 'checkrecord:add,checkrecord:del,checkrecord:edit,toExcel'
+      requestFN(
+        '/head/hasButton',
+        {
+          keys: keys
+        }
+      ).then((data) => {
+        this.add = data.checkrecordfhadminadd		// 新增权限
+        this.del = data.checkrecordfhadmindel		// 删除权限
+        this.edit = data.checkrecordfhadminedit	// 修改权限
+        this.toExcel = data.toExcel // 导出到excel权限
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    }
+  }
+
+}
+</script>
+
+<style>
+</style>
diff --git a/src/views/firefighting/fireUtilReport/components/recording.vue b/src/views/firefighting/fireUtilReport/components/recording.vue
new file mode 100644
index 0000000..b929e28
--- /dev/null
+++ b/src/views/firefighting/fireUtilReport/components/recording.vue
@@ -0,0 +1,1971 @@
+<template>
+  <div>
+    <div class="app-container">
+      <div class="level-title">
+        <h1>点位检查表基础信息</h1>
+      </div>
+      <div class="mb-20">
+        <table class="table-ui">
+          <tr>
+            <td class="tbg">点检表名称</td>
+            <td>{{ form.FIRE_CHECK_STANDARD_NAME }}</td>
+            <td class="tbg">设备编号</td>
+            <td>{{ form.FIRE_DEVICE_CODE }}</td>
+          </tr>
+          <tr>
+            <td class="tbg">所属区域</td>
+            <td>{{ form.FIRE_REGION_NAME }}</td>
+            <td class="tbg">区域编号</td>
+            <td>{{ form.FIRE_REGION_CODE }}</td>
+          </tr>
+          <tr>
+            <td class="tbg">所属点位</td>
+            <td>{{ form.FIRE_POINT_NAME }}</td>
+            <td class="tbg">点位编号</td>
+            <td>{{ form.FIRE_POINT_CODE }}</td>
+          </tr>
+          <tr>
+            <td class="tbg">所属部门</td>
+            <td>{{ form.DEPARTMENTNAME }}</td>
+            <td class="tbg">所属岗位</td>
+            <td>{{ form.POSTNAME }}</td>
+          </tr>
+          <tr>
+            <td class="tbg">排查周期</td>
+            <td>{{ form.FIRE_CHECK_TYPE_NAME }}</td>
+            <td class="tbg">责任人</td>
+            <td>{{ form.USERNAME }}</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>
+          <tr v-for="(data,index) in varList" :key="index">
+            <td align="center">{{ index+1 }}</td>
+            <td>{{ data.FIRE_REGION_NAME }}</td>
+            <td>{{ data.FIRE_POINT_NAME }}</td>
+            <td>{{ data.FIRE_DEVICE_CODE }}</td>
+            <td>{{ data.FIRE_CHECK_STANDARD_ITEM }}</td>
+            <td>
+              <template>
+                <el-radio-group :disabled="data.HASHIDDEN === 1" v-model="data.ISNORMAL">
+                  <el-radio :label="0" @click.native.prevent="qualified(index,0,data.HASHIDDEN)">合格</el-radio>
+                  <el-radio :label="1" @click.native.prevent="unqualified(index,1,data.HASHIDDEN)">不合格</el-radio>
+                  <el-radio :label="2" @click.native.prevent="notinvolved(index,2,data.HASHIDDEN )">不涉及</el-radio>
+                </el-radio-group>
+              </template>
+            </td>
+          </tr>
+        </table>
+      </div>
+      <div class="level-title">
+        <h1>其他隐患</h1>
+        <div class="level-btns">
+          <el-button type="success" size="mini" @click="editOtherHidden('')">
+            添加
+          </el-button>
+        </div>
+      </div>
+      <div class="mb-20">
+        <table class="table-ui">
+          <tr>
+            <th width="55" style="text-align:center">序号</th>
+            <th>隐患描述</th>
+            <th width="200">操作</th>
+          </tr>
+          <template v-if="otherHiddenList.length !== 0">
+            <tr v-for="(data,index) in otherHiddenList" :key="index">
+              <td align="center">{{ index+1 }}</td>
+              <td>{{ data.HIDDENDESCR }}</td>
+              <td>
+                <el-button type="primary" icon="el-icon-edit" size="mini" @click="editOtherHidden(data.HIDDEN_ID)">修改</el-button>
+                <el-button type="danger" icon="el-icon-delete" size="mini" @click="removeOtherHidden(data.HIDDEN_ID)">删除</el-button>
+              </td>
+            </tr>
+          </template>
+          <template v-else>
+            <tr>
+              <td colspan="3" style="text-align: center">暂无数据</td>
+            </tr>
+          </template>
+        </table>
+      </div>
+      <div class="mb-20">
+        <table class="table-ui">
+          <tr>
+            <td class="tbg">检查时间</td>
+            <td colspan="4">
+              <el-date-picker :picker-options="pickerTime" v-model="pd.CHECK_TIME" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" style="width: 100%" type="datetime" placeholder="这里输入检查时间" />
+            </td>
+          </tr>
+          <tr>
+            <td class="tbg">检查部门</td>
+            <td>
+              <SelectTree
+                ref="deptTree"
+                :clearable="false"
+                :options="treeData"
+                :props="defaultProps"
+                v-model="pd.DEPARTMENT_ID"
+                placeholder="请选择检查部门"
+              />
+            </td>
+            <td class="tbg">检查人</td>
+            <td>
+              <el-select v-model="pd.USER_ID" placeholder="请选择">
+                <el-option v-for="item in userList" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID" />
+              </el-select>
+            </td>
+            <td style="width: 90px; text-align: center;">
+              <el-button type="primary" @click="addOther">添加</el-button>
+            </td>
+          </tr>
+          <tr v-for="(data,index) in other" :key="index">
+            <td class="tbg">检查部门</td>
+            <td>
+              <SelectTree
+                ref="'deptTree'+index"
+                :clearable="false"
+                :options="treeData"
+                :props="defaultProps"
+                v-model="data.DEPARTMENT_ID"
+                placeholder="请选择整改部门"
+                @change="updateOtherDep(data.DEPARTMENT_ID,index)"
+              />
+            </td>
+            <td class="tbg">检查人</td>
+            <td>
+              <el-select v-model="data.USER_ID" placeholder="请选择">
+                <el-option v-for="item in otherUserList[index]" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID" />
+              </el-select>
+            </td>
+            <td style="width: 90px; text-align: center;">
+              <el-button type="primary" @click="removeOther(index)">删除</el-button>
+            </td>
+          </tr>
+          <tr>
+            <td class="tbg">补录原因</td>
+            <td colspan="4">
+              <el-input id="REASON" ref="REASON" :rows="3" v-model="pd.REASON" type="textarea" />
+            </td>
+          </tr>
+          <tr>
+            <td class="tbg">备注</td>
+            <td colspan="4">
+              <el-input id="DESCR" ref="DESCR" :rows="3" v-model="pd.DESCR" type="textarea" />
+            </td>
+          </tr>
+        </table>
+      </div>
+    </div>
+    <div class="ui-height" />
+    <div class="ui-foot">
+      <el-button type="primary" @click="save">保 存</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>
+                    <el-tooltip class="item" effect="dark" content="删除" placement="top">
+                      <span class="Delete" @click="delQualifiedImg(index)"><i class="el-icon-delete" /></span>
+                    </el-tooltip>
+                  </div>
+                </div>
+                <el-upload ref="qualifiedUpload" :on-preview="handlePictureCardPreview" :before-upload="quBeforeUpload" :auto-upload="false" class="avatar-uploader" action="#" accept=".jpg,.jpeg,.png" list-type="picture-card">
+                  <i class="el-icon-plus" />
+                </el-upload>
+              </div>
+              <el-dialog :visible.sync="dialogVisible">
+                <img :src="dialogImageUrl" width="100%" alt="">
+              </el-dialog>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogImgVisible = false">取 消</el-button>
+        <el-button type="primary" @click="saveQualifiedImg">确 定</el-button>
+      </div>
+    </el-dialog>
+    <!--  添加隐患  -->
+    <el-dialog v-loading="addLoading" :visible.sync="dialogFormVisible" :title="editVector">
+      <el-form v-if="dialogFormVisible" ref="hiddenForm" :rules="hiddenRules" :model="hiddenForm" label-width="140px" style="padding:0 20px">
+        <el-row v-if="hiddenFlag =='1'">
+          <el-col :span="24">
+            <el-form-item label="检查内容：">
+              <el-input v-model="listCheckItem.CHECK_CONTENT" disabled placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="隐患描述：" prop="HIDDENDESCR">
+              <el-input v-model="hiddenForm.HIDDENDESCR" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="隐患位置描述：" prop="POSITIONDESC">
+              <el-input v-model="hiddenForm.POSITIONDESC" placeholder="请输入内容" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="是否相关方：" prop="ISRELEVANT">
+              <el-radio v-model="hiddenForm.ISRELEVANT" label="1" value="1" >是</el-radio>
+              <el-radio v-model="hiddenForm.ISRELEVANT" label="2" value="2" >否</el-radio>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="隐患部位：" prop="HIDDENPART">
+              <el-input v-if="hiddenPartType =='value'" v-model="hiddenForm.HIDDENPART" style="width: 90%;" placeholder="请输入内容" />
+              <SelectTree
+                v-if="hiddenPartType =='select'"
+                ref="deptTree_Select1"
+                :clearable="false"
+                :options="hiddenPartList"
+                :props="defaultProps"
+                v-model="hiddenForm.HIDDENPART"
+                style="width: 90%;"
+                allow-create
+                placeholder="请选择" />
+              <el-button class="ml5" @click="hiddenPartTypeBtn">{{ hiddenPartType === 'select' ? '输入' : '选择' }}</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="隐患级别：" prop="HIDDENLEVEL">
+              <SelectTree
+                ref="deptTree_Select2"
+                :clearable="false"
+                :options="hiddenlevelList"
+                :props="defaultProps"
+                v-model="hiddenForm.HIDDENLEVEL"
+                :canparent="false"
+                style="width: 100%;"
+                children-name="nodes"
+                placeholder="请选择" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="隐患类型：" prop="HIDDENTYPE">
+              <SelectTree
+                ref="deptTree_Select3"
+                :clearable="false"
+                :options="hiddenTypeList"
+                :props="defaultProps"
+                v-model="hiddenForm.HIDDENTYPE"
+                :canparent="false"
+                children-name="nodes"
+                style="width: 100%;"
+                placeholder="请选择" />
+            </el-form-item>
+          </el-col>
+          <!--<el-col :span="12">
+            <el-form-item label="隐患类型2：" prop="HIDDENTYPE">
+              <SelectTree
+                ref="deptTree_Select4"
+                :clearable="false"
+                :options="hiddenType2List"
+                :props="defaultProps"
+                v-model="hiddenForm.HIDDENTYPE2"
+                :canparent="false"
+                children-name="nodes"
+                style="width: 100%;"
+                placeholder="请选择" />
+            </el-form-item>
+          </el-col>-->
+        </el-row>
+        <el-row>
+          <el-form-item label="隐患位置" prop="LONGITUDE" >
+            <el-row>
+              <el-col :span="5" style="padding-right: 2px">
+                <el-input
+                  id="LONGITUDE"
+                  ref="LONGITUDE"
+                  v-model="hiddenForm.LONGITUDE"
+                  :readonly="true"
+                  maxlength="255"
+                  placeholder="这里选择隐患经度..."
+                  title="隐患位置经度"
+                  @focus="chooseMap" />
+              </el-col>
+              <el-col :span="5" style="padding-left: 2px">
+                <el-input
+                  id="LATITUDE"
+                  ref="LATITUDE"
+                  v-model="hiddenForm.LATITUDE"
+                  :readonly="true"
+                  maxlength="255"
+                  placeholder="这里选择隐患位置纬度..."
+                  title="隐患位置经度"
+                  @focus="chooseMap" />
+              </el-col>
+              <el-col :span="4">
+                <el-button type="primary" icon="el-icon-add-location" style="margin-left:10px; " plain @click="chooseMap">位置定位</el-button>
+              </el-col>
+            </el-row>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="隐患图片：" class="is-required">
+              <div class="disContent">
+                <div v-for="(item, index) in hiddenImgs" :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="hiddenImgs">
+                          <img :src="config.fileUrl + item.FILEPATH" alt="" class="yuLanImg">
+                        </viewer>
+                      </span>
+                    </el-tooltip>
+                    <el-tooltip class="item" effect="dark" content="删除" placement="top">
+                      <span class="Delete" @click="delHiddenImg(index)"><i class="el-icon-delete" /></span>
+                    </el-tooltip>
+                  </div>
+                </div>
+                <el-upload
+                  ref="hiddenUpload"
+                  :on-preview="handlePictureCardPreview"
+                  :before-upload="hiddenBeforeUpload"
+                  :on-change="handleChangeIMG"
+                  :on-remove="hiddenRemove"
+                  :auto-upload="false"
+                  :limit="4"
+                  :class="{hide:hiddenPicture}"
+                  class="avatar-uploader"
+                  action="#"
+                  multiple
+                  accept=".jpg,.jpeg,.png"
+                  list-type="picture-card">
+                  <i class="el-icon-plus" />
+                </el-upload>
+              </div>
+              <span class="red-tip">* 最多只能上传四张图片</span>
+              <el-dialog :visible.sync="dialogVisible" append-to-body>
+                <img :src="dialogImageUrl" width="100%" alt="">
+              </el-dialog>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="隐患视频：">
+              <el-upload
+                ref="videoUpload"
+                :on-remove="handleRemoveVideo"
+                :on-error="handleUploadVideoError"
+                :on-exceed="handleUploadVideoExceed"
+                :before-upload="beforeVideoFileUpload"
+                :file-list="fileList"
+                :limit="1"
+                accept=".mp4"
+                class="upload-demo"
+                action="#"
+                multiple>
+                <div>
+                  <el-button size="small" type="primary" style="width:110px">点击上传</el-button>
+                  <span class="red-tip">* 只能上传mp4文件.最大上传50M</span>
+                </div>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="隐患处置：">
+              <el-radio-group v-model="hiddenForm.RECTIFICATIONTYPE">
+                <el-radio v-if="hiddenForm.HIDDENLEVEL !='jdyh001' && hiddenForm.HIDDENLEVEL !='hiddenLevel2002'" v-model="hiddenForm.RECTIFICATIONTYPE" label="1">立即整改</el-radio>
+                <el-radio v-model="hiddenForm.RECTIFICATIONTYPE" label="2">限期整改</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row class="form-group input-group-sm">
+          <el-col :span="11">
+            <el-form-item label="隐患发现部门：">
+              <el-input v-model="myUserInfo.DEPARTMENTName" :disabled="true" placeholder="请输入内容"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item label="隐患发现人：">
+              <el-input v-model="myUserInfo.USERNAME" :disabled="true" placeholder="请输入内容"/>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="hiddenForm.HIDDENLEVEL !='jdyh001' && hiddenForm.HIDDENLEVEL !='hiddenLevel2002'" :span="2">
+            <el-form-item label-width="0px">
+              <el-button type="primary" style="margin-left:15px" @click="addFindOther">添加</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-for="(data,index) in findCreatorList" :key="index" class="form-group input-group-sm">
+          <el-col :span="11">
+            <el-form-item label="隐患发现部门：">
+              <SelectTree
+                ref="'deptTree'+index"
+                :clearable="false"
+                :options="treeData"
+                :props="defaultProps"
+                v-model="data.DEPARTMENT_ID"
+                style="width: 100%;"
+                placeholder="请选择隐患发现部门"
+                @change="updateFindOtherDep(data.DEPARTMENT_ID,index)"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item label="隐患发现人：">
+              <el-select v-model="data.USER_ID" style="width: 100%;" clearable placeholder="请选择隐患发现人" @visible-change="$forceUpdate()">
+                <el-option v-for="item in findUserList[index]" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="2">
+            <el-form-item label-width="0px">
+              <el-button type="danger" style="margin-left:15px" @click="remoFindOther">删除</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="隐患发现时间：">
+              <el-date-picker
+                v-model="hiddenForm.DISCOVERYTIME"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                format="yyyy-MM-dd HH:mm:ss"
+                style="width: 100%"
+                placeholder="选择日期"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row class="form-group input-group-sm">
+          <el-col :span="12">
+            <el-form-item v-if="hiddenForm.HIDDENLEVEL !='jdyh001' && hiddenForm.HIDDENLEVEL !='hiddenLevel2002'" label="隐患确认人：" prop="CONFIRM_USER">
+              <el-select v-model="hiddenForm.CONFIRM_USER" style="width: 100%;" clearable placeholder="请选择隐患发现人" @visible-change="$forceUpdate()">
+                <el-option v-for="item in confirmUserList" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item v-if="hiddenForm.RECTIFICATIONTYPE==1" :prop="hiddenForm.RECTIFICATIONTYPE==1?'RECTIFYDESCR':''" label="整改描述">
+              <el-input v-model="hiddenForm.RECTIFYDESCR" placeholder="这里输入整改描述..." />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item v-if="hiddenForm.RECTIFICATIONTYPE==1" label="整改后图片" class="is-required">
+              <div class="disContent">
+                <div v-for="(item, index) in rectifyImgs" :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="rectifyImgs">
+                          <img :src="config.fileUrl + item.FILEPATH" alt="" class="yuLanImg">
+                        </viewer>
+                      </span>
+                    </el-tooltip>
+                    <el-tooltip class="item" effect="dark" content="删除" placement="top">
+                      <span class="Delete" @click="delRectifyImg(index)"><i class="el-icon-delete" /></span>
+                    </el-tooltip>
+                  </div>
+                </div>
+                <el-upload
+                  ref="rectifyUpload"
+                  :on-preview="handlePictureCardPreview"
+                  :before-upload="rectifyBeforeUpload"
+                  :auto-upload="false"
+                  class="avatar-uploader"
+                  action="#"
+                  accept=".jpg,.jpeg,.png"
+                  list-type="picture-card">
+                  <i class="el-icon-plus" />
+                </el-upload>
+              </div>
+              <el-dialog :visible.sync="dialogVisible" append-to-body>
+                <img :src="dialogImageUrl" width="100%" alt="">
+              </el-dialog>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <el-form-item v-if="hiddenForm.RECTIFICATIONTYPE==2 && hiddenForm.HIDDENLEVEL !='jdyh001' && hiddenForm.HIDDENLEVEL !='hiddenLevel2002'" :prop="hiddenForm.RECTIFICATIONTYPE==2?'RECTIFICATIONDEADLINE':''" label="整改期限">
+              <el-date-picker v-model="hiddenForm.RECTIFICATIONDEADLINE" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 100%" type="date" placeholder="这里输入整改期限" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item v-if="hiddenForm.RECTIFICATIONTYPE==2 && hiddenForm.HIDDENLEVEL !='jdyh001' && hiddenForm.HIDDENLEVEL !='hiddenLevel2002'" :prop="hiddenForm.RECTIFICATIONTYPE==2?'DEPARTMENT_ID':''" label="整改部门">
+              <SelectTree
+                ref="rectifyDeptTree"
+                :clearable="false"
+                :options="treeData"
+                :props="defaultProps"
+                v-model="hiddenForm.DEPARTMENT_ID"
+                style="width: 100%;"
+                placeholder="请选择整改部门"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item v-if="hiddenForm.RECTIFICATIONTYPE==2 && hiddenForm.HIDDENLEVEL !='jdyh001' && hiddenForm.HIDDENLEVEL !='hiddenLevel2002'" :prop="hiddenForm.RECTIFICATIONTYPE==2?'RECTIFICATIONOR':''" label="整改人">
+              <el-select v-model="hiddenForm.RECTIFICATIONOR" style="width: 100%;" clearable placeholder="请选择">
+                <el-option v-for="item in rectifyUserList" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+        <el-button v-loading.fullscreen.lock="addLoading" v-if="hiddenFlag=='1'" type="primary" @click="saveHidden">确 定</el-button>
+        <el-button v-loading.fullscreen.lock="addLoading" v-else-if="hiddenFlag=='2'" type="primary" @click="saveOtherHidden">确 定</el-button>
+      </div>
+    </el-dialog>
+    <baidu-map visible="false"/>
+    <el-dialog :visible.sync="dialogMap" :title="'确认隐患位置'" width="80%">
+      <div>
+        <iframe :src="iframeSrc" frameborder="0" allowtransparency="true" width="100%" height="600"/>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination'
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves'
+import SelectTree from '@/components/SelectTree'
+import { upload } from '@/utils/upload'
+export default {
+  components: { Pagination, SelectTree },
+  directives: { waves },
+  data() {
+    return {
+      config: config,
+      FIRE_RECORD_ID: '',
+      qianming: '',
+      FIRE_CHECK_ID: '',
+      permission: '',
+      LISTMANAGER_ID: '',	// 主键ID
+      pd: {
+        CHECK_TIME: '',
+        DEPARTMENT_ID: '',
+        USER_ID: '',
+        REASON: '',
+        DESCR: ''
+      },						// 存放字段参数
+      BMap: '',
+      hiddenForm: {
+        HIDDENDESCR: '',
+        HIDDENPART: '',
+        RECTIFYDESCR: '',
+        RECTIFICATIONDEADLINE: '',
+        RECTIFICATIONTYPE: '2',
+        RECTIFICATIONOR: '',
+        HIDDENLEVEL: '',
+        DEPARTMENT_ID: '',
+        SOURCE: '6',
+        HAVESCHEME: 0,
+        HIDDENTYPE: '',
+        confirmDept: '',
+        CONFIRM_USER: '',
+        POSITIONDESC: '',
+        ISRELEVANT: '2'
+      },
+      startTime: '',
+      endTime: '',
+      //  时间选择范围限制
+      pickerTime: {
+        disabledDate: time => {
+          return this.updatedPickerOptions(time)
+        }
+      },
+      varList: [],
+      hiddens: [],
+      now: '',
+      LONGITUDE: '',
+      LATITUDE: '',
+      other: [], // 其他验收人员
+      otherUserList: [],
+      userList: [],
+      rectifyUserList: [],
+      defaultNodes: [],
+      otherHiddenList: [],
+      otherHiddenIdsList: [],
+      USER_ID: '', // 当前登陆用户ID
+      DEPARTMENT_ID: '', // 当前登陆用户部门ID
+      form: {},
+      imgForm: {},
+      dialogFormVisible: false,
+      radio: '1',
+      textarea: '',
+      input: '',
+      dialogImageUrl: '',
+      dialogVisible: false,
+      dialogImgVisible: false,
+      treeData: [],
+      defaultProps: {
+        value: 'id',
+        children: 'nodes',
+        label: 'name'
+      },
+      disabled: false,
+      qualifiedImgs: [], // 合格检查项照片
+      qualifiedFiles: [],
+      hiddenImgs: [], // 隐患照片
+      hiddenFiles: [],
+      rectifyImgs: [], // 整改照片
+      rectifyFiles: [],
+      RECORDITEM_ID: '', // 当前正在操作的记录检查项ID（操作合格与不合格时使用）
+      listCheckItem: {}, // 当前正在操作的检查项 （操作不合格隐患时使用）
+      itemIndex: {}, // 当前正在操作的检查项序号 （操作不合格隐患时使用） 归档申请
+      hiddenRules: {
+        HIDDENDESCR: [{ required: true, message: '隐患描述不能为空', trigger: 'blur' }],
+        // HIDDENPART: [{ required: true, message: '隐患部位不能为空', trigger: 'blur' }],
+        HIDDENLEVEL: [{ required: true, message: '隐患级别不能为空', trigger: 'blur' }],
+        // RECTIFICATIONDEADLINE: [{ required: true, message: '整改期限不能为空', trigger: 'blur' }],
+        // DEPARTMENT_ID: [{ required: true, message: '整改部门不能为空', trigger: 'blur' }],
+        // RECTIFICATIONOR: [{ required: true, message: '整改人不能为空', trigger: 'blur' }],
+        RECTIFYDESCR: [{ required: true, message: '整改描述不能为空', trigger: 'blur' }],
+        HIDDENTYPE: [{ required: true, message: '整改类型不能为空', trigger: 'blur' }],
+        DISCOVERYTIME: [{ required: true, message: '隐患发现时间不能为空', trigger: 'blur' }],
+        CONFIRM_USER: [{ required: true, message: '隐患确认人部门不能为空', trigger: 'blur' }],
+        confirmDept: [{ required: true, message: '隐患确认人不能为空', trigger: 'blur' }],
+        // POSITIONDESC: [{ required: true, message: '隐患位置描述不能为空', trigger: 'blur' }],
+        ISRELEVANT: [{ required: true, message: '是否相关方不能为空', trigger: 'blur' }]
+      },
+      HIDDEN_ID: '',
+      hiddenDialogType: '',
+      hiddenlevelList: [],
+      isClearRectificationor: true, // 是否清空整改人
+      isClearConfirmUser: true,
+      hiddenFlag: '', // 添加隐患类型 1-不合格隐患  2 其他隐患
+      hiddenTypeList: [],
+      hiddenType2List: [],
+      hiddenPartList: [],
+      hiddenPartType: 'select',
+      fileList: [], // 隐患文件
+      hiddenPicture: false,
+      props: { value: 'BIANMA', label: 'NAME', children: 'children' },
+      myUserInfo: {},
+      findCreatorList: [],
+      findUserList: [], // 隐患发现人，根据部门显示人员
+      confirmUserList: [], // 隐患确认人
+      iframeSrc: '',
+      dialogMap: false,
+      expireTimeOPtion: {
+        disabledDate(time) {
+          return time.getTime() > Date.now() // 如果没有后面的-8.64e7就是不可以选择今天的
+        }
+      },
+      editVector: '添加隐患',
+      addLoading: false
+    }
+  },
+  watch: {
+
+    'pd.DEPARTMENT_ID': {
+      handler(newVal, oldVal) {
+        if (oldVal != null && oldVal != '') {
+          this.pd.USER_ID = ''
+        }
+        this.getUserList(newVal)
+      },
+      immediate: false
+    },
+    'hiddenForm.DEPARTMENT_ID': {
+      handler: function(newVal, oldVal) {
+        if (this.isClearRectificationor) {
+          this.hiddenForm.RECTIFICATIONOR = ''
+        }
+        this.getReUserList(newVal)
+        this.isClearRectificationor = true
+      }
+    },
+
+    'hiddenForm.RECTIFICATIONTYPE': {
+      handler: function() {
+        if (this.hiddenForm.RECTIFICATIONTYPE == 2) {
+          this.hiddenRules.RECTIFYDESCR = [{ required: false, message: '整改描述不能为空', trigger: 'blur' }]
+          this.$refs['hiddenForm'].validateField('RECTIFYDESCR')
+          // this.hiddenRules.RECTIFICATIONDEADLINE = [{ required: true, message: '整改期限不能为空', trigger: 'blur' }]
+          // this.hiddenRules.DEPARTMENT_ID = [{ required: true, message: '整改部门不能为空', trigger: 'blur' }]
+          // this.hiddenRules.RECTIFICATIONOR = [{ required: true, message: '整改人不能为空', trigger: 'blur' }]
+        } else if (this.hiddenForm.RECTIFICATIONTYPE == 1) {
+          // this.hiddenRules.RECTIFICATIONDEADLINE = [{ required: false, message: '整改期限不能为空', trigger: 'blur' }]
+          // this.$refs['hiddenForm'].validateField('RECTIFICATIONDEADLINE')
+          // this.hiddenRules.DEPARTMENT_ID = [{ required: false, message: '整改部门不能为空', trigger: 'blur' }]
+          // this.$refs['hiddenForm'].validateField('DEPARTMENT_ID')
+          // this.hiddenRules.RECTIFICATIONOR = [{ required: false, message: '整改人不能为空', trigger: 'blur' }]
+          this.$refs['hiddenForm'].validateField('RECTIFICATIONOR')
+          this.hiddenRules.RECTIFYDESCR = [{ required: true, message: '整改描述不能为空', trigger: 'blur' }]
+        }
+      }
+    }
+
+  },
+  async created() {
+    await this.getTreeList()
+    this.startTime = new Date(this.$parent.startTime).getTime()
+    this.endTime = new Date(this.$parent.endTime).getTime()
+    this.FIRE_RECORD_ID = this.$parent.FIRE_RECORD_ID
+    this.FIRE_CHECK_ID = this.$parent.FIRE_CHECK_ID
+    this.DEPARTMENT_ID = JSON.parse(sessionStorage.getItem('user')).DEPARTMENT_ID
+    if (JSON.parse(sessionStorage.getItem('user')).ISMAIN != '1') {
+      this.pd.USER_ID = JSON.parse(sessionStorage.getItem('user')).USER_ID
+    }
+    const node = {}
+    node.id = this.DEPARTMENT_ID
+    this.newHiddenForm = JSON.parse(JSON.stringify(this.hiddenForm))
+    this.$refs.deptTree.clearHandle()
+    this.$nextTick(() => { // 此处使用这个可以等节点渲染后再获取节点
+      this.$refs.deptTree.handleNodeClick(node)
+    })
+
+    this.getData()
+    this.getDict()
+    // this.getOtherHidden()
+  },
+  mounted() {
+    const that = this
+    window.addEventListener('message', function(e) {
+      that.hiddenForm.LONGITUDE = e.data.LONGITUDE
+      that.hiddenForm.LATITUDE = e.data.LATITUDE
+      that.dialogMap = false
+    })
+  },
+  methods: {
+    updatedPickerOptions(time) {
+      return time.getTime() > this.endTime || time.getTime() < this.startTime
+    },
+    save() {
+      var _this = this
+      if (this.pd.CHECK_TIME == null || this.pd.CHECK_TIME == '') {
+        this.$message({
+          message: '请选择检查时间',
+          type: 'error'
+        })
+        return false
+      }
+      if (this.pd.REASON == null || this.pd.REASON == '') {
+        this.$message({
+          message: '请填写补录原因',
+          type: 'error'
+        })
+        return false
+      }
+      if (this.pd.DEPARTMENT_ID == null || this.pd.DEPARTMENT_ID == '') {
+        this.$message({
+          message: '请选择检查部门',
+          type: 'error'
+        })
+        return false
+      }
+      if (this.pd.USER_ID == null || this.pd.USER_ID == '') {
+        this.$message({
+          message: '请选择检查人',
+          type: 'error'
+        })
+        return false
+      }
+      for (var i in _this.other) {
+        if (this.pd.USER_ID == _this.other[i].USER_ID) {
+          this.$message({
+            message: '检查人不能为同一人',
+            type: 'error'
+          })
+          return false
+        }
+      }
+      var items = []
+      var ids = []
+      for (let i = 0; i < this.varList.length; i++) {
+        var item = {}
+        item.LISTCHECKITEM_ID = this.varList[i].FIRE_CHECK_ID
+        item.ISNORMAL = this.varList[i].ISNORMAL
+        item.RECORDITEM_ID = this.varList[i].EQUIPMENT_RECORD_ID
+        items.push(item)
+      }
+      for (var j = 0; j < this.hiddens.length; j++) {
+        ids.push(this.hiddens[j].HIDDEN_ID)
+      }
+      this.permission = this.otherHiddenIdsList.join(',')
+      requestFN(
+        '/fireRecord/supplementaryRecords',
+        {
+          RECORDDEVICELIST: JSON.stringify(this.varList),
+          FIRE_CHECK_ID: this.FIRE_CHECK_ID,
+          FIRE_RECORD_ID: this.FIRE_RECORD_ID,
+          CHECK_USERS: this.pd.USER_ID,
+          DEPARTMENT_ID: this.pd.DEPARTMENT_ID,
+          CHECK_TIME: this.pd.CHECK_TIME,
+          REMAKE: this.pd.DESCR,
+          REASON: this.pd.REASON,
+          OTHERUSERLIST: JSON.stringify(this.otherUserList),
+          HIDDENIDLIST: this.permission
+        }
+      ).then((data) => {
+        this.$message({
+          message: '操作成功',
+          type: 'success'
+        })
+        this.back()
+      }).catch((e) => {
+        this.$message({
+          message: '保存失败',
+          type: 'error'
+        })
+      })
+      // eslint-disable-next-line no-undef
+      // var geolocation = new BMap.Geolocation()
+
+      // 调用百度地图api 中的获取当前位置接口
+      // geolocation.getCurrentPosition(function(r) {
+      //   requestFN(
+      //     '/checkrecord/add',
+      //     {
+      //       LISTMANAGER_ID: _this.LISTMANAGER_ID,
+      //       LIST_NAME: _this.form.NAME,
+      //       CHECK_TIME: _this.pd.CHECK_TIME,
+      //       DESCR: _this.pd.DESCR,
+      //       ITEMS: JSON.stringify(items),
+      //       IDS: ids.join(','),
+      //       /* LONGITUDE: r.point.lng,
+      //       LATITUDE: r.point.lat,*/
+      //       CHECKDEPT: _this.DEPARTMENT_ID,
+      //       CHECKOR: _this.pd.USER_ID,
+      //       OTHER: JSON.stringify(_this.other),
+      //
+      //       LONGITUDE: r.point.lng,
+      //       LATITUDE: r.point.lat
+      //
+      //     }
+      //   ).then((data) => {
+      //     _this.$message({
+      //       message: '操作成功',
+      //       type: 'success'
+      //     })
+      //     _this.back()
+      //   }).catch((e) => {
+      //   })
+      // })
+    },
+    back() {
+      this.$parent.activeName = 'List'
+    },
+    // 获取详情
+    getData() {
+      this.listLoading = true
+      requestFN(
+        '/fireCheckList/getInfo',
+        {
+          FIRE_CHECK_ID: this.$parent.FIRE_CHECK_ID
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.form = Object.assign({}, data.checkListInfo) // copy obj
+        // this.varList = data.varList
+        // for (let i = 0; i < data.varList.length; i++) {
+        //   console.log(data.varList[i])
+        //   if (data.varList[i].HASHIDDEN <= 0) {
+        //     data.varList[i].ISNORMAL = 0
+        //   }
+        //   this.varList.push(data.varList[i])
+        // }
+        this.varList = data.checkStandardList
+        console.log(this.varList)
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    // 获取其他隐患
+    // getOtherHidden() {
+    //   this.listLoading = true
+    //   requestFN(
+    //     '/hidden/getOtherHidden',
+    //     {
+    //       LISTMANAGER_ID: this.LISTMANAGER_ID
+    //     }
+    //   ).then((data) => {
+    //     this.otherHiddenList = data.hiddenList
+    //     this.addLoading = false
+    //   }).catch((e) => {
+    //     this.addLoading = false
+    //     this.listLoading = false
+    //   })
+    // },
+    notinvolved(index, type) {
+      this.varList[index].ISNORMAL = type
+    },
+    // 合格上传照片
+    qualified(index, type, istrue) {
+      if (istrue > 0) { // 如果有隐患不弹窗
+        return
+      }
+      this.qualifiedImgs = [] // 合格检查项照片
+      this.qualifiedFiles = []
+      if (this.varList[index].ISNORMAL == 1) {
+        for (var i = 0; i < this.hiddens.length; i++) {
+          if (this.hiddens[i].LISTCHECKITEM_ID == this.varList[index]) {
+            this.hiddens.splice(i, 1)
+          }
+        }
+      } else if (this.varList[index].ISNORMAL == 0) {
+        this.dialogImgVisible = true
+        this.getQualifiedImgs(this.varList[index].EQUIPMENT_RECORD_ID)
+        this.RECORDITEM_ID = this.varList[index].EQUIPMENT_RECORD_ID
+      }
+      this.varList[index].ISNORMAL = type
+    },
+    // 获取合格检查项照片
+    getQualifiedImgs(RECORDITEM_ID) {
+      this.listLoading = true
+      requestFN(
+        '/imgfiles/listImgs',
+        {
+          FOREIGN_KEY: RECORDITEM_ID,
+          TYPE: '14'
+        }
+      ).then((data) => {
+        this.qualifiedImgs = data.imgs
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    // 合格照片提交
+    saveQualifiedImg() {
+      // this.$refs.qualifiedUpload.submit()
+      const loading = this.$loading({
+        lock: true,
+        text: '上传中...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      const formData = new FormData()
+      for (var i = 0; i < this.qualifiedFiles.length; i++) {
+        if (this.qualifiedFiles[i]) {
+          formData.append('FFILE', this.qualifiedFiles[i])
+        }
+      }
+      formData.append('FOREIGN_KEY', this.RECORDITEM_ID)
+      formData.append('TYPE', 14)
+      upload(
+        '/imgfiles/add',
+        formData
+      ).then((data) => {
+        loading.close()
+        this.$message({
+          message: '操作成功',
+          type: 'success'
+        })
+        this.dialogImgVisible = false
+        this.RECORDITEM_ID = ''
+      }).catch((e) => {
+        loading.close()
+        this.$message({
+          message: '检查照片上传失败',
+          type: 'error'
+        })
+      })
+    },
+    // 删除合格检查项照片
+    delQualifiedImg(index) {
+      this.$confirm('确定要删除吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        requestFN(
+          '/imgfiles/delete',
+          {
+            IMGFILES_ID: this.qualifiedImgs[index].IMGFILES_ID
+          }
+        ).then(() => {
+          this.$message({
+            message: '删除成功',
+            type: 'success'
+          })
+          this.qualifiedImgs.splice(index, 1)
+        }).catch((e) => {
+        })
+      }).catch(() => {
+      })
+    },
+
+    // 检查照片上传（合格）
+    quBeforeUpload(file) {
+      const types = ['image/jpeg', 'image/jpg', 'image/png']
+      const isImage = types.includes(file.type)
+      if (!isImage) {
+        this.$message.error('上传图片只能是 JPG、JPEG、PNG 格式!')
+        return false
+      } else {
+        this.qualifiedFiles.push(file)
+      }
+    },
+    // 不合格上传隐患
+    unqualified(index, type, istrue) {
+      if (istrue > 0) { // 如果有隐患不弹窗
+        return
+      }
+      this.hiddenPicture = false
+      this.$refs.videoUpload && this.$refs.videoUpload.clearFiles()
+      if (type == '1') {
+        this.getHiddenReginTreeList()
+        this.getEditMyInfo()
+      }
+      this.hiddenFlag = '1'
+      this.hiddenForm = {
+        HIDDENDESCR: '',
+        HIDDENPART: '',
+        RECTIFYDESCR: '',
+        RECTIFICATIONDEADLINE: '',
+        RECTIFICATIONTYPE: '2',
+        ISRELEVANT: '2',
+        RECTIFICATIONOR: '',
+        HIDDENLEVEL: '',
+        DEPARTMENT_ID: '',
+        SOURCE: '6',
+        HAVESCHEME: 0,
+        HIDDENTYPE: '',
+        DISCOVERYTIME: this.dateformat(new Date(), 'YYYY-MM-DD HH:mm:ss')
+      }
+      this.fileList = []
+      this.listCheckItem = { }
+      this.itemIndex = ''
+
+      this.hiddenImgs = [] // 隐患照片
+      this.hiddenFiles = []
+      this.rectifyImgs = [] // 整改照片
+      this.rectifyFiles = []
+      this.updateConfirmDept()
+      if (this.varList[index].ISNORMAL == 0) {
+        this.HIDDEN_ID = ''
+        this.LISTCHECKITEM_ID = this.varList[index].FIRE_CHECK_ID
+        this.RECORDITEM_ID = this.varList[index].EQUIPMENT_RECORD_ID
+        this.hiddenDialogType = 'add'
+        this.dialogFormVisible = true
+        this.listCheckItem = this.varList[index]
+        this.itemIndex = index
+        if (this.$refs.rectifyDeptTree) {
+          this.$refs.rectifyDeptTree.clearHandle()
+        }
+      } else if (this.varList[index].ISNORMAL == 1) {
+        this.HIDDEN_ID = this.varList[index].HIDDEN_ID
+        this.LISTCHECKITEM_ID = this.varList[index].FIRE_CHECK_ID
+        this.RECORDITEM_ID = this.varList[index].EQUIPMENT_RECORD_ID
+        this.hiddenDialogType = 'edit'
+        this.dialogFormVisible = true
+        this.listCheckItem = this.varList[index]
+        this.itemIndex = index
+        this.getHiddenData()
+      } else if (this.varList[index].ISNORMAL == 2) {
+        this.HIDDEN_ID = ''
+        this.LISTCHECKITEM_ID = this.varList[index].FIRE_CHECK_ID
+        this.RECORDITEM_ID = this.varList[index].EQUIPMENT_RECORD_ID
+        this.hiddenDialogType = 'add'
+        this.dialogFormVisible = true
+        this.listCheckItem = this.varList[index]
+        this.itemIndex = index
+        this.$refs.rectifyDeptTree.clearHandle()
+      }
+      this.varList[index].ISNORMAL = type
+    },
+    // 获取隐患信息
+    getHiddenData() {
+      this.listLoading = true
+      requestFN(
+        '/hidden/goEdit',
+        {
+          HIDDEN_ID: this.HIDDEN_ID
+        }
+      ).then((data) => {
+        /* this.$refs.rectifyDeptTree.clearHandle()
+        this.$refs.deptTree_Select1.clearHandle()
+        this.$refs.deptTree_Select2.clearHandle()
+        this.$refs.deptTree_Select3.clearHandle()
+        this.$refs.deptTree_Select4.clearHandle()*/
+        // this.$refs.deptTree_Select5.clearHandle()
+        if (data.pd.RECTIFICATIONDEPT) {
+          data.pd.DEPARTMENT_ID = data.pd.RECTIFICATIONDEPT
+        }
+        if (data.hImgs.length >= 4) {
+          this.hiddenPicture = true
+        }
+        this.hiddenImgs = data.hImgs
+        this.fileList = data.hiddenVideo
+        this.rectifyImgs = data.rImgs
+        this.$nextTick(() => { // 此处使用这个可以等节点渲染后再获取节点
+          this.hiddenForm = Object.assign({}, data.pd)
+          data.pd.DEPARTMENT_ID = data.pd.RECTIFICATIONDEPT
+          const nodea = {}
+          nodea.id = this.hiddenForm.DEPARTMENT_ID
+          this.isClearRectificationor = false
+          this.isClearConfirmUser = false
+          this.$refs.rectifyDeptTree.handleNodeClick(nodea)
+          this.$refs.deptTree_Select1.handleNodeClick({ id: data.pd.HIDDENPART })
+          this.$refs.deptTree_Select2.handleNodeClick({ id: data.pd.HIDDENLEVEL })
+          this.$refs.deptTree_Select3.handleNodeClick({ id: data.pd.HIDDENTYPE })
+          // this.$refs.deptTree_Select4.handleNodeClick({ id: data.pd.HIDDENTYPE2 })
+          // this.$refs.deptTree_Select5.handleNodeClick({ id: data.pd.confirmDept })
+        })
+        this.addLoading = false
+      }).catch((e) => {
+        this.listLoading = false
+        this.addLoading = false
+      })
+    },
+    // 隐患提交
+    saveHidden() {
+      this.addLoading = true
+      var _this = this
+      if (this.hiddenDialogType == 'add' && this.hiddenForm.RECTIFICATIONTYPE == 2 && this.$refs.hiddenUpload.uploadFiles.length < 1) {
+        this.$message({
+          message: '请上传隐患图片',
+          type: 'error'
+        })
+        this.addLoading = false
+        return false
+      }
+      if (this.hiddenDialogType == 'add' && this.hiddenForm.RECTIFICATIONTYPE == 1) {
+        if (this.$refs.hiddenUpload.uploadFiles.length < 1) {
+          this.$message({
+            message: '请上传隐患图片',
+            type: 'error'
+          })
+          this.addLoading = false
+          return false
+        }
+        if (this.$refs.rectifyUpload.uploadFiles.length < 1) {
+          this.$message({
+            message: '请上传整改后图片',
+            type: 'error'
+          })
+          this.addLoading = false
+          return false
+        }
+      }
+      if (this.hiddenDialogType == 'edit' && this.hiddenForm.RECTIFICATIONTYPE == 2 && this.$refs.hiddenUpload.uploadFiles.length + this.hiddenImgs.length < 1) {
+        this.$message({
+          message: '请上传隐患图片',
+          type: 'error'
+        })
+        this.addLoading = false
+        return false
+      }
+      if (this.hiddenDialogType == 'edit' && this.hiddenForm.RECTIFICATIONTYPE == 1) {
+        if (this.$refs.hiddenUpload.uploadFiles.length + this.hiddenImgs.length < 1) {
+          this.$message({
+            message: '请上传隐患图片',
+            type: 'error'
+          })
+          this.addLoading = false
+          return false
+        }
+        if (this.$refs.rectifyUpload.uploadFiles.length + this.rectifyImgs.length < 1) {
+          this.$message({
+            message: '请上传整改后图片',
+            type: 'error'
+          })
+          this.addLoading = false
+          return false
+        }
+      }
+      this.$refs.hiddenForm.validate(valid => {
+        if (valid) {
+          this.addLoading = true
+          var temp2
+          if (_this.hiddenDialogType === 'add') {
+            temp2 = 'addHiddenApi'
+          } else {
+            temp2 = 'edit'
+          }
+          requestFN(
+            '/hidden/' + temp2,
+            {
+              ..._this.hiddenForm,
+              RECTIFICATIONDEPT: _this.hiddenForm.DEPARTMENT_ID,
+              HIDDEN_ID: _this.HIDDEN_ID,
+              SOURCE: '6',
+              STATE: '0',
+              RISK_UNIT: _this.listCheckItem.FIRE_POINT_NAME,
+              IDENTIFICATION: _this.listCheckItem.PARTSNAME,
+              RISK_DESCR: '无',
+              RISK_POSITION: _this.listCheckItem.POSITIONNAME,
+              LEVEL: _this.hiddenForm.HIDDENLEVEL,
+              CHECK_CONTENT: _this.listCheckItem.CHECK_CONTENT,
+              LISTMANAGER_ID: _this.LISTMANAGER_ID,
+              RECORDITEM_ID: _this.RECORDITEM_ID,
+              RISKITEM_ID: _this.LISTCHECKITEM_ID,
+              LONGITUDE: _this.hiddenForm.LONGITUDE,
+              LATITUDE: _this.hiddenForm.LATITUDE,
+              hiddenPartType: _this.hiddenPartType
+            }
+          ).then((data) => {
+            _this.HIDDEN_ID = data.pd.HIDDEN_ID
+            _this.varList[_this.itemIndex].HIDDENDESCR = data.pd.HIDDENDESCR
+            console.log(_this.varList)
+            if (_this.fileList.length > 0) {
+              if (_this.uploadVideo()) {
+                _this.uploadImg()
+              }
+              this.addLoading = false
+            } else {
+              _this.uploadImg()
+            }
+          }).catch((e) => {
+            this.addLoading = false
+          })
+          // eslint-disable-next-line no-undef
+          // var geolocation = new BMap.Geolocation()
+
+          // 调用百度地图api 中的获取当前位置接口
+          // geolocation.getCurrentPosition(function(r) {
+
+          // })
+        } else {
+          this.addLoading = false
+          return false
+        }
+      })
+    },
+    // 上传隐患视频
+    uploadVideo() {
+      console.log(this.fileList)
+      const formData = new FormData()
+      for (var i = 0; i < this.fileList.length; i++) {
+        formData.append('FFILE', this.fileList[i])
+      }
+      formData.append('FOREIGN_KEY', this.HIDDEN_ID)
+      formData.append('TYPE', 102)
+      return new Promise((resolve, rejected) => {
+        upload(
+          '/imgfiles/addVideo',
+          formData
+        ).then((data) => {
+          resolve(true)
+        }).catch((e) => {
+          this.listLoading = false
+          rejected(false)
+        })
+      })
+    },
+    // 上传隐患照片
+    uploadImg() {
+      const formData = new FormData()
+      for (var i = 0; i < this.$refs.hiddenUpload.uploadFiles.length; i++) {
+        formData.append('FFILE', this.$refs.hiddenUpload.uploadFiles[i].raw)
+      }
+      formData.append('FOREIGN_KEY', this.HIDDEN_ID)
+      formData.append('TYPE', 3)
+      upload(
+        '/imgfiles/add',
+        formData
+      ).then((data) => {
+        if (this.hiddenForm.RECTIFICATIONTYPE == 2) {
+          this.saveSuccess()
+        } else if (this.hiddenForm.RECTIFICATIONTYPE == 1) {
+          this.uploadRectifyImg()
+        }
+      }).catch((e) => {
+        this.addLoading = false
+        this.listLoading = false
+      })
+    },
+    // 上传整改照片
+    uploadRectifyImg() {
+      this.$refs.rectifyUpload.submit()
+      const formData = new FormData()
+      for (var i = 0; i < this.$refs.rectifyUpload.uploadFiles.length; i++) {
+        formData.append('FFILE', this.$refs.rectifyUpload.uploadFiles[i].raw)
+      }
+      formData.append('FOREIGN_KEY', this.HIDDEN_ID)
+      formData.append('TYPE', 4)
+      upload(
+        '/imgfiles/add',
+        formData
+      ).then((data) => {
+        this.saveSuccess()
+      }).catch((e) => {
+        this.addLoading = false
+        this.listLoading = false
+      })
+    },
+    // saveSuccess 保存成功
+    saveSuccess() {
+      this.$message({
+        message: '操作成功',
+        type: 'success'
+      })
+      if (this.hiddenFlag == '1') {
+        this.varList[this.itemIndex].ISNORMAL = 1
+        this.varList[this.itemIndex].HIDDEN_ID = this.HIDDEN_ID
+
+        var hidden = {}
+        hidden.HIDDEN_ID = this.HIDDEN_ID
+        hidden.LISTCHECKITEM_ID = this.varList[this.itemIndex]
+        this.hiddens.push(hidden)
+        this.addLoading = false
+      } else if (this.hiddenFlag == '2') {
+        // this.getOtherHidden()
+        this.addLoading = false
+      }
+      this.dialogFormVisible = false
+    },
+    // 删除隐患照片
+    delHiddenImg(index) {
+      this.$confirm('确定要删除吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        requestFN(
+          '/imgfiles/delete',
+          {
+            IMGFILES_ID: this.hiddenImgs[index].IMGFILES_ID
+          }
+        ).then(() => {
+          this.$message({
+            message: '删除成功',
+            type: 'success'
+          })
+          this.hiddenImgs.splice(index, 1)
+          this.hiddenPicture = this.$refs.hiddenUpload.uploadFiles.length + this.hiddenImgs.length >= 4
+        }).catch((e) => {
+        })
+      }).catch(() => {
+      })
+    },
+    // 删除整改照片
+    delRectifyImg(index) {
+      this.$confirm('确定要删除吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        requestFN(
+          '/imgfiles/delete',
+          {
+            IMGFILES_ID: this.rectifyImgs[index].IMGFILES_ID
+          }
+        ).then(() => {
+          this.$message({
+            message: '删除成功',
+            type: 'success'
+          })
+          this.rectifyImgs.splice(index, 1)
+        }).catch((e) => {
+        })
+      }).catch(() => {
+      })
+    },
+
+    // 隐患上传
+    hiddenBeforeUpload(file) {
+      const types = ['image/jpeg', 'image/jpg', 'image/png']
+      const isImage = types.includes(file.type)
+      if (!isImage) {
+        this.$message.error('上传图片只能是 JPG、JPEG、PNG 格式!')
+        return false
+      } else if (this.rectifyFiles.length >= 4) {
+        this.$message.error('最多上传4张隐患图片')
+        return false
+      } else {
+        this.hiddenFiles.push(file)
+      }
+    },
+
+    // 整改上传
+    rectifyBeforeUpload(file) {
+      const types = ['image/jpeg', 'image/jpg', 'image/png']
+      const isImage = types.includes(file.type)
+      if (!isImage) {
+        this.$message.error('上传图片只能是 JPG、JPEG、PNG 格式!')
+        return false
+      } else {
+        this.rectifyFiles.push(file)
+      }
+    },
+    // 添加/编辑其他隐患
+    editOtherHidden(id) {
+      if (id == '') {
+        this.editVector = '添加隐患'
+      } else {
+        this.editVector = '修改隐患'
+        this.addLoading = true
+      }
+
+      this.hiddenPicture = false
+      this.$refs.videoUpload && this.$refs.videoUpload.clearFiles()
+      this.getHiddenReginTreeList()
+      this.updateConfirmDept()
+      this.hiddenFlag = '2'
+      this.hiddenForm = {
+        HIDDENDESCR: '',
+        HIDDENPART: '',
+        HIDDENLEVEL: '',
+        HIDDENTYPE: '',
+        DEPARTMENT_ID: '',
+        USERNAME: '',
+        USER_ID: '',
+        confirmDept: '',
+        CONFIRM_USER: '',
+        RECTIFYDESCR: '',
+        RECTIFICATIONDEADLINE: '',
+        RECTIFICATIONOR: '',
+        RECTIFICATIONTYPE: '2',
+        ISRELEVANT: '2',
+        SOURCE: '6',
+        HAVESCHEME: 0,
+        DISCOVERYTIME: this.dateformat(new Date(), 'YYYY-MM-DD HH:mm:ss')
+      }
+      this.listCheckItem = { }
+      this.itemIndex = ''
+
+      this.hiddenImgs = [] // 隐患照片
+      this.hiddenFiles = []
+      this.rectifyImgs = [] // 整改照片
+      this.rectifyFiles = []
+      this.findUserList = []
+      this.fileList = []
+      this.getEditMyInfo()
+      if (id != null && id != '' && id != undefined) {
+        this.HIDDEN_ID = id
+        this.hiddenDialogType = 'edit'
+        this.dialogFormVisible = true
+        this.getHiddenData()
+      } else {
+        this.HIDDEN_ID = ''
+        this.hiddenDialogType = 'listAdd'
+        this.dialogFormVisible = true
+        if (this.$refs.rectifyDeptTree) {
+          this.$refs.rectifyDeptTree.clearHandle()
+        }
+      }
+    },
+    dateformat(date, fmt) {
+      if (/(y+)/.test(fmt)) {
+        fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length))
+      }
+      const o = {
+        'M+': date.getMonth() + 1,
+        'd+': date.getDate(),
+        'h+': date.getHours(),
+        'm+': date.getMinutes(),
+        's+': date.getSeconds()
+      }
+      for (const k in o) {
+        if (new RegExp(`(${k})`).test(fmt)) {
+          const str = o[k] + ''
+          fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? str : this.padLeftZero(str))
+        }
+      }
+      return fmt
+    },
+    padLeftZero(str) {
+      return ('00' + str).substr(str.length)
+    },
+    // 其他隐患提交
+    saveOtherHidden() {
+      console.log(this.$refs.hiddenUpload.uploadFiles.length < 1)
+      console.log(this.hiddenForm.RECTIFICATIONTYPE == 2)
+      console.log(this.hiddenDialogType)
+      this.addLoading = true
+      if (this.hiddenDialogType == 'listAdd' && this.hiddenForm.RECTIFICATIONTYPE == 2 && this.$refs.hiddenUpload.uploadFiles.length < 1) {
+        this.$message({
+          message: '请上传隐患图片',
+          type: 'error'
+        })
+        this.addLoading = false
+        return false
+      }
+      if (this.hiddenDialogType == 'add' && this.hiddenForm.RECTIFICATIONTYPE == 1) {
+        if (this.$refs.hiddenUpload.uploadFiles.length < 1) {
+          this.$message({
+            message: '请上传隐患图片',
+            type: 'error'
+          })
+          this.addLoading = false
+          return false
+        }
+        if (this.$refs.rectifyUpload.uploadFiles.length < 1) {
+          this.$message({
+            message: '请上传整改后图片',
+            type: 'error'
+          })
+          this.addLoading = false
+          return false
+        }
+      }
+      if (this.hiddenDialogType == 'edit' && this.hiddenForm.RECTIFICATIONTYPE == 2 && this.$refs.hiddenUpload.uploadFiles.length + this.hiddenImgs.length < 1) {
+        this.$message({
+          message: '请上传隐患图片',
+          type: 'error'
+        })
+        this.addLoading = false
+        return false
+      }
+      if (this.hiddenDialogType == 'edit' && this.hiddenForm.RECTIFICATIONTYPE == 1) {
+        if (this.$refs.hiddenUpload.uploadFiles.length + this.hiddenImgs.length < 1) {
+          this.$message({
+            message: '请上传隐患图片',
+            type: 'error'
+          })
+          this.addLoading = false
+          return false
+        }
+        if (this.$refs.rectifyUpload.uploadFiles.length + this.rectifyImgs.length < 1) {
+          this.$message({
+            message: '请上传整改后图片',
+            type: 'error'
+          })
+          this.addLoading = false
+          return false
+        }
+      }
+      var findCreator = ''
+      if (this.findCreatorList) {
+        this.findCreatorList.forEach((row, index) => {
+          findCreator += this.findCreatorList[index].USER_ID + ','
+        })
+      }
+      this.$refs.hiddenForm.validate(valid => {
+        if (valid) {
+          requestFN(
+            '/hidden/' + this.hiddenDialogType,
+            {
+              ...this.hiddenForm,
+              RECTIFICATIONDEPT: this.hiddenForm.DEPARTMENT_ID,
+              HIDDEN_ID: this.HIDDEN_ID,
+              SOURCE: '6',
+              STATE: '0',
+              // HIDDENDESCR: this.hiddenForm.HIDDENDESCR,
+              // HIDDENPART: this.hiddenForm.HIDDENPART,
+              // RECTIFYDESCR: this.hiddenForm.RECTIFYDESCR,
+              // RECTIFICATIONDEADLINE: this.hiddenForm.RECTIFICATIONDEADLINE,
+              // RECTIFICATIONTYPE: this.hiddenForm.RECTIFICATIONTYPE,
+              // RECTIFICATIONOR: this.hiddenForm.RECTIFICATIONOR,
+              // HIDDENLEVEL: this.hiddenForm.HIDDENLEVEL,
+              // RECTIFICATIONDEPT: this.hiddenForm.DEPARTMENT_ID,
+              // HIDDENTYPE: this.hiddenForm.HIDDENTYPE,
+              LISTMANAGER_ID: this.LISTMANAGER_ID,
+              HAVESCHEME: 0,
+              hiddenPartType: this.hiddenPartType,
+              findCreator: findCreator
+              // DISCOVERYTIME: this.hiddenForm.DISCOVERYTIME, // 隐患发现时间
+              // CONFIRM_USER: this.hiddenForm.CONFIRM_USER // 隐患确认人
+            }
+          ).then((data) => {
+            this.HIDDEN_ID = data.pd.HIDDEN_ID
+            this.otherHiddenIdsList = this.otherHiddenIdsList.filter(cs => cs !== this.HIDDEN_ID)
+            this.otherHiddenList = this.otherHiddenList.filter(oh => oh.HIDDEN_ID !== this.HIDDEN_ID)
+            this.otherHiddenList.push(data.pd)
+            this.otherHiddenIdsList.push(data.pd.HIDDEN_ID)
+            if (this.fileList.length > 0) {
+              if (this.uploadVideo()) {
+                // this.$refs.hiddenUpload.submit()
+                this.uploadImg()
+              }
+            } else {
+              // this.$refs.hiddenUpload.submit()
+              this.uploadImg()
+            }
+          }).catch((e) => {
+            this.addLoading = false
+          })
+        } else {
+          this.addLoading = false
+          return false
+        }
+      })
+    },
+    // 删除
+    removeOtherHidden(id) {
+      this.$confirm('确定要删除吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        requestFN(
+          'hidden/delete',
+          {
+            HIDDEN_ID: id
+          }
+        ).then(() => {
+          console.log(id)
+          console.log('---------')
+          this.otherHiddenIdsList = this.otherHiddenIdsList.filter(ids => ids !== id)
+          console.log(this.otherHiddenIdsList)
+          this.otherHiddenList = this.otherHiddenList.filter(oh => oh.HIDDEN_ID !== id)
+          this.$message({
+            message: '删除成功',
+            type: 'success'
+          })
+          // this.getOtherHidden()
+        }).catch((e) => {
+        })
+      }).catch(() => {
+      })
+    },
+    // 部门
+    getTreeList() {
+      return new Promise((resolve) => {
+        requestFN(
+          '/department/listTree',
+          {}
+        ).then((data) => {
+          this.treeData = JSON.parse(data.zTreeNodes)
+
+          resolve()
+        }).catch((e) => {
+        })
+      })
+    },
+    // 添加检查人
+    addOther() {
+      var o = { 'DEPARTMENT_ID': '', 'USER_ID': '' }
+      this.other.push(o)
+      var index = this.other.length - 1
+      this.otherUserList[index] = []
+    },
+    // 修改其他检查人部门
+    updateOtherDep(DEPARTMENT_ID, i) {
+      this.other[i].USER_ID = ''
+      this.getUserList(DEPARTMENT_ID, i)
+    },
+    // 删除检查人
+    removeOther(index) {
+      this.other.splice(index, 1)
+    },
+    // 获取人员列表
+    getUserList(DEPARTMENT_ID, i) {
+      if (DEPARTMENT_ID) {
+        requestFN(
+          '/user/listAll',
+          {
+            DEPARTMENT_ID: DEPARTMENT_ID,
+            NOMAIN: '1'
+          }
+        ).then((data) => {
+          if (i > -1) {
+            this.otherUserList[i] = data.userList
+            this.$forceUpdate()
+          } else {
+            this.userList = data.userList
+          }
+        }).catch((e) => {
+        })
+      }
+    },
+    // 获取整改人列表
+    getReUserList(DEPARTMENT_ID) {
+      if (DEPARTMENT_ID) {
+        requestFN(
+          '/user/listAll',
+          { DEPARTMENT_ID: DEPARTMENT_ID }
+        ).then((data) => {
+          this.rectifyUserList = data.userList
+        }).catch((e) => {
+        })
+      }
+    },
+    // 获取数据字典数据
+    getDict: function() {
+      requestFN(
+        '/dictionaries/listSelectTree',
+        {
+          DICTIONARIES_ID: '5e7cf8620ba54ad89719d0be62133c7a'
+        }
+      ).then((data) => {
+        this.hiddenlevelList = JSON.parse(data.zTreeNodes)
+        console.log('隐患级别')
+        console.log(this.hiddenlevelList)
+        this.hiddenlevelList.forEach((itemFirst, i) => {
+          itemFirst.nodes.forEach((itemSecond, j) => {
+            if (itemSecond.DICTIONARIES_ID === 'a9d916b5a17848c1b15e8b821c24bf6e') { // 忽略隐患、较大隐患、重大隐患 第二级
+              itemFirst.nodes.splice(j, 1)
+            }
+          })
+        })
+      })
+      requestFN(
+        '/dictionaries/listSelectTree',
+        {
+          DICTIONARIES_ID: '3babc15144444bdc8d763d0af2bdfff6'
+        }
+      ).then((data) => {
+        this.hiddenTypeList = JSON.parse(data.zTreeNodes)
+      })
+      requestFN(
+        '/dictionaries/listSelectTree',
+        {
+          DICTIONARIES_ID: '18c0a9aea6e54feab9f4ab3f46e0bc86'
+        }
+      ).then((data) => {
+        this.hiddenType2List = JSON.parse(data.zTreeNodes)
+      })
+    },
+    handleRemove(file) {
+      console.log(file)
+    },
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    },
+    handleDownload(file) {
+      console.log(file)
+    },
+    // 获取隐患部位 下拉树
+    getHiddenReginTreeList() {
+      this.treeLoading = true
+      requestFN(
+        '/hiddenRegion/listAll',
+        {
+
+        }
+      ).then((data) => {
+        this.treeLoading = false
+        this.hiddenPartList = JSON.parse(data.zTreeNodes)
+      }).catch((e) => {
+        this.treeLoading = false
+      })
+    },
+    handleChangeIMG(file, fileList) {
+      const types = ['image/jpeg', 'image/jpg', 'image/png']
+      const isImage = types.includes(file.raw.type)
+      if (!isImage) {
+        this.$message.error('上传图片只能是 JPG、JPEG、PNG 格式!')
+        fileList.pop()
+      }
+      this.hiddenPicture = this.$refs.hiddenUpload.uploadFiles.length + this.hiddenImgs.length >= 4
+    },
+    hiddenRemove() {
+      this.hiddenPicture = this.$refs.hiddenUpload.uploadFiles.length + this.hiddenImgs.length >= 4
+    },
+    handleRemoveVideo(file, fileList) { // 文件列表移除文件时的钩子
+      this.fileList = []
+    },
+    // eslint-disable-next-line handle-callback-err
+    handleUploadVideoError(err, file, fileList) {
+      this.fileList = fileList
+      file.status = 'success'
+      this.fileList.push(file)
+    },
+    handleUploadVideoExceed(file, fileList) { // 文件超出个数限制时的钩子
+      this.$message.warning('最多上传1个视频哦！')
+    },
+    beforeVideoFileUpload(file) {
+      const types = ['video/mp4']
+      const isImage = types.includes(file.type)
+      const isLt500M = file.size / 1024 / 1024 < 50
+      if (this.fileList.length > 0) {
+        this.$message.error('文件超出个数限制!')
+        return false
+      }
+      if (!isImage) {
+        this.$message.error('上传视频只能是 MP4 格式!')
+        return false
+      } else if (!isLt500M) {
+        this.$message.error('上传视频大小不能超过 50MB!')
+        return false
+      } else {
+        this.fileList.push(file)
+        this.$forceUpdate()
+        return true
+      }
+    },
+    getEditMyInfo() { // 获取登录人信息
+      requestFN(
+        '/user/goEditMyInfo',
+        {}
+      ).then((data) => {
+        // var o = { 'DEPARTMENT_ID': data.pd.DEPARTMENT_ID, 'USER_ID': data.pd.USER_ID }
+        this.myUserInfo.DEPARTMENT_ID = data.depname
+        this.myUserInfo.DEPARTMENTName = data.pd.deptName
+        this.myUserInfo.USERNAME = data.pd.NAME
+        this.$forceUpdate()
+      }).catch((e) => {
+        this.addLoading = false
+      })
+    },
+    addFindOther() { // 添加隐患发现人
+      var o = { 'DEPARTMENT_ID': '', 'USER_ID': '' }
+      this.findCreatorList.push(o)
+    },
+    remoFindOther(index) { // 删除隐患发现人员
+      this.findCreatorList.splice(index, 1)
+    },
+    updateFindOtherDep(DEPARTMENT_ID, i) { // 点击发现部门
+      this.findCreatorList[i].USER_ID = ''
+      this.getFindUserList(DEPARTMENT_ID, i)
+    },
+    getFindUserList(DEPARTMENT_ID, index) { // 获取发现发现部门的人员信息
+      this.listLoading = true
+      requestFN(
+        '/user/listAll',
+        {
+          DEPARTMENT_ID: DEPARTMENT_ID,
+          tm: new Date().getTime()
+        }
+      ).then((data) => {
+        this.$set(this.findUserList, index, data.userList)
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    updateConfirmDept() { // 根据选择的隐患确认部门显示隐患确认人
+      this.listLoading = true
+      requestFN(
+        '/user/getHiddenConfirm',
+        {
+          tm: new Date().getTime(),
+          IS_HAZARDCONFIRMER: '1'
+        }
+      ).then((data) => {
+        this.confirmUserList = data.userList
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    hiddenPartTypeBtn() {
+      this.hiddenForm.HIDDENPART = ''
+      this.hiddenPartType = (this.hiddenPartType == 'select') ? 'value' : 'select'
+    },
+    chooseMap() { // 弹出地图
+      this.dialogMap = true
+      this.iframeSrc = this.config.weburl + 'static/maplocation.html?t=' + Math.random()
+    }
+  }
+}
+</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>
diff --git a/src/views/firefighting/fireUtilReport/index.vue b/src/views/firefighting/fireUtilReport/index.vue
index fa086b6..5a49d71 100644
--- a/src/views/firefighting/fireUtilReport/index.vue
+++ b/src/views/firefighting/fireUtilReport/index.vue
@@ -3,12 +3,12 @@
 </template>
 <script>
 import List from './components/list'
-import FirePumpRoom from './components/firePumpRoom'
-import FireResources from './components/fireResources.vue'
-import FireControlRoom from './components/fireControlRoom.vue'
+import FireRecord from './components/fireRecord.vue'
+import FireList from './components/fireList.vue'
+import RecordInfo from './components/recordInfo.vue'
 export default {
   components: {
-    List, FirePumpRoom, FireResources, FireControlRoom
+    List, FireRecord, FireList, RecordInfo
   },
   data() {
     return {
-- 
2.42.0.windows.1


From 639864bba972fde7c037fa1bb3963afc4fb4868f Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 17 Jan 2024 14:43:04 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=B6=88=E9=98=B2=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=8A=9F=E8=83=BD=E6=A8=A1=E5=9D=97-?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/index.vue | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index 7f41d02..e3e0443 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -162,7 +162,7 @@
                 >
                   <div v-if="bottomOptionsIndex !== ''" class="item">
                     <template v-for="(item1,index1) in item.list">
-                      <template v-if="containAuthorizationShow(item1)">
+                      <template v-if="containAuthorizationShow(item1,item)">
                         <template v-if="eliminateAuthorizationShow(item1)">
                           <div
                             :key="index1"
@@ -2557,10 +2557,21 @@ export default {
       this.bottomOptionsIndex = ''
       this.collapse = false
     },
-    containAuthorizationShow({ containAuthorization }) {
+    containAuthorizationShow(e, item) {
+      // create by liu jun (PS:此处根据[下面这个if]孙海官的需求，对消防管控的权限进行了特殊处理，未进入具体企业时，显示消防救援队，进入具体企业后，显示消防管控其他按钮)
+      if (item && item.list && item.list.length > 0) {
+        if (item.label === '消防管控') {
+          if (e.label === '消防救援队') {
+            return !(this.CORP_INFO_ID && this.CORP_INFO_ID !== '')
+          }
+          if (e.label !== '消防救援队') {
+            return (this.CORP_INFO_ID && this.CORP_INFO_ID !== '')
+          }
+        }
+      }
       const CORP_INFO_ID = this.CORP_INFO_ID
-      if (containAuthorization.length === 0) return true
-      if (containAuthorization.includes(CORP_INFO_ID)) {
+      if (e.containAuthorization.length === 0) return true
+      if (e.containAuthorization.includes(CORP_INFO_ID)) {
         return true
       } else {
         return false
-- 
2.42.0.windows.1