From 07e27d1bfb7fd5fe2c23026c0294f807f627921b Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Sat, 13 Apr 2024 10:01:11 +0800
Subject: [PATCH 01/23] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=AE=9A=E4=BD=8D?=
 =?UTF-8?q?=E6=96=B0=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/OneCompany/text.txt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/views/OneCompany/text.txt

diff --git a/src/views/OneCompany/text.txt b/src/views/OneCompany/text.txt
new file mode 100644
index 0000000..e69de29

From 0d4a5a36bfd24adf90d10ba355b469973a375e48 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Sat, 13 Apr 2024 10:09:00 +0800
Subject: [PATCH 02/23] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=AE=9A=E4=BD=8D?=
 =?UTF-8?q?=E6=96=B0=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/{OneCompany => oneCompany}/text.txt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/views/{OneCompany => oneCompany}/text.txt (100%)

diff --git a/src/views/OneCompany/text.txt b/src/views/oneCompany/text.txt
similarity index 100%
rename from src/views/OneCompany/text.txt
rename to src/views/oneCompany/text.txt

From ac31e38b1a130ae0d272d92b613657613354da10 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Sat, 13 Apr 2024 10:27:29 +0800
Subject: [PATCH 03/23] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=AE=9A=E4=BD=8D?=
 =?UTF-8?q?=E6=96=B0=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reflection/components/QRCode.vue          |  36 ++
 .../reflection/components/apply.vue           | 320 +++++++++++
 .../reflection/components/flowInfo.vue        |  94 ++++
 .../reflection/components/flowInfoList.vue    |  87 +++
 .../reflection/components/flowStep.vue        | 107 ++++
 .../oneCompany/reflection/components/list.vue | 253 +++++++++
 .../reflection/components/picture.vue         |  36 ++
 .../reflection/components/record.vue          | 198 +++++++
 .../reflection/components/sendUtil.vue        | 341 ++++++++++++
 .../oneCompany/reflection/components/user.vue | 250 +++++++++
 .../reflection/components/users.vue           | 513 ++++++++++++++++++
 src/views/oneCompany/reflection/index.vue     |  23 +
 12 files changed, 2258 insertions(+)
 create mode 100644 src/views/oneCompany/reflection/components/QRCode.vue
 create mode 100644 src/views/oneCompany/reflection/components/apply.vue
 create mode 100644 src/views/oneCompany/reflection/components/flowInfo.vue
 create mode 100644 src/views/oneCompany/reflection/components/flowInfoList.vue
 create mode 100644 src/views/oneCompany/reflection/components/flowStep.vue
 create mode 100644 src/views/oneCompany/reflection/components/list.vue
 create mode 100644 src/views/oneCompany/reflection/components/picture.vue
 create mode 100644 src/views/oneCompany/reflection/components/record.vue
 create mode 100644 src/views/oneCompany/reflection/components/sendUtil.vue
 create mode 100644 src/views/oneCompany/reflection/components/user.vue
 create mode 100644 src/views/oneCompany/reflection/components/users.vue
 create mode 100644 src/views/oneCompany/reflection/index.vue

