Merge branch '深圳三院' of http://119.23.210.103:3000/wy/zdqy_firm_former into 深圳三院

public/config.js

@@ -70,7 +70,7 @@
         // 系统名称
         SYSTEM_NAME: '金通医学实验室标准化数智化管理平台',
         // 润乾报表根目录
-        REPORT_PATH: '金通医学实验室管理系统/007深圳三院',
+        REPORT_PATH: '金通医学实验室管理系统',
         // 是否显示开启明文SQL
         SHOW_PLAINTEXT: false,
         // 是否加密 GET 请求参数

src/api/platform/system/identity.js

@@ -1,85 +1,98 @@
 import request from '@/utils/request'
-import { SYSTEM_URL } from '@/api/baseUrl'
+import { SYSTEM_URL, FORM_URL } from '@/api/baseUrl'
 /**
  * 查询列表数据
  * @param {*} params
  */
-export function queryPageList(params) {
-  return request({
-    url: SYSTEM_URL() + '/identity/query',
-    method: 'post',
-    data: params
-  })
+export function queryPageList (params) {
+    return request({
+        url: SYSTEM_URL() + '/identity/query',
+        method: 'post',
+        data: params
+    })
 }
 /**
  * 删除数据
  * @param {*} params
  */
-export function remove(params) {
-  return request({
-    url: SYSTEM_URL() + '/identity/remove',
-    method: 'post',
-    isLoading: true,
-    params: params
-  })
+export function remove (params) {
+    return request({
+        url: SYSTEM_URL() + '/identity/remove',
+        method: 'post',
+        isLoading: true,
+        params: params
+    })
 }
 /**
  * 保存数据
  * @param {*} params
  */
-export function save(params) {
-  return request({
-    url: SYSTEM_URL() + '/identity/save',
-    method: 'post',
-    isLoading: true,
-    data: params
-  })
+export function save (params) {
+    return request({
+        url: SYSTEM_URL() + '/identity/save',
+        method: 'post',
+        isLoading: true,
+        data: params
+    })
 }
 
 /**
  * 获取数据
  * @param {*} params
  */
-export function get(params) {
-  return request({
-    url: SYSTEM_URL() + '/identity/get',
-    method: 'get',
-    params
-  })
+export function get (params) {
+    return request({
+        url: SYSTEM_URL() + '/identity/get',
+        method: 'get',
+        params
+    })
 }
 /**
  * 获取数据
  * @param {*} params
  */
-export function getByAlias(params) {
-  return request({
-    url: SYSTEM_URL() + '/identity/getByAlias',
-    method: 'get',
-    params
-  })
+export function getByAlias (params) {
+    return request({
+        url: SYSTEM_URL() + '/identity/getByAlias',
+        method: 'get',
+        params
+    })
 }
 
 /**
  * 预览数据
  * @param {*} params
  */
-export function test(params) {
-  return request({
-    url: SYSTEM_URL() + '/identity/test',
-    method: 'post',
-    isLoading: true,
-    data: params
-  })
+export function test (params) {
+    return request({
+        url: SYSTEM_URL() + '/identity/test',
+        method: 'post',
+        isLoading: true,
+        data: params
+    })
 }
 
 /**
  * 获取下一个流水号编号
  * @param {*} params
  */
-export function getNextIdByAlias(params) {
-  return request({
-    url: SYSTEM_URL() + '/identity/getNextIdByAlias',
-    method: 'get',
-    params: params
-  })
+export function getNextIdByAlias (params) {
+    return request({
+        url: SYSTEM_URL() + '/identity/getNextIdByAlias',
+        method: 'get',
+        params: params
+    })
+}
+
+/**
+ * 试剂耗材库存，出入库记录
+ * @param {*} params
+ */
+export function reagentConsumablesInventory (params) {
+    return request({
+        url: FORM_URL() + `/reagent/reagentConsumablesInventory/sync?id=${params.id}&action=${params.action}`,
+        method: 'post',
+        isLoading: true,
+        data: params
+    })
 }

src/utils/common.js

@@ -5,7 +5,7 @@ import { preview } from '@/business/platform/form/utils/custom/preview'
 import request from '@/business/platform/form/utils/custom/joinCURD'
 import pinyin4js from 'pinyin4js'
 import { snapshoot } from '@/api/platform/file/attachment'
-import { getNextIdByAlias } from '@/api/platform/system/identity'
+import { getNextIdByAlias, reagentConsumablesInventory } from '@/api/platform/system/identity'
 import { save as sendMsg } from '@/api/platform/message/innerMessage'
 import { save as saveNews, manage, internal } from '@/api/platform/system/news'
 import { bpmTaskSave } from '@/api/platform/bpmn/bpmTask'
@@ -161,6 +161,7 @@ export default {
     pinyin4js,
     snapshoot,
     getNextIdByAlias,
+    reagentConsumablesInventory,
     decode,
     encryptByAes,
     decryptByAes,

src/views/component/device/index.vue

@@ -195,7 +195,6 @@
                                             <div class="item">是否校准：{{ row.shiFouXiaoZhun || '/' }}</div>
                                             <div class="item">校准周期：{{ row.xiaoZhunZQ?`${row.xiaoZhunZQ}月` : '/' }}</div>
                                             <div class="item">最近校准时间：{{ row.yiXiaoRiQi || '/' }}</div>
-                                            <div class="item">校准机构：{{ row.shiWuShuoMing || '/' }}</div>
                                         </div>
                                     </el-col>
                                 </el-row>
@@ -1227,8 +1226,9 @@ export default {
      * @param {*} currentUser 当前用户ID
      * @param {*} currentPosition 当前地点ID
      */
-        handleBasicData (list, currentTime, currentApartment, currentUser, currentPosition, deptList) {
-            list.forEach(async element => {
+        async handleBasicData (list, currentTime, currentApartment, currentUser, currentPosition, deptList) {
+            // 使用map生成一个异步操作的数组
+            const promises = list.map(async (element) => {
                 element.bianZhiShiJian = currentTime
                 element.bianZhiRen = currentUser
                 element.diDian = currentPosition
@@ -1236,9 +1236,15 @@ export default {
                 const o = deptList?.find(i => i.positionName === element.bianZhiBuMen.trim())
                 const { positionId = currentApartment } = o || {}
                 element.bianZhiBuMen = positionId
-                if (!element.id) element.sheBeiShiBieH = await this.getNextAlias() // 新增的时候自动生成编号
+                if (!element.id) {
+                    // 获取下一个编号
+                    element.sheBeiShiBieH = await this.getNextAlias()
+                }
             })
+            // 使用Promise.all并发执行所有异步操作
+            await Promise.all(promises)
         },
+
         /**
      *
      * @param {*} list excel数据
@@ -1358,19 +1364,21 @@ export default {
 
             importData = this.formatDateFieldsToReal(importData)
             console.log('%c partOne doCheck is completed! %c the result is %c', 'background:#35495E; padding: 1px; border-radius: 3px 0 0 3px; color: #fff;', 'background:#FF5733; padding: 1px; border-radius: 0 3px 3px 0; color: #fff;', 'background:transparent', importData)
+            this.loading = true
             Promise.all([this.$common.request('sql', positionSql), this.$common.request('sql', supplierSql), this.$common.request('sql', deviceGroupSql)]).then(async ([res1, res2, res3]) => {
                 const { data: positionList = [] } = res1.variables || {}
                 const { data: supplierList = [] } = res2.variables || {}
                 const { data: deviceGroupList = [] } = res3.variables || {}
                 // 根据原设备编号去重，检验原设备编号是否在数据库中存在
                 const originalDeviceNoList = await this.filterOriginalDeviceNo(importData, currentPosition)
-                this.handleBasicData(importData, currentTime, currentApartment, currentUser, currentPosition, deptList)
+                await this.handleBasicData(importData, currentTime, currentApartment, currentUser, currentPosition, deptList)
                 this.handleExcelData(importData, positionList, supplierList, userList, deviceGroupList)
                 // 分离出 已存在的设备，和新设备
                 const newDeviceList = importData.filter(i => !originalDeviceNoList.includes(i.yuanSheBeiBian.trim()))
                 const existDeviceList = importData.filter(i => originalDeviceNoList.includes(i.yuanSheBeiBian.trim()))
                 console.log('%c new device %c', 'background:#FF5733; padding: 1px; border-radius: 0 3px 3px 0; color: #fff;', 'background:transparent', newDeviceList)
                 console.log('%c already exist device %c', 'background:#43f80c; padding: 1px; border-radius: 0 3px 3px 0; color: #fff;', 'background:transparent', existDeviceList)
+                this.loading = false
                 this.$confirm(`<span style="color:#f56c6c; font-size: 18px; font-weight: 600;">
                                         经系统判定</span><br>1.预期新导入设备的数量为 ${newDeviceList.length} 台！<br>
                                         2.预期更新已存在的设备数量为 ${existDeviceList.length} 台！<br>
@@ -1388,22 +1396,28 @@ export default {
                         this.getDatas()
                     }, 1000)
                 }).catch(() => { })
+            }).catch(() => {
+                this.loading = false
             })
         },
         async doImportDevice (existDeviceList, currentPosition) {
             this.loading = true
             const allRequests = []
-            existDeviceList.forEach(async item => {
+            for (let index = 0; index < existDeviceList.length; index++) {
+                const item = existDeviceList[index]
                 let params = {}
                 if (item.id) {
+                    // 获取设备数据
                     const { data: itemData } = await getequipmentCard({ id: item.id })
-                    params = { ...itemData, ...item }
+                    params = { ...itemData, ...item } // 合并数据
                 } else {
-                    params = item
+                    params = item // 直接使用当前 item
                 }
                 console.log(params)
+                // 将每个 saveEquipmentCard 请求加入到 allRequests 数组中
                 allRequests.push(saveEquipmentCard(params))
-            })
+            }
+            // 等待所有异步请求完成
             await Promise.all(allRequests)
             this.loading = false
         },

src/views/component/device/maintenanceStaticAll.vue

@@ -43,7 +43,7 @@
                             readonly-text="text"
                             :disabled="false"
                             :multiple="false"
-                            :filter="filter"
+                            :filter="[]"
                             filterable
                         />
                     </div>
@@ -74,6 +74,10 @@
                             <div class="red-circle" />
                             <span>全部未完成</span>
                         </div>
+                        <div class="item">
+                            <div class="red-bg" />
+                            <span>设备状况异常</span>
+                        </div>
                         <div class="item-time">
                             <span>统计时间：{{ curTime }}</span>
                         </div>
@@ -90,7 +94,7 @@
                     <div class="column">
                         <div v-for="(item,index) in formatData" :key="index" class="content-item">
                             <div class="item">{{ index+1 }}</div>
-                            <div v-for="(i,ind) in item" :key="ind" class="item">
+                            <div v-for="(i,ind) in item" :key="ind" class="item" :class="i.status?'':'unusual'">
                                 <el-tooltip v-show="i.count>0" class="item" effect="light" placement="top-start">
                                     <template slot="content">
                                         <div>
@@ -100,7 +104,7 @@
                                                 <el-divider />
                                                 <div class="detail-item">
                                                     <div class="item" style="margin:2px 0">处理人：{{ switchIdToUserName(ii.bian_zhi_ren_)|| '/' }}</div>
-                                                    <div class="item" style="margin:2px 0">设备状态：{{ ii.wei_hu_zhuang_tai|| '/' }}</div>
+                                                    <div class="item" style="margin:2px 0">设备状况：{{ ii.wei_hu_zhuang_tai|| '/' }}</div>
                                                     <div class="item" style="margin:2px 0">维护项目：{{ ii.wei_hu_xiang_mu_c|| '/' }}</div>
                                                     <div class="item" style="margin:2px 0">备注：{{ ii.bei_zhu_|| '/' }}</div>
                                                 </div>
@@ -154,7 +158,7 @@ export default {
         if ((year % 4 === 0 && year % 100 !== 0) || (year % 400 === 0)) {
             monthList[1] = 29
         }
-        const { userId, position, level } = this.$store.getters
+        const { userId, position, level, mainPosition } = this.$store.getters
         return {
             dialogParams: {},
             MaintenanceStaticVisible: false,
@@ -170,7 +174,7 @@ export default {
             month: monthValue,
             monthDays: monthDays,
             userId: userId,
-            position: position,
+            position: (mainPosition && mainPosition.id) || position,
             level: level.second || level.first,
             loading: false,
             title: '设备维护统计',
@@ -280,13 +284,15 @@ export default {
                         data: [],
                         count: 0,
                         todo: 0,
-                        done: 0
+                        done: 0,
+                        status: true
                     }
                     const tempList = item.children.filter(k => k.ji_hua_shi_jian_ === fullDay)
                     obj.count = tempList.length
                     obj.todo = tempList.filter(k => k.shi_fou_guo_shen_ === '待处理').length
                     obj.done = tempList.filter(k => k.shi_fou_guo_shen_ === '已完成').length
                     obj.data = tempList.filter(k => k.shi_fou_guo_shen_ === '已完成')
+                    obj.status = !obj.data.some(item => item.wei_hu_zhuang_tai === '异常')
                     arr.push(obj)
                 })
                 answer[i] = arr
@@ -496,6 +502,12 @@ export default {
                         background-color: #E6A23C;
                         border-radius: 50%;
                     }
+                    .red-bg {
+                        width: 12px;
+                        height: 12px;
+                        background-color: #F56C6C;
+                        opacity: .7;
+                    }
                 }
             }
             .search{
@@ -557,6 +569,10 @@ export default {
                         }
                     }
                     .content-item{
+                        .unusual{
+                            background-color: #F56C6C;
+                            opacity: .7;
+                        }
                         >.item{
                             position: relative;
                             height: 46px;

src/views/component/env/monthlyStat.vue

@@ -1,6 +1,6 @@
 <template>
     <el-dialog
-        :title="title"
+        :title="labelTitle"
         :visible.sync="dialogVisible"
         :close-on-click-modal="false"
         :close-on-press-escape="false"
@@ -106,6 +106,10 @@ export default {
         visible: {
             type: Boolean,
             default: false
+        },
+        labelTitle: {
+            type: String,
+            default: '月报表参数选择'
         }
     },
     data () {
@@ -129,6 +133,14 @@ export default {
             immediate: true
         }
     },
+    mounted () {
+        // 增加默认值属性
+        this.fields.forEach(item => {
+            if (item.default) {
+                this.$set(this.paramForm, item.key, item.default)
+            }
+        })
+    },
     methods: {
         handleActionEvent ({ key }) {
             switch (key) {

src/views/component/facility/ultStatic.vue

@@ -0,0 +1,596 @@
+<template>
+    <el-dialog
+        v-loading="loading"
+        :title="title"
+        :visible.sync="dialogVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        :show-close="false"
+        append-to-body
+        fullscreen
+        class="dialog paper-detail-dialog"
+        top="0"
+    >
+        <div slot="title" class="dialog-title">
+            <span class="dialogtitle">{{ title }}</span>
+            <div>
+                <ibps-toolbar :actions="toolbars" @action-event="handleActionEvent" />
+            </div>
+        </div>
+        <div class="container">
+            <div class="left" :style="{width:initWidth}">
+                <div class="search">
+                    <div class="item">
+                        <div class="label">维护月份：</div>
+                        <div class="content">
+                            <el-date-picker
+                                v-model="month"
+                                :clearable="false"
+                                type="month"
+                                placeholder="选择查询的月份"
+                                value-format="yyyy-MM"
+                                :picker-options="pickerOptions"
+                                size="mini"
+                                @change="handleMonthChange"
+                            />
+                        </div>
+                    </div>
+                    <div class="item">
+                        <div class="label">部门：</div>
+                        <ibps-user-selector
+                            v-model="position"
+                            type="position"
+                            readonly-text="text"
+                            :disabled="false"
+                            :multiple="false"
+                            :filter="[]"
+                            filterable
+                        />
+                    </div>
+                    <div class="item">
+                        <div class="label">灯管号：</div>
+                        <div class="content">
+                            <el-input v-model="deviceNo" size="mini" />
+                        </div>
+                    </div>
+                    <div class="item">
+                        <div class="label">紫外灯名：</div>
+                        <div class="content">
+                            <el-input v-model="deviceName" size="mini" />
+                        </div>
+                    </div>
+                    <div class="item">
+                        <div class="label">岗位：</div>
+                        <div class="content">
+                            <el-input v-model="gangWei" size="mini" />
+                        </div>
+                    </div>
+                </div>
+                <div class="hearder">
+                    <div class="agend">
+                        <div class="item">
+                            <div class="green-circle" />
+                            <span>已完成</span>
+                        </div>
+                        <!-- <div class="item">
+                            <div class="orange-circle" />
+                            <span>部分完成</span>
+                        </div> -->
+                        <div class="item">
+                            <div class="red-circle" />
+                            <span>待处理</span>
+                        </div>
+                        <!-- <div class="item">
+                            <div class="red-bg" />
+                            <span>设备状况异常</span>
+                        </div> -->
+                        <div class="item-time">
+                            <span>统计时间：{{ curTime }}</span>
+                        </div>
+                    </div>
+                </div>
+
+                <div v-if="fliterData.length>0" class="table">
+                    <div class="column">
+                        <div class="item">紫外灯/日期</div>
+                        <div v-for="(item,index) in fliterData" :key="index" class="item" style="cursor:pointer" @click="goLookStatic(item)">
+                            <span style="padding:0 6px">{{ item.deng_guan_hao_ }}/{{ item.zi_wai_deng_ming_ }}</span>
+                        </div>
+                    </div>
+                    <div class="column">
+                        <div v-for="(item,index) in formatData" :key="index" class="content-item">
+                            <div class="item">{{ index+1 }}</div>
+                            <div v-for="(i,ind) in item" :key="ind" class="item">
+                                <el-tooltip v-show="i.count>0" class="item" effect="light" placement="top-start">
+                                    <template slot="content">
+                                        <div>
+                                            <div v-for="(ii,indd) in i.data" :key="indd" class="detail">
+                                                <el-divider />
+                                                <div class="detail-item">
+                                                    <div class="item" style="margin:2px 0">处理人：{{ switchIdToUserName(ii.qian_ming_)|| '/' }}</div>
+                                                    <div class="item" style="margin:2px 0">岗位：{{ ii.gang_wei_|| '/' }}</div>
+                                                    <div class="item" style="margin:2px 0">额定时长：{{ ii.e_ding_shi_chang_|| '/' }}</div>
+                                                    <div class="item" style="margin:2px 0">已使用总时长：{{ ii.zsc2|| '/' }}</div>
+                                                    <div class="item" style="margin:2px 0">当次使用时长：{{ ii.shi_yong_shi_chan|| '/' }}</div>
+                                                    <div class="item" style="margin:2px 0">使用时间：{{ ii.sysj1|| '/' }}</div>
+                                                    <div class="item" style="margin:2px 0">擦拭情况：{{ ii.wan_cheng_qing_ku|| '/' }}</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </template>
+                                    <div class="green-circle" />
+                                    <!-- <div v-else class="orange-circle" /> -->
+                                </el-tooltip>
+                                <div v-if=" i.count===0 && i.show" class="red-circle" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <el-empty v-else description="暂无数据" />
+            </div>
+        </div>
+    </el-dialog>
+</template>
+
+<script>
+import dayjs from 'dayjs'
+import ibpsUserSelector from '@/business/platform/org/selector'
+export default {
+    components: {
+        ibpsUserSelector
+    },
+    props: {
+        params: {
+            type: Object,
+            default: function () {
+                return {}
+            }
+        },
+        dialogVisible: {
+            type: Boolean,
+            default: false
+        }
+    },
+    data () {
+        const monthList = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
+        const monthValue = dayjs().format('YYYY-MM')
+        const year = +monthValue.split('-')[0]
+        const month = +monthValue.split('-')[1]
+        const monthDays = monthList[month - 1]
+        if ((year % 4 === 0 && year % 100 !== 0) || (year % 400 === 0)) {
+            monthList[1] = 29
+        }
+        const { userId, position, level, mainPosition } = this.$store.getters
+        return {
+            dialogParams: {},
+            MaintenanceStaticVisible: false,
+            pickerOptions: {
+                disabledDate (time) {
+                    return time.getTime() > Date.now()
+                }
+            },
+            curTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+            deviceNo: '',
+            deviceName: '',
+            gangWei: '',
+            monthList: monthList,
+            month: monthValue,
+            monthDays: monthDays,
+            userId: userId,
+            position: (mainPosition && mainPosition.id) || position,
+            level: level.second || level.first,
+            loading: false,
+            title: '设备维护统计',
+            toolbars: [
+                { key: 'export', label: '导出', type: 'primary', hidden: true },
+                { key: 'cancel', label: '退出', type: 'danger' }
+            ],
+            initWidth: '1800px',
+            isEdit: false,
+            isFinished: false,
+            readonly: false,
+            preParams: {},
+            Ids: [],
+            form: {
+            },
+            rules: {
+
+            },
+            dataList: [],
+            type: [],
+            filter: [{
+                descVal: '2',
+                includeSub: true,
+                old: 'position',
+                partyId: this.$store.getters.userInfo.employee.positions,
+                partyName: '',
+                scriptContent: '',
+                type: 'user',
+                userType: 'position'
+            }],
+            totalList: []
+        }
+    },
+    computed: {
+        fliterData () {
+            const fliterData = this.dataList
+            let result = []
+            fliterData.forEach(item => {
+                const { she_shi_id_, zi_wai_deng_ming_, deng_guan_hao_, bu_men_, gang_wei_ } = item
+                const t = result.find(i => i.she_shi_id_ === she_shi_id_)
+                if (t) {
+                    t.children.push(item)
+                } else {
+                    result.push({
+                        she_shi_id_: she_shi_id_ || '',
+                        zi_wai_deng_ming_: zi_wai_deng_ming_ || '',
+                        deng_guan_hao_: deng_guan_hao_ || '',
+                        bu_men_: bu_men_ || '',
+                        gang_wei_: gang_wei_ || '',
+                        children: [item]
+                    })
+                }
+            })
+            // console.log('fliterData', result)
+            this.totalList.forEach(item => {
+                const { she_shi_id_, zi_wai_deng_ming_, deng_guan_hao_, bian_zhi_bu_men_, gang_wei_ } = item
+                const t = result.find(i => i.she_shi_id_ === item.she_shi_id_)
+                if (!t) {
+                    result.push({
+                        she_shi_id_: she_shi_id_ || '',
+                        zi_wai_deng_ming_: zi_wai_deng_ming_ || '',
+                        deng_guan_hao_: deng_guan_hao_ || '',
+                        bu_men_: bian_zhi_bu_men_ || '',
+                        gang_wei_: gang_wei_ || '',
+                        children: []
+                    })
+                }
+            })
+            if (this.position) {
+                result = result.filter(item => item.bu_men_ === this.position)
+            }
+            if (this.deviceNo) {
+                result = result.filter(item => item.deng_guan_hao_.indexOf(this.deviceNo) > -1)
+            }
+            if (this.deviceName) {
+                result = result.filter(item => item.zi_wai_deng_ming_.indexOf(this.deviceName) > -1)
+            }
+            if (this.gangWei) {
+                result = result.filter(item => item.gang_wei_.indexOf(this.gangWei) > -1)
+            }
+            return result
+        },
+        formatData () {
+            const answer = new Array(this.monthDays)
+            for (let i = 0; i < this.monthDays; i++) {
+                const arr = []
+                const day = ('0' + (i + 1)).slice(-2)
+                const fullDay = this.month + '-' + day
+                // console.log(fullDay)
+                this.fliterData.forEach(item => {
+                    const obj = {
+                        data: [],
+                        count: 0,
+                        show: true,
+                        fullDay
+                    }
+                    const tempList = item.children.filter(k => k.ri_qi_.slice(0, 10) === fullDay)
+                    obj.count = tempList.length
+                    obj.data = tempList
+                    if (new Date(fullDay).getTime() > new Date(this.curTime).getTime()) {
+                        obj.show = false
+                    }
+                    arr.push(obj)
+                })
+                answer[i] = arr
+            }
+            // console.log('answer', answer)
+            return answer
+        }
+    },
+    async mounted () {
+        this.init()
+        const sql = `select she_shi_id_,zi_wai_deng_ming_,deng_guan_hao_,bian_zhi_bu_men_,gang_wei_ from t_jykzwdxdjlbsc where di_dian_='${this.level}' and shi_fou_ting_yong='1'`
+        const { variables: { data }} = await this.$common.request('sql', sql)
+        this.totalList = data
+    },
+    methods: {
+        handleActionEvent ({ key }) {
+            switch (key) {
+                case 'cancel':
+                    this.closeDialog()
+                    break
+                case 'export':
+                    this.handleExport()
+                    break
+                default:
+                    break
+            }
+        },
+        // 查看设备统计
+        goLookStatic (row) {
+            // this.dialogParams = row
+            // this.dialogParams.searchMonth = this.month
+            // this.MaintenanceStaticVisible = true
+        },
+        // 人员id 转人员名称
+        switchIdToUserName (id) {
+            const { userList } = this.$store.getters
+            const temp = userList.find(item => item.userId === id)
+            return temp ? temp.userName : ''
+        },
+        async handleMonthChange (val) {
+            const year = +val.split('-')[0]
+            const month = +val.split('-')[1]
+            this.monthDays = this.monthList[month - 1]
+            if ((year % 4 === 0 && year % 100 !== 0) || (year % 400 === 0)) {
+                this.monthList[1] = 29
+            } else {
+                this.monthList[1] = 28
+            }
+            await this.init()
+        },
+        // 获取人员部门
+        getPersonPosition (id) {
+            const userList = this.$store.getters.userList
+            const bianzhiUserid = userList.find(i => i.userId === id)
+            if (bianzhiUserid) {
+                return bianzhiUserid.positionId
+            }
+        },
+        checkRequired (flag) {
+        },
+        // 刷新
+        async goRefresh () {
+        },
+        // 关闭当前窗口
+        closeDialog (needRefresh) {
+            this.$emit('update:dialogVisible', false, needRefresh)
+        },
+        async init () {
+            this.loading = true
+            this.title = `紫外灯消毒月度统计`
+            const y = +this.month.split('-')[0]
+            const m = +this.month.split('-')[1]
+            const sql = `select a.id_,a.parent_id_,a.she_bei_hao_,a.ri_qi_,a.bu_men_,a.wan_cheng_qing_ku,a.pi_ci_,a.shi_yong_shi_chan,a.zong_shi_chang_ as zsc1,a.qian_ming_,a.fang_jian_di_zhi_,a.e_ding_shi_chang_,a.zi_wai_deng_id_,a.gang_wei_,a.pan_ding_ri_qi_ as pdrq1,b.zi_wai_deng_ming_,b.zong_shi_chang_ as zsc2,b.deng_guan_hao_,b.ri_chang_zhao_she,b.shang_ci_xiao_du_,b.she_shi_id_,b.fang_jian_,b.shi_fou_gen_huan_,b.shi_fou_ting_yong,b.pan_ding_ri_qi_ as pdrq2 FROM t_jykzwdxdjlbzb a LEFT JOIN t_jykzwdxdjlbsc b ON a.zi_wai_deng_id_=b.id_ where b.di_dian_='${this.level}' and b.shi_fou_ting_yong='1' and YEAR(a.ri_qi_) = ${y} and MONTH(a.ri_qi_) = ${m}`
+            const { variables: { data }} = await this.$common.request('sql', sql)
+            // console.log('data', data)
+            this.dataList = data
+            // this.dataList.forEach(item => {
+            //     if (!Object.hasOwn(item, 'wei_hu_lei_xing_') || !item.wei_hu_lei_xing_) {
+            //         item.wei_hu_lei_xing_ = '按需保养'
+            //     }
+            // })
+            this.loading = false
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.paper-detail-dialog {
+    ::v-deep {
+        .el-dialog__header {
+            text-align: center;
+        }
+    }
+.dialog-title{
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    div{
+        z-index: 99999999;
+        position: absolute;
+        right:8vw;
+    }
+    .dialogtitle{
+        font-size: 22px;
+        font-family: SimHei;
+        font-weight: bold;
+        color: #222;
+    }
+}
+.container {
+        display: flex;
+        width: 100%;
+        justify-content: center;
+        .el-row{
+            margin: 0 !important;
+        }
+        .required{
+            color: #606266 !important;
+            &::before{
+                content: '*';
+                margin: 0 4px 0 -7.5px;
+                color: red;
+            }
+        }
+        .left{
+            height: calc(100vh - 100px);
+            box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+            padding:20px;
+            overflow-y: auto;
+            .agend{
+                margin: 20px 0 10px 0;
+                display: flex;
+                .item-time{
+                    margin-left: 40px;
+                    width: 200px;
+                }
+                .item{
+                    width: 100px;
+                    display: flex;
+                    align-items: center;
+                    gap: 4px;
+                    .green-circle {
+                        width: 12px;
+                        height: 12px;
+                        background-color: #67C23A;
+                        border-radius: 50%;
+                    }
+                    .red-circle {
+                        width: 12px;
+                        height: 12px;
+                        background-color: #F56C6C;
+                        border-radius: 50%;
+                    }
+                    .orange-circle {
+                        width: 12px;
+                        height: 12px;
+                        background-color: #E6A23C;
+                        border-radius: 50%;
+                    }
+                    .red-bg {
+                        width: 12px;
+                        height: 12px;
+                        background-color: #F56C6C;
+                        opacity: .7;
+                    }
+                }
+            }
+            .search{
+                display: flex;
+                .item{
+                    width: 300px;
+                    display: flex;
+                    align-items: center;
+                    .label{
+                        font-size: 12px;
+                        width: 60px;
+                    }
+                }
+            }
+            .item{
+                width: 100%;
+            }
+            .title{
+                margin: 16px 0 6px -16px;
+            }
+            .table{
+                display: flex;
+                .column{
+                    flex: 1;
+                    &:nth-child(2){
+                        display: flex;
+                    }
+                    >.item{
+                        height: 46px;
+                        line-height: 46px;
+                        min-width: 100px;
+                        border-bottom: 1px solid #333;
+                        border-right: 1px solid #333;
+                        border-left: 1px solid #333;
+                        white-space: nowrap;
+                    }
+                    @media screen and (max-width: 1800px) {
+                         >.item{
+                            height: 40px;
+                            line-height: 40px;
+                        }
+                    }
+                    @media screen and (max-width: 1550px) {
+                         >.item{
+                            height: 34px;
+                            line-height: 34px;
+                        }
+                    }
+                    >.item:nth-child(1){
+                        font-weight: 600;
+                        border-top: 1px solid #333;
+                        height: 30px;
+                        line-height: 30px;
+                        text-align: center;
+                    }
+                    >.item:not(:first-child) {
+                        :hover{
+                            color: #409EFF;
+                        }
+                    }
+                    .content-item{
+                        .unusual{
+                            background-color: #F56C6C;
+                            opacity: .7;
+                        }
+                        >.item{
+                            position: relative;
+                            height: 46px;
+                            width: 46px;
+                            text-align: center;
+                            line-height: 46px;
+                            border-bottom: 1px solid #333;
+                            border-right: 1px solid #333;
+                        }
+                        @media screen and (max-width: 1800px) {
+                            >.item{
+                                height: 40px;
+                                width: 40px;
+                                line-height: 40px;
+
+                            }
+                        }
+                        @media screen and (max-width: 1550px) {
+                            >.item{
+                                height: 34px;
+                                width: 34px;
+                                line-height: 34px;
+
+                            }
+                        }
+                        >.item:nth-child(1){
+                            font-weight: 600;
+                            border-top: 1px solid #333;
+                            height: 30px;
+                            line-height: 30px;
+                        }
+                        .green-circle {
+                            cursor: pointer;
+                            position: absolute;
+                            top: 50%;
+                            left: 50%;
+                            transform: translate(-50%, -50%);
+                            width: 10px;
+                            height: 10px;
+                            background-color: #67C23A;
+                            border-radius: 50%;
+                        }
+                        .red-circle {
+                            cursor: pointer;
+                            position: absolute;
+                            top: 50%;
+                            left: 50%;
+                            transform: translate(-50%, -50%);
+                            width: 10px;
+                            height: 10px;
+                            background-color: #F56C6C;
+                            border-radius: 50%;
+                        }
+                        .orange-circle {
+                            cursor: pointer;
+                            position: absolute;
+                            top: 50%;
+                            left: 50%;
+                            transform: translate(-50%, -50%);
+                            width: 10px;
+                            height: 10px;
+                            background-color: #E6A23C;
+                            border-radius: 50%;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+    ::v-deep {
+        .el-form-item__label{
+            text-align: left;
+            font-size: 12px !important;
+        }
+        .el-form-item__content{
+            font-size: 12px !important;
+        }
+        .el-divider--horizontal{
+            margin: 10px 0;
+        }
+    }
+</style>

src/views/platform/examination/exam/detail.vue

@@ -262,8 +262,9 @@ export default {
         }
     },
     data () {
-        const { userList } = this.$store.getters || {}
+        const { userList, mainPosition } = this.$store.getters || {}
         return {
+            mainPosition,
             userList,
             title: '考试详情',
             dialogVisible: this.visible,
@@ -360,11 +361,21 @@ export default {
             this.posData()
         },
         // 获取部门数据
-        posData () {
+        async posData () {
+            const sql = `select p.*,r.SUB_PID_ as userId FROM IBPS_PARTY_POSITION p INNER JOIN ibps_party_rel r ON p.id_ = r.MAIN_PID_ WHERE r.BIZ_ = 'mainPost' ORDER BY p.CREATE_TIME_ DESC`
+            const { variables: { data }} = await this.$common.request('sql', sql)
             this.paperList.forEach((item) => {
-                const user = this.userList.find((u) => u.userName === item.userName)
-                item.positionId = user.positionId
-                item.positionName = user.positions
+                const mainUser = data.find(i => i.userId === item.examinee)
+                // 如果有主部门  只统计主部门
+                if (mainUser) {
+                    item.positionId = mainUser?.ID_ || ''
+                    item.positionName = mainUser?.NAME_ || ''
+                } else {
+                    // 没有主部门 则统计全部
+                    const user = this.userList.find((u) => u.userId === item.examinee)
+                    item.positionId = user?.positionId || ''
+                    item.positionName = user?.positions || ''
+                }
             })
         },
         handleActionEvent ({ key }) {

src/views/platform/examination/questionBank/edit.vue

@@ -29,13 +29,21 @@
                 />
             </el-form-item>
             <el-form-item label="题库分类：" prop="ti_ku_fen_lei_">
-                <el-input
+                <el-select
                     v-model="form.ti_ku_fen_lei_"
-                    type="text"
-                    :maxlength="128"
+                    filterable
+                    allow-create
+                    width="100%"
                     :disabled="readonly"
-                    placeholder="请填写题库分类"
-                />
+                    placeholder="请选择题库分类"
+                >
+                    <el-option
+                        v-for="item in paperTypeOptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                    />
+                </el-select>
             </el-form-item>
             <el-form-item prop="ti_ku_zhuang_tai_">
                 <template slot="label">