diff --git a/src/views/oneCompany/reflection/components/QRCode.vue b/src/views/oneCompany/reflection/components/QRCode.vue
new file mode 100644
index 0000000..297e138
--- /dev/null
+++ b/src/views/oneCompany/reflection/components/QRCode.vue
@@ -0,0 +1,36 @@
+<template>
+  <div>
+    <el-dialog :visible.sync="visible" :append-to-body="appendToBody" title="相关方安全告知培训合格证" width="370px" destroy-on-close	>
+      <vue-qr :text="qrCodeStr" :margin="0" :size="320" color-dark="#000" color-light="#fff"/>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import vueQr from 'vue-qr'
+
+export default {
+  components: { vueQr },
+  props: {
+    appendToBody: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      qrCodeStr: ''
+    }
+  },
+  methods: {
+    init(e) {
+      this.visible = true
+      this.qrCodeStr = e.qrCodeStr
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/src/views/oneCompany/reflection/components/apply.vue b/src/views/oneCompany/reflection/components/apply.vue
new file mode 100644
index 0000000..199811d
--- /dev/null
+++ b/src/views/oneCompany/reflection/components/apply.vue
@@ -0,0 +1,320 @@
+<template>
+  <el-dialog
+    v-if="visible"
+    :visible.sync="visible"
+    :before-close="handleClose"
+    :append-to-body="true"
+    title="培训申请"
+    width="60%">
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-row>
+        <el-col :span="12">
+          <el-form-item
+            prop="TERRITORIALITY"
+            label="集团单位 "
+          >
+            <Treeselect
+              :options="jituanDanweiTreeData"
+              :normalizer="normalizer"
+              v-model="form.TERRITORIALITY"
+              placeholder="请选择集团单位 "
+              no-options-text="暂无数据"
+              no-children-text="暂无数据"
+              style="width: 100%;"
+              @select="getUserList($event)"
+            />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item
+            prop="TERRITORIALITY_USER_ID"
+            label="审核人员"
+          >
+            <div style="display:flex;justify-content: space-between;align-items: flex-start;">
+              <el-select v-model="form.TERRITORIALITY_USER_ID">
+                <el-option
+                  v-for="item in companyUserList"
+                  :key="item.USER_ID"
+                  :label="item.NAME"
+                  :value="item.USER_ID"/>
+              </el-select>
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="12">
+          <el-form-item
+            prop="MANAGER"
+            label="主管部门"
+          >
+            <Treeselect
+              :options="treeData"
+              :normalizer="normalizer"
+              v-model="form.MANAGER"
+              :disabled="true"
+              placeholder="请选择主管部门"
+              no-options-text="暂无数据"
+              no-children-text="暂无数据"
+              style="width: 100%;"
+              @select="getmanagerUserList($event)"
+            />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item
+            prop="MANAGER_USER_ID"
+            label="审核人员"
+          >
+            <div style="display:flex;justify-content: space-between;align-items: flex-start;">
+              <el-select v-model="form.MANAGER_USER_ID">
+                <el-option
+                  v-for="item in managercompanyUserList"
+                  :key="item.USER_ID"
+                  :label="item.NAME"
+                  :value="item.USER_ID"/>
+              </el-select>
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item
+            prop="SUPERVISION"
+            label="安监部门"
+          >
+            <Treeselect
+              :options="treeData"
+              :normalizer="normalizer"
+              v-model="form.SUPERVISION"
+              :disabled="true"
+              placeholder="请选择安监部门"
+              no-options-text="暂无数据"
+              no-children-text="暂无数据"
+              style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item
+            prop="SUPERVISION_USER_ID"
+            label="审核人员"
+          >
+            <div style="display:flex;justify-content: space-between;align-items: flex-start;">
+              <el-select v-model="form.SUPERVISION_USER_ID">
+                <el-option v-for="item in userList" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID"/>
+              </el-select>
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="备注">
+            <el-input :rows="3" v-model="form.DESCR" type="textarea" placeholder="这里输入备注..."/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="closeWindow">取 消</el-button>
+      <el-button :loading="loading" type="primary" @click="save">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { requestFN } from '@/utils/request'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+
+export default {
+  components: {
+    Treeselect
+  },
+  props: {
+    corpInfo: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      loading: false,
+      treeData: [],
+      companyTreeData: [],
+      corpinfo: {},
+      userList: [],
+      companyUserList: [],
+      managercompanyUserList: [],
+      jituanDanwei: '',
+      jituanDanweiTreeData: [],
+      normalizer(node) {
+        return {
+          id: node.id,
+          label: node.name,
+          children: node.nodes
+        }
+      },
+      form: {},
+      rules: {
+        // SUPERVISION: [{ required: true, message: '安监部门不能为空', trigger: 'blur' }],
+        SUPERVISION_USER_ID: [{ required: true, message: '审核人员不能为空', trigger: 'blur' }],
+        MANAGER: [{ required: true, message: '主管部门不能为空', trigger: 'blur' }],
+        MANAGER_USER_ID: [{ required: true, message: '审核人员不能为空', trigger: 'blur' }],
+        TERRITORIALITY: [{ required: true, message: '属地管理部门不能为空', trigger: 'blur' }],
+        TERRITORIALITY_USER_ID: [{ required: true, message: '审核人员不能为空', trigger: 'blur' }]
+      }
+    }
+  },
+  methods: {
+    async init(e) {
+      if (e) {
+        this.users = e
+      }
+      this.visible = true
+      this.loading = false
+      this.form = {}
+      /**
+       * 获取相关方的 集团单位  corpinfo/getDataForEditByCorpInfoId
+       * 根据集团单位 找到 对应的 企业id
+       */
+      await this.getCorpinfo()
+    },
+    getCorpinfo() {
+      requestFN(
+        '/corpinfo/getDataForEditByCorpInfoId',
+        {
+          CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID,
+          tm: new Date().getTime()
+        }
+      ).then((data) => {
+        this.corpinfo = data.pd
+        // 河港机械	jtdw002  1e6dbbe16004402f8d2c0e52afd9a676
+        // 河港港工	jtdw003  3a854eefa7894e06aaa1a2611bca80f6
+        // 河港检测	jtdw004  020578a4c1f04bc692ee25145c2efbe5
+        // 方宇物业	jtdw005 90966974de3c4b83aca6f8fd6432d5c2
+
+        if (data.pd.CORP_TYPE == 'jtdw002') {
+          this.jituanDanwei = '1e6dbbe16004402f8d2c0e52afd9a676'
+        }
+        if (data.pd.CORP_TYPE == 'jtdw003') {
+          this.jituanDanwei = '3a854eefa7894e06aaa1a2611bca80f6'
+        }
+        if (data.pd.CORP_TYPE == 'jtdw004') {
+          this.jituanDanwei = '020578a4c1f04bc692ee25145c2efbe5'
+        }
+        if (data.pd.CORP_TYPE == 'jtdw005') {
+          this.jituanDanwei = '90966974de3c4b83aca6f8fd6432d5c2'
+        }
+        this.getTreeData()
+      })
+    },
+    // 获得部门树
+    getTreeData() {
+      requestFN(
+        '/regulatoryApi/department/listTree',
+        {}
+      ).then((data) => {
+        this.treeData = JSON.parse(data.zTreeNodes)
+        // 必须指定【股份-安全监督部】
+        this.form.SUPERVISION = 'c31058273a2d40f9b83dd8e5ae3a723c'
+        this.form.MANAGER = this.corpinfo.MAIN_DEPARTMENT
+        this.getRegulatoryUserList(this.form.SUPERVISION)
+        this.getmanagerUserList(this.corpinfo.MAIN_DEPARTMENT)
+      }).catch((e) => {
+        console.log(e)
+      })
+
+      if (this.jituanDanwei) {
+        requestFN(
+          '/companyApi/department/listTree',
+          { CORPINFO_ID: this.jituanDanwei }
+        ).then((data) => {
+          this.jituanDanweiTreeData = JSON.parse(data.zTreeNodes)
+        }).catch((e) => {
+        })
+      }
+    },
+    getRegulatoryUserList(DEPARTMENT_ID) {
+      requestFN(
+        '/regulatoryApi/user/listAll',
+        {
+          DEPARTMENT_ID: DEPARTMENT_ID,
+          ISASSESS: '1'
+        }
+      ).then((data) => {
+        this.userList = data.userList
+      }).catch((e) => {
+      })
+    },
+    // 人员
+    getUserList({ id: DEPARTMENT_ID }) {
+      requestFN(
+        '/companyApi/user/listAll',
+        {
+          DEPARTMENT_ID
+        }
+      ).then((data) => {
+        this.companyUserList = data.userList
+      }).catch((e) => {
+      })
+    },
+    getmanagerUserList(DEPARTMENT_ID) {
+      requestFN(
+        '/regulatoryApi/user/listAll',
+        {
+          DEPARTMENT_ID: DEPARTMENT_ID
+        }
+      ).then((data) => {
+        this.managercompanyUserList = data.userList
+      }).catch((e) => {
+      })
+    },
+
+    save() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.loading = true
+          this.form.USER_COUNT = this.users.length
+          this.form.AUDIT_STATUS = 0
+          this.form.TYPE = 2
+          requestFN(
+            '/trainingbatch/add',
+            {
+              ...this.form,
+              users: this.users.join(',')
+            }
+          ).then((data) => {
+            this.loading = false
+            this.$message({
+              message: '申请成功',
+              type: 'success'
+            })
+            this.handleClose()
+          }).catch((e) => {
+            this.listLoading = false
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    handleClose() {
+      this.visible = false
+      this.$emit('finish', '')
+    },
+    closeWindow() {
+      this.handleClose()
+    }
+  }
+}
+</script>
diff --git a/src/views/oneCompany/reflection/components/flowInfo.vue b/src/views/oneCompany/reflection/components/flowInfo.vue
new file mode 100644
index 0000000..9f79cb9
--- /dev/null
+++ b/src/views/oneCompany/reflection/components/flowInfo.vue
@@ -0,0 +1,94 @@
+<template>
+  <el-dialog
+    v-if="visible"
+    :visible.sync="visible"
+    :before-close="handleClose"
+    :append-to-body="appendToBody"
+    title="审批流程"
+    width="60%">
+    <el-steps :space="200" :active="list.length" direction="vertical" finish-status="success">
+      <el-step v-for="item in list" :key="item.FLOW_DETAIL_ID" :value="item.FLOW_DETAIL_ID" :title="item.SORT+''">
+        <template slot="description">
+          <el-card class="box-card a" style="width: 900px;">
+            <div slot="header" class="clearfix">
+              <span>{{ item.STEP_NAME }}</span>
+            </div>
+            <div>
+              <el-row>
+                <el-col :span="12">
+                  <el-row>
+                    <el-col v-if="item.APPROVER_NAME">
+                      审批人：{{ item.APPROVER_NAME }}
+                    </el-col>
+                    <el-col>
+                      审批状态：{{ item.PASS_FLAG === '1' ? '同意' : '不同意' }}
+                    </el-col>
+                    <el-col>
+                      {{ (!item.APPROVER_NAME ? '被审批人归属公司：':'审批人归属公司：') + item.APPROVER_CORPINFO_NAME }}
+                    </el-col>
+                    <el-col>
+                      {{ (!item.APPROVER_NAME ? '发起申请时间：':'审批时间：') + item.APPROVER_TIME }}
+                    </el-col>
+                    <el-col v-if="item.APPROVER_OPINION">
+                      审批意见：{{ item.APPROVER_OPINION }}
+                    </el-col>
+                    <el-col v-if="item.END_FLAG === '1'" style="color: red; font-weight: bold;font-size: large">
+                      审批结束
+                    </el-col>
+                  </el-row>
+                </el-col>
+                <el-col v-if="item.APPOINT_ANNEX" :span="12">
+                  <el-button icon="el-icon-download" type="primary" @click = "download(item)">下载附件</el-button>
+                </el-col>
+              </el-row>
+            </div>
+          </el-card>
+        </template>
+      </el-step>
+    </el-steps>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="closeWindow">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import useDownloadFile from '../../../../utils/useDownloadFile'
+
+export default {
+  props: {
+    appendToBody: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      loading: false,
+      list: [],
+      form: {
+        XGF_USER_ID: ''
+      }
+    }
+  },
+  methods: {
+    init(e) {
+      this.visible = true
+      this.loading = false
+      this.list = e.flow
+    },
+    handleClose() {
+      this.visible = false
+      this.$emit('finish', '')
+    },
+    closeWindow() {
+      this.handleClose()
+    },
+    download(item) {
+      useDownloadFile(item.APPOINT_ANNEX)
+    }
+  }
+}
+</script>
diff --git a/src/views/oneCompany/reflection/components/flowInfoList.vue b/src/views/oneCompany/reflection/components/flowInfoList.vue
new file mode 100644
index 0000000..3b55422
--- /dev/null
+++ b/src/views/oneCompany/reflection/components/flowInfoList.vue
@@ -0,0 +1,87 @@
+<template>
+  <el-dialog
+    v-if="visible"
+    :visible.sync="visible"
+    :before-close="handleClose"
+    :append-to-body="true"
+    title="审批流程"
+    width="60%">
+    <el-table
+      ref="multipleTable"
+      :data="list"
+      :header-cell-style="{'font-weight': 'bold','color': '#000'}"
+      tooltip-effect="dark"
+      border
+      fit
+      highlight-current-row>
+      <el-table-column type="index" label="序号" width="50" align="center"/>
+      <el-table-column prop="CREATOR_TIME" label="审批流创建时间" align="center"/>
+      <el-table-column label="操作" align="center" width="250">
+        <template slot-scope="{row}">
+          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">详情</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="closeWindow">取 消</el-button>
+    </div>
+    <flow-info ref="flowInfo" append-to-body/>
+  </el-dialog>
+</template>
+
+<script>
+import { requestFN } from '@/utils/request'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import FlowInfo from './flowInfo.vue'
+
+export default {
+  components: {
+    FlowInfo,
+    Treeselect
+  },
+  props: {
+    corpInfo: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      loading: false,
+      list: [],
+      form: {
+        XGF_USER_ID: ''
+      }
+    }
+  },
+  methods: {
+    init(e) {
+      this.visible = true
+      this.loading = false
+      this.form.XGF_USER_ID = e.XGF_USER_ID
+      this.getInfo()
+    },
+    getInfo() {
+      requestFN(
+        '/xgf/user/getApproveInfo', this.form
+      ).then((data) => {
+        this.list = data.list
+      }).catch((e) => {
+        console.log(e)
+      })
+    },
+    handleShow(row) {
+      this.$refs.flowInfo.init(row)
+    },
+    handleClose() {
+      this.visible = false
+      this.$emit('finish', '')
+    },
+    closeWindow() {
+      this.handleClose()
+    }
+  }
+}
+</script>
diff --git a/src/views/oneCompany/reflection/components/flowStep.vue b/src/views/oneCompany/reflection/components/flowStep.vue
new file mode 100644
index 0000000..1af3130
--- /dev/null
+++ b/src/views/oneCompany/reflection/components/flowStep.vue
@@ -0,0 +1,107 @@
+<template>
+  <el-dialog
+    v-if="visible"
+    :visible.sync="visible"
+    :v-loading="loading"
+    :before-close="handleClose"
+    :append-to-body="true"
+    :title="title"
+    width="60%">
+    <el-steps :space="200" :active="+step" direction="vertical" finish-status="success">
+      <el-step v-for="item in list" :key="item.INDEX" :value="item.INDEX" :title="item.INDEX">
+        <template slot="description">
+          <el-card class="box-card" style="width: 900px;">
+            <div slot="header" class="clearfix">
+              <span>审批节点</span>
+            </div>
+            <div>
+              <el-row>
+                <el-col>
+                  审批人：{{ item.APPOINT_USER_NAME }}
+                </el-col>
+                <el-col v-if="item.INDEX !== step">
+                  审批人公司：{{ item.APPOINT_CORP_NAME }}
+                </el-col>
+                <el-col>
+                  审批人部门：{{ item.APPOINT_DEPARTMENT_NAME }}
+                </el-col>
+                <el-col v-if="item.INDEX !== step">
+                  审批状态：{{ item.APPOINT_STATUS === '1' ? '同意' : item.APPOINT_STATUS === '0' ? '不同意' : '' }}
+                </el-col>
+                <el-col v-if="item.INDEX !== step">
+                  审批时间：{{ item.APPOINT_TIME }}
+                </el-col>
+                <el-col v-if="item.APPOINT_OPINION && item.INDEX !== step">
+                  审批意见：{{ item.APPOINT_OPINION }}
+                </el-col>
+              </el-row>
+            </div>
+          </el-card>
+        </template>
+      </el-step>
+    </el-steps>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="closeWindow">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import { requestFN } from '@/utils/request'
+
+export default {
+  props: {
+    corpInfo: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      loading: false,
+      list: [],
+      title: '审批流程',
+      form: {
+        XGF_USER_ID: ''
+      },
+      step: 0
+    }
+  },
+  methods: {
+    init(e) {
+      this.form.XGF_USER_ID = e.XGF_USER_ID
+      this.getInfo()
+    },
+    getInfo() {
+      requestFN(
+        '/xgf/user/getApproveInfo', this.form
+      ).then((data) => {
+        this.list = data.flow.info
+        this.step = data.flow.STEP
+        if (data.flow.endFlag === '1') {
+          this.title = '审批中'
+        }
+        if (data.flow.endFlag === '2') {
+          this.title = '审批结束'
+        }
+        if (data.flow.endFlag === '-2') {
+          this.title = '审批驳回'
+        }
+        this.visible = true
+        this.loading = false
+      }).catch((e) => {
+        console.log(e)
+      })
+    },
+    handleClose() {
+      this.visible = false
+      this.$emit('finish', '')
+    },
+    closeWindow() {
+      this.handleClose()
+    }
+  }
+}
+</script>
diff --git a/src/views/oneCompany/reflection/components/list.vue b/src/views/oneCompany/reflection/components/list.vue
new file mode 100644
index 0000000..ebb3f19
--- /dev/null
+++ b/src/views/oneCompany/reflection/components/list.vue
@@ -0,0 +1,253 @@
+<template>
+  <div class="app-container">
+    <el-form label-width="130px">
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="用户名">
+            <el-input v-model="KEYWORDS" placeholder="请输入用户名"/>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="false" :span="6">
+          <el-form-item label="培训状态">
+            <el-select v-model="STATUS" placeholder="请选择培训状态" style="width: 100%;" clearable>
+              <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value"/>
+            </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>
+    <el-table
+      ref="multipleTable"
+      :data="varList"
+      :header-cell-style="{'font-weight': 'bold','color': '#000'}"
+      tooltip-effect="dark"
+      border
+      fit
+      highlight-current-row>
+      <el-table-column :selectable="handleSelectWithDifferentStatus" type="selection" width="55" align="center"/>
+      <el-table-column type="index" label="序号" width="50" align="center"/>
+      <el-table-column prop="USERNAME" label="用户名" align="center"/>
+      <el-table-column prop="NAME" label="姓名" align="center"/>
+      <el-table-column prop="BELONG_TO_CORP_NAME" label="外派公司名称" align="center"/>
+      <el-table-column label="操作" align="center" width="450">
+        <template slot-scope="{row}">
+          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">详情</el-button>
+          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleFlowShow(row)">流程详情</el-button>
+          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleFlowStepShow(row)">审批流程</el-button>
+          <el-button v-if="row.power_flag === '1'" type="primary" icon="el-icon-s-claim" size="mini" @click="approve([row])">审批</el-button>
+          <el-button v-if="false" type="success" icon="el-icon-edit" size="mini" @click="getUserInfo(row)">电子合格证</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="page-btn-group">
+      <div>
+        <el-button v-if="false" type="primary" icon="el-icon-plus" @click="handleAdd">批量同意</el-button>
+      </div>
+      <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList"/>
+    </div>
+    <user ref="userInfo" append-to-body/>
+    <user-info ref="userInfos" append-to-body/>
+    <send-util ref="sendUtil" append-to-body @refresh="getList"/>
+    <flow-info-list ref="flowInfo"/>
+    <flow-step ref="flowStep" />
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves' // waves directive
+import vueQr from 'vue-qr'
+import apply from './apply'
+import user from './user.vue'
+import SendUtil from './sendUtil.vue'
+import UserInfo from '../../flowApply/components/userInfo.vue'
+import FlowInfoList from './flowInfoList.vue'
+import FlowStep from './flowStep.vue'
+
+export default {
+  components: { FlowStep, FlowInfoList, UserInfo, SendUtil, Pagination, apply, vueQr, user },
+  directives: { waves },
+  data() {
+    return {
+      config: config,
+      QRCodeDialog: false,
+      qrcodeStr: '',
+      userDetailForm: {},
+      specialUsersList: {},
+      detailForm: {},
+      userEntryForm: {},
+      imgUrl: '',
+      SUPERVISE_CORPINFO_ID: '',
+      wenhuachengduList: [], // 文化程度
+      postList: [], // 岗位名称
+      photosOfLevel: [], // 三级教育照片
+      trainRecordList: [], // 培训记录
+      contractFileList: [], // 合同文件
+      insuranceFileList: [], // 保险文件
+      gongshangbaoxianFile: [],
+      userPhotoFile: [], // 头像
+      userCardIDPhotoFile: [], // 身份证照片
+      socialPhotoFile: [], // 身份证照片
+      listQuery: {
+        page: 1,
+        limit: 20
+      },
+      total: 0,
+      varList: [],
+      KEYWORDS: '',
+      statusList: [{ value: 0, label: '未培训' }, { value: 1, label: '培训中' }, {
+        value: 2,
+        label: '已培训(合格)'
+      }, { value: 3, label: '已培训(不合格)' }, { value: 9, label: '申请中' }],
+      STATUS: '',
+      add: false,		// 新增按钮
+      del: false,		// 删除按钮
+      edit: false	// 修改按钮
+    }
+  },
+  created() {
+    this.getDict()
+    this.getList()
+    this.hasButton()
+  },
+  methods: {
+    handleSelectWithDifferentStatus(row, rowIndex) {
+      if (row.STATUS === 0) {
+        // 不禁用
+        return true
+      } else {
+        // 禁用
+        return false
+      }
+    },
+    getQuery() {
+      if (this.$refs.multipleTable) {
+        this.$refs.multipleTable.clearSelection()
+      }
+      this.listQuery = {
+        page: 1,
+        limit: 10
+      }
+      this.getList()
+    },
+    goKeyReset() {
+      this.KEYWORDS = ''
+      this.STATUS = ''
+      this.getQuery()
+    },
+    getList() {
+      this.listLoading = true
+      requestFN(
+        '/xgf/user/getAppointApproveList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          KEYWORDS: this.KEYWORDS,
+          STATUS: '1',
+          EMPLOY_FLAG: '1',
+          CHECK_STATUS: '1'
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.list
+        this.total = data.page.totalResult
+      })
+        .catch((e) => {
+          this.listLoading = false
+        })
+    },
+    handleShow(row) {
+      this.$refs.userInfos.init(row)
+    },
+    handleFlowShow(row) {
+      this.$refs.flowInfo.init(row)
+    },
+    handleFlowStepShow(row) {
+      this.$refs.flowStep.init(row)
+    },
+    approve(row) {
+      this.$refs.sendUtil.init(row)
+    },
+    getUserInfo(row) {
+      this.$refs.userInfo.init(row)
+    },
+    handleAdd() {
+      const _selectData = this.$refs.multipleTable.selection
+      if (_selectData == null || _selectData.length == 0) {
+        this.$message({
+          message: '未勾选培训人员...',
+          type: 'error'
+        })
+        return false
+      }
+
+      var users = []
+      _selectData.map(item => {
+        if (item.STATUS === 0) {
+          users.push(item.USER_ID)
+        }
+      })
+
+      if (users == null || users.length == 0) {
+        this.$message({
+          message: '勾选人员暂无法提交申请...',
+          type: 'error'
+        })
+        return false
+      }
+      this.$refs.apply.init(users)
+    },
+    hasButton() {
+      var keys = 'trainingbatch:add,trainingbatch:del,trainingbatch:edit,fhSms,email,fromExcel,toExcel'
+      requestFN(
+        '/head/hasButton',
+        {
+          keys: keys, tm: new Date().getTime()
+        }
+      ).then((data) => {
+        if (data.result == 'success') {
+          this.add = data.trainingbatchfhadminadd	// 增
+          this.del = data.trainingbatchfhadmindel	// 删
+          this.edit = data.trainingbatchfhadminedit	// 改
+          this.fromExcel = data.fromExcel	// 从excel导入权限
+          this.toExcel = data.toExcel		// 导出到excel权限
+        } else if (data.result == 'exception') {
+          // showException('按钮权限', data.exception)// 显示异常
+          console.info('按钮权限:', data.exception)
+        }
+      })
+        .catch((e) => {
+          this.listLoading = false
+        })
+    },
+    getDict: function() {
+      requestFN(
+        'dictionaries/getLevels',
+        { DICTIONARIES_ID: 'd7d80f08d73a4accbccf4fd3d8d1d867' }
+      ).then((data) => {
+        this.wenhuachengduList = data.list
+      }).catch((e) => {
+        this.listLoading = false
+      })
+      requestFN(
+        'dictionaries/getLevels',
+        { DICTIONARIES_ID: '09e36ac01e9540f8bc84eab1c1a78754' }
+      ).then((data) => {
+        this.postList = data.list
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    }
+  }
+}
+</script>
+
diff --git a/src/views/oneCompany/reflection/components/picture.vue b/src/views/oneCompany/reflection/components/picture.vue
new file mode 100644
index 0000000..57e7255
--- /dev/null
+++ b/src/views/oneCompany/reflection/components/picture.vue
@@ -0,0 +1,36 @@
+<template>
+  <div>
+    <el-dialog :visible.sync="visible" :append-to-body="appendToBody" title="头像" width="370px" destroy-on-close	>
+      <el-image :src="src"/>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import vueQr from 'vue-qr'
+
+export default {
+  components: { vueQr },
+  props: {
+    appendToBody: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      src: ''
+    }
+  },
+  methods: {
+    init(e) {
+      this.visible = true
+      this.src = e.src
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/src/views/oneCompany/reflection/components/record.vue b/src/views/oneCompany/reflection/components/record.vue
new file mode 100644
index 0000000..e82258d
--- /dev/null
+++ b/src/views/oneCompany/reflection/components/record.vue
@@ -0,0 +1,198 @@
+<template>
+  <div class="app-container">
+    <el-page-header content="申请记录" @back="goBack"/>
+    <el-form label-width="130px">
+      <el-row>
+        <el-col :span="5">
+          <el-form-item label="申请人员">
+            <el-input v-model="KEYWORDS" placeholder="请输入申请人员"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item label="主管部门">
+            <Treeselect
+              :options="companyTreeData"
+              :normalizer="normalizer"
+              v-model="MANAGER"
+              placeholder="请选择部门"
+              no-options-text="暂无数据"
+              no-children-text="暂无数据"
+              style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item label="属地管理部门">
+            <Treeselect
+              :options="companyTreeData"
+              :normalizer="normalizer"
+              v-model="TERRITORIALITY"
+              placeholder="请选择部门"
+              no-options-text="暂无数据"
+              no-children-text="暂无数据"
+              style="width: 100%;"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item label="申请状态">
+            <el-select v-model="AUDIT_STATUS" placeholder="请选择申请状态" style="width: 100%;">
+              <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" />
+            </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>
+    <el-table ref="multipleTable" :data="varList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="index" label="序号" width="50" align="center" />
+      <el-table-column prop="CREATTIME" label="申请时间" align="center" />
+      <el-table-column prop="CREATOR" label="申请人员" align="center" />
+      <el-table-column prop="SUPERVISION_DEPARTMENT_NAME" label="安监部门" align="center" />
+      <el-table-column prop="MANAGER_DEPT_NAME" label="主管部门" align="center" />
+      <el-table-column prop="TERRITORIALITY_DEPARTMENT_NAME" label="属地管理部门" align="center" />
+      <el-table-column prop="TRAIN_DATE" label="申请年份" align="center" >
+        <template slot-scope="{row}">
+          {{ new Date(row.CREATTIME).getFullYear() }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="AUDIT_STATUS" label="申请状态" align="center" >
+        <template slot-scope="{row}">
+          <span v-if="row.AUDIT_STATUS === 0">待审核</span>
+          <span v-if="row.AUDIT_STATUS === 1">审核中</span>
+          <span v-if="row.AUDIT_STATUS === 2">待培训</span>
+          <span v-if="row.AUDIT_STATUS === 3">已完成</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="PASS_COUNT" label="审核通过人数" align="center" /> <!-- 已更新为申请状态中的审核通过人员数-->
+      <el-table-column prop="USER_COUNT" label="申请人数" align="center" />
+      <el-table-column label="操作" align="center" width="200">
+        <template slot-scope="{row}">
+          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">查看</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="page-btn-group">
+      <div/>
+      <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
+    </div>
+
+    <users ref="users"/>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves' // waves directive
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import users from './users'
+export default {
+  components: { Pagination, Treeselect, users },
+  directives: { waves },
+  data() {
+    return {
+      listQuery: {
+        page: 1,
+        limit: 10
+      },
+      total: 0,
+      varList: [],
+      treeData: [],
+      companyTreeData: [],
+      normalizer(node) {
+        return {
+          id: node.id,
+          label: node.name,
+          children: node.nodes
+        }
+      },
+      MANAGER: null,
+      TERRITORIALITY: null,
+      statusList: [{ value: 0, label: '待审核' }, { value: 1, label: '审核中' }, { value: 2, label: '待培训' }, { value: 3, label: '已完成' }],
+      AUDIT_STATUS: '',
+      KEYWORDS: ''
+    }
+  },
+  created() {
+    this.getList()
+    this.getTreeData()
+  },
+  methods: {
+    getQuery() {
+      this.$refs.multipleTable.clearSelection()
+      this.listQuery = {
+        page: 1,
+        limit: 10
+      }
+      this.getList()
+    },
+    goKeyReset() {
+      this.MANAGER = null
+      this.TERRITORIALITY = null
+      this.AUDIT_STATUS = ''
+      this.KEYWORDS = ''
+      this.getQuery()
+    },
+    getList() {
+      this.listLoading = true
+      requestFN(
+        '/trainingbatch/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          MANAGER: this.MANAGER,
+          TERRITORIALITY: this.TERRITORIALITY,
+          AUDIT_STATUS: this.AUDIT_STATUS,
+          KEYWORDS: this.KEYWORDS,
+          TYPE: 2,
+          USER_ID: JSON.parse(sessionStorage.getItem('user')).USER_ID
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.varList
+        console.log(this.varList)
+        this.total = data.page.totalResult
+      })
+        .catch((e) => {
+          this.listLoading = false
+        })
+    },
+
+    // 获得部门树
+    getTreeData() {
+      requestFN(
+        '/regulatoryApi/department/listTree',
+        {}
+      ).then((data) => {
+        this.treeData = JSON.parse(data.zTreeNodes)
+      }).catch((e) => {
+      })
+      requestFN(
+        '/companyApi/department/listTree',
+        { CORPINFO_ID: this.$parent.SUPERVISE_CORPINFO_ID }
+      ).then((data) => {
+        this.companyTreeData = JSON.parse(data.zTreeNodes)
+      }).catch((e) => {
+      })
+    },
+
+    handleShow(row) {
+      this.$refs.users.init(row)
+    },
+    goBack() {
+      this.$parent.activeName = 'List'
+    }
+  }
+}
+</script>
+
diff --git a/src/views/oneCompany/reflection/components/sendUtil.vue b/src/views/oneCompany/reflection/components/sendUtil.vue
new file mode 100644
index 0000000..b211ab5
--- /dev/null
+++ b/src/views/oneCompany/reflection/components/sendUtil.vue
@@ -0,0 +1,341 @@
+<template>
+  <div>
+    <el-dialog
+      v-loading="loading"
+      :visible.sync="visible"
+      :append-to-body="appendToBody"
+      :before-close="beforeClose"
+      title="审批"
+      width="1200px"
+      destroy-on-close>
+      <el-form ref="form" :model="form" :rules="rules" label-width="200px" label-position="right" type="flex">
+        <el-row :gutter="12">
+          <el-col :span="12">
+            <el-form-item prop="STATUS" label="是否通过: ">
+              <el-select v-model="form.STATUS" filterable style="width: 300px" placeholder="请选择" @change="clearInfo">
+                <el-option label="是" value="1"/>
+                <el-option label="否" value="0"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              v-if="form.STATUS === '1' && isShow"
+              :label="menu.department + ':'"
+              prop="APPOINT_DEPARTMENT_ID">
+              <Treeselect
+                :options="departmentTree"
+                :normalizer="normalizer"
+                v-model="form.APPOINT_DEPARTMENT_ID"
+                placeholder="请选择部门"
+                no-options-text="暂无数据"
+                no-children-text="暂无数据"
+                style="width: 300px"
+                @select="getPeopleList($event)"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col v-if="form.STATUS === '0'" :span="12">
+            <el-form-item v-if="form.STATUS === '0'" prop="OPINION" label="打回原因:">
+              <el-input v-model="form.OPINION" :rows="2" type="textarea" placeholder="填写审批意见"/>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.STATUS === '1' && isShow" :span="12">
+            <el-form-item v-if="form.STATUS === '1'" :label="menu.user +':'" prop="APPOINT_USER_ID">
+              <el-select v-model="form.user" style="width: 300px" placeholder="请选择" @change="chooseUser">
+                <el-option
+                  v-for="item in peopleList"
+                  :key="item.USER_ID"
+                  :value="JSON.stringify(item)"
+                  :label="item.NAME"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="form.STATUS === '1' && menu.uploadFile" :span="12">
+            <el-form-item :label="menu.uploadFile + ':'" prop="APPOINT_ANNEX">
+              <upload-file
+                :file-list.sync="form.APPOINT_ANNEX"
+                :multiple="false"
+                :accept="'.pdf,.jpg,.png,doc,docx'"
+                :limit="20"
+                :size="1024"
+                :upload-type="1"/>
+            </el-form-item>
+          </el-col>
+          <el-col v-if="menu.limitFlag === '1' && form.STATUS === '1'" :span="12">
+            <el-form-item prop="LIMIT_END_TIME" label="培训有效期结束时间:">
+              <el-date-picker v-model="form.LIMIT_END_TIME" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" style="width:300px "/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="handleClose">关 闭</el-button>
+        <el-button type="primary" @click="sendMessage('1')">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import vueQr from 'vue-qr'
+import Treeselect from '@riophae/vue-treeselect'
+import { requestFN } from '@/utils/request'
+import uploadFile from '../../../util/uploadFile/index.vue'
+import { upload } from '@/utils/upload'
+
+export default {
+  components: { uploadFile, Treeselect, vueQr },
+  props: {
+    appendToBody: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      loading: false,
+      form: {
+        STATUS: null,
+        APPOINT_CORP_ID: '',
+        APPOINT_CORP_NAME: '',
+        APPOINT_DEPARTMENT_ID: null,
+        APPOINT_DEPARTMENT_NAME: '',
+        APPOINT_USER_ID: null,
+        APPOINT_USER_NAME: '',
+        OPINION: '',
+        APPOINT_ANNEX: [],
+        user: '',
+        tm: new Date().getTime(),
+        list: [],
+        isShow: true,
+        info: {}
+      },
+      rules: {
+        STATUS: [
+          { required: true, message: '请选择是否通过', trigger: 'change' }
+        ],
+        APPOINT_DEPARTMENT_ID: [
+          { required: true, message: '请选择指定监管部门', trigger: 'change' }
+        ],
+        APPOINT_USER_ID: [
+          { required: true, message: '请选择指定监管部门审批人', trigger: 'change' }
+        ],
+        OPINION: [
+          { required: true, message: '请填写打回原因', trigger: 'change' }
+        ],
+        APPOINT_ANNEX: [
+          { required: true, message: '请上传文件', trigger: 'change' }
+        ],
+        LIMIT_END_TIME: [
+          { required: true, message: '请选择指定培训有效截至时间', trigger: 'change' }
+        ]
+      },
+      heirloom: {},
+
+      normalizer(node) {
+        return {
+          id: node.id,
+          label: node.name,
+          children: node.nodes
+        }
+      },
+
+      departmentTree: [],
+      peopleList: [],
+      corpFlag: false,
+      menu: {
+        department: '',
+        user: '',
+        uploadFile: '',
+        limitFlag: ''
+      }
+    }
+  },
+  methods: {
+    async init(e) {
+      this.loading = true
+      this.visible = true
+      this.heirloom = JSON.stringify(e)
+      this.form.list = JSON.stringify(e)
+      this.info = e[0]
+      await this.getMenu()
+
+      if (this.info.FLOWS_TYPE === '0') {
+        if (this.info.FLOWS_STEP === 0) {
+          this.isShow = true
+          await this.getDepartmentTree()
+          this.corpFlag = false
+        } else {
+          this.isShow = false
+        }
+      }
+      if (this.info.FLOWS_TYPE === '1') {
+        this.isShow = true
+        if (this.info.FLOWS_STEP === 2 || this.info.FLOWS_STEP === 3) {
+          await this.getDepartmentTree()
+          this.corpFlag = false
+          if (this.info.FLOWS_STEP === 3) {
+            this.isShow = false
+          }
+        } else {
+          await this.getCorpDepartmentTree()
+          this.corpFlag = true
+        }
+      }
+      if (this.info.FLOWS_TYPE === '2') {
+        if (this.info.FLOWS_STEP === 1) {
+          this.isShow = true
+          await this.getDepartmentTree()
+          this.corpFlag = false
+        } else {
+          this.isShow = false
+        }
+      }
+      this.loading = false
+    },
+    getMenu() {
+      return new Promise(resolve => {
+        requestFN(
+          '/flowTrain/getPintName', { FLOWS_TYPE: this.info.FLOWS_TYPE, FLOWS_STEP: this.info.FLOWS_STEP }
+        ).then((data) => {
+          this.menu.department = data.Department
+          this.menu.user = data.User
+          this.menu.uploadFile = data.UploadFile
+          this.menu.limitFlag = data.limitFlag
+          resolve(true)
+        }).catch((e) => {
+        })
+      })
+    },
+    sendMessage(e) {
+      this.$refs.form.validate((valid) => {
+        if (!valid) {
+          this.$message.error('请填写完整信息')
+        } else {
+          const formData = new FormData()
+          Object.keys(this.form).map(key => {
+            formData.append(key, this.form[key])
+          })
+          if (this.form.APPOINT_ANNEX) {
+            for (let i = 0; i < this.form.APPOINT_ANNEX.length; i++) {
+              formData.append('chengNuoShu', this.form.APPOINT_ANNEX[i].raw)
+            }
+          }
+          upload('/xgf/user/approveMax', formData)
+            .then((data) => {
+              this.$message.success('推送成功')
+              this.visible = false
+              this.$emit('refresh', '')
+              this.handleClose()
+            })
+            .catch((e) => {
+              console.log(e)
+            })
+        }
+      })
+    },
+    getDepartmentTree() {
+      return new Promise(resolve => {
+        requestFN(
+          '/department/listTree',
+          {}
+        ).then((data) => {
+          this.departmentTree = this.removeEmptyChildren(JSON.parse(data.zTreeNodes))
+          resolve(true)
+        }).catch((e) => {
+        })
+      })
+    },
+    getCorpDepartmentTree() {
+      return new Promise(resolve => {
+        requestFN(
+          '/openApi/corpDepartment/listTree',
+          {}
+        ).then((data) => {
+          this.departmentTree = this.removeEmptyChildren(JSON.parse(data.zTreeNodes))
+          resolve(true)
+        }).catch((e) => {
+        })
+      })
+    },
+    getPeopleList(e) {
+      this.form.APPOINT_DEPARTMENT_NAME = e.name
+      if (!this.corpFlag) {
+        requestFN(
+          '/user/listAll',
+          {
+            DEPARTMENT_ID: e.id
+          }
+        ).then((data) => {
+          this.peopleList = data.userList
+          this.form.user = ''
+        }).catch((e) => {
+          console.log(e)
+        })
+      } else {
+        requestFN(
+          '/user/listAllManageAndCorp',
+          {
+            DEPARTMENT_ID: e.id
+          }
+        ).then((data) => {
+          this.peopleList = data.userList
+          this.form.user = ''
+        }).catch((e) => {
+          console.log(e)
+        })
+      }
+    },
+    chooseUser(e) {
+      const entity = JSON.parse(e)
+      this.form.APPOINT_USER_ID = entity.USER_ID
+      this.form.APPOINT_USER_NAME = entity.NAME
+    },
+
+    handleClose() {
+      this.form = {
+        STATUS: '',
+        APPOINT_DEPARTMENT_ID: null,
+        APPOINT_DEPARTMENT_NAME: '',
+        APPOINT_USER_ID: '',
+        APPOINT_USER_NAME: '',
+        OPINION: '',
+        user: '',
+        list: [],
+        tm: new Date().getTime()
+      }
+      this.visible = false
+    },
+    beforeClose() {
+      this.visible = false
+      this.form = {
+        STATUS: '',
+        APPOINT_DEPARTMENT_ID: null,
+        APPOINT_DEPARTMENT_NAME: '',
+        APPOINT_USER_ID: '',
+        APPOINT_USER_NAME: '',
+        OPINION: '',
+        user: '',
+        list: [],
+        tm: new Date().getTime()
+      }
+    },
+    clearInfo() {
+      this.form.APPOINT_DEPARTMENT_ID = null
+      this.form.APPOINT_DEPARTMENT_NAME = ''
+      this.form.APPOINT_USER_ID = null
+      this.form.APPOINT_USER_NAME = ''
+      this.form.OPINION = ''
+      this.form.user = ''
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/src/views/oneCompany/reflection/components/user.vue b/src/views/oneCompany/reflection/components/user.vue
new file mode 100644
index 0000000..889dc08
--- /dev/null
+++ b/src/views/oneCompany/reflection/components/user.vue
@@ -0,0 +1,250 @@
+<template>
+  <div>
+    <el-dialog :visible.sync="visible" :append-to-body="appendToBody" title="相关方安全告知培训合格证" width="370px">
+      <div v-for="item in peopleList" :key="item.CLASS_INFO_ID" style="height: 220px">
+        <div class="bg_table">
+          <div class="title">相关方安全告知培训合格证</div>
+          <div class="red">{{ item.CLASS_NO }}</div>
+          <table class="table">
+            <tr>
+              <td style="width: 120px">
+                <div class="text textone name">姓名</div>
+              </td>
+              <td style="width: 100px;">
+                <div class="text text1 tcenter">{{ item.NAME }}</div>
+              </td>
+              <td style="width: 86px">
+                <div class="text text2 tcenter">工种</div>
+              </td>
+              <td style="width: 148px;">
+                <div v-if="item.JOBS_TYPE" class="text tcenter ">{{ item.JOBS_TYPE }}</div>
+                <div v-else>暂无</div>
+              </td>
+              <td rowspan="4" style="width: 134px;">
+                <img v-if="!getShowPicture(item)" src="../../../../assets/images/peopleHead.png" alt="" style="width: 116px; height: 146px">
+                <img v-if="getShowPicture(item)" :src="config.fileUrl + item.PHOTO" alt="" style="width: 116px; height: 146px" @click="openPicture(config.fileUrl + item.PHOTO)">
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <div class="text textone">资质</div>
+              </td>
+              <td colspan="3">
+                <div v-if="item.CERTIFICATE" class="text">{{ item.CERTIFICATE }}</div>
+                <div v-else>暂无</div>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <div class="text textone">培训时间</div>
+              </td>
+              <td colspan="3">
+                <div class="text">{{ item.OPENING_TIME }}</div>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <div class="text textone">有效期限</div>
+              </td>
+              <td colspan="3">
+                <div class="text">{{ item.VALIDITY_PERIOD_END }}</div>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <div class="text textone">所在单位</div>
+              </td>
+              <td colspan="3">
+                <div class="text">{{ item.DEPARTMENT_NAME }}</div>
+              </td>
+              <td rowspan="3" style="padding-top: 6px" @click="click(config.messageUrl + '?CLASS_INFO_ID=' + item.CLASS_INFO_ID)">
+                <vue-qr :text="config.messageUrl + '?CLASS_INFO_ID=' + item.CLASS_INFO_ID" :margin="0" :size="110" color-dark="#000" color-light="#fff"/>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <div class="text textone">身份证号</div>
+              </td>
+              <td colspan="3">
+                <div class="text">{{ item.CARD_ID }}</div>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <div class="text textone">手机</div>
+              </td>
+              <td colspan="3">
+                <div class="text">{{ item.PHONE }}</div>
+              </td>
+            </tr>
+          </table>
+        </div>
+      </div>
+    </el-dialog>
+    <QRCode ref="QRcode" append-to-body/>
+    <Picture ref="Picture" append-to-body/>
+  </div>
+</template>
+
+<script>
+import { requestFN } from '@/utils/request'
+import vueQr from 'vue-qr'
+import QRCode from './QRCode.vue'
+import Picture from './picture.vue'
+
+export default {
+  components: { QRCode, Picture, vueQr },
+  props: {
+    appendToBody: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      config: config,
+      visible: false,
+      peopleList: [],
+      CLASS_MESSAGE_ID: '',
+      CLASS_INFO_ID: '',
+      USER_ID: '',
+      qrCodeStr: ''
+    }
+  },
+  methods: {
+    init(e) {
+      console.info(e)
+      if (e && e.CLASS_INFO_ID) {
+        this.CLASS_INFO_ID = e.CLASS_INFO_ID
+      }
+      if (e && e.CLASS_MESSAGE_ID) {
+        this.CLASS_MESSAGE_ID = e.CLASS_MESSAGE_ID
+      }
+      if (e && e.USER_ID) {
+        this.USER_ID = e.USER_ID
+      }
+      this.qrCodeStr = config.messageUrl + '?CLASS_INFO_ID=' + this.CLASS_INFO_ID
+      this.visible = true
+      this.getInfo()
+    },
+    getInfo() {
+      requestFN('/trainusers/getUserinfoList', {
+        CLASS_INFO_ID: this.CLASS_INFO_ID,
+        CLASS_MESSAGE_ID: this.CLASS_MESSAGE_ID,
+        USER_ID: this.USER_ID
+      })
+        .then((data) => {
+          this.peopleList = data.list
+        }).catch((e) => {
+          console.log(e)
+        })
+    },
+    getShowPicture(row) {
+      if (row.PHOTO && row.PHOTO !== '' && (row.PHOTO.indexOf('.jpg') >= 0 || row.PHOTO.indexOf('.png') >= 0 || row.PHOTO.indexOf('.jpeg') >= 0)) {
+        return true
+      }
+    },
+    click(e) {
+      this.$refs.QRcode.init({ qrCodeStr: e })
+    },
+    openPicture(src) {
+      this.$refs.Picture.init({ src: src })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+.name{
+  width: 120px;
+  overflow: hidden;//溢出隐藏
+  white-space: nowrap; // 强制一行显示
+  text-overflow: ellipsis;// 显示。。。省略号
+}
+.red {
+  width: 660px;
+  color: #ff0000;
+  margin-left: 34px;
+  font-size: 24px;
+}
+
+.bg_table {
+  background: url("../../../../assets/tablebg.jpg") no-repeat bottom center;
+  background-size: 100%;
+  width: 660px;
+  height: 430px;
+  border: 4px solid #453d3a;
+  transform: scale(0.5);
+  transform-origin: top left;
+
+  .title {
+    font-size: 28px;
+    text-align: center;
+    margin-top: 34px;
+    font-weight: bold;
+    color: #000000;
+  }
+
+  .table {
+    border-collapse: collapse;
+    width: 590px;
+    color: #453d3a;
+    font-size: 20px;
+    margin: 34px;
+    text-align: left;
+    margin-top: 10px;
+
+    .tcenter {
+      text-align: center
+    }
+
+    .w60 {
+      width: 100px;
+    }
+
+    .w74 {
+      width: 148px
+    }
+
+    th, td {
+      border: 2px solid #453d3a;
+      text-align: left;
+      height: 40px;
+      padding: 0 16px;
+
+      box-sizing: border-box;
+
+      .textone {
+        width: 80px;
+        text-align: justify;
+        text-align-last: justify;
+        text-justify: distribute-all-lines;
+        margin: 0 auto;
+      }
+
+      .text1 {
+        width: 60px;
+        text-align: justify;
+        text-align-last: justify;
+        text-justify: distribute-all-lines;
+        margin: 0 auto;
+
+      }
+
+      .text2 {
+        width: 50px;
+        text-align: justify;
+        text-align-last: justify;
+        text-justify: distribute-all-lines;
+        margin: 0 auto;
+
+      }
+
+      .text {
+
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/oneCompany/reflection/components/users.vue b/src/views/oneCompany/reflection/components/users.vue
new file mode 100644
index 0000000..2d11653
--- /dev/null
+++ b/src/views/oneCompany/reflection/components/users.vue
@@ -0,0 +1,513 @@
+<template>
+  <div class="app-container">
+    <el-dialog
+      v-if="visible"
+      :visible.sync="visible"
+      :before-close="handleClose"
+      :append-to-body="true"
+      title="申请详情"
+      width="60%">
+      <div class="level-title mt-20" style="display: flex;justify-content: space-between;">
+        <h1>申请信息</h1>
+      </div>
+      <table class="table-ui" style="margin-bottom: 20px;">
+        <tr>
+          <th style="width: 17%">申请人</th>
+          <td style="width: 17%">{{ pd.CREATOR }}</td>
+          <th style="width: 17%">申请时间</th>
+          <td style="width: 17%">{{ pd.CREATTIME }}</td>
+          <th style="width: 17%">备注</th>
+          <td style="width: 15%">{{ pd.DESCR }}</td>
+        </tr>
+        <tr>
+          <th style="width: 30px">安监部门</th>
+          <td style="width: 50px">{{ pd.SUPERVISION_DEPARTMENT_NAME }}</td>
+          <th style="width: 30px">审核人</th>
+          <td style="width: 50px">{{ pd.SUPERVISION_USER_NAME }}</td>
+          <th style="width: 30px">审核时间</th>
+          <td style="width: 50px">{{ pd.SUPERVISION_TIME }}</td>
+        </tr>
+        <tr>
+          <th>主管部门</th>
+          <td>{{ pd.MANAGER_DEPT_NAME }}</td>
+          <th>审核人</th>
+          <td>{{ pd.MANAGER_USER_NAME }}</td>
+          <th>审核时间</th>
+          <td>{{ pd.MANAGER_TIME }}</td>
+        </tr>
+        <tr>
+          <th>属地管理部门</th>
+          <td>{{ pd.TERRITORIALITY_DEPARTMENT_NAME }}</td>
+          <th>审核人</th>
+          <td>{{ pd.TERRITORIALITY_USER_NAME }}</td>
+          <th>审核时间</th>
+          <td>{{ pd.TERRITORIALITY_TIME }}</td>
+        </tr>
+        <tr v-if="pd.AUDIT_DESCR">
+          <th>股份公司意见</th>
+          <td colspan="5">{{ pd.AUDIT_DESCR }}</td>
+        </tr>
+        <tr v-if="pd.CORP_AUDIT_DESCR">
+          <th>分公司意见</th>
+          <td colspan="5">{{ pd.CORP_AUDIT_DESCR }}</td>
+        </tr>
+      </table>
+      <div class="level-title">
+        <h1>申请人员列表</h1>
+      </div>
+      <el-table ref="multipleTable" :data="userList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column type="index" label="序号" width="50" align="center" />
+        <el-table-column prop="USERNAME" label="用户名" align="center" />
+        <el-table-column prop="NAME" label="姓名" align="center" />
+        <el-table-column prop="DEPARTMENT_NAME" label="部门" align="center" />
+        <el-table-column prop="STATE" label="审核状态" align="center" >
+          <template slot-scope="{row}">
+            <el-tag v-if="row.MANAGER_STATE === 0 || row.SUPERVISION_STATE === 0 || row.TERRITORIALITY_STATE === 0" type="danger">审核不通过</el-tag>
+            <el-tag v-else-if="row.MANAGER_STATE === 1 && row.SUPERVISION_STATE === 1 && row.TERRITORIALITY_STATE === 1" type="success">审核通过</el-tag>
+            <el-tag v-else type="success">待审核</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="200" >
+          <template slot-scope="{row}">
+            <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row.USER_ID)">查看</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="page-btn-group">
+        <div/>
+        <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getUserList" />
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="closeWindow">关 闭</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog
+      v-if="userInfoDialog"
+      :visible.sync="userInfoDialog"
+      :append-to-body="true"
+      title="查看"
+      width="60%">
+      <table class="table-ui" style="margin-bottom: 20px;">
+        <div class="level-title">
+          <h1>人员信息</h1>
+        </div>
+        <tr>
+          <th>照片</th>
+          <td>
+            <span v-if="imgUrl != ''">
+              <div class="img-flex">
+                <viewer>
+                  <img :src="imgUrl" width="40" height="40" style="object-fit: cover;">
+                </viewer>
+              </div>
+            </span>
+            <span v-else/>
+          </td>
+          <th>姓名</th>
+          <td>{{ userDetailForm.NAME }}</td>
+          <th>性别</th>
+          <td>{{ userDetailForm.SEX === '0' ? '男' : '女' }}</td>
+        </tr>
+        <tr>
+          <th>出生年月</th>
+          <td>{{ userDetailForm.DATE_OF_BIRTH }}</td>
+          <th>年龄</th>
+          <td>{{ userDetailForm.AGE }}</td>
+          <th>手机号</th>
+          <td>{{ userDetailForm.PHONE }}</td>
+        </tr>
+        <tr>
+          <th>身份证</th>
+          <td>{{ userDetailForm.CARD_ID }}</td>
+          <th>身份证照片</th>
+          <!--if条件不可删除-->
+          <td v-if="userCardIDPhotoFile.length>0" colspan="3">
+            <span>
+              <div class="img-flex">
+                <viewer>
+                  <img
+                    v-for="item in userCardIDPhotoFile"
+                    :src="config.fileUrl + item.FILEPATH"
+                    :key="item.IMGFILES_ID"
+                    width="40"
+                    height="40"
+                    style="object-fit: cover;">
+                </viewer>
+              </div>
+            </span>
+          </td>
+        </tr>
+
+        <tr>
+          <th>民族</th>
+          <td>{{ userDetailForm.minzuName ? userDetailForm.minzuName : '暂无信息' }}</td>
+          <th>婚姻状况</th>
+          <td>{{ userDetailForm.MARITALSTATUS === '0' ? '未婚' : '已婚' }}</td>
+          <th>政治面貌</th>
+          <td>{{ userDetailForm.zzName }} {{
+            userDetailForm.zzName == '中共党员' ? '入党时间' + userDetailForm.POLITICAL_TIME : ''
+          }}
+          </td>
+        </tr>
+
+        <tr>
+          <th>户口所在地</th>
+          <td>{{ userDetailForm.HKLOCAL ? userDetailForm.HKLOCAL : '暂无信息' }}</td>
+          <th>现住址</th>
+          <td>{{ userDetailForm.ADDRESS ? userDetailForm.ADDRESS : '暂无信息' }}</td>
+          <th>联系电话</th>
+          <td>{{ userDetailForm.PHONE }}</td>
+        </tr>
+        <tr>
+          <th>文化程度</th>
+          <td>{{ userDetailForm.DEGREE_OF_EDUCATION_NAME }}</td>
+          <th>岗位名称(工种)</th>
+          <td colspan="5">{{ userDetailForm.POST_ID }}</td>
+        </tr>
+        <tr>
+          <th>是否缴纳社保</th>
+          <td :colspan="userDetailForm.IS_SOCIAL === '1' ? '':5">{{ formatLabel(userDetailForm.IS_SOCIAL) }}</td>
+          <th v-if="userDetailForm.IS_SOCIAL === '1'">社会保障号码</th>
+          <td v-if="userDetailForm.IS_SOCIAL === '1'">{{ userDetailForm.SOCIAL_NUMBER }}</td>
+          <th v-if="userDetailForm.IS_SOCIAL === '1'">社保卡照片</th>
+          <td v-if="userDetailForm.IS_SOCIAL === '1'&& socialPhotoFile.length>0" colspan="3">
+            <span>
+              <div class="img-flex">
+                <viewer>
+                  <img
+                    v-for="item in socialPhotoFile"
+                    :src="config.fileUrl + item.FILEPATH"
+                    :key="item.IMGFILES_ID"
+                    width="40"
+                    height="40"
+                    style="object-fit: cover;">
+                </viewer>
+              </div>
+            </span>
+          </td>
+        </tr>
+        <tr>
+          <th>是否参加三级安全培训</th>
+          <td>{{ formatLabel(userDetailForm.IS_LEVEL_THREE) }}</td>
+          <th v-if="userDetailForm.IS_LEVEL_THREE == 1">三级安全培训照片</th>
+          <td v-if="userDetailForm.IS_LEVEL_THREE == 1 && photosOfLevel.length>0" colspan="5">
+            <span>
+              <div class="img-flex">
+                <viewer>
+                  <img
+                    v-for="item in photosOfLevel"
+                    :src="config.fileUrl + item.FILEPATH"
+                    :key="item.IMGFILES_ID"
+                    width="40"
+                    height="40"
+                    style="object-fit: cover;">
+                </viewer>
+              </div>
+            </span>
+          </td>
+        </tr>
+        <tr>
+          <th>是否缴纳保险</th>
+          <td>{{ formatLabel(userDetailForm.IS_BF) }}</td>
+          <th>是否特殊工种</th>
+          <td>{{ formatLabel(userDetailForm.IS_SPECIAL_JOB) }}</td>
+          <th>是否流动人员</th>
+          <td>{{ formatLabel(userDetailForm.ISFLOW) }}</td>
+        </tr>
+      </table>
+      <div class="level-title">
+        <h1>培训记录</h1>
+      </div>
+      <el-table
+        :data="trainRecordList"
+        :header-cell-style="{'font-weight': 'bold','color': '#000'}"
+        tooltip-effect="dark"
+        border
+        fit
+        highlight-current-row>
+        <el-table-column type="selection" width="55" align="center"/>
+        <el-table-column type="index" label="序号" width="50" align="center"/>
+        <el-table-column prop="CLASS_NAME" label="班级名称" align="center"/>
+        <el-table-column prop="OPENING_TIME" label="开班时间" align="center"/>
+        <el-table-column prop="TRAINING_TYPE_NAME" label="培训类型" align="center"/>
+        <el-table-column prop="PLACE_NAME" label="培训地点" align="center"/>
+        <el-table-column label="培训有效期" align="center">
+          <template slot-scope="{row}">
+            <span>{{ formatDate(row.VALIDITY_PERIOD_START) }} 至 {{ formatDate(row.VALIDITY_PERIOD_END) }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div v-if="userDetailForm.IS_SPECIAL_JOB == '1'" class="level-title">
+        <h1>特种作业人员信息</h1>
+      </div>
+      <table v-for="(item,index) in specialUsersList" :key="index" class="table-ui" style="margin-bottom: 20px;">
+        <tr>
+          <th style="width: 150px">证书名称</th>
+          <td style="width: 150px">{{ item.CERTIFICATE }}</td>
+          <th style="width: 150px">作业类别</th>
+          <td style="width: 180px">{{ item.SPECIAL_TYPE_NAME }}</td>
+          <th style="width: 150px">操作项目</th>
+          <td>{{ item.OPERATION_TYPE_NAME }}</td>
+        </tr>
+        <tr>
+          <th>特种作业证书编号</th>
+          <td>{{ item.SPECIAL_NUMBER }}</td>
+          <th>发证机关</th>
+          <td colspan="3">{{ item.ISSUING_AUTHORITY }}</td>
+        </tr>
+        <tr>
+          <th>复审时间</th>
+          <td>{{ item.REVIEW_TIME }}</td>
+          <th>有效期</th>
+          <td colspan="3">{{ item.VALIDITY_TIME_START }} 至 {{ item.VALIDITY_TIME_END }}</td>
+        </tr>
+      </table>
+      <div
+        v-if="detailForm.SUPERVISION_STATE === 0 || detailForm.MANAGER_STATE === 0 || detailForm.TERRITORIALITY_STATE === 0"
+        class="level-title mt-20">
+        <h1>打回信息</h1>
+      </div>
+      <table
+        v-if="detailForm.SUPERVISION_STATE === 0 || detailForm.MANAGER_STATE === 0 || detailForm.TERRITORIALITY_STATE === 0"
+        class="table-ui"
+        style="margin-bottom: 20px;">
+        <tr>
+          <th>打回人</th>
+          <td v-if="detailForm.SUPERVISION_STATE === 0">{{ detailForm.SUPERVISION_USER_NAME }}</td>
+          <td v-if="detailForm.MANAGER_STATE === 0">{{ detailForm.MANAGER_USER_NAME }}</td>
+          <td
+            v-if="detailForm.TERRITORIALITY_STATE === 0 && detailForm.MANAGER_USER_NAME !== detailForm.TERRITORIALITY_USER_NAME">
+            {{ detailForm.TERRITORIALITY_USER_NAME }}
+          </td>
+          <th>打回原由</th>
+          <td v-if="detailForm.SUPERVISION_STATE === 0">{{ detailForm.SUPERVISION_OPINION }}</td>
+          <td v-if="detailForm.MANAGER_STATE === 0">{{ detailForm.MANAGER_OPINION }}</td>
+          <td
+            v-if="detailForm.TERRITORIALITY_STATE === 0 && detailForm.MANAGER_USER_NAME !== detailForm.TERRITORIALITY_USER_NAME">
+            {{ detailForm.TERRITORIALITY_OPINION }}
+          </td>
+        </tr>
+      </table>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="userInfoDialog = false">关 闭</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog :visible.sync="QRCodeDialog" title="查看二维码" width="680px" class="top-dialog">
+      <div class="table-qrcode" style="text-align: center;padding-top: 30px;">
+        <vue-qr :text="qrcodeStr" :margin="0" :size="300" color-dark="#000" color-light="#fff" />
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="QRCodeDialog = false">关 闭</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import vueQr from 'vue-qr'
+import dateformat from '@/utils/dateformat'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+export default {
+  components: {
+    Pagination,
+    vueQr
+  },
+  data() {
+    return {
+      config: config,
+      contractFileList: [], // 合同文件
+      insuranceFileList: [], // 保险文件
+      userInfoDialog: false,
+      QRCodeDialog: false,
+      qrcodeStr: '',
+      userDetailForm: {},
+      userEntryForm: {},
+      specialUsersList: {},
+      imgUrl: '',
+      wenhuachengduList: [], // 文化程度
+      userCardIDPhotoFile: [], // 身份证照片
+      postList: [], // 岗位名称
+      trainRecordList: [], // 培训记录
+      visible: false,
+      pd: {},
+      userList: [],
+      listQuery: {
+        page: 1,
+        limit: 10
+      },
+      total: 0,
+      photosOfLevel: []
+    }
+  },
+  methods: {
+    formatDate(date, column) {
+      if (date) {
+        return dateformat(date, 'YYYY-MM-DD')
+      } else {
+        return ''
+      }
+    },
+    init(e) {
+      if (e) {
+        this.pd = e
+      }
+      this.visible = true
+      this.userList = []
+      this.getDict()
+      this.getUserList()
+    },
+    // 获取数据字典数据
+    getDict: function() {
+      requestFN(
+        '/dictionaries/getLevels',
+        {
+          DICTIONARIES_ID: '1144b16d85f14b108ea7859e2be9d001'
+        }
+      ).then((data) => {
+        this.flowAreaList = data.list
+      }).catch((e) => {
+
+      })
+      requestFN(
+        'dictionaries/getLevels',
+        { DICTIONARIES_ID: 'd7d80f08d73a4accbccf4fd3d8d1d867' }
+      ).then((data) => {
+        this.wenhuachengduList = data.list
+      }).catch((e) => {
+        this.listLoading = false
+      })
+      requestFN(
+        'dictionaries/getLevels',
+        { DICTIONARIES_ID: '09e36ac01e9540f8bc84eab1c1a78754' }
+      ).then((data) => {
+        this.postList = data.list
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+
+    // 人员
+    getUserList() {
+      requestFN(
+        '/trainingbatch/batchUserList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          TRAININGBATCH_ID: this.pd.TRAININGBATCH_ID
+        }
+      ).then((data) => {
+        this.userList = data.varList
+        this.total = data.page.totalResult
+      }).catch((e) => {
+      })
+    },
+    // 二维码
+    showQRCode(id) {
+      this.QRCodeDialog = true
+      const arr = [{ USER_ID: id, CODE_TYPE: '1' }]
+      this.qrcodeStr = JSON.stringify(arr)
+    },
+    // 查看
+    async handleShow(USER_ID) {
+      await this.getUserInfoById(USER_ID)
+      await this.getOtherUserInfoById(USER_ID)
+      this.userInfoDialog = true
+    },
+    getUserInfoById(id) {
+      return new Promise((resolve, reject) => {
+        requestFN(
+          '/user/getFloatPersonDetailById',
+          {
+            USER_ID: id,
+            TRAININGBATCH_ID: this.pd.TRAININGBATCH_ID,
+            CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID
+          }
+        ).then((data) => {
+          this.userDetailForm = Object.assign(this.userDetailForm, data.userDetail)
+          this.userEntryForm = Object.assign(this.userEntryForm, data.eCard)
+          if (this.userDetailForm.PHOTO) {
+            this.imgUrl = config.fileUrl + this.userDetailForm.PHOTO
+          }
+          this.trainRecordList = data.recordList
+          // this.insuranceFileList = data.insuranceFile
+          // this.contractFileList = data.contractFile
+          resolve()
+        }).catch((e) => {
+          reject()
+        })
+      })
+    },
+    getOtherUserInfoById(id) {
+      return new Promise((resolve, reject) => {
+        requestFN(
+          'user/getDetailByUserIdAndCorpInfoId',
+          {
+            USER_ID: id,
+            CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID,
+            CER_TYPE: '7498057c4c1f4a11b9a960e66ea04a7a'
+          }
+        ).then((data) => {
+          Object.assign(this.userDetailForm, data.pd)
+          this.userPhotoFile = data.userPhotoFile
+          if (this.userPhotoFile.length > 0) {
+            this.imgUrl = config.fileUrl + this.userPhotoFile[0].FILEPATH
+          }
+          this.insuranceFileList = data.insuranceFile
+          this.specialUsersList = data.specialUsers
+          this.contractFileList = data.contractFile
+          this.userCardIDPhotoFile = data.userCardIDPhotoFile
+          this.socialPhotoFile = data.socialPhotoFile
+          this.gongshangbaoxianFile = data.gongshangbaoxianFile
+          resolve()
+        }).catch((e) => {
+          reject()
+        })
+      })
+    },
+    // 转换是否
+    formatLabel(value) {
+      if (value == '1') {
+        return '是'
+      } else if (value == '0') {
+        return '否'
+      } else {
+        return ''
+      }
+    },
+    // 转换字典数据
+    formatDictioariesLabel(value, type) {
+      var list = []
+      if (type == '0') {
+        list = this.wenhuachengduList
+      } else if (type == '1') {
+        list = this.postList
+      }
+      if (value) {
+        if (list.length > 0) {
+          var data = ''
+          for (let i = 0; i < list.length; i++) {
+            const obj = list[i]
+            if (value == obj.BIANMA) {
+              data = obj.NAME
+              break
+            }
+          }
+          return data
+        } else {
+          return value
+        }
+      } else {
+        return ''
+      }
+    },
+
+    handleClose() {
+      this.visible = false
+    },
+    closeWindow() {
+      this.handleClose()
+    }
+  }
+}
+</script>
diff --git a/src/views/oneCompany/reflection/index.vue b/src/views/oneCompany/reflection/index.vue
new file mode 100644
index 0000000..70cda6e
--- /dev/null
+++ b/src/views/oneCompany/reflection/index.vue
@@ -0,0 +1,23 @@
+<template>
+  <component :is="activeName" />
+</template>
+
+<script>
+import List from './components/list'
+import Record from './components/record'
+export default {
+  components: {
+    List: List,
+    Record: Record
+  },
+  data() {
+    return {
+      activeName: 'List',
+      SUPERVISE_CORPINFO_ID: ''
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

From df67a534da04335c7f4230f9493092b05997085c Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Sat, 13 Apr 2024 10:45:56 +0800
Subject: [PATCH 04/23] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reflection/components/QRCode.vue          |  36 --
 .../reflection/components/apply.vue           | 320 -----------
 .../reflection/components/flowInfo.vue        |  94 ----
 .../reflection/components/flowInfoList.vue    |  87 ---
 .../reflection/components/flowStep.vue        | 107 ----
 .../oneCompany/reflection/components/list.vue |  13 +-
 .../reflection/components/picture.vue         |  36 --
 .../reflection/components/record.vue          | 198 -------
 .../reflection/components/sendUtil.vue        | 341 ------------
 .../oneCompany/reflection/components/user.vue | 250 ---------
 .../reflection/components/users.vue           | 513 ------------------
 src/views/oneCompany/reflection/index.vue     |   4 +-
 12 files changed, 2 insertions(+), 1997 deletions(-)
 delete mode 100644 src/views/oneCompany/reflection/components/QRCode.vue
 delete mode 100644 src/views/oneCompany/reflection/components/apply.vue
 delete mode 100644 src/views/oneCompany/reflection/components/flowInfo.vue
 delete mode 100644 src/views/oneCompany/reflection/components/flowInfoList.vue
 delete mode 100644 src/views/oneCompany/reflection/components/flowStep.vue
 delete mode 100644 src/views/oneCompany/reflection/components/picture.vue
 delete mode 100644 src/views/oneCompany/reflection/components/record.vue
 delete mode 100644 src/views/oneCompany/reflection/components/sendUtil.vue
 delete mode 100644 src/views/oneCompany/reflection/components/user.vue
 delete mode 100644 src/views/oneCompany/reflection/components/users.vue

diff --git a/src/views/oneCompany/reflection/components/QRCode.vue b/src/views/oneCompany/reflection/components/QRCode.vue
deleted file mode 100644
index 297e138..0000000
--- a/src/views/oneCompany/reflection/components/QRCode.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<template>
-  <div>
-    <el-dialog :visible.sync="visible" :append-to-body="appendToBody" title="相关方安全告知培训合格证" width="370px" destroy-on-close	>
-      <vue-qr :text="qrCodeStr" :margin="0" :size="320" color-dark="#000" color-light="#fff"/>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import vueQr from 'vue-qr'
-
-export default {
-  components: { vueQr },
-  props: {
-    appendToBody: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      visible: false,
-      qrCodeStr: ''
-    }
-  },
-  methods: {
-    init(e) {
-      this.visible = true
-      this.qrCodeStr = e.qrCodeStr
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-</style>
diff --git a/src/views/oneCompany/reflection/components/apply.vue b/src/views/oneCompany/reflection/components/apply.vue
deleted file mode 100644
index 199811d..0000000
--- a/src/views/oneCompany/reflection/components/apply.vue
+++ /dev/null
@@ -1,320 +0,0 @@
-<template>
-  <el-dialog
-    v-if="visible"
-    :visible.sync="visible"
-    :before-close="handleClose"
-    :append-to-body="true"
-    title="培训申请"
-    width="60%">
-    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-      <el-row>
-        <el-col :span="12">
-          <el-form-item
-            prop="TERRITORIALITY"
-            label="集团单位 "
-          >
-            <Treeselect
-              :options="jituanDanweiTreeData"
-              :normalizer="normalizer"
-              v-model="form.TERRITORIALITY"
-              placeholder="请选择集团单位 "
-              no-options-text="暂无数据"
-              no-children-text="暂无数据"
-              style="width: 100%;"
-              @select="getUserList($event)"
-            />
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="12">
-          <el-form-item
-            prop="TERRITORIALITY_USER_ID"
-            label="审核人员"
-          >
-            <div style="display:flex;justify-content: space-between;align-items: flex-start;">
-              <el-select v-model="form.TERRITORIALITY_USER_ID">
-                <el-option
-                  v-for="item in companyUserList"
-                  :key="item.USER_ID"
-                  :label="item.NAME"
-                  :value="item.USER_ID"/>
-              </el-select>
-            </div>
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <el-row>
-        <el-col :span="12">
-          <el-form-item
-            prop="MANAGER"
-            label="主管部门"
-          >
-            <Treeselect
-              :options="treeData"
-              :normalizer="normalizer"
-              v-model="form.MANAGER"
-              :disabled="true"
-              placeholder="请选择主管部门"
-              no-options-text="暂无数据"
-              no-children-text="暂无数据"
-              style="width: 100%;"
-              @select="getmanagerUserList($event)"
-            />
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="12">
-          <el-form-item
-            prop="MANAGER_USER_ID"
-            label="审核人员"
-          >
-            <div style="display:flex;justify-content: space-between;align-items: flex-start;">
-              <el-select v-model="form.MANAGER_USER_ID">
-                <el-option
-                  v-for="item in managercompanyUserList"
-                  :key="item.USER_ID"
-                  :label="item.NAME"
-                  :value="item.USER_ID"/>
-              </el-select>
-            </div>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item
-            prop="SUPERVISION"
-            label="安监部门"
-          >
-            <Treeselect
-              :options="treeData"
-              :normalizer="normalizer"
-              v-model="form.SUPERVISION"
-              :disabled="true"
-              placeholder="请选择安监部门"
-              no-options-text="暂无数据"
-              no-children-text="暂无数据"
-              style="width: 100%;"
-            />
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="12">
-          <el-form-item
-            prop="SUPERVISION_USER_ID"
-            label="审核人员"
-          >
-            <div style="display:flex;justify-content: space-between;align-items: flex-start;">
-              <el-select v-model="form.SUPERVISION_USER_ID">
-                <el-option v-for="item in userList" :key="item.USER_ID" :label="item.NAME" :value="item.USER_ID"/>
-              </el-select>
-            </div>
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <el-row>
-        <el-col :span="24">
-          <el-form-item label="备注">
-            <el-input :rows="3" v-model="form.DESCR" type="textarea" placeholder="这里输入备注..."/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-
-    <div slot="footer" class="dialog-footer">
-      <el-button @click="closeWindow">取 消</el-button>
-      <el-button :loading="loading" type="primary" @click="save">确 定</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { requestFN } from '@/utils/request'
-import Treeselect from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-
-export default {
-  components: {
-    Treeselect
-  },
-  props: {
-    corpInfo: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      visible: false,
-      loading: false,
-      treeData: [],
-      companyTreeData: [],
-      corpinfo: {},
-      userList: [],
-      companyUserList: [],
-      managercompanyUserList: [],
-      jituanDanwei: '',
-      jituanDanweiTreeData: [],
-      normalizer(node) {
-        return {
-          id: node.id,
-          label: node.name,
-          children: node.nodes
-        }
-      },
-      form: {},
-      rules: {
-        // SUPERVISION: [{ required: true, message: '安监部门不能为空', trigger: 'blur' }],
-        SUPERVISION_USER_ID: [{ required: true, message: '审核人员不能为空', trigger: 'blur' }],
-        MANAGER: [{ required: true, message: '主管部门不能为空', trigger: 'blur' }],
-        MANAGER_USER_ID: [{ required: true, message: '审核人员不能为空', trigger: 'blur' }],
-        TERRITORIALITY: [{ required: true, message: '属地管理部门不能为空', trigger: 'blur' }],
-        TERRITORIALITY_USER_ID: [{ required: true, message: '审核人员不能为空', trigger: 'blur' }]
-      }
-    }
-  },
-  methods: {
-    async init(e) {
-      if (e) {
-        this.users = e
-      }
-      this.visible = true
-      this.loading = false
-      this.form = {}
-      /**
-       * 获取相关方的 集团单位  corpinfo/getDataForEditByCorpInfoId
-       * 根据集团单位 找到 对应的 企业id
-       */
-      await this.getCorpinfo()
-    },
-    getCorpinfo() {
-      requestFN(
-        '/corpinfo/getDataForEditByCorpInfoId',
-        {
-          CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID,
-          tm: new Date().getTime()
-        }
-      ).then((data) => {
-        this.corpinfo = data.pd
-        // 河港机械	jtdw002  1e6dbbe16004402f8d2c0e52afd9a676
-        // 河港港工	jtdw003  3a854eefa7894e06aaa1a2611bca80f6
-        // 河港检测	jtdw004  020578a4c1f04bc692ee25145c2efbe5
-        // 方宇物业	jtdw005 90966974de3c4b83aca6f8fd6432d5c2
-
-        if (data.pd.CORP_TYPE == 'jtdw002') {
-          this.jituanDanwei = '1e6dbbe16004402f8d2c0e52afd9a676'
-        }
-        if (data.pd.CORP_TYPE == 'jtdw003') {
-          this.jituanDanwei = '3a854eefa7894e06aaa1a2611bca80f6'
-        }
-        if (data.pd.CORP_TYPE == 'jtdw004') {
-          this.jituanDanwei = '020578a4c1f04bc692ee25145c2efbe5'
-        }
-        if (data.pd.CORP_TYPE == 'jtdw005') {
-          this.jituanDanwei = '90966974de3c4b83aca6f8fd6432d5c2'
-        }
-        this.getTreeData()
-      })
-    },
-    // 获得部门树
-    getTreeData() {
-      requestFN(
-        '/regulatoryApi/department/listTree',
-        {}
-      ).then((data) => {
-        this.treeData = JSON.parse(data.zTreeNodes)
-        // 必须指定【股份-安全监督部】
-        this.form.SUPERVISION = 'c31058273a2d40f9b83dd8e5ae3a723c'
-        this.form.MANAGER = this.corpinfo.MAIN_DEPARTMENT
-        this.getRegulatoryUserList(this.form.SUPERVISION)
-        this.getmanagerUserList(this.corpinfo.MAIN_DEPARTMENT)
-      }).catch((e) => {
-        console.log(e)
-      })
-
-      if (this.jituanDanwei) {
-        requestFN(
-          '/companyApi/department/listTree',
-          { CORPINFO_ID: this.jituanDanwei }
-        ).then((data) => {
-          this.jituanDanweiTreeData = JSON.parse(data.zTreeNodes)
-        }).catch((e) => {
-        })
-      }
-    },
-    getRegulatoryUserList(DEPARTMENT_ID) {
-      requestFN(
-        '/regulatoryApi/user/listAll',
-        {
-          DEPARTMENT_ID: DEPARTMENT_ID,
-          ISASSESS: '1'
-        }
-      ).then((data) => {
-        this.userList = data.userList
-      }).catch((e) => {
-      })
-    },
-    // 人员
-    getUserList({ id: DEPARTMENT_ID }) {
-      requestFN(
-        '/companyApi/user/listAll',
-        {
-          DEPARTMENT_ID
-        }
-      ).then((data) => {
-        this.companyUserList = data.userList
-      }).catch((e) => {
-      })
-    },
-    getmanagerUserList(DEPARTMENT_ID) {
-      requestFN(
-        '/regulatoryApi/user/listAll',
-        {
-          DEPARTMENT_ID: DEPARTMENT_ID
-        }
-      ).then((data) => {
-        this.managercompanyUserList = data.userList
-      }).catch((e) => {
-      })
-    },
-
-    save() {
-      this.$refs.form.validate(valid => {
-        if (valid) {
-          this.loading = true
-          this.form.USER_COUNT = this.users.length
-          this.form.AUDIT_STATUS = 0
-          this.form.TYPE = 2
-          requestFN(
-            '/trainingbatch/add',
-            {
-              ...this.form,
-              users: this.users.join(',')
-            }
-          ).then((data) => {
-            this.loading = false
-            this.$message({
-              message: '申请成功',
-              type: 'success'
-            })
-            this.handleClose()
-          }).catch((e) => {
-            this.listLoading = false
-          })
-        } else {
-          return false
-        }
-      })
-    },
-    handleClose() {
-      this.visible = false
-      this.$emit('finish', '')
-    },
-    closeWindow() {
-      this.handleClose()
-    }
-  }
-}
-</script>
diff --git a/src/views/oneCompany/reflection/components/flowInfo.vue b/src/views/oneCompany/reflection/components/flowInfo.vue
deleted file mode 100644
index 9f79cb9..0000000
--- a/src/views/oneCompany/reflection/components/flowInfo.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<template>
-  <el-dialog
-    v-if="visible"
-    :visible.sync="visible"
-    :before-close="handleClose"
-    :append-to-body="appendToBody"
-    title="审批流程"
-    width="60%">
-    <el-steps :space="200" :active="list.length" direction="vertical" finish-status="success">
-      <el-step v-for="item in list" :key="item.FLOW_DETAIL_ID" :value="item.FLOW_DETAIL_ID" :title="item.SORT+''">
-        <template slot="description">
-          <el-card class="box-card a" style="width: 900px;">
-            <div slot="header" class="clearfix">
-              <span>{{ item.STEP_NAME }}</span>
-            </div>
-            <div>
-              <el-row>
-                <el-col :span="12">
-                  <el-row>
-                    <el-col v-if="item.APPROVER_NAME">
-                      审批人：{{ item.APPROVER_NAME }}
-                    </el-col>
-                    <el-col>
-                      审批状态：{{ item.PASS_FLAG === '1' ? '同意' : '不同意' }}
-                    </el-col>
-                    <el-col>
-                      {{ (!item.APPROVER_NAME ? '被审批人归属公司：':'审批人归属公司：') + item.APPROVER_CORPINFO_NAME }}
-                    </el-col>
-                    <el-col>
-                      {{ (!item.APPROVER_NAME ? '发起申请时间：':'审批时间：') + item.APPROVER_TIME }}
-                    </el-col>
-                    <el-col v-if="item.APPROVER_OPINION">
-                      审批意见：{{ item.APPROVER_OPINION }}
-                    </el-col>
-                    <el-col v-if="item.END_FLAG === '1'" style="color: red; font-weight: bold;font-size: large">
-                      审批结束
-                    </el-col>
-                  </el-row>
-                </el-col>
-                <el-col v-if="item.APPOINT_ANNEX" :span="12">
-                  <el-button icon="el-icon-download" type="primary" @click = "download(item)">下载附件</el-button>
-                </el-col>
-              </el-row>
-            </div>
-          </el-card>
-        </template>
-      </el-step>
-    </el-steps>
-    <div slot="footer" class="dialog-footer">
-      <el-button @click="closeWindow">取 消</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import useDownloadFile from '../../../../utils/useDownloadFile'
-
-export default {
-  props: {
-    appendToBody: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      visible: false,
-      loading: false,
-      list: [],
-      form: {
-        XGF_USER_ID: ''
-      }
-    }
-  },
-  methods: {
-    init(e) {
-      this.visible = true
-      this.loading = false
-      this.list = e.flow
-    },
-    handleClose() {
-      this.visible = false
-      this.$emit('finish', '')
-    },
-    closeWindow() {
-      this.handleClose()
-    },
-    download(item) {
-      useDownloadFile(item.APPOINT_ANNEX)
-    }
-  }
-}
-</script>
diff --git a/src/views/oneCompany/reflection/components/flowInfoList.vue b/src/views/oneCompany/reflection/components/flowInfoList.vue
deleted file mode 100644
index 3b55422..0000000
--- a/src/views/oneCompany/reflection/components/flowInfoList.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-  <el-dialog
-    v-if="visible"
-    :visible.sync="visible"
-    :before-close="handleClose"
-    :append-to-body="true"
-    title="审批流程"
-    width="60%">
-    <el-table
-      ref="multipleTable"
-      :data="list"
-      :header-cell-style="{'font-weight': 'bold','color': '#000'}"
-      tooltip-effect="dark"
-      border
-      fit
-      highlight-current-row>
-      <el-table-column type="index" label="序号" width="50" align="center"/>
-      <el-table-column prop="CREATOR_TIME" label="审批流创建时间" align="center"/>
-      <el-table-column label="操作" align="center" width="250">
-        <template slot-scope="{row}">
-          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">详情</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <div slot="footer" class="dialog-footer">
-      <el-button @click="closeWindow">取 消</el-button>
-    </div>
-    <flow-info ref="flowInfo" append-to-body/>
-  </el-dialog>
-</template>
-
-<script>
-import { requestFN } from '@/utils/request'
-import Treeselect from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import FlowInfo from './flowInfo.vue'
-
-export default {
-  components: {
-    FlowInfo,
-    Treeselect
-  },
-  props: {
-    corpInfo: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      visible: false,
-      loading: false,
-      list: [],
-      form: {
-        XGF_USER_ID: ''
-      }
-    }
-  },
-  methods: {
-    init(e) {
-      this.visible = true
-      this.loading = false
-      this.form.XGF_USER_ID = e.XGF_USER_ID
-      this.getInfo()
-    },
-    getInfo() {
-      requestFN(
-        '/xgf/user/getApproveInfo', this.form
-      ).then((data) => {
-        this.list = data.list
-      }).catch((e) => {
-        console.log(e)
-      })
-    },
-    handleShow(row) {
-      this.$refs.flowInfo.init(row)
-    },
-    handleClose() {
-      this.visible = false
-      this.$emit('finish', '')
-    },
-    closeWindow() {
-      this.handleClose()
-    }
-  }
-}
-</script>
diff --git a/src/views/oneCompany/reflection/components/flowStep.vue b/src/views/oneCompany/reflection/components/flowStep.vue
deleted file mode 100644
index 1af3130..0000000
--- a/src/views/oneCompany/reflection/components/flowStep.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-  <el-dialog
-    v-if="visible"
-    :visible.sync="visible"
-    :v-loading="loading"
-    :before-close="handleClose"
-    :append-to-body="true"
-    :title="title"
-    width="60%">
-    <el-steps :space="200" :active="+step" direction="vertical" finish-status="success">
-      <el-step v-for="item in list" :key="item.INDEX" :value="item.INDEX" :title="item.INDEX">
-        <template slot="description">
-          <el-card class="box-card" style="width: 900px;">
-            <div slot="header" class="clearfix">
-              <span>审批节点</span>
-            </div>
-            <div>
-              <el-row>
-                <el-col>
-                  审批人：{{ item.APPOINT_USER_NAME }}
-                </el-col>
-                <el-col v-if="item.INDEX !== step">
-                  审批人公司：{{ item.APPOINT_CORP_NAME }}
-                </el-col>
-                <el-col>
-                  审批人部门：{{ item.APPOINT_DEPARTMENT_NAME }}
-                </el-col>
-                <el-col v-if="item.INDEX !== step">
-                  审批状态：{{ item.APPOINT_STATUS === '1' ? '同意' : item.APPOINT_STATUS === '0' ? '不同意' : '' }}
-                </el-col>
-                <el-col v-if="item.INDEX !== step">
-                  审批时间：{{ item.APPOINT_TIME }}
-                </el-col>
-                <el-col v-if="item.APPOINT_OPINION && item.INDEX !== step">
-                  审批意见：{{ item.APPOINT_OPINION }}
-                </el-col>
-              </el-row>
-            </div>
-          </el-card>
-        </template>
-      </el-step>
-    </el-steps>
-    <div slot="footer" class="dialog-footer">
-      <el-button @click="closeWindow">取 消</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import { requestFN } from '@/utils/request'
-
-export default {
-  props: {
-    corpInfo: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      visible: false,
-      loading: false,
-      list: [],
-      title: '审批流程',
-      form: {
-        XGF_USER_ID: ''
-      },
-      step: 0
-    }
-  },
-  methods: {
-    init(e) {
-      this.form.XGF_USER_ID = e.XGF_USER_ID
-      this.getInfo()
-    },
-    getInfo() {
-      requestFN(
-        '/xgf/user/getApproveInfo', this.form
-      ).then((data) => {
-        this.list = data.flow.info
-        this.step = data.flow.STEP
-        if (data.flow.endFlag === '1') {
-          this.title = '审批中'
-        }
-        if (data.flow.endFlag === '2') {
-          this.title = '审批结束'
-        }
-        if (data.flow.endFlag === '-2') {
-          this.title = '审批驳回'
-        }
-        this.visible = true
-        this.loading = false
-      }).catch((e) => {
-        console.log(e)
-      })
-    },
-    handleClose() {
-      this.visible = false
-      this.$emit('finish', '')
-    },
-    closeWindow() {
-      this.handleClose()
-    }
-  }
-}
-</script>
diff --git a/src/views/oneCompany/reflection/components/list.vue b/src/views/oneCompany/reflection/components/list.vue
index ebb3f19..41db9f2 100644
--- a/src/views/oneCompany/reflection/components/list.vue
+++ b/src/views/oneCompany/reflection/components/list.vue
@@ -55,11 +55,6 @@
       </div>
       <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList"/>
     </div>
-    <user ref="userInfo" append-to-body/>
-    <user-info ref="userInfos" append-to-body/>
-    <send-util ref="sendUtil" append-to-body @refresh="getList"/>
-    <flow-info-list ref="flowInfo"/>
-    <flow-step ref="flowStep" />
   </div>
 </template>
 
@@ -68,15 +63,9 @@ import Pagination from '@/components/Pagination' // 通过 el-pagination二次
 import { requestFN } from '@/utils/request'
 import waves from '@/directive/waves' // waves directive
 import vueQr from 'vue-qr'
-import apply from './apply'
-import user from './user.vue'
-import SendUtil from './sendUtil.vue'
-import UserInfo from '../../flowApply/components/userInfo.vue'
-import FlowInfoList from './flowInfoList.vue'
-import FlowStep from './flowStep.vue'
 
 export default {
-  components: { FlowStep, FlowInfoList, UserInfo, SendUtil, Pagination, apply, vueQr, user },
+  components: { Pagination, vueQr },
   directives: { waves },
   data() {
     return {
diff --git a/src/views/oneCompany/reflection/components/picture.vue b/src/views/oneCompany/reflection/components/picture.vue
deleted file mode 100644
index 57e7255..0000000
--- a/src/views/oneCompany/reflection/components/picture.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<template>
-  <div>
-    <el-dialog :visible.sync="visible" :append-to-body="appendToBody" title="头像" width="370px" destroy-on-close	>
-      <el-image :src="src"/>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import vueQr from 'vue-qr'
-
-export default {
-  components: { vueQr },
-  props: {
-    appendToBody: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      visible: false,
-      src: ''
-    }
-  },
-  methods: {
-    init(e) {
-      this.visible = true
-      this.src = e.src
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-</style>
diff --git a/src/views/oneCompany/reflection/components/record.vue b/src/views/oneCompany/reflection/components/record.vue
deleted file mode 100644
index e82258d..0000000
--- a/src/views/oneCompany/reflection/components/record.vue
+++ /dev/null
@@ -1,198 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-page-header content="申请记录" @back="goBack"/>
-    <el-form label-width="130px">
-      <el-row>
-        <el-col :span="5">
-          <el-form-item label="申请人员">
-            <el-input v-model="KEYWORDS" placeholder="请输入申请人员"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="5">
-          <el-form-item label="主管部门">
-            <Treeselect
-              :options="companyTreeData"
-              :normalizer="normalizer"
-              v-model="MANAGER"
-              placeholder="请选择部门"
-              no-options-text="暂无数据"
-              no-children-text="暂无数据"
-              style="width: 100%;"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="5">
-          <el-form-item label="属地管理部门">
-            <Treeselect
-              :options="companyTreeData"
-              :normalizer="normalizer"
-              v-model="TERRITORIALITY"
-              placeholder="请选择部门"
-              no-options-text="暂无数据"
-              no-children-text="暂无数据"
-              style="width: 100%;"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="5">
-          <el-form-item label="申请状态">
-            <el-select v-model="AUDIT_STATUS" placeholder="请选择申请状态" style="width: 100%;">
-              <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" />
-            </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>
-    <el-table ref="multipleTable" :data="varList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column type="index" label="序号" width="50" align="center" />
-      <el-table-column prop="CREATTIME" label="申请时间" align="center" />
-      <el-table-column prop="CREATOR" label="申请人员" align="center" />
-      <el-table-column prop="SUPERVISION_DEPARTMENT_NAME" label="安监部门" align="center" />
-      <el-table-column prop="MANAGER_DEPT_NAME" label="主管部门" align="center" />
-      <el-table-column prop="TERRITORIALITY_DEPARTMENT_NAME" label="属地管理部门" align="center" />
-      <el-table-column prop="TRAIN_DATE" label="申请年份" align="center" >
-        <template slot-scope="{row}">
-          {{ new Date(row.CREATTIME).getFullYear() }}
-        </template>
-      </el-table-column>
-      <el-table-column prop="AUDIT_STATUS" label="申请状态" align="center" >
-        <template slot-scope="{row}">
-          <span v-if="row.AUDIT_STATUS === 0">待审核</span>
-          <span v-if="row.AUDIT_STATUS === 1">审核中</span>
-          <span v-if="row.AUDIT_STATUS === 2">待培训</span>
-          <span v-if="row.AUDIT_STATUS === 3">已完成</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="PASS_COUNT" label="审核通过人数" align="center" /> <!-- 已更新为申请状态中的审核通过人员数-->
-      <el-table-column prop="USER_COUNT" label="申请人数" align="center" />
-      <el-table-column label="操作" align="center" width="200">
-        <template slot-scope="{row}">
-          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">查看</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <div class="page-btn-group">
-      <div/>
-      <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
-    </div>
-
-    <users ref="users"/>
-  </div>
-</template>
-
-<script>
-import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
-import { requestFN } from '@/utils/request'
-import waves from '@/directive/waves' // waves directive
-import Treeselect from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import users from './users'
-export default {
-  components: { Pagination, Treeselect, users },
-  directives: { waves },
-  data() {
-    return {
-      listQuery: {
-        page: 1,
-        limit: 10
-      },
-      total: 0,
-      varList: [],
-      treeData: [],
-      companyTreeData: [],
-      normalizer(node) {
-        return {
-          id: node.id,
-          label: node.name,
-          children: node.nodes
-        }
-      },
-      MANAGER: null,
-      TERRITORIALITY: null,
-      statusList: [{ value: 0, label: '待审核' }, { value: 1, label: '审核中' }, { value: 2, label: '待培训' }, { value: 3, label: '已完成' }],
-      AUDIT_STATUS: '',
-      KEYWORDS: ''
-    }
-  },
-  created() {
-    this.getList()
-    this.getTreeData()
-  },
-  methods: {
-    getQuery() {
-      this.$refs.multipleTable.clearSelection()
-      this.listQuery = {
-        page: 1,
-        limit: 10
-      }
-      this.getList()
-    },
-    goKeyReset() {
-      this.MANAGER = null
-      this.TERRITORIALITY = null
-      this.AUDIT_STATUS = ''
-      this.KEYWORDS = ''
-      this.getQuery()
-    },
-    getList() {
-      this.listLoading = true
-      requestFN(
-        '/trainingbatch/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
-        {
-          MANAGER: this.MANAGER,
-          TERRITORIALITY: this.TERRITORIALITY,
-          AUDIT_STATUS: this.AUDIT_STATUS,
-          KEYWORDS: this.KEYWORDS,
-          TYPE: 2,
-          USER_ID: JSON.parse(sessionStorage.getItem('user')).USER_ID
-        }
-      ).then((data) => {
-        this.listLoading = false
-        this.varList = data.varList
-        console.log(this.varList)
-        this.total = data.page.totalResult
-      })
-        .catch((e) => {
-          this.listLoading = false
-        })
-    },
-
-    // 获得部门树
-    getTreeData() {
-      requestFN(
-        '/regulatoryApi/department/listTree',
-        {}
-      ).then((data) => {
-        this.treeData = JSON.parse(data.zTreeNodes)
-      }).catch((e) => {
-      })
-      requestFN(
-        '/companyApi/department/listTree',
-        { CORPINFO_ID: this.$parent.SUPERVISE_CORPINFO_ID }
-      ).then((data) => {
-        this.companyTreeData = JSON.parse(data.zTreeNodes)
-      }).catch((e) => {
-      })
-    },
-
-    handleShow(row) {
-      this.$refs.users.init(row)
-    },
-    goBack() {
-      this.$parent.activeName = 'List'
-    }
-  }
-}
-</script>
-
diff --git a/src/views/oneCompany/reflection/components/sendUtil.vue b/src/views/oneCompany/reflection/components/sendUtil.vue
deleted file mode 100644
index b211ab5..0000000
--- a/src/views/oneCompany/reflection/components/sendUtil.vue
+++ /dev/null
@@ -1,341 +0,0 @@
-<template>
-  <div>
-    <el-dialog
-      v-loading="loading"
-      :visible.sync="visible"
-      :append-to-body="appendToBody"
-      :before-close="beforeClose"
-      title="审批"
-      width="1200px"
-      destroy-on-close>
-      <el-form ref="form" :model="form" :rules="rules" label-width="200px" label-position="right" type="flex">
-        <el-row :gutter="12">
-          <el-col :span="12">
-            <el-form-item prop="STATUS" label="是否通过: ">
-              <el-select v-model="form.STATUS" filterable style="width: 300px" placeholder="请选择" @change="clearInfo">
-                <el-option label="是" value="1"/>
-                <el-option label="否" value="0"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item
-              v-if="form.STATUS === '1' && isShow"
-              :label="menu.department + ':'"
-              prop="APPOINT_DEPARTMENT_ID">
-              <Treeselect
-                :options="departmentTree"
-                :normalizer="normalizer"
-                v-model="form.APPOINT_DEPARTMENT_ID"
-                placeholder="请选择部门"
-                no-options-text="暂无数据"
-                no-children-text="暂无数据"
-                style="width: 300px"
-                @select="getPeopleList($event)"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col v-if="form.STATUS === '0'" :span="12">
-            <el-form-item v-if="form.STATUS === '0'" prop="OPINION" label="打回原因:">
-              <el-input v-model="form.OPINION" :rows="2" type="textarea" placeholder="填写审批意见"/>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="form.STATUS === '1' && isShow" :span="12">
-            <el-form-item v-if="form.STATUS === '1'" :label="menu.user +':'" prop="APPOINT_USER_ID">
-              <el-select v-model="form.user" style="width: 300px" placeholder="请选择" @change="chooseUser">
-                <el-option
-                  v-for="item in peopleList"
-                  :key="item.USER_ID"
-                  :value="JSON.stringify(item)"
-                  :label="item.NAME"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="form.STATUS === '1' && menu.uploadFile" :span="12">
-            <el-form-item :label="menu.uploadFile + ':'" prop="APPOINT_ANNEX">
-              <upload-file
-                :file-list.sync="form.APPOINT_ANNEX"
-                :multiple="false"
-                :accept="'.pdf,.jpg,.png,doc,docx'"
-                :limit="20"
-                :size="1024"
-                :upload-type="1"/>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="menu.limitFlag === '1' && form.STATUS === '1'" :span="12">
-            <el-form-item prop="LIMIT_END_TIME" label="培训有效期结束时间:">
-              <el-date-picker v-model="form.LIMIT_END_TIME" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" style="width:300px "/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="handleClose">关 闭</el-button>
-        <el-button type="primary" @click="sendMessage('1')">确 定</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import vueQr from 'vue-qr'
-import Treeselect from '@riophae/vue-treeselect'
-import { requestFN } from '@/utils/request'
-import uploadFile from '../../../util/uploadFile/index.vue'
-import { upload } from '@/utils/upload'
-
-export default {
-  components: { uploadFile, Treeselect, vueQr },
-  props: {
-    appendToBody: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      visible: false,
-      loading: false,
-      form: {
-        STATUS: null,
-        APPOINT_CORP_ID: '',
-        APPOINT_CORP_NAME: '',
-        APPOINT_DEPARTMENT_ID: null,
-        APPOINT_DEPARTMENT_NAME: '',
-        APPOINT_USER_ID: null,
-        APPOINT_USER_NAME: '',
-        OPINION: '',
-        APPOINT_ANNEX: [],
-        user: '',
-        tm: new Date().getTime(),
-        list: [],
-        isShow: true,
-        info: {}
-      },
-      rules: {
-        STATUS: [
-          { required: true, message: '请选择是否通过', trigger: 'change' }
-        ],
-        APPOINT_DEPARTMENT_ID: [
-          { required: true, message: '请选择指定监管部门', trigger: 'change' }
-        ],
-        APPOINT_USER_ID: [
-          { required: true, message: '请选择指定监管部门审批人', trigger: 'change' }
-        ],
-        OPINION: [
-          { required: true, message: '请填写打回原因', trigger: 'change' }
-        ],
-        APPOINT_ANNEX: [
-          { required: true, message: '请上传文件', trigger: 'change' }
-        ],
-        LIMIT_END_TIME: [
-          { required: true, message: '请选择指定培训有效截至时间', trigger: 'change' }
-        ]
-      },
-      heirloom: {},
-
-      normalizer(node) {
-        return {
-          id: node.id,
-          label: node.name,
-          children: node.nodes
-        }
-      },
-
-      departmentTree: [],
-      peopleList: [],
-      corpFlag: false,
-      menu: {
-        department: '',
-        user: '',
-        uploadFile: '',
-        limitFlag: ''
-      }
-    }
-  },
-  methods: {
-    async init(e) {
-      this.loading = true
-      this.visible = true
-      this.heirloom = JSON.stringify(e)
-      this.form.list = JSON.stringify(e)
-      this.info = e[0]
-      await this.getMenu()
-
-      if (this.info.FLOWS_TYPE === '0') {
-        if (this.info.FLOWS_STEP === 0) {
-          this.isShow = true
-          await this.getDepartmentTree()
-          this.corpFlag = false
-        } else {
-          this.isShow = false
-        }
-      }
-      if (this.info.FLOWS_TYPE === '1') {
-        this.isShow = true
-        if (this.info.FLOWS_STEP === 2 || this.info.FLOWS_STEP === 3) {
-          await this.getDepartmentTree()
-          this.corpFlag = false
-          if (this.info.FLOWS_STEP === 3) {
-            this.isShow = false
-          }
-        } else {
-          await this.getCorpDepartmentTree()
-          this.corpFlag = true
-        }
-      }
-      if (this.info.FLOWS_TYPE === '2') {
-        if (this.info.FLOWS_STEP === 1) {
-          this.isShow = true
-          await this.getDepartmentTree()
-          this.corpFlag = false
-        } else {
-          this.isShow = false
-        }
-      }
-      this.loading = false
-    },
-    getMenu() {
-      return new Promise(resolve => {
-        requestFN(
-          '/flowTrain/getPintName', { FLOWS_TYPE: this.info.FLOWS_TYPE, FLOWS_STEP: this.info.FLOWS_STEP }
-        ).then((data) => {
-          this.menu.department = data.Department
-          this.menu.user = data.User
-          this.menu.uploadFile = data.UploadFile
-          this.menu.limitFlag = data.limitFlag
-          resolve(true)
-        }).catch((e) => {
-        })
-      })
-    },
-    sendMessage(e) {
-      this.$refs.form.validate((valid) => {
-        if (!valid) {
-          this.$message.error('请填写完整信息')
-        } else {
-          const formData = new FormData()
-          Object.keys(this.form).map(key => {
-            formData.append(key, this.form[key])
-          })
-          if (this.form.APPOINT_ANNEX) {
-            for (let i = 0; i < this.form.APPOINT_ANNEX.length; i++) {
-              formData.append('chengNuoShu', this.form.APPOINT_ANNEX[i].raw)
-            }
-          }
-          upload('/xgf/user/approveMax', formData)
-            .then((data) => {
-              this.$message.success('推送成功')
-              this.visible = false
-              this.$emit('refresh', '')
-              this.handleClose()
-            })
-            .catch((e) => {
-              console.log(e)
-            })
-        }
-      })
-    },
-    getDepartmentTree() {
-      return new Promise(resolve => {
-        requestFN(
-          '/department/listTree',
-          {}
-        ).then((data) => {
-          this.departmentTree = this.removeEmptyChildren(JSON.parse(data.zTreeNodes))
-          resolve(true)
-        }).catch((e) => {
-        })
-      })
-    },
-    getCorpDepartmentTree() {
-      return new Promise(resolve => {
-        requestFN(
-          '/openApi/corpDepartment/listTree',
-          {}
-        ).then((data) => {
-          this.departmentTree = this.removeEmptyChildren(JSON.parse(data.zTreeNodes))
-          resolve(true)
-        }).catch((e) => {
-        })
-      })
-    },
-    getPeopleList(e) {
-      this.form.APPOINT_DEPARTMENT_NAME = e.name
-      if (!this.corpFlag) {
-        requestFN(
-          '/user/listAll',
-          {
-            DEPARTMENT_ID: e.id
-          }
-        ).then((data) => {
-          this.peopleList = data.userList
-          this.form.user = ''
-        }).catch((e) => {
-          console.log(e)
-        })
-      } else {
-        requestFN(
-          '/user/listAllManageAndCorp',
-          {
-            DEPARTMENT_ID: e.id
-          }
-        ).then((data) => {
-          this.peopleList = data.userList
-          this.form.user = ''
-        }).catch((e) => {
-          console.log(e)
-        })
-      }
-    },
-    chooseUser(e) {
-      const entity = JSON.parse(e)
-      this.form.APPOINT_USER_ID = entity.USER_ID
-      this.form.APPOINT_USER_NAME = entity.NAME
-    },
-
-    handleClose() {
-      this.form = {
-        STATUS: '',
-        APPOINT_DEPARTMENT_ID: null,
-        APPOINT_DEPARTMENT_NAME: '',
-        APPOINT_USER_ID: '',
-        APPOINT_USER_NAME: '',
-        OPINION: '',
-        user: '',
-        list: [],
-        tm: new Date().getTime()
-      }
-      this.visible = false
-    },
-    beforeClose() {
-      this.visible = false
-      this.form = {
-        STATUS: '',
-        APPOINT_DEPARTMENT_ID: null,
-        APPOINT_DEPARTMENT_NAME: '',
-        APPOINT_USER_ID: '',
-        APPOINT_USER_NAME: '',
-        OPINION: '',
-        user: '',
-        list: [],
-        tm: new Date().getTime()
-      }
-    },
-    clearInfo() {
-      this.form.APPOINT_DEPARTMENT_ID = null
-      this.form.APPOINT_DEPARTMENT_NAME = ''
-      this.form.APPOINT_USER_ID = null
-      this.form.APPOINT_USER_NAME = ''
-      this.form.OPINION = ''
-      this.form.user = ''
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-</style>
diff --git a/src/views/oneCompany/reflection/components/user.vue b/src/views/oneCompany/reflection/components/user.vue
deleted file mode 100644
index 889dc08..0000000
--- a/src/views/oneCompany/reflection/components/user.vue
+++ /dev/null
@@ -1,250 +0,0 @@
-<template>
-  <div>
-    <el-dialog :visible.sync="visible" :append-to-body="appendToBody" title="相关方安全告知培训合格证" width="370px">
-      <div v-for="item in peopleList" :key="item.CLASS_INFO_ID" style="height: 220px">
-        <div class="bg_table">
-          <div class="title">相关方安全告知培训合格证</div>
-          <div class="red">{{ item.CLASS_NO }}</div>
-          <table class="table">
-            <tr>
-              <td style="width: 120px">
-                <div class="text textone name">姓名</div>
-              </td>
-              <td style="width: 100px;">
-                <div class="text text1 tcenter">{{ item.NAME }}</div>
-              </td>
-              <td style="width: 86px">
-                <div class="text text2 tcenter">工种</div>
-              </td>
-              <td style="width: 148px;">
-                <div v-if="item.JOBS_TYPE" class="text tcenter ">{{ item.JOBS_TYPE }}</div>
-                <div v-else>暂无</div>
-              </td>
-              <td rowspan="4" style="width: 134px;">
-                <img v-if="!getShowPicture(item)" src="../../../../assets/images/peopleHead.png" alt="" style="width: 116px; height: 146px">
-                <img v-if="getShowPicture(item)" :src="config.fileUrl + item.PHOTO" alt="" style="width: 116px; height: 146px" @click="openPicture(config.fileUrl + item.PHOTO)">
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <div class="text textone">资质</div>
-              </td>
-              <td colspan="3">
-                <div v-if="item.CERTIFICATE" class="text">{{ item.CERTIFICATE }}</div>
-                <div v-else>暂无</div>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <div class="text textone">培训时间</div>
-              </td>
-              <td colspan="3">
-                <div class="text">{{ item.OPENING_TIME }}</div>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <div class="text textone">有效期限</div>
-              </td>
-              <td colspan="3">
-                <div class="text">{{ item.VALIDITY_PERIOD_END }}</div>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <div class="text textone">所在单位</div>
-              </td>
-              <td colspan="3">
-                <div class="text">{{ item.DEPARTMENT_NAME }}</div>
-              </td>
-              <td rowspan="3" style="padding-top: 6px" @click="click(config.messageUrl + '?CLASS_INFO_ID=' + item.CLASS_INFO_ID)">
-                <vue-qr :text="config.messageUrl + '?CLASS_INFO_ID=' + item.CLASS_INFO_ID" :margin="0" :size="110" color-dark="#000" color-light="#fff"/>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <div class="text textone">身份证号</div>
-              </td>
-              <td colspan="3">
-                <div class="text">{{ item.CARD_ID }}</div>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <div class="text textone">手机</div>
-              </td>
-              <td colspan="3">
-                <div class="text">{{ item.PHONE }}</div>
-              </td>
-            </tr>
-          </table>
-        </div>
-      </div>
-    </el-dialog>
-    <QRCode ref="QRcode" append-to-body/>
-    <Picture ref="Picture" append-to-body/>
-  </div>
-</template>
-
-<script>
-import { requestFN } from '@/utils/request'
-import vueQr from 'vue-qr'
-import QRCode from './QRCode.vue'
-import Picture from './picture.vue'
-
-export default {
-  components: { QRCode, Picture, vueQr },
-  props: {
-    appendToBody: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      config: config,
-      visible: false,
-      peopleList: [],
-      CLASS_MESSAGE_ID: '',
-      CLASS_INFO_ID: '',
-      USER_ID: '',
-      qrCodeStr: ''
-    }
-  },
-  methods: {
-    init(e) {
-      console.info(e)
-      if (e && e.CLASS_INFO_ID) {
-        this.CLASS_INFO_ID = e.CLASS_INFO_ID
-      }
-      if (e && e.CLASS_MESSAGE_ID) {
-        this.CLASS_MESSAGE_ID = e.CLASS_MESSAGE_ID
-      }
-      if (e && e.USER_ID) {
-        this.USER_ID = e.USER_ID
-      }
-      this.qrCodeStr = config.messageUrl + '?CLASS_INFO_ID=' + this.CLASS_INFO_ID
-      this.visible = true
-      this.getInfo()
-    },
-    getInfo() {
-      requestFN('/trainusers/getUserinfoList', {
-        CLASS_INFO_ID: this.CLASS_INFO_ID,
-        CLASS_MESSAGE_ID: this.CLASS_MESSAGE_ID,
-        USER_ID: this.USER_ID
-      })
-        .then((data) => {
-          this.peopleList = data.list
-        }).catch((e) => {
-          console.log(e)
-        })
-    },
-    getShowPicture(row) {
-      if (row.PHOTO && row.PHOTO !== '' && (row.PHOTO.indexOf('.jpg') >= 0 || row.PHOTO.indexOf('.png') >= 0 || row.PHOTO.indexOf('.jpeg') >= 0)) {
-        return true
-      }
-    },
-    click(e) {
-      this.$refs.QRcode.init({ qrCodeStr: e })
-    },
-    openPicture(src) {
-      this.$refs.Picture.init({ src: src })
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-
-.name{
-  width: 120px;
-  overflow: hidden;//溢出隐藏
-  white-space: nowrap; // 强制一行显示
-  text-overflow: ellipsis;// 显示。。。省略号
-}
-.red {
-  width: 660px;
-  color: #ff0000;
-  margin-left: 34px;
-  font-size: 24px;
-}
-
-.bg_table {
-  background: url("../../../../assets/tablebg.jpg") no-repeat bottom center;
-  background-size: 100%;
-  width: 660px;
-  height: 430px;
-  border: 4px solid #453d3a;
-  transform: scale(0.5);
-  transform-origin: top left;
-
-  .title {
-    font-size: 28px;
-    text-align: center;
-    margin-top: 34px;
-    font-weight: bold;
-    color: #000000;
-  }
-
-  .table {
-    border-collapse: collapse;
-    width: 590px;
-    color: #453d3a;
-    font-size: 20px;
-    margin: 34px;
-    text-align: left;
-    margin-top: 10px;
-
-    .tcenter {
-      text-align: center
-    }
-
-    .w60 {
-      width: 100px;
-    }
-
-    .w74 {
-      width: 148px
-    }
-
-    th, td {
-      border: 2px solid #453d3a;
-      text-align: left;
-      height: 40px;
-      padding: 0 16px;
-
-      box-sizing: border-box;
-
-      .textone {
-        width: 80px;
-        text-align: justify;
-        text-align-last: justify;
-        text-justify: distribute-all-lines;
-        margin: 0 auto;
-      }
-
-      .text1 {
-        width: 60px;
-        text-align: justify;
-        text-align-last: justify;
-        text-justify: distribute-all-lines;
-        margin: 0 auto;
-
-      }
-
-      .text2 {
-        width: 50px;
-        text-align: justify;
-        text-align-last: justify;
-        text-justify: distribute-all-lines;
-        margin: 0 auto;
-
-      }
-
-      .text {
-
-      }
-    }
-  }
-}
-</style>
diff --git a/src/views/oneCompany/reflection/components/users.vue b/src/views/oneCompany/reflection/components/users.vue
deleted file mode 100644
index 2d11653..0000000
--- a/src/views/oneCompany/reflection/components/users.vue
+++ /dev/null
@@ -1,513 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-dialog
-      v-if="visible"
-      :visible.sync="visible"
-      :before-close="handleClose"
-      :append-to-body="true"
-      title="申请详情"
-      width="60%">
-      <div class="level-title mt-20" style="display: flex;justify-content: space-between;">
-        <h1>申请信息</h1>
-      </div>
-      <table class="table-ui" style="margin-bottom: 20px;">
-        <tr>
-          <th style="width: 17%">申请人</th>
-          <td style="width: 17%">{{ pd.CREATOR }}</td>
-          <th style="width: 17%">申请时间</th>
-          <td style="width: 17%">{{ pd.CREATTIME }}</td>
-          <th style="width: 17%">备注</th>
-          <td style="width: 15%">{{ pd.DESCR }}</td>
-        </tr>
-        <tr>
-          <th style="width: 30px">安监部门</th>
-          <td style="width: 50px">{{ pd.SUPERVISION_DEPARTMENT_NAME }}</td>
-          <th style="width: 30px">审核人</th>
-          <td style="width: 50px">{{ pd.SUPERVISION_USER_NAME }}</td>
-          <th style="width: 30px">审核时间</th>
-          <td style="width: 50px">{{ pd.SUPERVISION_TIME }}</td>
-        </tr>
-        <tr>
-          <th>主管部门</th>
-          <td>{{ pd.MANAGER_DEPT_NAME }}</td>
-          <th>审核人</th>
-          <td>{{ pd.MANAGER_USER_NAME }}</td>
-          <th>审核时间</th>
-          <td>{{ pd.MANAGER_TIME }}</td>
-        </tr>
-        <tr>
-          <th>属地管理部门</th>
-          <td>{{ pd.TERRITORIALITY_DEPARTMENT_NAME }}</td>
-          <th>审核人</th>
-          <td>{{ pd.TERRITORIALITY_USER_NAME }}</td>
-          <th>审核时间</th>
-          <td>{{ pd.TERRITORIALITY_TIME }}</td>
-        </tr>
-        <tr v-if="pd.AUDIT_DESCR">
-          <th>股份公司意见</th>
-          <td colspan="5">{{ pd.AUDIT_DESCR }}</td>
-        </tr>
-        <tr v-if="pd.CORP_AUDIT_DESCR">
-          <th>分公司意见</th>
-          <td colspan="5">{{ pd.CORP_AUDIT_DESCR }}</td>
-        </tr>
-      </table>
-      <div class="level-title">
-        <h1>申请人员列表</h1>
-      </div>
-      <el-table ref="multipleTable" :data="userList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column type="index" label="序号" width="50" align="center" />
-        <el-table-column prop="USERNAME" label="用户名" align="center" />
-        <el-table-column prop="NAME" label="姓名" align="center" />
-        <el-table-column prop="DEPARTMENT_NAME" label="部门" align="center" />
-        <el-table-column prop="STATE" label="审核状态" align="center" >
-          <template slot-scope="{row}">
-            <el-tag v-if="row.MANAGER_STATE === 0 || row.SUPERVISION_STATE === 0 || row.TERRITORIALITY_STATE === 0" type="danger">审核不通过</el-tag>
-            <el-tag v-else-if="row.MANAGER_STATE === 1 && row.SUPERVISION_STATE === 1 && row.TERRITORIALITY_STATE === 1" type="success">审核通过</el-tag>
-            <el-tag v-else type="success">待审核</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="200" >
-          <template slot-scope="{row}">
-            <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row.USER_ID)">查看</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="page-btn-group">
-        <div/>
-        <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getUserList" />
-      </div>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="closeWindow">关 闭</el-button>
-      </div>
-    </el-dialog>
-    <el-dialog
-      v-if="userInfoDialog"
-      :visible.sync="userInfoDialog"
-      :append-to-body="true"
-      title="查看"
-      width="60%">
-      <table class="table-ui" style="margin-bottom: 20px;">
-        <div class="level-title">
-          <h1>人员信息</h1>
-        </div>
-        <tr>
-          <th>照片</th>
-          <td>
-            <span v-if="imgUrl != ''">
-              <div class="img-flex">
-                <viewer>
-                  <img :src="imgUrl" width="40" height="40" style="object-fit: cover;">
-                </viewer>
-              </div>
-            </span>
-            <span v-else/>
-          </td>
-          <th>姓名</th>
-          <td>{{ userDetailForm.NAME }}</td>
-          <th>性别</th>
-          <td>{{ userDetailForm.SEX === '0' ? '男' : '女' }}</td>
-        </tr>
-        <tr>
-          <th>出生年月</th>
-          <td>{{ userDetailForm.DATE_OF_BIRTH }}</td>
-          <th>年龄</th>
-          <td>{{ userDetailForm.AGE }}</td>
-          <th>手机号</th>
-          <td>{{ userDetailForm.PHONE }}</td>
-        </tr>
-        <tr>
-          <th>身份证</th>
-          <td>{{ userDetailForm.CARD_ID }}</td>
-          <th>身份证照片</th>
-          <!--if条件不可删除-->
-          <td v-if="userCardIDPhotoFile.length>0" colspan="3">
-            <span>
-              <div class="img-flex">
-                <viewer>
-                  <img
-                    v-for="item in userCardIDPhotoFile"
-                    :src="config.fileUrl + item.FILEPATH"
-                    :key="item.IMGFILES_ID"
-                    width="40"
-                    height="40"
-                    style="object-fit: cover;">
-                </viewer>
-              </div>
-            </span>
-          </td>
-        </tr>
-
-        <tr>
-          <th>民族</th>
-          <td>{{ userDetailForm.minzuName ? userDetailForm.minzuName : '暂无信息' }}</td>
-          <th>婚姻状况</th>
-          <td>{{ userDetailForm.MARITALSTATUS === '0' ? '未婚' : '已婚' }}</td>
-          <th>政治面貌</th>
-          <td>{{ userDetailForm.zzName }} {{
-            userDetailForm.zzName == '中共党员' ? '入党时间' + userDetailForm.POLITICAL_TIME : ''
-          }}
-          </td>
-        </tr>
-
-        <tr>
-          <th>户口所在地</th>
-          <td>{{ userDetailForm.HKLOCAL ? userDetailForm.HKLOCAL : '暂无信息' }}</td>
-          <th>现住址</th>
-          <td>{{ userDetailForm.ADDRESS ? userDetailForm.ADDRESS : '暂无信息' }}</td>
-          <th>联系电话</th>
-          <td>{{ userDetailForm.PHONE }}</td>
-        </tr>
-        <tr>
-          <th>文化程度</th>
-          <td>{{ userDetailForm.DEGREE_OF_EDUCATION_NAME }}</td>
-          <th>岗位名称(工种)</th>
-          <td colspan="5">{{ userDetailForm.POST_ID }}</td>
-        </tr>
-        <tr>
-          <th>是否缴纳社保</th>
-          <td :colspan="userDetailForm.IS_SOCIAL === '1' ? '':5">{{ formatLabel(userDetailForm.IS_SOCIAL) }}</td>
-          <th v-if="userDetailForm.IS_SOCIAL === '1'">社会保障号码</th>
-          <td v-if="userDetailForm.IS_SOCIAL === '1'">{{ userDetailForm.SOCIAL_NUMBER }}</td>
-          <th v-if="userDetailForm.IS_SOCIAL === '1'">社保卡照片</th>
-          <td v-if="userDetailForm.IS_SOCIAL === '1'&& socialPhotoFile.length>0" colspan="3">
-            <span>
-              <div class="img-flex">
-                <viewer>
-                  <img
-                    v-for="item in socialPhotoFile"
-                    :src="config.fileUrl + item.FILEPATH"
-                    :key="item.IMGFILES_ID"
-                    width="40"
-                    height="40"
-                    style="object-fit: cover;">
-                </viewer>
-              </div>
-            </span>
-          </td>
-        </tr>
-        <tr>
-          <th>是否参加三级安全培训</th>
-          <td>{{ formatLabel(userDetailForm.IS_LEVEL_THREE) }}</td>
-          <th v-if="userDetailForm.IS_LEVEL_THREE == 1">三级安全培训照片</th>
-          <td v-if="userDetailForm.IS_LEVEL_THREE == 1 && photosOfLevel.length>0" colspan="5">
-            <span>
-              <div class="img-flex">
-                <viewer>
-                  <img
-                    v-for="item in photosOfLevel"
-                    :src="config.fileUrl + item.FILEPATH"
-                    :key="item.IMGFILES_ID"
-                    width="40"
-                    height="40"
-                    style="object-fit: cover;">
-                </viewer>
-              </div>
-            </span>
-          </td>
-        </tr>
-        <tr>
-          <th>是否缴纳保险</th>
-          <td>{{ formatLabel(userDetailForm.IS_BF) }}</td>
-          <th>是否特殊工种</th>
-          <td>{{ formatLabel(userDetailForm.IS_SPECIAL_JOB) }}</td>
-          <th>是否流动人员</th>
-          <td>{{ formatLabel(userDetailForm.ISFLOW) }}</td>
-        </tr>
-      </table>
-      <div class="level-title">
-        <h1>培训记录</h1>
-      </div>
-      <el-table
-        :data="trainRecordList"
-        :header-cell-style="{'font-weight': 'bold','color': '#000'}"
-        tooltip-effect="dark"
-        border
-        fit
-        highlight-current-row>
-        <el-table-column type="selection" width="55" align="center"/>
-        <el-table-column type="index" label="序号" width="50" align="center"/>
-        <el-table-column prop="CLASS_NAME" label="班级名称" align="center"/>
-        <el-table-column prop="OPENING_TIME" label="开班时间" align="center"/>
-        <el-table-column prop="TRAINING_TYPE_NAME" label="培训类型" align="center"/>
-        <el-table-column prop="PLACE_NAME" label="培训地点" align="center"/>
-        <el-table-column label="培训有效期" align="center">
-          <template slot-scope="{row}">
-            <span>{{ formatDate(row.VALIDITY_PERIOD_START) }} 至 {{ formatDate(row.VALIDITY_PERIOD_END) }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div v-if="userDetailForm.IS_SPECIAL_JOB == '1'" class="level-title">
-        <h1>特种作业人员信息</h1>
-      </div>
-      <table v-for="(item,index) in specialUsersList" :key="index" class="table-ui" style="margin-bottom: 20px;">
-        <tr>
-          <th style="width: 150px">证书名称</th>
-          <td style="width: 150px">{{ item.CERTIFICATE }}</td>
-          <th style="width: 150px">作业类别</th>
-          <td style="width: 180px">{{ item.SPECIAL_TYPE_NAME }}</td>
-          <th style="width: 150px">操作项目</th>
-          <td>{{ item.OPERATION_TYPE_NAME }}</td>
-        </tr>
-        <tr>
-          <th>特种作业证书编号</th>
-          <td>{{ item.SPECIAL_NUMBER }}</td>
-          <th>发证机关</th>
-          <td colspan="3">{{ item.ISSUING_AUTHORITY }}</td>
-        </tr>
-        <tr>
-          <th>复审时间</th>
-          <td>{{ item.REVIEW_TIME }}</td>
-          <th>有效期</th>
-          <td colspan="3">{{ item.VALIDITY_TIME_START }} 至 {{ item.VALIDITY_TIME_END }}</td>
-        </tr>
-      </table>
-      <div
-        v-if="detailForm.SUPERVISION_STATE === 0 || detailForm.MANAGER_STATE === 0 || detailForm.TERRITORIALITY_STATE === 0"
-        class="level-title mt-20">
-        <h1>打回信息</h1>
-      </div>
-      <table
-        v-if="detailForm.SUPERVISION_STATE === 0 || detailForm.MANAGER_STATE === 0 || detailForm.TERRITORIALITY_STATE === 0"
-        class="table-ui"
-        style="margin-bottom: 20px;">
-        <tr>
-          <th>打回人</th>
-          <td v-if="detailForm.SUPERVISION_STATE === 0">{{ detailForm.SUPERVISION_USER_NAME }}</td>
-          <td v-if="detailForm.MANAGER_STATE === 0">{{ detailForm.MANAGER_USER_NAME }}</td>
-          <td
-            v-if="detailForm.TERRITORIALITY_STATE === 0 && detailForm.MANAGER_USER_NAME !== detailForm.TERRITORIALITY_USER_NAME">
-            {{ detailForm.TERRITORIALITY_USER_NAME }}
-          </td>
-          <th>打回原由</th>
-          <td v-if="detailForm.SUPERVISION_STATE === 0">{{ detailForm.SUPERVISION_OPINION }}</td>
-          <td v-if="detailForm.MANAGER_STATE === 0">{{ detailForm.MANAGER_OPINION }}</td>
-          <td
-            v-if="detailForm.TERRITORIALITY_STATE === 0 && detailForm.MANAGER_USER_NAME !== detailForm.TERRITORIALITY_USER_NAME">
-            {{ detailForm.TERRITORIALITY_OPINION }}
-          </td>
-        </tr>
-      </table>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="userInfoDialog = false">关 闭</el-button>
-      </div>
-    </el-dialog>
-    <el-dialog :visible.sync="QRCodeDialog" title="查看二维码" width="680px" class="top-dialog">
-      <div class="table-qrcode" style="text-align: center;padding-top: 30px;">
-        <vue-qr :text="qrcodeStr" :margin="0" :size="300" color-dark="#000" color-light="#fff" />
-      </div>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="QRCodeDialog = false">关 闭</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
-import { requestFN } from '@/utils/request'
-import vueQr from 'vue-qr'
-import dateformat from '@/utils/dateformat'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-export default {
-  components: {
-    Pagination,
-    vueQr
-  },
-  data() {
-    return {
-      config: config,
-      contractFileList: [], // 合同文件
-      insuranceFileList: [], // 保险文件
-      userInfoDialog: false,
-      QRCodeDialog: false,
-      qrcodeStr: '',
-      userDetailForm: {},
-      userEntryForm: {},
-      specialUsersList: {},
-      imgUrl: '',
-      wenhuachengduList: [], // 文化程度
-      userCardIDPhotoFile: [], // 身份证照片
-      postList: [], // 岗位名称
-      trainRecordList: [], // 培训记录
-      visible: false,
-      pd: {},
-      userList: [],
-      listQuery: {
-        page: 1,
-        limit: 10
-      },
-      total: 0,
-      photosOfLevel: []
-    }
-  },
-  methods: {
-    formatDate(date, column) {
-      if (date) {
-        return dateformat(date, 'YYYY-MM-DD')
-      } else {
-        return ''
-      }
-    },
-    init(e) {
-      if (e) {
-        this.pd = e
-      }
-      this.visible = true
-      this.userList = []
-      this.getDict()
-      this.getUserList()
-    },
-    // 获取数据字典数据
-    getDict: function() {
-      requestFN(
-        '/dictionaries/getLevels',
-        {
-          DICTIONARIES_ID: '1144b16d85f14b108ea7859e2be9d001'
-        }
-      ).then((data) => {
-        this.flowAreaList = data.list
-      }).catch((e) => {
-
-      })
-      requestFN(
-        'dictionaries/getLevels',
-        { DICTIONARIES_ID: 'd7d80f08d73a4accbccf4fd3d8d1d867' }
-      ).then((data) => {
-        this.wenhuachengduList = data.list
-      }).catch((e) => {
-        this.listLoading = false
-      })
-      requestFN(
-        'dictionaries/getLevels',
-        { DICTIONARIES_ID: '09e36ac01e9540f8bc84eab1c1a78754' }
-      ).then((data) => {
-        this.postList = data.list
-      }).catch((e) => {
-        this.listLoading = false
-      })
-    },
-
-    // 人员
-    getUserList() {
-      requestFN(
-        '/trainingbatch/batchUserList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
-        {
-          TRAININGBATCH_ID: this.pd.TRAININGBATCH_ID
-        }
-      ).then((data) => {
-        this.userList = data.varList
-        this.total = data.page.totalResult
-      }).catch((e) => {
-      })
-    },
-    // 二维码
-    showQRCode(id) {
-      this.QRCodeDialog = true
-      const arr = [{ USER_ID: id, CODE_TYPE: '1' }]
-      this.qrcodeStr = JSON.stringify(arr)
-    },
-    // 查看
-    async handleShow(USER_ID) {
-      await this.getUserInfoById(USER_ID)
-      await this.getOtherUserInfoById(USER_ID)
-      this.userInfoDialog = true
-    },
-    getUserInfoById(id) {
-      return new Promise((resolve, reject) => {
-        requestFN(
-          '/user/getFloatPersonDetailById',
-          {
-            USER_ID: id,
-            TRAININGBATCH_ID: this.pd.TRAININGBATCH_ID,
-            CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID
-          }
-        ).then((data) => {
-          this.userDetailForm = Object.assign(this.userDetailForm, data.userDetail)
-          this.userEntryForm = Object.assign(this.userEntryForm, data.eCard)
-          if (this.userDetailForm.PHOTO) {
-            this.imgUrl = config.fileUrl + this.userDetailForm.PHOTO
-          }
-          this.trainRecordList = data.recordList
-          // this.insuranceFileList = data.insuranceFile
-          // this.contractFileList = data.contractFile
-          resolve()
-        }).catch((e) => {
-          reject()
-        })
-      })
-    },
-    getOtherUserInfoById(id) {
-      return new Promise((resolve, reject) => {
-        requestFN(
-          'user/getDetailByUserIdAndCorpInfoId',
-          {
-            USER_ID: id,
-            CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID,
-            CER_TYPE: '7498057c4c1f4a11b9a960e66ea04a7a'
-          }
-        ).then((data) => {
-          Object.assign(this.userDetailForm, data.pd)
-          this.userPhotoFile = data.userPhotoFile
-          if (this.userPhotoFile.length > 0) {
-            this.imgUrl = config.fileUrl + this.userPhotoFile[0].FILEPATH
-          }
-          this.insuranceFileList = data.insuranceFile
-          this.specialUsersList = data.specialUsers
-          this.contractFileList = data.contractFile
-          this.userCardIDPhotoFile = data.userCardIDPhotoFile
-          this.socialPhotoFile = data.socialPhotoFile
-          this.gongshangbaoxianFile = data.gongshangbaoxianFile
-          resolve()
-        }).catch((e) => {
-          reject()
-        })
-      })
-    },
-    // 转换是否
-    formatLabel(value) {
-      if (value == '1') {
-        return '是'
-      } else if (value == '0') {
-        return '否'
-      } else {
-        return ''
-      }
-    },
-    // 转换字典数据
-    formatDictioariesLabel(value, type) {
-      var list = []
-      if (type == '0') {
-        list = this.wenhuachengduList
-      } else if (type == '1') {
-        list = this.postList
-      }
-      if (value) {
-        if (list.length > 0) {
-          var data = ''
-          for (let i = 0; i < list.length; i++) {
-            const obj = list[i]
-            if (value == obj.BIANMA) {
-              data = obj.NAME
-              break
-            }
-          }
-          return data
-        } else {
-          return value
-        }
-      } else {
-        return ''
-      }
-    },
-
-    handleClose() {
-      this.visible = false
-    },
-    closeWindow() {
-      this.handleClose()
-    }
-  }
-}
-</script>
diff --git a/src/views/oneCompany/reflection/index.vue b/src/views/oneCompany/reflection/index.vue
index 70cda6e..45be1d5 100644
--- a/src/views/oneCompany/reflection/index.vue
+++ b/src/views/oneCompany/reflection/index.vue
@@ -4,11 +4,9 @@
 
 <script>
 import List from './components/list'
-import Record from './components/record'
 export default {
   components: {
-    List: List,
-    Record: Record
+    List: List
   },
   data() {
     return {

From 6a802fc163f5150c1c28209afbe2eac625b58a9d Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Sat, 13 Apr 2024 10:59:29 +0800
Subject: [PATCH 05/23] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oneCompany/reflection/components/list.vue | 82 ++++---------------
 1 file changed, 17 insertions(+), 65 deletions(-)

diff --git a/src/views/oneCompany/reflection/components/list.vue b/src/views/oneCompany/reflection/components/list.vue
index 41db9f2..2859cff 100644
--- a/src/views/oneCompany/reflection/components/list.vue
+++ b/src/views/oneCompany/reflection/components/list.vue
@@ -38,22 +38,25 @@
       <el-table-column type="index" label="序号" width="50" align="center"/>
       <el-table-column prop="USERNAME" label="用户名" align="center"/>
       <el-table-column prop="NAME" label="姓名" align="center"/>
-      <el-table-column prop="BELONG_TO_CORP_NAME" label="外派公司名称" align="center"/>
-      <el-table-column label="操作" align="center" width="450">
+      <el-table-column prop="departmentName" label="部门名称" align="center"/>
+      <el-table-column prop="userPhone" label="用户手机号" align="center"/>
+      <el-table-column prop="deviceId" label="设备id" align="center"/>
+      <el-table-column prop="deviceName" label="设备名称" align="center"/>
+      <el-table-column prop="id" label="其他系统编号" align="center"/>
+      <el-table-column prop="idRemark" label="其他系统备注" align="center"/>
+      <el-table-column prop="createTime" label="创建时间" align="center"/>
+      <el-table-column label="操作" align="center" width="200">
         <template slot-scope="{row}">
-          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleShow(row)">详情</el-button>
-          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleFlowShow(row)">流程详情</el-button>
-          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleFlowStepShow(row)">审批流程</el-button>
-          <el-button v-if="row.power_flag === '1'" type="primary" icon="el-icon-s-claim" size="mini" @click="approve([row])">审批</el-button>
-          <el-button v-if="false" type="success" icon="el-icon-edit" size="mini" @click="getUserInfo(row)">电子合格证</el-button>
+          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleDelete(row)">删除</el-button>
+          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleDelete(row)">编辑</el-button>
         </template>
       </el-table-column>
     </el-table>
     <div class="page-btn-group">
       <div>
-        <el-button v-if="false" type="primary" icon="el-icon-plus" @click="handleAdd">批量同意</el-button>
+        <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
       </div>
-      <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList"/>
+      <pagination :total="listQuery.total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList"/>
     </div>
   </div>
 </template>
@@ -70,36 +73,11 @@ export default {
   data() {
     return {
       config: config,
-      QRCodeDialog: false,
-      qrcodeStr: '',
-      userDetailForm: {},
-      specialUsersList: {},
-      detailForm: {},
-      userEntryForm: {},
-      imgUrl: '',
-      SUPERVISE_CORPINFO_ID: '',
-      wenhuachengduList: [], // 文化程度
-      postList: [], // 岗位名称
-      photosOfLevel: [], // 三级教育照片
-      trainRecordList: [], // 培训记录
-      contractFileList: [], // 合同文件
-      insuranceFileList: [], // 保险文件
-      gongshangbaoxianFile: [],
-      userPhotoFile: [], // 头像
-      userCardIDPhotoFile: [], // 身份证照片
-      socialPhotoFile: [], // 身份证照片
       listQuery: {
-        page: 1,
-        limit: 20
+        page: 0,
+        limit: 10,
+        total: 0
       },
-      total: 0,
-      varList: [],
-      KEYWORDS: '',
-      statusList: [{ value: 0, label: '未培训' }, { value: 1, label: '培训中' }, {
-        value: 2,
-        label: '已培训(合格)'
-      }, { value: 3, label: '已培训(不合格)' }, { value: 9, label: '申请中' }],
-      STATUS: '',
       add: false,		// 新增按钮
       del: false,		// 删除按钮
       edit: false	// 修改按钮
@@ -138,7 +116,7 @@ export default {
     getList() {
       this.listLoading = true
       requestFN(
-        '/xgf/user/getAppointApproveList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        '/dw/getMapList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
           KEYWORDS: this.KEYWORDS,
           STATUS: '1',
@@ -154,21 +132,6 @@ export default {
           this.listLoading = false
         })
     },
-    handleShow(row) {
-      this.$refs.userInfos.init(row)
-    },
-    handleFlowShow(row) {
-      this.$refs.flowInfo.init(row)
-    },
-    handleFlowStepShow(row) {
-      this.$refs.flowStep.init(row)
-    },
-    approve(row) {
-      this.$refs.sendUtil.init(row)
-    },
-    getUserInfo(row) {
-      this.$refs.userInfo.init(row)
-    },
     handleAdd() {
       const _selectData = this.$refs.multipleTable.selection
       if (_selectData == null || _selectData.length == 0) {
@@ -219,22 +182,11 @@ export default {
         })
     },
     getDict: function() {
-      requestFN(
-        'dictionaries/getLevels',
-        { DICTIONARIES_ID: 'd7d80f08d73a4accbccf4fd3d8d1d867' }
-      ).then((data) => {
+      requestFN('dw/getDictionary').then((data) => {
         this.wenhuachengduList = data.list
       }).catch((e) => {
         this.listLoading = false
       })
-      requestFN(
-        'dictionaries/getLevels',
-        { DICTIONARIES_ID: '09e36ac01e9540f8bc84eab1c1a78754' }
-      ).then((data) => {
-        this.postList = data.list
-      }).catch((e) => {
-        this.listLoading = false
-      })
     }
   }
 }

From e2b3dbd5ef325b188e87dd378ade1a29edbed9e3 Mon Sep 17 00:00:00 2001
From: limingyu <limingyu203@163.com>
Date: Sat, 13 Apr 2024 11:12:25 +0800
Subject: [PATCH 06/23] =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E5=AE=9A=E4=BD=8D=20=E6=8A=A5=E8=AD=A6=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oneCompany/alarmList/components/list.vue  | 332 ++++++++++++++++++
 src/views/oneCompany/alarmList/index.vue      |  29 ++
 2 files changed, 361 insertions(+)
 create mode 100644 src/views/oneCompany/alarmList/components/list.vue
 create mode 100644 src/views/oneCompany/alarmList/index.vue

diff --git a/src/views/oneCompany/alarmList/components/list.vue b/src/views/oneCompany/alarmList/components/list.vue
new file mode 100644
index 0000000..8cdbabb
--- /dev/null
+++ b/src/views/oneCompany/alarmList/components/list.vue
@@ -0,0 +1,332 @@
+<template>
+  <div class="app-container">
+    <el-form ref="searchForm" :model="searchForm" label-width="80px">
+      <el-row>
+        <el-col :span="6">
+          <el-form-item label="作业编号" prop="keySource">
+            <el-input v-model="searchForm.keyJobNumber" placeholder="请输入作业编号" class="filter-item" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="特级动火审批状态" prop="keyHiddenDescr" label-width="130px">
+            <el-select v-model="searchForm.keyState" placeholder="请选择">
+              <el-option v-for="item in statusSuperList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="动火等级" prop="HOT_WORK_LEVEL_INDEX" >
+            <el-select v-model="searchForm.HOT_WORK_LEVEL_INDEX" placeholder="请选择" style="width: 80%">
+              <el-option v-for="item in hotworklevelList" :key="item.id" :label="item.name" :value="item.id" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="动火内容" prop="keySource">
+            <el-input v-model="searchForm.JOB_CONTENT" placeholder="请输入动火内容" class="filter-item" />
+          </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="JOB_NUMBER" label="作业编号" />
+      <el-table-column prop="JOB_TYPE_INDEX" label="作业类型" >
+        <template slot-scope="{row}">
+          {{ translate(row.JOB_TYPE_INDEX, jobTypeList) }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="HOT_WORK_LEVEL_NAME" label="动火等级" />
+      <el-table-column prop="JOB_CONTENT" label="动火内容" />
+      <el-table-column prop="HOT_WORK_POSITION" label="动火部位" />
+      <el-table-column prop="UNIT_LEADER_DEPARTMENT_NAME" label="动火区域管辖单位" />
+      <el-table-column prop="WORK_LEVEL" label="申请单位" >
+        <template slot-scope="{row}">
+          {{ getUserName('deptName', row.HOT_WORK_APPLICATION_List) }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="APPLY_USER_NAME" label="申请人" />
+      <el-table-column prop="APPLY_USER_NAME" label="申请时间" >
+        <template slot-scope="{row}">
+          {{ getUserName('OPERATTIME', row.HOT_WORK_APPLICATION_List) }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="STATE" label="审核状态" >
+        <template slot-scope="{row}">
+          {{ translate(row.STATE.toString(), statusList) }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="examineUserName" label="审核人" >
+        <template slot-scope="{row}">
+          {{ row.examineUserName || row.examineDeptName }}
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" width="200">
+        <template slot-scope="{row}">
+          <!--          <el-button :disabled="row.STATE !='11'" type="primary" icon="el-icon-document" size="mini" @click="goDetail(row.HOTWORKAPPLICATION_ID,'apply')">申请</el-button>-->
+          <!--          <el-button :disabled="row.STATE !='-2'" type="primary" icon="el-icon-document" size="mini" @click="goDetail(row.HOTWORKAPPLICATION_ID,'repulse')">打回</el-button>-->
+          <el-button icon="el-icon-view" size="mini" @click="goInfo(row.HOTWORKAPPLICATION_ID,'see')">查看</el-button>
+          <!--<el-button v-if="row.STATE=='-6' && row.CREATOR == loginUserID" type="danger" icon="el-icon-delete" plain @click="batchDel(row.HOTWORKAPPLICATION_ID)">删除</el-button>-->
+          <el-button v-if="(row.CREATOR == loginUserID || loginUserID == '1' || loginRoleNumber == 'R20201225624685') && row.STATE != 11" type="danger" icon="el-icon-delete" plain @click="batchDel(row.HOTWORKAPPLICATION_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>
+  </div>
+</template>
+<script>
+import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
+import { requestFN } from '@/utils/request'
+import waves from '@/directive/waves' // waves directive
+import SelectTree from '@/components/SelectTree'
+
+export default {
+  components: { Pagination, SelectTree },
+  directives: { waves },
+  data() {
+    return {
+      listLoading: true,
+      add: false,
+      del: false,
+      edit: false,
+      listQuery: {
+        page: 1,
+        limit: 20
+      },
+      total: 0,
+      KEYWORDS: '',
+      varList: [],
+      pd: [],
+
+      multipleSelectionAll: [], // 所有选中的数据包含跨页数据
+      multipleSelection: [], // 当前页选中的数据
+      treeData: [], // 动火前管辖单位
+      dialogFormShow: false,
+      dialogFormEdit: false,
+      dialogType: 'add',
+      replyListQuery: {
+        page: 1,
+        limit: 20
+      },
+      jobTypeList: [
+        { id: '0', name: '内部作业' },
+        { id: '1', name: '相关方作业' }
+      ],
+      statusSuperList: [
+        { id: '0', name: '请选择' },
+        { id: '1', name: '待提交' },
+        { id: '2', name: '待审批' },
+        { id: '3', name: '审批通过' },
+        { id: '4', name: '已打回' }
+      ],
+      hotworklevelList: [
+        { id: '0', name: '特级' },
+        { id: '1', name: '一级' },
+        { id: '2', name: '二级' },
+        { id: '3', name: '三级' }
+      ],
+      defaultProps: {
+        value: 'id',
+        children: 'nodes',
+        label: 'name'
+      },
+      statusList: [
+        { id: '0', name: '申请人' },
+        { id: '1', name: '动火单位待确认' },
+        { id: '2', name: '项目发包单位待确认' },
+        { id: '3', name: '现场管辖单位待签发' },
+        { id: '4', name: '动火许可签发单位待审核' },
+        { id: '5', name: '安全总监待确认' },
+        { id: '6', name: '现场管辖人待接收' },
+        { id: '7', name: '动火前现场管辖人待确认' },
+        { id: '8', name: '现场管辖人待确认' },
+        { id: '9', name: '动火后现场管辖人待确认' },
+        { id: '30', name: '动火负责人待确认' },
+        { id: '31', name: '项目主管人员待待初审' },
+        { id: '32', name: '项目主管部门负责人待审核' },
+        { id: '33', name: '分公司安全总监待审批' },
+        { id: '34', name: '分公司主要负责人待签批' },
+        { id: '35', name: '（港股）安全监督部门待初审' },
+        { id: '36', name: '安委会办公室待审批' },
+        { id: '37', name: '安全总监待审批' },
+        { id: '10', name: '延时监火' },
+        { id: '11', name: '归档' },
+        { id: '-1', name: '审核不通过' },
+        { id: '-2', name: '特级不通过' },
+        { id: '-3', name: '关闭归档' },
+        { id: '-4', name: '延期' },
+        { id: '-5', name: '已打回' },
+        { id: '-6', name: '超期未动火' }
+      ],
+      STATUS: '',
+      DEPTIDS: '',
+      searchForm: {
+        keyJobNumber: '',
+        keyState: '',
+        keyApplyUserName: '',
+        keyApproveUserName: '',
+        keyApproveTime: '',
+        HOT_WORK_LEVEL_INDEX: '',
+        JOB_CONTENT: '',
+        HOT_WORK_POSITION: '',
+        UNIT_LEADER_DEPARTMENT_ID: ''
+      },
+      loginUserID: '',
+      loginRoleNumber: JSON.parse(sessionStorage.getItem('user')).RNUMBER
+    }
+  },
+  created() {
+    this.getList()
+    this.getEditMyInfo()
+    this.getDictTreeData()
+  },
+  methods: {
+    getRowKey(row) {
+      return row.HOTWORK_ID
+    },
+    // 搜索
+    getQuery() {
+      this.$refs.multipleTable.clearSelection()
+      this.getList()
+    },
+    // 获取登录人信息
+    getEditMyInfo() {
+      requestFN(
+        '/user/goEditMyInfo',
+        {}
+      ).then((data) => {
+        this.loginUserID = data.pd.USER_ID				// 主职角色ID
+      }).catch((e) => {
+
+      })
+    },
+    // 获取列表
+    getList() {
+      this.listLoading = true
+      requestFN(
+        '/dw/getAlarmList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {
+          tm: new Date().getTime()
+        }
+      ).then((data) => {
+        this.listLoading = false
+        this.varList = data.varList
+        this.total = data.page.totalResult
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    // 判断按钮权限，用于是否显示按钮
+    hasButton() {
+      var keys = 'hotwork:add,hotwork:del,hotwork:edit,toExcel'
+      requestFN(
+        '/head/hasButton',
+        {
+          keys: keys
+        }
+      ).then((data) => {
+        this.add = data.hotworkfhadminadd		// 新增权限
+        this.del = data.hotworkfhadmindel		// 删除权限
+        this.edit = data.hotworkfhadminedit	// 修改权限
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    translate(id, list) {
+      for (let i = 0; i < list.length; i++) {
+        if (list[i].BIANMA === id || list[i].value === id || list[i].id === id) return list[i].NAME || list[i].label || list[i].name
+      }
+    },
+    getUserName(keyName, list) {
+      if (list) {
+        var keyVal = ''
+        for (let i = 0; i < list.length; i++) {
+          if (list[i][keyName]) {
+            keyVal += list[i][keyName] + ','
+          }
+        }
+        return keyVal.substring(0, (keyVal.length - 1))
+      }
+    },
+    goDetail(id, type) {
+      this.$parent.activeName = 'Detail'
+      this.$parent.HOTWORKAPPLICATION_ID = id
+      this.$parent.HOTWORKAPPLICATION_TYPE = type
+    },
+    goInfo(id, type) {
+      this.$parent.activeName = 'Info'
+      this.$parent.HOTWORKAPPLICATION_ID = id
+      this.$parent.HOTWORKAPPLICATION_TYPE = type
+    },
+    getDictTreeData() {
+      return new Promise((resolve) => {
+        requestFN(
+          '/department/listTreeCorpDept',
+          {}
+        ).then((data) => {
+          this.treeData = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes')
+          resolve('ok')
+        }).catch((e) => {
+        })
+      })
+    },
+    chongzhi() {
+      this.searchForm = {
+        stateConfirm: '',
+        keySource: '',
+        keyHiddenDescr: '',
+        keyFindUserName: '',
+        keyFindUserDept: '',
+        keyHiddenType: '',
+        keyHiddenPart: '',
+        keyHiddenlevel: '',
+        keyFindTime: [],
+        keyFindStateTime: '',
+        keyFindEndTime: '',
+        keyConfirmUser: '',
+        HOT_WORK_LEVEL_INDEX: '',
+        JOB_CONTENT: '',
+        HOT_WORK_POSITION: ''
+      }
+      this.$refs.searchForm.resetFields()
+      this.getList()
+    },
+    batchDel(id) {
+      this.$confirm('确定要删除吗?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.listLoading = true
+        requestFN(
+          '/hotworkapplication/delete',
+          {
+            HOTWORKAPPLICATION_ID: id,
+            loginUserId: this.loginUserID
+          }
+        ).then(() => {
+          this.$message({
+            message: '删除成功',
+            type: 'success'
+          })
+          this.listLoading = false
+          this.varList = []
+          this.listQuery.page = 1
+          this.getList()
+        }).catch((e) => {
+          this.listLoading = false
+        })
+      }).catch(() => {
+      })
+    }
+  }
+}
+
+</script>
diff --git a/src/views/oneCompany/alarmList/index.vue b/src/views/oneCompany/alarmList/index.vue
new file mode 100644
index 0000000..479ef45
--- /dev/null
+++ b/src/views/oneCompany/alarmList/index.vue
@@ -0,0 +1,29 @@
+<template>
+  <div>
+    <List v-show="activeName=='List'" ref="list" />
+  </div>
+</template>
+
+<script>
+import List from './components/list'
+export default {
+  components: {
+    List: List
+  },
+  data() {
+    return {
+      activeName: 'List'
+    }
+  },
+  watch: {
+    activeName(val) {
+      if (val == 'List') {
+        this.$refs.list.getList()
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

From 419c30bc45b2adf168defe705f526f48d6525275 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Sat, 13 Apr 2024 12:33:30 +0800
Subject: [PATCH 07/23] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/oneCompany/reflection/components/list.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/oneCompany/reflection/components/list.vue b/src/views/oneCompany/reflection/components/list.vue
index 2859cff..dfee90d 100644
--- a/src/views/oneCompany/reflection/components/list.vue
+++ b/src/views/oneCompany/reflection/components/list.vue
@@ -85,7 +85,7 @@ export default {
   },
   created() {
     this.getDict()
-    this.getList()
+    // this.getList()
     this.hasButton()
   },
   methods: {
@@ -116,7 +116,7 @@ export default {
     getList() {
       this.listLoading = true
       requestFN(
-        '/dw/getMapList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        '/dingWei/getMapList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
           KEYWORDS: this.KEYWORDS,
           STATUS: '1',
@@ -182,7 +182,7 @@ export default {
         })
     },
     getDict: function() {
-      requestFN('dw/getDictionary').then((data) => {
+      requestFN('dingWei/getDictionary').then((data) => {
         this.wenhuachengduList = data.list
       }).catch((e) => {
         this.listLoading = false

From 03a1881fa64770ecbebf69d4e189508bcceef10c Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Sat, 13 Apr 2024 12:40:04 +0800
Subject: [PATCH 08/23] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oneCompany/reflection/components/list.vue | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/views/oneCompany/reflection/components/list.vue b/src/views/oneCompany/reflection/components/list.vue
index dfee90d..a70c8cc 100644
--- a/src/views/oneCompany/reflection/components/list.vue
+++ b/src/views/oneCompany/reflection/components/list.vue
@@ -78,6 +78,9 @@ export default {
         limit: 10,
         total: 0
       },
+      listLoading: false,
+      KEYWORDS: '',
+      varList: [],
       add: false,		// 新增按钮
       del: false,		// 删除按钮
       edit: false	// 修改按钮
@@ -109,28 +112,20 @@ export default {
       this.getList()
     },
     goKeyReset() {
-      this.KEYWORDS = ''
       this.STATUS = ''
       this.getQuery()
     },
     getList() {
       this.listLoading = true
       requestFN(
-        '/dingWei/getMapList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
-        {
-          KEYWORDS: this.KEYWORDS,
-          STATUS: '1',
-          EMPLOY_FLAG: '1',
-          CHECK_STATUS: '1'
-        }
+        '/dingWei/getMapList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page, {}
       ).then((data) => {
         this.listLoading = false
         this.varList = data.list
-        this.total = data.page.totalResult
+        this.total = data.page.total
+      }).catch((e) => {
+        this.listLoading = false
       })
-        .catch((e) => {
-          this.listLoading = false
-        })
     },
     handleAdd() {
       const _selectData = this.$refs.multipleTable.selection

From 5b145195c834823154c22e72e06668dae8e94449 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Sat, 13 Apr 2024 14:44:16 +0800
Subject: [PATCH 09/23] =?UTF-8?q?=E6=9C=AA=E5=88=86=E9=A1=B5bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oneCompany/reflection/components/info.vue | 316 ++++++++++++++++++
 .../oneCompany/reflection/components/list.vue |  37 +-
 2 files changed, 321 insertions(+), 32 deletions(-)
 create mode 100644 src/views/oneCompany/reflection/components/info.vue

diff --git a/src/views/oneCompany/reflection/components/info.vue b/src/views/oneCompany/reflection/components/info.vue
new file mode 100644
index 0000000..3426505
--- /dev/null
+++ b/src/views/oneCompany/reflection/components/info.vue
@@ -0,0 +1,316 @@
+<template>
+  <div>
+    <el-dialog
+      v-loading="loading"
+      :visible.sync="visible"
+      :append-to-body="appendToBody"
+      :before-close="beforeClose"
+      title="审批"
+      width="1200px"
+      destroy-on-close>
+      <el-form ref="form" :model="material" :rules="rules" label-width="200px" label-position="right" type="flex">
+        <el-row :gutter="12">
+          <el-col :span="12">
+            <el-form-item prop="typeInfo" label="映射类型: ">
+              <el-select v-model="material.typeInfo" filterable style="width: 300px" placeholder="请选择" @change="saveInfo">
+                <el-option v-for="item in dic.mapType" :key="item.value" :label="item.name" :value="JSON.stringify(item)"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-col :span="12">
+              <el-form-item label="部门：" prop="departmentId">
+                <Treeselect
+                  :options="dic.deptList"
+                  :normalizer="normalizer"
+                  v-model="material.departmentId"
+                  placeholder="请选择部门"
+                  no-options-text="暂无数据"
+                  no-children-text="暂无数据"
+                  style="width: 300px"
+                  @select="getPeopleList($event)"
+                />
+              </el-form-item>
+            </el-col>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="人员：" prop="userInfo">
+              <el-select v-model="material.userInfo" style="width: 300px" placeholder="请选择" @change="chooseUser">
+                <el-option
+                  v-for="item in dic.userList"
+                  :key="item.USER_ID"
+                  :value="JSON.stringify(item)"
+                  :label="item.NAME"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="设备编号：" prop="deviceId">
+              <el-input v-model="material.deviceId" placeholder="请输入内容"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="设备名称：" prop="deviceName">
+              <el-input v-model="material.deviceName" placeholder="请输入内容"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="其他系统编号：" prop="id">
+              <el-input v-model="material.id" placeholder="请输入内容"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="其他系统编号备注：" prop="id_remark">
+              <el-input v-model="material.idRemark" placeholder="请输入内容"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="备注：" prop="id">
+              <el-input v-model="material.remark" placeholder="请输入内容"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="handleClose">关 闭</el-button>
+        <el-button type="primary" @click="sendMessage('1')">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import vueQr from 'vue-qr'
+import Treeselect from '@riophae/vue-treeselect'
+import { requestFN } from '@/utils/request'
+import uploadFile from '../../../util/uploadFile/index.vue'
+
+export default {
+  components: { uploadFile, Treeselect, vueQr },
+  props: {
+    appendToBody: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      loading: false,
+      material: {
+        typeInfo: '',
+        type: '',
+        typeName: '',
+        deptInfo: '',
+        departmentId: null,
+        departmentName: '',
+        userInfo: '',
+        userId: '',
+        userName: '',
+        deviceId: '',
+        deviceName: '',
+        id: '',
+        idRemark: '',
+        remark: ''
+      },
+      form: {
+        required: {
+          type: '',
+          typeName: '',
+          departmentId: '',
+          departmentName: '',
+          userId: '',
+          userName: '',
+          deviceId: '',
+          deviceName: '',
+          id: '',
+          idRemark: ''
+        },
+        remark: ''
+      },
+      normalizer(node) {
+        return {
+          id: node.id,
+          label: node.name,
+          children: node.nodes
+        }
+      },
+
+      rules: {
+        typeInfo: [
+          { required: true, message: '请选择映射类型', trigger: 'change' }
+        ],
+        userInfo: [
+          { required: true, message: '请选择映射人', trigger: 'change' }
+        ],
+        departmentId: [
+          { required: true, message: '请选择部门', trigger: 'change' }
+        ],
+        deviceId: [
+          { required: true, message: '请填写其他系统编号', trigger: 'change' }
+        ],
+        deviceName: [
+          { required: true, message: '请填写其他系统名称', trigger: 'change' }
+        ],
+        id: [
+          { required: true, message: '请填写其他系统编号', trigger: 'change' }
+        ],
+        idRemark: [
+          { required: true, message: '请填写其他系统编号备注', trigger: 'change' }
+        ]
+      },
+      heirloom: {},
+      departmentTree: [],
+      peopleList: [],
+      dic: {
+        alarmStatus: [],
+        logType: [],
+        mapType: [],
+        deptList: [],
+        userList: []
+      }
+    }
+  },
+  methods: {
+    async init(e) {
+      if (e) {
+        this.heirloom = e
+      }
+      this.visible = true
+      await this.getDepartmentTree()
+      this.getDict()
+    },
+    getMenu() {
+      return new Promise(resolve => {
+        requestFN(
+          '/flowTrain/getPintName', { FLOWS_TYPE: this.info.FLOWS_TYPE, FLOWS_STEP: this.info.FLOWS_STEP }
+        ).then((data) => {
+          this.menu.department = data.Department
+          this.menu.user = data.User
+          this.menu.uploadFile = data.UploadFile
+          this.menu.limitFlag = data.limitFlag
+          resolve(true)
+        }).catch((e) => {
+        })
+      })
+    },
+    sendMessage(e) {
+      this.$refs.form.validate((valid) => {
+        if (!valid) {
+          this.$message.error('请填写完整信息')
+        } else {
+          this.form.required.type = this.material.type
+          this.form.required.typeName = this.material.typeName
+          this.form.required.departmentId = this.material.departmentId
+          this.form.required.departmentName = this.material.departmentName
+          this.form.required.userId = this.material.userId
+          this.form.required.userName = this.material.userName
+          this.form.required.deviceId = this.material.deviceId
+          this.form.required.deviceName = this.material.deviceName
+          this.form.required.id = this.material.id
+          this.form.required.idRemark = this.material.idRemark
+          this.form.remark = this.material.remark
+
+          requestFN(
+            '/dingWei/saveOrUpdateMap', { data: JSON.stringify(this.form) }
+          ).then((data) => {
+            if (data.code === 0) {
+              this.$message.success('操作成功')
+              this.handleClose()
+              this.$emit('refresh')
+            } else {
+              this.$message.error(data.msg)
+            }
+          }).catch((e) => {
+            console.log(e)
+          })
+        }
+      })
+    },
+    getPeopleList(e) {
+      this.material.departmentName = e.name
+      requestFN(
+        '/user/listAll',
+        {
+          DEPARTMENT_ID: e.id
+        }
+      ).then((data) => {
+        this.dic.userList = data.userList
+        this.material.userInfo = ''
+      }).catch((e) => {
+        console.log(e)
+      })
+    },
+    chooseUser(e) {
+      const entity = JSON.parse(e)
+      this.material.userId = entity.USER_ID
+      this.material.userName = entity.NAME
+    },
+    handleClose() {
+      this.form = {
+        STATUS: '',
+        APPOINT_DEPARTMENT_ID: null,
+        APPOINT_DEPARTMENT_NAME: '',
+        APPOINT_USER_ID: '',
+        APPOINT_USER_NAME: '',
+        OPINION: '',
+        user: '',
+        list: [],
+        tm: new Date().getTime()
+      }
+      this.visible = false
+    },
+    beforeClose() {
+      this.visible = false
+      this.form = {
+        STATUS: '',
+        APPOINT_DEPARTMENT_ID: null,
+        APPOINT_DEPARTMENT_NAME: '',
+        APPOINT_USER_ID: '',
+        APPOINT_USER_NAME: '',
+        OPINION: '',
+        user: '',
+        list: [],
+        tm: new Date().getTime()
+      }
+    },
+    saveInfo(e) {
+      const info = JSON.parse(e)
+      this.material.type = info.value
+      this.material.typeName = info.name
+    },
+    getDict() {
+      requestFN('dingWei/getDictionary').then((data) => {
+        this.dic.alarmStatus = JSON.parse(data.AlarmStatus)
+        this.dic.logType = JSON.parse(data.LogType)
+        this.dic.mapType = JSON.parse(data.MapType)
+      }).catch((e) => {
+        this.listLoading = false
+      })
+    },
+    getDepartmentTree() {
+      return new Promise(resolve => {
+        requestFN(
+          '/department/listTree',
+        ).then((data) => {
+          this.dic.deptList = this.removeEmptyChildren(JSON.parse(data.zTreeNodes))
+          resolve(true)
+        }).catch((e) => {
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/src/views/oneCompany/reflection/components/list.vue b/src/views/oneCompany/reflection/components/list.vue
index a70c8cc..8d173f7 100644
--- a/src/views/oneCompany/reflection/components/list.vue
+++ b/src/views/oneCompany/reflection/components/list.vue
@@ -58,6 +58,7 @@
       </div>
       <pagination :total="listQuery.total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList"/>
     </div>
+    <info ref="info" @flush="getList"/>
   </div>
 </template>
 
@@ -65,10 +66,11 @@
 import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
 import { requestFN } from '@/utils/request'
 import waves from '@/directive/waves' // waves directive
+import info from './info.vue'
 import vueQr from 'vue-qr'
 
 export default {
-  components: { Pagination, vueQr },
+  components: { Pagination, vueQr, info },
   directives: { waves },
   data() {
     return {
@@ -93,13 +95,7 @@ export default {
   },
   methods: {
     handleSelectWithDifferentStatus(row, rowIndex) {
-      if (row.STATUS === 0) {
-        // 不禁用
-        return true
-      } else {
-        // 禁用
-        return false
-      }
+      return true
     },
     getQuery() {
       if (this.$refs.multipleTable) {
@@ -128,30 +124,7 @@ export default {
       })
     },
     handleAdd() {
-      const _selectData = this.$refs.multipleTable.selection
-      if (_selectData == null || _selectData.length == 0) {
-        this.$message({
-          message: '未勾选培训人员...',
-          type: 'error'
-        })
-        return false
-      }
-
-      var users = []
-      _selectData.map(item => {
-        if (item.STATUS === 0) {
-          users.push(item.USER_ID)
-        }
-      })
-
-      if (users == null || users.length == 0) {
-        this.$message({
-          message: '勾选人员暂无法提交申请...',
-          type: 'error'
-        })
-        return false
-      }
-      this.$refs.apply.init(users)
+      this.$refs.info.init()
     },
     hasButton() {
       var keys = 'trainingbatch:add,trainingbatch:del,trainingbatch:edit,fhSms,email,fromExcel,toExcel'

From 83714b2115ad36677add7a83878e8206e822f8fb Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Sat, 13 Apr 2024 15:16:58 +0800
Subject: [PATCH 10/23] =?UTF-8?q?=E6=98=A0=E5=B0=84=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oneCompany/reflection/components/info.vue | 62 +++++++++++++------
 .../oneCompany/reflection/components/list.vue |  6 +-
 2 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/src/views/oneCompany/reflection/components/info.vue b/src/views/oneCompany/reflection/components/info.vue
index 3426505..1cd789a 100644
--- a/src/views/oneCompany/reflection/components/info.vue
+++ b/src/views/oneCompany/reflection/components/info.vue
@@ -12,16 +12,21 @@
         <el-row :gutter="12">
           <el-col :span="12">
             <el-form-item prop="typeInfo" label="映射类型: ">
-              <el-select v-model="material.typeInfo" filterable style="width: 300px" placeholder="请选择" @change="saveInfo">
+              <el-select v-model="material.typeInfo" filterable style="width:300px" placeholder="请选择" @change="saveInfo">
                 <el-option v-for="item in dic.mapType" :key="item.value" :label="item.name" :value="JSON.stringify(item)"/>
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="备注：" prop="remark">
+              <el-input v-model="material.remark" style="width: 300px" placeholder="请输入内容"/>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-col :span="12">
-              <el-form-item label="部门：" prop="departmentId">
+              <el-form-item label="负责部门：" prop="departmentId" style="width:300px">
                 <Treeselect
                   :options="dic.deptList"
                   :normalizer="normalizer"
@@ -36,8 +41,8 @@
             </el-col>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="人员：" prop="userInfo">
-              <el-select v-model="material.userInfo" style="width: 300px" placeholder="请选择" @change="chooseUser">
+            <el-form-item label="负责人员：" prop="userInfo" >
+              <el-select v-model="material.userInfo" style="width:300px" placeholder="请选择" @change="chooseUser">
                 <el-option
                   v-for="item in dic.userList"
                   :key="item.USER_ID"
@@ -47,34 +52,39 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="负责人手机号：" prop="userPhone">
+              <el-input v-model="material.userPhone" style="width: 300px" placeholder="请输入内容"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="负责人身份证：" prop="userCardId">
+              <el-input v-model="material.userCardId" style="width: 300px" placeholder="请输入内容"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="设备编号：" prop="deviceId">
-              <el-input v-model="material.deviceId" placeholder="请输入内容"/>
+              <el-input v-model="material.deviceId" style="width: 300px" placeholder="请输入内容"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="设备名称：" prop="deviceName">
-              <el-input v-model="material.deviceName" placeholder="请输入内容"/>
+              <el-input v-model="material.deviceName" style="width: 300px" placeholder="请输入内容"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="其他系统编号：" prop="id">
-              <el-input v-model="material.id" placeholder="请输入内容"/>
+              <el-input v-model="material.id" style="width: 300px" placeholder="请输入内容"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="其他系统编号备注：" prop="id_remark">
-              <el-input v-model="material.idRemark" placeholder="请输入内容"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="备注：" prop="id">
-              <el-input v-model="material.remark" placeholder="请输入内容"/>
+            <el-form-item label="其他系统编号备注：" prop="idRemark">
+              <el-input v-model="material.idRemark" style="width: 300px" placeholder="请输入内容"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -120,7 +130,9 @@ export default {
         deviceName: '',
         id: '',
         idRemark: '',
-        remark: ''
+        remark: '',
+        userCardId: '',
+        userPhone: ''
       },
       form: {
         required: {
@@ -133,9 +145,11 @@ export default {
           deviceId: '',
           deviceName: '',
           id: '',
-          idRemark: ''
+          userCardId: '',
+          userPhone: ''
         },
-        remark: ''
+        remark: '',
+        idRemark: ''
       },
       normalizer(node) {
         return {
@@ -166,6 +180,12 @@ export default {
         ],
         idRemark: [
           { required: true, message: '请填写其他系统编号备注', trigger: 'change' }
+        ],
+        userPhone: [
+          { required: true, message: '请填写负责人手机号', trigger: 'change' }
+        ],
+        userCardId: [
+          { required: true, message: '请填写负责人身份证', trigger: 'change' }
         ]
       },
       heirloom: {},
@@ -217,7 +237,9 @@ export default {
           this.form.required.deviceId = this.material.deviceId
           this.form.required.deviceName = this.material.deviceName
           this.form.required.id = this.material.id
-          this.form.required.idRemark = this.material.idRemark
+          this.form.required.userCardId = this.material.userCardId
+          this.form.required.userPhone = this.material.userPhone
+          this.form.idRemark = this.material.idRemark
           this.form.remark = this.material.remark
 
           requestFN(
diff --git a/src/views/oneCompany/reflection/components/list.vue b/src/views/oneCompany/reflection/components/list.vue
index 8d173f7..cf26c0b 100644
--- a/src/views/oneCompany/reflection/components/list.vue
+++ b/src/views/oneCompany/reflection/components/list.vue
@@ -36,15 +36,15 @@
       highlight-current-row>
       <el-table-column :selectable="handleSelectWithDifferentStatus" type="selection" width="55" align="center"/>
       <el-table-column type="index" label="序号" width="50" align="center"/>
-      <el-table-column prop="USERNAME" label="用户名" align="center"/>
-      <el-table-column prop="NAME" label="姓名" align="center"/>
+      <el-table-column prop="typeName" label="映射类型" align="center"/>
+      <el-table-column prop="userName" label="姓名" align="center"/>
       <el-table-column prop="departmentName" label="部门名称" align="center"/>
       <el-table-column prop="userPhone" label="用户手机号" align="center"/>
       <el-table-column prop="deviceId" label="设备id" align="center"/>
       <el-table-column prop="deviceName" label="设备名称" align="center"/>
       <el-table-column prop="id" label="其他系统编号" align="center"/>
       <el-table-column prop="idRemark" label="其他系统备注" align="center"/>
-      <el-table-column prop="createTime" label="创建时间" align="center"/>
+      <el-table-column prop="createdTime" label="创建时间" align="center"/>
       <el-table-column label="操作" align="center" width="200">
         <template slot-scope="{row}">
           <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleDelete(row)">删除</el-button>

From 3d03d27b90e11a1d2bcfb85ad3319c45b2c37eda Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Sat, 13 Apr 2024 16:12:37 +0800
Subject: [PATCH 11/23] =?UTF-8?q?=E6=98=A0=E5=B0=84=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oneCompany/reflection/components/info.vue | 135 ++++++++++++------
 .../oneCompany/reflection/components/list.vue |  39 ++++-
 2 files changed, 125 insertions(+), 49 deletions(-)

diff --git a/src/views/oneCompany/reflection/components/info.vue b/src/views/oneCompany/reflection/components/info.vue
index 1cd789a..f43dea7 100644
--- a/src/views/oneCompany/reflection/components/info.vue
+++ b/src/views/oneCompany/reflection/components/info.vue
@@ -202,12 +202,34 @@ export default {
   },
   methods: {
     async init(e) {
-      if (e) {
-        this.heirloom = e
-      }
       this.visible = true
       await this.getDepartmentTree()
-      this.getDict()
+      await this.getDict()
+      await this.getPeopleList({ id: e.departmentId })
+      if (e) {
+        await this.initInfo(e)
+      }
+    },
+    initInfo(e) {
+      return new Promise(resolve => {
+        this.heirloom = e
+        this.material.type = e.type
+        this.material.typeName = e.typeName
+        this.material.typeInfo = JSON.stringify({ name: e.typeName, value: e.type })
+        this.material.userId = e.userId
+        this.material.userName = e.userName
+        this.material.departmentId = e.departmentId
+        this.material.departmentName = e.departmentName
+        this.material.userPhone = e.userPhone
+        this.material.userCardId = e.userCardId
+        this.material.deviceId = e.deviceId
+        this.material.deviceName = e.deviceName
+        this.material.id = e.id
+        this.material.idRemark = e.idRemark
+        this.material.userInfo = e.userName
+        this.material.dwUserMapId = e.dwUserMapId
+        this.material.remark = e.remark
+      })
     },
     getMenu() {
       return new Promise(resolve => {
@@ -224,6 +246,7 @@ export default {
       })
     },
     sendMessage(e) {
+      console.log(this.material)
       this.$refs.form.validate((valid) => {
         if (!valid) {
           this.$message.error('请填写完整信息')
@@ -241,14 +264,16 @@ export default {
           this.form.required.userPhone = this.material.userPhone
           this.form.idRemark = this.material.idRemark
           this.form.remark = this.material.remark
+          this.form.dwUserMapId = this.material.dwUserMapId
 
           requestFN(
             '/dingWei/saveOrUpdateMap', { data: JSON.stringify(this.form) }
           ).then((data) => {
-            if (data.code === 0) {
+            if (data.code === 200) {
               this.$message.success('操作成功')
               this.handleClose()
-              this.$emit('refresh')
+              this.$emit('flush')
+              this.visible = false
             } else {
               this.$message.error(data.msg)
             }
@@ -259,17 +284,21 @@ export default {
       })
     },
     getPeopleList(e) {
-      this.material.departmentName = e.name
-      requestFN(
-        '/user/listAll',
-        {
-          DEPARTMENT_ID: e.id
-        }
-      ).then((data) => {
-        this.dic.userList = data.userList
-        this.material.userInfo = ''
-      }).catch((e) => {
-        console.log(e)
+      return new Promise(resolve => {
+        this.material.departmentName = e.name
+        requestFN(
+          '/user/listAll',
+          {
+            DEPARTMENT_ID: e.id
+          }
+        ).then((data) => {
+          this.dic.userList = data.userList
+          this.material.userInfo = ''
+          resolve(true)
+        }).catch((e) => {
+          console.log(e)
+          resolve(true)
+        })
       })
     },
     chooseUser(e) {
@@ -278,32 +307,46 @@ export default {
       this.material.userName = entity.NAME
     },
     handleClose() {
-      this.form = {
-        STATUS: '',
-        APPOINT_DEPARTMENT_ID: null,
-        APPOINT_DEPARTMENT_NAME: '',
-        APPOINT_USER_ID: '',
-        APPOINT_USER_NAME: '',
-        OPINION: '',
-        user: '',
-        list: [],
-        tm: new Date().getTime()
-      }
-      this.visible = false
+      this.beforeClose()
     },
     beforeClose() {
       this.visible = false
       this.form = {
-        STATUS: '',
-        APPOINT_DEPARTMENT_ID: null,
-        APPOINT_DEPARTMENT_NAME: '',
-        APPOINT_USER_ID: '',
-        APPOINT_USER_NAME: '',
-        OPINION: '',
-        user: '',
-        list: [],
-        tm: new Date().getTime()
+        required: {
+          type: '',
+          typeName: '',
+          departmentId: '',
+          departmentName: '',
+          userId: '',
+          userName: '',
+          deviceId: '',
+          deviceName: '',
+          id: '',
+          userCardId: '',
+          userPhone: ''
+        },
+        remark: '',
+        idRemark: ''
       }
+      this.material = {
+        typeInfo: '',
+        type: '',
+        typeName: '',
+        deptInfo: '',
+        departmentId: null,
+        departmentName: '',
+        userInfo: '',
+        userId: '',
+        userName: '',
+        deviceId: '',
+        deviceName: '',
+        id: '',
+        idRemark: '',
+        remark: '',
+        userCardId: '',
+        userPhone: ''
+      }
+      this.$emit('flush')
     },
     saveInfo(e) {
       const info = JSON.parse(e)
@@ -311,12 +354,16 @@ export default {
       this.material.typeName = info.name
     },
     getDict() {
-      requestFN('dingWei/getDictionary').then((data) => {
-        this.dic.alarmStatus = JSON.parse(data.AlarmStatus)
-        this.dic.logType = JSON.parse(data.LogType)
-        this.dic.mapType = JSON.parse(data.MapType)
-      }).catch((e) => {
-        this.listLoading = false
+      return new Promise(resolve => {
+        requestFN('dingWei/getDictionary').then((data) => {
+          this.dic.alarmStatus = JSON.parse(data.AlarmStatus)
+          this.dic.logType = JSON.parse(data.LogType)
+          this.dic.mapType = JSON.parse(data.MapType)
+          resolve(true)
+        }).catch((e) => {
+          this.listLoading = false
+          resolve(true)
+        })
       })
     },
     getDepartmentTree() {
diff --git a/src/views/oneCompany/reflection/components/list.vue b/src/views/oneCompany/reflection/components/list.vue
index cf26c0b..be3ee81 100644
--- a/src/views/oneCompany/reflection/components/list.vue
+++ b/src/views/oneCompany/reflection/components/list.vue
@@ -47,8 +47,8 @@
       <el-table-column prop="createdTime" label="创建时间" align="center"/>
       <el-table-column label="操作" align="center" width="200">
         <template slot-scope="{row}">
-          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleDelete(row)">删除</el-button>
-          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleDelete(row)">编辑</el-button>
+          <el-button type="danger" icon="el-icon-edit" size="mini" @click="handleDelete(row)">删除</el-button>
+          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row)">编辑</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -89,8 +89,7 @@ export default {
     }
   },
   created() {
-    this.getDict()
-    // this.getList()
+    this.getList()
     this.hasButton()
   },
   methods: {
@@ -118,7 +117,7 @@ export default {
       ).then((data) => {
         this.listLoading = false
         this.varList = data.list
-        this.total = data.page.total
+        this.listQuery.total = Number(data.page.total)
       }).catch((e) => {
         this.listLoading = false
       })
@@ -155,7 +154,37 @@ export default {
       }).catch((e) => {
         this.listLoading = false
       })
+    },
+    handleDelete(row) {
+      this.$confirm('是否删除该条数据?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.listLoading = true
+        requestFN(
+          '/dingWei/deleteMap', { id: row.dwUserMapId }
+        ).then((data) => {
+          this.listLoading = false
+          this.$message({
+            type: 'success',
+            message: '删除成功!'
+          })
+          this.getList()
+        }).catch((e) => {
+          this.listLoading = false
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    handleEdit(row) {
+      this.$refs.info.init(row)
     }
+
   }
 }
 </script>

From ffc9dcf5fefe78affdcfe855f99d5f8c1f595a9c Mon Sep 17 00:00:00 2001
From: limingyu <limingyu203@163.com>
Date: Sat, 13 Apr 2024 16:22:26 +0800
Subject: [PATCH 12/23] =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E5=AE=9A=E4=BD=8D=20=E6=8A=A5=E8=AD=A6=E5=88=97?=
 =?UTF-8?q?=E8=A1=A82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oneCompany/alarmList/components/list.vue  | 315 ++++++------------
 1 file changed, 101 insertions(+), 214 deletions(-)

diff --git a/src/views/oneCompany/alarmList/components/list.vue b/src/views/oneCompany/alarmList/components/list.vue
index 8cdbabb..892e8fa 100644
--- a/src/views/oneCompany/alarmList/components/list.vue
+++ b/src/views/oneCompany/alarmList/components/list.vue
@@ -3,72 +3,45 @@
     <el-form ref="searchForm" :model="searchForm" label-width="80px">
       <el-row>
         <el-col :span="6">
-          <el-form-item label="作业编号" prop="keySource">
-            <el-input v-model="searchForm.keyJobNumber" placeholder="请输入作业编号" class="filter-item" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="特级动火审批状态" prop="keyHiddenDescr" label-width="130px">
-            <el-select v-model="searchForm.keyState" placeholder="请选择">
-              <el-option v-for="item in statusSuperList" :key="item.id" :label="item.name" :value="item.id" />
+          <el-form-item label="报警状态" prop="status">
+            <el-select v-model="searchForm.status" style="width: 100%;">
+              <el-option v-for="item in statusList" :key="item.DICTIONARIES_ID" :value="item.BIANMA" :label="item.NAME"/>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="动火等级" prop="HOT_WORK_LEVEL_INDEX" >
-            <el-select v-model="searchForm.HOT_WORK_LEVEL_INDEX" placeholder="请选择" style="width: 80%">
-              <el-option v-for="item in hotworklevelList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="动火内容" prop="keySource">
-            <el-input v-model="searchForm.JOB_CONTENT" placeholder="请输入动火内容" class="filter-item" />
-          </el-form-item>
+          <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getList">
+            搜索
+          </el-button>
+          <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="chongzhi">
+            重置
+          </el-button>
         </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="JOB_NUMBER" label="作业编号" />
-      <el-table-column prop="JOB_TYPE_INDEX" label="作业类型" >
+      <el-table-column fixed="left" type="index" label="序号" width="50" align="center" />
+      <el-table-column prop="alarmName" label="报警名称" width="100"/>
+      <el-table-column prop="alarmMessage" label="报警信息" />
+      <el-table-column prop="relatedFunctions" label="相关功能" />
+      <el-table-column prop="typeName" label="类型名称" />
+      <el-table-column prop="message" label="报警信息" width="200"/>
+      <!--      <el-table-column prop="id" label="其他系统id" width="200"/>-->
+      <el-table-column prop="idRemak" label="其他系统备注" />
+      <el-table-column prop="remark" label="备注" />
+      <el-table-column prop="corpName" label="企业名称" width="150"/>
+      <el-table-column prop="departmentName" label="部门名称" />
+      <el-table-column prop="equipmentName" label="报警来源" width="100"/>
+      <el-table-column prop="createdTime" label="创建时间" width="150"/>
+      <el-table-column prop="level" label="报警等级" />
+      <el-table-column prop="address" label="报警地址" />
+      <el-table-column prop="statusName" label="状态名称" />
+      <el-table-column prop="opinion" label="处理意见" width="200"/>
+      <el-table-column fixed="right" label="操作" align="center" width="200">
         <template slot-scope="{row}">
-          {{ translate(row.JOB_TYPE_INDEX, jobTypeList) }}
-        </template>
-      </el-table-column>
-      <el-table-column prop="HOT_WORK_LEVEL_NAME" label="动火等级" />
-      <el-table-column prop="JOB_CONTENT" label="动火内容" />
-      <el-table-column prop="HOT_WORK_POSITION" label="动火部位" />
-      <el-table-column prop="UNIT_LEADER_DEPARTMENT_NAME" label="动火区域管辖单位" />
-      <el-table-column prop="WORK_LEVEL" label="申请单位" >
-        <template slot-scope="{row}">
-          {{ getUserName('deptName', row.HOT_WORK_APPLICATION_List) }}
-        </template>
-      </el-table-column>
-      <el-table-column prop="APPLY_USER_NAME" label="申请人" />
-      <el-table-column prop="APPLY_USER_NAME" label="申请时间" >
-        <template slot-scope="{row}">
-          {{ getUserName('OPERATTIME', row.HOT_WORK_APPLICATION_List) }}
-        </template>
-      </el-table-column>
-      <el-table-column prop="STATE" label="审核状态" >
-        <template slot-scope="{row}">
-          {{ translate(row.STATE.toString(), statusList) }}
-        </template>
-      </el-table-column>
-      <el-table-column prop="examineUserName" label="审核人" >
-        <template slot-scope="{row}">
-          {{ row.examineUserName || row.examineDeptName }}
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" width="200">
-        <template slot-scope="{row}">
-          <!--          <el-button :disabled="row.STATE !='11'" type="primary" icon="el-icon-document" size="mini" @click="goDetail(row.HOTWORKAPPLICATION_ID,'apply')">申请</el-button>-->
-          <!--          <el-button :disabled="row.STATE !='-2'" type="primary" icon="el-icon-document" size="mini" @click="goDetail(row.HOTWORKAPPLICATION_ID,'repulse')">打回</el-button>-->
-          <el-button icon="el-icon-view" size="mini" @click="goInfo(row.HOTWORKAPPLICATION_ID,'see')">查看</el-button>
-          <!--<el-button v-if="row.STATE=='-6' && row.CREATOR == loginUserID" type="danger" icon="el-icon-delete" plain @click="batchDel(row.HOTWORKAPPLICATION_ID)">删除</el-button>-->
-          <el-button v-if="(row.CREATOR == loginUserID || loginUserID == '1' || loginRoleNumber == 'R20201225624685') && row.STATE != 11" type="danger" icon="el-icon-delete" plain @click="batchDel(row.HOTWORKAPPLICATION_ID)">删除</el-button>
+          <el-button v-if="row.status == null || row.status == '0'" icon="el-icon-view" type="danger" size="mini" @click="goInfo(row.dwAlarmId,'ignore')">忽略</el-button>
+          <el-button v-if="row.status == null || row.status == '0'" icon="el-icon-view" type="primary" size="mini" @click="goInfo(row.dwAlarmId,'confirm')">确认</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -79,6 +52,17 @@
       </div>
       <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
     </div>
+    <el-dialog :visible.sync="dialogManageAlarm" :title="dialogType === 'ignore' ? '忽略报警' : '确认报警'" width="650px">
+      <el-form ref="form" :model="manageAlarmForm" :rules="manageAlarmRules" label-width="110px" style="width: 500px;">
+        <el-form-item label="处理意见" prop="opinion">
+          <el-input v-model="manageAlarmForm.opinion" :rows="4" type="textarea" placeholder="这里输入处理意见..." />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="closeManageAlarm()">取 消</el-button>
+        <el-button type="primary" @click="manageAlarm()">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -108,78 +92,31 @@ export default {
       multipleSelectionAll: [], // 所有选中的数据包含跨页数据
       multipleSelection: [], // 当前页选中的数据
       treeData: [], // 动火前管辖单位
-      dialogFormShow: false,
-      dialogFormEdit: false,
-      dialogType: 'add',
+      dialogType: 'ignore',
       replyListQuery: {
         page: 1,
         limit: 20
       },
-      jobTypeList: [
-        { id: '0', name: '内部作业' },
-        { id: '1', name: '相关方作业' }
-      ],
-      statusSuperList: [
-        { id: '0', name: '请选择' },
-        { id: '1', name: '待提交' },
-        { id: '2', name: '待审批' },
-        { id: '3', name: '审批通过' },
-        { id: '4', name: '已打回' }
-      ],
-      hotworklevelList: [
-        { id: '0', name: '特级' },
-        { id: '1', name: '一级' },
-        { id: '2', name: '二级' },
-        { id: '3', name: '三级' }
-      ],
       defaultProps: {
         value: 'id',
         children: 'nodes',
         label: 'name'
       },
-      statusList: [
-        { id: '0', name: '申请人' },
-        { id: '1', name: '动火单位待确认' },
-        { id: '2', name: '项目发包单位待确认' },
-        { id: '3', name: '现场管辖单位待签发' },
-        { id: '4', name: '动火许可签发单位待审核' },
-        { id: '5', name: '安全总监待确认' },
-        { id: '6', name: '现场管辖人待接收' },
-        { id: '7', name: '动火前现场管辖人待确认' },
-        { id: '8', name: '现场管辖人待确认' },
-        { id: '9', name: '动火后现场管辖人待确认' },
-        { id: '30', name: '动火负责人待确认' },
-        { id: '31', name: '项目主管人员待待初审' },
-        { id: '32', name: '项目主管部门负责人待审核' },
-        { id: '33', name: '分公司安全总监待审批' },
-        { id: '34', name: '分公司主要负责人待签批' },
-        { id: '35', name: '（港股）安全监督部门待初审' },
-        { id: '36', name: '安委会办公室待审批' },
-        { id: '37', name: '安全总监待审批' },
-        { id: '10', name: '延时监火' },
-        { id: '11', name: '归档' },
-        { id: '-1', name: '审核不通过' },
-        { id: '-2', name: '特级不通过' },
-        { id: '-3', name: '关闭归档' },
-        { id: '-4', name: '延期' },
-        { id: '-5', name: '已打回' },
-        { id: '-6', name: '超期未动火' }
-      ],
-      STATUS: '',
-      DEPTIDS: '',
-      searchForm: {
-        keyJobNumber: '',
-        keyState: '',
-        keyApplyUserName: '',
-        keyApproveUserName: '',
-        keyApproveTime: '',
-        HOT_WORK_LEVEL_INDEX: '',
-        JOB_CONTENT: '',
-        HOT_WORK_POSITION: '',
-        UNIT_LEADER_DEPARTMENT_ID: ''
-      },
       loginUserID: '',
-      loginRoleNumber: JSON.parse(sessionStorage.getItem('user')).RNUMBER
+      loginRoleNumber: JSON.parse(sessionStorage.getItem('user')).RNUMBER,
+      dialogManageAlarm: false,
+      manageAlarmForm: {
+        opinion: '', // 处理意见
+        DW_ALARM_ID: '',
+        status: ''
+      },
+      manageAlarmRules: {
+        opinion: [{ required: true, message: '处理意见不能为空', trigger: 'blur' }]
+      },
+      searchForm: {
+        status: ''
+      },
+      statusList: []
     }
   },
   created() {
@@ -189,7 +126,7 @@ export default {
   },
   methods: {
     getRowKey(row) {
-      return row.HOTWORK_ID
+      return row.dwAlarmId
     },
     // 搜索
     getQuery() {
@@ -211,59 +148,58 @@ export default {
     getList() {
       this.listLoading = true
       requestFN(
-        '/dw/getAlarmList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
-        {
-          tm: new Date().getTime()
-        }
+        '/dingWei/getAlarmList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        {}
       ).then((data) => {
         this.listLoading = false
-        this.varList = data.varList
-        this.total = data.page.totalResult
+        this.varList = data.list
+        this.total = data.page.total
       }).catch((e) => {
         this.listLoading = false
       })
     },
-    // 判断按钮权限，用于是否显示按钮
-    hasButton() {
-      var keys = 'hotwork:add,hotwork:del,hotwork:edit,toExcel'
-      requestFN(
-        '/head/hasButton',
-        {
-          keys: keys
-        }
-      ).then((data) => {
-        this.add = data.hotworkfhadminadd		// 新增权限
-        this.del = data.hotworkfhadmindel		// 删除权限
-        this.edit = data.hotworkfhadminedit	// 修改权限
-      }).catch((e) => {
-        this.listLoading = false
-      })
-    },
-    translate(id, list) {
-      for (let i = 0; i < list.length; i++) {
-        if (list[i].BIANMA === id || list[i].value === id || list[i].id === id) return list[i].NAME || list[i].label || list[i].name
-      }
-    },
-    getUserName(keyName, list) {
-      if (list) {
-        var keyVal = ''
-        for (let i = 0; i < list.length; i++) {
-          if (list[i][keyName]) {
-            keyVal += list[i][keyName] + ','
-          }
-        }
-        return keyVal.substring(0, (keyVal.length - 1))
-      }
-    },
-    goDetail(id, type) {
-      this.$parent.activeName = 'Detail'
-      this.$parent.HOTWORKAPPLICATION_ID = id
-      this.$parent.HOTWORKAPPLICATION_TYPE = type
-    },
     goInfo(id, type) {
-      this.$parent.activeName = 'Info'
-      this.$parent.HOTWORKAPPLICATION_ID = id
-      this.$parent.HOTWORKAPPLICATION_TYPE = type
+      this.dialogManageAlarm = true
+      this.dialogType = type
+      this.manageAlarmForm.DW_ALARM_ID = id
+      if (type === 'ignore') {
+        this.manageAlarmForm.status = '2'
+      } else {
+        this.manageAlarmForm.status = '1'
+      }
+    },
+    manageAlarm() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.listLoading = true
+          requestFN(
+            '/dingWei/manageAlarm',
+            this.manageAlarmForm
+          ).then((data) => {
+            if (data.code === 200) {
+              this.closeManageAlarm()
+              this.getList()
+              this.$message({
+                message: '操作成功',
+                type: 'success'
+              })
+            } else {
+              this.$message.error(data.message)
+            }
+          })
+        }
+      })
+    },
+    closeManageAlarm() {
+      this.dialogManageAlarm = false
+      this.resetForm()
+    },
+    resetForm() {
+      this.manageAlarmForm = {
+        opinion: '', // 处理意见
+        DW_ALARM_ID: '',
+        status: ''
+      }
     },
     getDictTreeData() {
       return new Promise((resolve) => {
@@ -276,55 +212,6 @@ export default {
         }).catch((e) => {
         })
       })
-    },
-    chongzhi() {
-      this.searchForm = {
-        stateConfirm: '',
-        keySource: '',
-        keyHiddenDescr: '',
-        keyFindUserName: '',
-        keyFindUserDept: '',
-        keyHiddenType: '',
-        keyHiddenPart: '',
-        keyHiddenlevel: '',
-        keyFindTime: [],
-        keyFindStateTime: '',
-        keyFindEndTime: '',
-        keyConfirmUser: '',
-        HOT_WORK_LEVEL_INDEX: '',
-        JOB_CONTENT: '',
-        HOT_WORK_POSITION: ''
-      }
-      this.$refs.searchForm.resetFields()
-      this.getList()
-    },
-    batchDel(id) {
-      this.$confirm('确定要删除吗?', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.listLoading = true
-        requestFN(
-          '/hotworkapplication/delete',
-          {
-            HOTWORKAPPLICATION_ID: id,
-            loginUserId: this.loginUserID
-          }
-        ).then(() => {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.listLoading = false
-          this.varList = []
-          this.listQuery.page = 1
-          this.getList()
-        }).catch((e) => {
-          this.listLoading = false
-        })
-      }).catch(() => {
-      })
     }
   }
 }

From 830e2d2f48652db4431dc891d08128daee469ed3 Mon Sep 17 00:00:00 2001
From: limingyu <limingyu203@163.com>
Date: Sat, 13 Apr 2024 16:48:21 +0800
Subject: [PATCH 13/23] =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E5=AE=9A=E4=BD=8D=20=E6=8A=A5=E8=AD=A6=E5=88=97?=
 =?UTF-8?q?=E8=A1=A83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oneCompany/alarmList/components/list.vue  | 35 +++++++++++++++----
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/views/oneCompany/alarmList/components/list.vue b/src/views/oneCompany/alarmList/components/list.vue
index 892e8fa..64997eb 100644
--- a/src/views/oneCompany/alarmList/components/list.vue
+++ b/src/views/oneCompany/alarmList/components/list.vue
@@ -2,18 +2,18 @@
   <div class="app-container">
     <el-form ref="searchForm" :model="searchForm" label-width="80px">
       <el-row>
-        <el-col :span="6">
+        <el-col :span="4">
           <el-form-item label="报警状态" prop="status">
             <el-select v-model="searchForm.status" style="width: 100%;">
-              <el-option v-for="item in statusList" :key="item.DICTIONARIES_ID" :value="item.BIANMA" :label="item.NAME"/>
+              <el-option v-for="item in alarmStatusList" :key="item.value" :value="item.value" :label="item.name"/>
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="4" label-width="10px" style="margin-left: 20px">
           <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="getList">
             搜索
           </el-button>
-          <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="chongzhi">
+          <el-button v-waves class="filter-item" type="success" icon="el-icon-refresh" @click="resetSearchForm">
             重置
           </el-button>
         </el-col>
@@ -116,13 +116,14 @@ export default {
       searchForm: {
         status: ''
       },
-      statusList: []
+      alarmStatusList: []
     }
   },
   created() {
     this.getList()
     this.getEditMyInfo()
     this.getDictTreeData()
+    this.getDictionary()
   },
   methods: {
     getRowKey(row) {
@@ -141,15 +142,22 @@ export default {
       ).then((data) => {
         this.loginUserID = data.pd.USER_ID				// 主职角色ID
       }).catch((e) => {
-
       })
     },
+    resetSearchForm() {
+      this.searchForm = {
+        status: ''
+      }
+      this.getList()
+    },
     // 获取列表
     getList() {
       this.listLoading = true
       requestFN(
         '/dingWei/getAlarmList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
-        {}
+        {
+          status: this.searchForm.status
+        }
       ).then((data) => {
         this.listLoading = false
         this.varList = data.list
@@ -158,6 +166,19 @@ export default {
         this.listLoading = false
       })
     },
+    getDictionary() {
+      requestFN(
+        '/dingWei/getDictionary',
+        {}
+      ).then((data) => {
+        if (data.code === 200) {
+          var alarmStatusList = JSON.parse(data.AlarmStatus)
+          this.alarmStatusList = alarmStatusList
+        }
+      }).catch((e) => {
+
+      })
+    },
     goInfo(id, type) {
       this.dialogManageAlarm = true
       this.dialogType = type

From 384b1e27b7904e45977d73bba6ebd24e15d9248f Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Sat, 13 Apr 2024 17:11:13 +0800
Subject: [PATCH 14/23] =?UTF-8?q?=E6=9F=A5=E8=AF=A2bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oneCompany/reflection/components/list.vue      | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/views/oneCompany/reflection/components/list.vue b/src/views/oneCompany/reflection/components/list.vue
index be3ee81..18d4ea3 100644
--- a/src/views/oneCompany/reflection/components/list.vue
+++ b/src/views/oneCompany/reflection/components/list.vue
@@ -3,8 +3,8 @@
     <el-form label-width="130px">
       <el-row>
         <el-col :span="6">
-          <el-form-item label="用户名">
-            <el-input v-model="KEYWORDS" placeholder="请输入用户名"/>
+          <el-form-item label="姓名">
+            <el-input v-model="condition.userName" placeholder="请输入姓名"/>
           </el-form-item>
         </el-col>
         <el-col v-if="false" :span="6">
@@ -74,6 +74,9 @@ export default {
   directives: { waves },
   data() {
     return {
+      condition: {
+        userName: ''
+      },
       config: config,
       listQuery: {
         page: 0,
@@ -107,13 +110,16 @@ export default {
       this.getList()
     },
     goKeyReset() {
-      this.STATUS = ''
+      this.condition = {
+        userName: ''
+      }
       this.getQuery()
     },
     getList() {
       this.listLoading = true
       requestFN(
-        '/dingWei/getMapList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page, {}
+        '/dingWei/getMapList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        this.condition
       ).then((data) => {
         this.listLoading = false
         this.varList = data.list

From 35500daad3ff776bfa0f8af45a47ae364485e1b0 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Tue, 16 Apr 2024 16:09:16 +0800
Subject: [PATCH 15/23] =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E5=AE=9A=E4=BD=8D=E5=9C=B0=E5=9B=BE=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                         | 3 +++
 src/views/oneCompany/reflection/components/info.vue | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/App.vue b/src/App.vue
index 0ffa327..4178ff7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -25,4 +25,7 @@ export default {
   font-size: 14px !important;
   font-weight: 500;
 }
+.el-loading-mask{
+  z-index: 9999 !important;
+}
 </style>
diff --git a/src/views/oneCompany/reflection/components/info.vue b/src/views/oneCompany/reflection/components/info.vue
index f43dea7..3f3d9ce 100644
--- a/src/views/oneCompany/reflection/components/info.vue
+++ b/src/views/oneCompany/reflection/components/info.vue
@@ -1,7 +1,6 @@
 <template>
   <div>
     <el-dialog
-      v-loading="loading"
       :visible.sync="visible"
       :append-to-body="appendToBody"
       :before-close="beforeClose"

From c912472911765c2782d4dd67f565e32e0b2ae0da Mon Sep 17 00:00:00 2001
From: LiuJiaNan <liujianan@zcloudchina.com>
Date: Tue, 16 Apr 2024 16:25:19 +0800
Subject: [PATCH 16/23] =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=BD=A8=E8=BF=B9?=
 =?UTF-8?q?=E3=80=81=E6=8A=A5=E8=AD=A6=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/index.vue | 156 ++++++++++++++++++++++++++++------------
 1 file changed, 112 insertions(+), 44 deletions(-)

diff --git a/src/views/map/index.vue b/src/views/map/index.vue
index b0da679..ebaae81 100644
--- a/src/views/map/index.vue
+++ b/src/views/map/index.vue
@@ -1052,6 +1052,7 @@ export default {
       },
       subscription: {
         topic: '+/UwbBQ/+/prop',
+        topic1: '+/+/+/alarm',
         qos: 0
       },
 
@@ -1072,7 +1073,8 @@ export default {
         CORP_INFO_ID: '',
         longitude: '',
         latitude: ''
-      }
+      },
+      trajectoryEntityCollection: {}
     }
   },
   mounted() {
@@ -1183,6 +1185,58 @@ export default {
           this.closeBubbles()
         }
       }, Cesium.ScreenSpaceEventType.LEFT_CLICK)
+      viewer.cesiumWidget.screenSpaceEventHandler.removeInputAction(Cesium.ScreenSpaceEventType.RIGHT_DOUBLE_CLICK)
+      viewer.cesiumWidget.screenSpaceEventHandler.removeInputAction(Cesium.ScreenSpaceEventType.RIGHT_CLICK)
+      document.addEventListener('contextmenu', function(event) {
+        event.preventDefault()
+      })
+      this.handler.setInputAction(movement => {
+        const pick = viewer.scene.pick(movement.position)
+        if (Cesium.defined(pick) && (pick.id.id)) {
+          if (!pick.id._monitoItems) {
+            this.removeTrajectory()
+            return
+          }
+          const point_type = pick.id._monitoItems.data.point_type
+          const point_id = pick.id._monitoItems.data.id
+          const corpInfoId = pick.id._monitoItems.data.corpInfoId
+          if (point_type === '标记点peoplePositionOne') {
+            this.removeTrajectory()
+            this.addTrajectory(point_id, corpInfoId)
+          }
+        } else {
+          this.removeTrajectory()
+        }
+      }, Cesium.ScreenSpaceEventType.RIGHT_CLICK)
+    },
+    addTrajectory(point_id, corpInfoId) {
+      requestFN(
+        '/map/getPersonTrace',
+        {
+          id: point_id,
+          corpId: corpInfoId
+        }
+      ).then((data) => {
+        if (data.list) {
+          const positions = []
+          for (let i = 0; i < data.list.length; i++) {
+            positions.push(Cesium.Cartesian3.fromDegrees(data.list[i].XAxis, data.list[i].YAxis))
+          }
+          const entity = new Cesium.Entity({
+            id: 'trajectory',
+            polyline: { positions, width: 5.0, material: Cesium.Color.RED }
+          })
+          const collection = new Cesium.CustomDataSource('trajectoryEntityCollection')
+          collection.entities.add(entity)
+          viewer.dataSources.add(collection)
+          this.trajectoryEntityCollection = collection
+        }
+      })
+    },
+    removeTrajectory() {
+      if (Object.keys(this.trajectoryEntityCollection).length === 0) return
+      viewer.dataSources.remove(this.trajectoryEntityCollection)
+      this.trajectoryEntityCollection = {}
     },
 
     getCatesian3FromPX: function(px) {
@@ -1520,6 +1574,7 @@ export default {
         this.destroyConnection()
         this.clearAllBottomOptionsItemsCheck()
         this.clearAllBottomOptionsItemsEntityCollection()
+        this.removeTrajectory()
         this.onePerLocArr = []
         this.perLocArr = []
         this.clearMqttPoint()
@@ -1562,6 +1617,7 @@ export default {
       this.addBranchPoint()
       this.clearAllBottomOptionsItemsCheck()
       this.clearAllBottomOptionsItemsEntityCollection()
+      this.removeTrajectory()
     },
     bottomOptionsClick(index) {
       if (this.bottomClickDisable) return
@@ -1631,6 +1687,7 @@ export default {
       } else if (this.CORP_INFO_ID) {
         this.CORP_INFO_ID = ''
         this.clearAllBottomOptionsItemsEntityCollection()
+        this.removeTrajectory()
         this.dragAreaEntity(this.branchPoint)
         this.toCenter(this.parentCenter)
         this.destroyConnection()
@@ -1675,7 +1732,8 @@ export default {
         }
         if (this.gangkouActive === '00003' && this.CORP_INFO_ID === '035958e685cf4850bc40151c5e0617a6' && urlType === 'peoplePosition') {
           this.doUnSubscribe()
-          this.clearMqttPoint('1698584148364034050/UwbBQ/')
+          this.clearMqttPoint('+/UwbBQ/')
+          this.removeTrajectory()
         }
         this.bottomOptionsList[pindex].list[index].check = false
         if (this.gangkouActive === '00004') {
@@ -1997,48 +2055,58 @@ export default {
     },
     mqttMessage(CORP_INFO_ID) {
       this.client.on('message', (topic, message) => {
+        if (topic.indexOf('UwbBQ') !== -1 && topic.indexOf('prop') !== -1) {
         // created by liu jun mqtt返回的参数可能是一个数组
-        let peopleList = JSON.parse(message)
-        if (!Array.isArray(peopleList)) {
-          peopleList = [peopleList]
-        }
-        for (let i = 0; i < peopleList.length; i++) {
-          const item = peopleList[i]
-          // 如果不是人员信息则跳过
-          // UwbBQ是人员定位卡的id（UwbJiZhan这是基站的id）
-          if (item.productKey !== 'UwbBQ') {
-            continue
+          let peopleList = JSON.parse(message)
+          if (!Array.isArray(peopleList)) {
+            peopleList = [peopleList]
           }
-          // 将地图上剩余的点与最新的定位人员点进行对比   更新地图上已存在的点    新增地图上之前没有的点
-          const index = this.onePerLocArr.findIndex(item1 => {
-            return item1.id.toString() === item.deviceCode.toString()
-          })
-          const x = item.properties[2].value
-          const y = item.properties[3].value
-          const pointColor = this.isPointxyWithinTheArea(this.pointBox, x, y)
-          if (index !== -1) {
-            this.onePerLocArr[index].x = x
-            this.onePerLocArr[index].y = y
-            this.onePerLocArr[index].icon_type = 'img4_0' + pointColor
-            ry_drag.getPosition(this.onePerLocArr[index])
-          } else {
-            // const id = '4_0_' +item.deviceCode
-            const perLoc = {
-              id: item.deviceCode,
-              // name: item.realName,
-              x: x,
-              y: y,
-              icon_type: 'img4_0' + pointColor,
-              // infoname: item.realName,
-              data_id: item.deviceCode,
-              point_type: '标记点peoplePositionOne',
-              label: '人员定位',
-              corpInfoId: CORP_INFO_ID
+          for (let i = 0; i < peopleList.length; i++) {
+            const item = peopleList[i]
+            // 如果不是人员信息则跳过
+            // UwbBQ是人员定位卡的id（UwbJiZhan这是基站的id）
+            if (item.productKey !== 'UwbBQ') {
+              continue
+            }
+            // 将地图上剩余的点与最新的定位人员点进行对比   更新地图上已存在的点    新增地图上之前没有的点
+            const index = this.onePerLocArr.findIndex(item1 => {
+              return item1.id.toString() === item.deviceCode.toString()
+            })
+            const x = item.properties[2].value
+            const y = item.properties[3].value
+            const pointColor = this.isPointxyWithinTheArea(this.pointBox, x, y)
+            if (index !== -1) {
+              this.onePerLocArr[index].x = x
+              this.onePerLocArr[index].y = y
+              this.onePerLocArr[index].icon_type = 'img4_0' + pointColor
+              ry_drag.getPosition(this.onePerLocArr[index])
+            } else {
+            // const id = '4_0_' +item.deviceCode
+              const perLoc = {
+                id: item.deviceCode,
+                // name: item.realName,
+                x: x,
+                y: y,
+                icon_type: 'img4_0' + pointColor,
+                // infoname: item.realName,
+                data_id: item.deviceCode,
+                point_type: '标记点peoplePositionOne',
+                label: '人员定位',
+                corpInfoId: CORP_INFO_ID
+              }
+              this.onePerLocArr.push(perLoc)
+              ry_drag.addEntity(perLoc)
+              this.mqttPoint[this.subscription.topic.substring(0, this.subscription.topic.lastIndexOf('+')) + item.deviceCode] = item.deviceCode
             }
-            this.onePerLocArr.push(perLoc)
-            ry_drag.addEntity(perLoc)
-            this.mqttPoint[this.subscription.topic.substring(0, this.subscription.topic.lastIndexOf('+')) + item.deviceCode] = item.deviceCode
           }
+        } else if (topic.indexOf('alarm') !== -1) {
+          const formatMessage = JSON.parse(message)
+          this.$notify({
+            title: '报警信息',
+            dangerouslyUseHTMLString: true,
+            message: `部门：${formatMessage.deptName}<br/>类型：${formatMessage.identifierName}`,
+            type: 'error'
+          })
         }
       })
     },
@@ -2052,8 +2120,8 @@ export default {
     },
     // 订阅
     doSubscribe() {
-      const { topic, qos } = this.subscription
-      this.client.subscribe(topic, { qos }, (error, res) => {
+      const { topic, topic1, qos } = this.subscription
+      this.client.subscribe([topic, topic1], { qos }, (error, res) => {
         if (error) {
           console.log('Subscribe to topics error', error)
           return
@@ -2064,8 +2132,8 @@ export default {
     },
     // 取消订阅
     doUnSubscribe() {
-      const { topic } = this.subscription
-      this.client.unsubscribe(topic, error => {
+      const { topic, topic1 } = this.subscription
+      this.client.unsubscribe([topic, topic1], error => {
         if (error) {
           console.log('Subscribe to topics error', error)
         }

From f50fdae4350f72845c00454128fb7145613b1ed0 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Tue, 16 Apr 2024 17:22:43 +0800
Subject: [PATCH 17/23] =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E5=AE=9A=E4=BD=8D=E5=9C=B0=E5=9B=BE=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oneCompany/reflection/components/info.vue      | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/views/oneCompany/reflection/components/info.vue b/src/views/oneCompany/reflection/components/info.vue
index 3f3d9ce..b777473 100644
--- a/src/views/oneCompany/reflection/components/info.vue
+++ b/src/views/oneCompany/reflection/components/info.vue
@@ -230,20 +230,6 @@ export default {
         this.material.remark = e.remark
       })
     },
-    getMenu() {
-      return new Promise(resolve => {
-        requestFN(
-          '/flowTrain/getPintName', { FLOWS_TYPE: this.info.FLOWS_TYPE, FLOWS_STEP: this.info.FLOWS_STEP }
-        ).then((data) => {
-          this.menu.department = data.Department
-          this.menu.user = data.User
-          this.menu.uploadFile = data.UploadFile
-          this.menu.limitFlag = data.limitFlag
-          resolve(true)
-        }).catch((e) => {
-        })
-      })
-    },
     sendMessage(e) {
       console.log(this.material)
       this.$refs.form.validate((valid) => {

From 06672de43b1f96006988b657e8dc45996e20f88b Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 17 Apr 2024 08:57:43 +0800
Subject: [PATCH 18/23] =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E5=AE=9A=E4=BD=8D=E5=9C=B0=E5=9B=BE=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/oneCompany/reflection/components/info.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/oneCompany/reflection/components/info.vue b/src/views/oneCompany/reflection/components/info.vue
index b777473..3a157a1 100644
--- a/src/views/oneCompany/reflection/components/info.vue
+++ b/src/views/oneCompany/reflection/components/info.vue
@@ -102,9 +102,10 @@ import vueQr from 'vue-qr'
 import Treeselect from '@riophae/vue-treeselect'
 import { requestFN } from '@/utils/request'
 import uploadFile from '../../../util/uploadFile/index.vue'
+import UploadImg from '../../../util/uploadImg/index.vue'
 
 export default {
-  components: { uploadFile, Treeselect, vueQr },
+  components: { UploadImg, uploadFile, Treeselect, vueQr },
   props: {
     appendToBody: {
       type: Boolean,
@@ -131,7 +132,8 @@ export default {
         idRemark: '',
         remark: '',
         userCardId: '',
-        userPhone: ''
+        userPhone: '',
+        photo: []
       },
       form: {
         required: {

From d62d563bc9850fbe5f9133742e80dd745576748b Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 17 Apr 2024 11:21:45 +0800
Subject: [PATCH 19/23] =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8=E4=BC=81?=
 =?UTF-8?q?=E4=B8=9A=E7=AB=AF=E5=9C=B0=E5=9B=BE=E5=8A=9F=E8=83=BD=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/components/renyuan.vue       | 88 +++++++++++++++++++++-
 src/views/map/dialog/peoplePositionYGS.vue | 35 ++++++---
 2 files changed, 109 insertions(+), 14 deletions(-)

diff --git a/src/views/map/components/renyuan.vue b/src/views/map/components/renyuan.vue
index f3bbb76..c74e60b 100644
--- a/src/views/map/components/renyuan.vue
+++ b/src/views/map/components/renyuan.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="renyuan">
-    <div class="block1">
+    <div v-if="false" class="block1">
       <layout-title title="定位基础信息"/>
       <div class="options">
         <div v-for="(item,index) in block1OptionsList" :key="index" class="option">
@@ -15,7 +15,7 @@
         </div>
       </div>
     </div>
-    <div class="block2">
+    <div v-if="false" class="block2">
       <layout-title title="定位状态数据"/>
       <div class="options">
         <div class="bg"/>
@@ -29,7 +29,7 @@
         </div>
       </div>
     </div>
-    <div class="block3">
+    <div v-if="false" class="block3">
       <layout-title title="定位标签状态"/>
       <div class="content">
         <div class="options">
@@ -56,18 +56,42 @@
         </div>
       </div>
     </div>
+    <div class="block4">
+      <layout-title title="报警列表"/>
+      <div class="content">
+        <div class="table">
+          <div class="tr">
+            <div class="td">区域名称</div>
+            <div class="td">报警设备编号</div>
+            <div class="td">异地告警</div>
+          </div>
+          <div v-for="(item,index) in block4List" :key="index" class="tr">
+            <div class="td">{{ item.alarmName }}</div>
+            <div class="td">{{ item.equipmentName }}</div>
+            <div class="td">{{ item.statusName }}</div>
+          </div>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
 import layoutTitle from './title.vue'
 import CountTo from 'vue-count-to'
+import { requestFN } from '../../../utils/request'
 
 export default {
   components: {
     CountTo,
     layoutTitle
   },
+  props: {
+    corpInfoId: {
+      type: String,
+      default: ''
+    }
+  },
   data() {
     return {
       block1OptionsList: [
@@ -131,12 +155,26 @@ export default {
           count: '-',
           facount: '-'
         }
-      ]
+      ],
+      block4List: []
     }
   },
+  created() {
+    this.getData()
+  },
   methods: {
     block3OptionsClick(index) {
       this.block3OptionsIndex = index
+    },
+    getData() {
+      requestFN(
+        '/map/getAlarmList',
+        { corpId: this.corpInfoId }
+      ).then((data) => {
+        this.block4List = data.list
+      }).catch((e) => {
+        this.$message.error(e)
+      })
     }
   }
 }
@@ -321,6 +359,48 @@ export default {
       }
     }
   }
+
+  .block4 {
+    margin-top: 10px;
+    width: 410px;
+    background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.8));
+
+    .content {
+      border: 1px solid;
+      border-image: linear-gradient(to bottom, rgba(58, 122, 149, 0), rgba(58, 122, 149, 1)) 1;
+      border-top: none;
+      padding: 10px;
+
+      .options {
+        display: flex;
+        justify-content: flex-end;
+
+        .title {
+          cursor: pointer;
+        }
+      }
+
+      .table {
+        margin-top: 5px;
+
+        .tr {
+          display: flex;
+
+          &:nth-child(odd) {
+            background-color: rgba(42, 86, 158, 0.53);
+          }
+
+          .td {
+            flex: 1;
+            text-align: center;
+            font-size: 12px;
+            color: #fff;
+            padding: 5px;
+          }
+        }
+      }
+    }
+  }
 }
 
 @keyframes scale {
diff --git a/src/views/map/dialog/peoplePositionYGS.vue b/src/views/map/dialog/peoplePositionYGS.vue
index ea15b25..e1b2313 100644
--- a/src/views/map/dialog/peoplePositionYGS.vue
+++ b/src/views/map/dialog/peoplePositionYGS.vue
@@ -8,19 +8,25 @@
         <td class="bbg-transparent">照片</td>
         <td ><img src="../../../assets/map/index/touxiang.png" alt="" width="50" height="50"></td>
         <td class="bbg-transparent">姓名</td>
-        <td >{{ info?info.NAME:'' }}</td>
+        <td >{{ info?info.userName:'' }}</td>
       </tr>
       <tr>
+        <td class="bbg-transparent">公司</td>
+        <td >{{ info?info.corpName:'' }}</td>
         <td class="bbg-transparent">部门</td>
-        <td >{{ info?info.DEPARTMENT_NAME:'' }}</td>
-        <td class="bbg-transparent">岗位</td>
-        <td >{{ info?info.POST_NAME:'' }}</td>
+        <td >{{ info?info.departmentName:'' }}</td>
+      </tr>
+      <tr>
+        <td class="bbg-transparent">设备id</td>
+        <td >{{ info?info.deviceId:'' }}</td>
+        <td class="bbg-transparent">设备名称</td>
+        <td >{{ info?info.deviceName:'' }}</td>
       </tr>
       <tr>
         <td class="bbg-transparent">人员类型</td>
-        <td >{{ info?info.PERSON_TYPE:'' }}</td>
-        <td class="bbg-transparent">是否为隐患确认人</td>
-        <td >{{ info.IS_HAZARDCONFIRMER == 0 ?'否':'是' }}</td>
+        <td>{{ otherInfo?otherInfo.personType:'' }}</td>
+        <td class="bbg-transparent">岗位</td>
+        <td>{{ otherInfo?otherInfo.postName:'' }}</td>
       </tr>
     </table>
   </div>
@@ -42,12 +48,19 @@ export default {
       default() {
         return ''
       }
+    },
+    corpId: {
+      type: String,
+      default() {
+        return ''
+      }
     }
   },
   data() {
     return {
       config: config,
-      info: {}
+      info: {},
+      otherInfo: {}
     }
   },
   created() {
@@ -58,10 +71,12 @@ export default {
       requestFN(
         '/map/getPersonByCardNo',
         {
-          CARDNO: this.id
+          CARDNO: this.id,
+          corpId: this.corpId
         }
       ).then((data) => {
-        this.info = data.pd
+        this.info = data.info.required
+        this.otherInfo = data.otherInfo
       }).catch((e) => {
       })
     }

From c6f5cdeb98cd013a227338243d7e140de7cbc26f Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 17 Apr 2024 14:22:05 +0800
Subject: [PATCH 20/23] =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BEbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/components/renyuan.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/map/components/renyuan.vue b/src/views/map/components/renyuan.vue
index c74e60b..c66875b 100644
--- a/src/views/map/components/renyuan.vue
+++ b/src/views/map/components/renyuan.vue
@@ -63,7 +63,7 @@
           <div class="tr">
             <div class="td">区域名称</div>
             <div class="td">报警设备编号</div>
-            <div class="td">异地告警</div>
+            <div class="td">状态告警</div>
           </div>
           <div v-for="(item,index) in block4List" :key="index" class="tr">
             <div class="td">{{ item.alarmName }}</div>

From 6e69b967629eacd9f03453042f994602cf7bad60 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 17 Apr 2024 17:58:27 +0800
Subject: [PATCH 21/23] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D-=E8=BF=9E=E7=82=B9b?=
 =?UTF-8?q?ug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xgf/flow/components/sendUtil.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/xgf/flow/components/sendUtil.vue b/src/views/xgf/flow/components/sendUtil.vue
index b211ab5..fd4ef59 100644
--- a/src/views/xgf/flow/components/sendUtil.vue
+++ b/src/views/xgf/flow/components/sendUtil.vue
@@ -217,6 +217,7 @@ export default {
         if (!valid) {
           this.$message.error('请填写完整信息')
         } else {
+          this.loading = true
           const formData = new FormData()
           Object.keys(this.form).map(key => {
             formData.append(key, this.form[key])
@@ -232,9 +233,11 @@ export default {
               this.visible = false
               this.$emit('refresh', '')
               this.handleClose()
+              this.loading = false
             })
             .catch((e) => {
               console.log(e)
+              this.loading = false
             })
         }
       })

From f667d9e2060b5c8159097fd9296cfa3dae69b996 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Wed, 17 Apr 2024 18:31:54 +0800
Subject: [PATCH 22/23] =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E5=AE=9A=E4=BD=8Dbug=E4=BF=AE=E5=A4=8D=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/map/dialog/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/map/dialog/index.vue b/src/views/map/dialog/index.vue
index 13f1587..12c8e6d 100644
--- a/src/views/map/dialog/index.vue
+++ b/src/views/map/dialog/index.vue
@@ -49,7 +49,7 @@
       <!--曹妃甸东 八项作业 曹实业详细页面 end-->
       <peoplePositionNine v-if="type === 'peoplePositionNine'" :id="id" :type="type" :infoname="infoname"/>
       <peoplePositionOne v-if="type === 'peoplePositionOne' && corpInfoId !== '035958e685cf4850bc40151c5e0617a6'" :id="id" :type="type" />
-      <peoplePositionYGS v-if="type === 'peoplePositionOne' && corpInfoId === '035958e685cf4850bc40151c5e0617a6'" :id="id" :type="type" />
+      <peoplePositionYGS v-if="type === 'peoplePositionOne' && corpInfoId === '035958e685cf4850bc40151c5e0617a6'" :id="id" :type="type" corp-id="035958e685cf4850bc40151c5e0617a6" />
       <!-- 重点工程 start -->
       <outSourceInfo v-if="type === 'PROJECT'" :id="id" :type="type" />
       <outSourceVideoInfo v-if="type === 'VIDEO'" :id="id" :type="type" />

From 91df5a5593f53038f0c3f3ab21380699b84f3334 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Thu, 18 Apr 2024 17:03:14 +0800
Subject: [PATCH 23/23] =?UTF-8?q?15179=20=E8=B0=83=E6=95=B4=E4=B8=80?=
 =?UTF-8?q?=E4=B8=8B=E6=8E=92=E7=89=88=20=E8=B0=83=E6=95=B4=E4=B8=BA?=
 =?UTF-8?q?=E4=B8=80=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oneCompany/alarmList/components/list.vue      | 15 +++++++--------
 .../oneCompany/reflection/components/info.vue     |  4 ++--
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/views/oneCompany/alarmList/components/list.vue b/src/views/oneCompany/alarmList/components/list.vue
index 64997eb..835380a 100644
--- a/src/views/oneCompany/alarmList/components/list.vue
+++ b/src/views/oneCompany/alarmList/components/list.vue
@@ -19,19 +19,18 @@
         </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 v-loading="listLoading" ref="multipleTable" :data="varList" :row-key="getRowKey" :header-cell-style="{'font-weight': 'bold','color': '#000'}" height="600px" tooltip-effect="dark" border fit highlight-current-row>
       <el-table-column :reserve-selection="true" type="selection" width="55" align="center" />
       <el-table-column fixed="left" type="index" label="序号" width="50" align="center" />
       <el-table-column prop="alarmName" label="报警名称" width="100"/>
-      <el-table-column prop="alarmMessage" label="报警信息" />
-      <el-table-column prop="relatedFunctions" label="相关功能" />
-      <el-table-column prop="typeName" label="类型名称" />
+      <el-table-column v-if="false" prop="alarmMessage" label="报警信息" />
+      <el-table-column v-if="false" prop="relatedFunctions" label="相关功能" />
+      <el-table-column v-if="false" prop="typeName" label="类型名称" />
       <el-table-column prop="message" label="报警信息" width="200"/>
-      <!--      <el-table-column prop="id" label="其他系统id" width="200"/>-->
-      <el-table-column prop="idRemak" label="其他系统备注" />
-      <el-table-column prop="remark" label="备注" />
+      <el-table-column v-if="false" prop="idRemak" label="其他系统备注" />
+      <el-table-column v-if="false" prop="remark" label="备注" />
       <el-table-column prop="corpName" label="企业名称" width="150"/>
-      <el-table-column prop="departmentName" label="部门名称" />
+      <el-table-column v-if="false" prop="departmentName" label="部门名称" />
       <el-table-column prop="equipmentName" label="报警来源" width="100"/>
       <el-table-column prop="createdTime" label="创建时间" width="150"/>
       <el-table-column prop="level" label="报警等级" />
diff --git a/src/views/oneCompany/reflection/components/info.vue b/src/views/oneCompany/reflection/components/info.vue
index 3a157a1..219d312 100644
--- a/src/views/oneCompany/reflection/components/info.vue
+++ b/src/views/oneCompany/reflection/components/info.vue
@@ -53,7 +53,7 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="负责人手机号：" prop="userPhone">
+            <el-form-item label="负责人通讯号：" prop="userPhone">
               <el-input v-model="material.userPhone" style="width: 300px" placeholder="请输入内容"/>
             </el-form-item>
           </el-col>
@@ -183,7 +183,7 @@ export default {
           { required: true, message: '请填写其他系统编号备注', trigger: 'change' }
         ],
         userPhone: [
-          { required: true, message: '请填写负责人手机号', trigger: 'change' }
+          { required: true, message: '请填写负责人通讯号', trigger: 'change' }
         ],
         userCardId: [
           { required: true, message: '请填写负责人身份证', trigger: 'change' }