task4617,bug5015

src/views/component/specialForm/specialForm.vue

@@ -5,7 +5,7 @@
                 <el-col>
                     <el-table ref="external" :data="reagentBatchDataFilter">
                         <el-table-column type="index" label="序号" />
-                        <el-table-column label="比对人" prop="bi_dui_ren_">
+                        <el-table-column :label="formData.biaoMing=='t_sgrsfyyqrsfbdb'?'操作人':'比对人'" prop="bi_dui_ren_">
                             <template scope="{row}">
                                 <ibps-user-selector
                                     v-model="row.bi_dui_ren_"
@@ -93,6 +93,14 @@ export default {
                 }
             },
             immediate: true
+        },
+        'formData.biaoMing': {
+            handler (value) {
+                if (value) {
+                    this.initData()
+                }
+            },
+            immediate: true
         }
     },
     mounted () {
@@ -100,9 +108,19 @@ export default {
     },
     methods: {
         initData () {
+            const tableName = {
+                't_ymsyrybdb': 'ymsyrybd',
+                't_smjzhjxqxsyrybdb': 'xqxsyrybdfqjl',
+                't_sgrsfyyqrsfbdb': 'sgrsfyyqrsfbdbfqjl',
+                't_bbrsrybdb': 'bbrsrybdlbfqjl'
+            }
             // const sql = `select * from t_ymsyrybdb where pid_ = '${this.formData.pid}' and type != 'startRecord'`
-            if (this.formData.pid) {
-                this.$common.request('query', { key: 'ymsyrybd', params: [this.formData.pid] }).then(res => {
+            // const sql = `select * from t_smjzhjxqxsyrybdb where pid_ = '${this.formData.pid}' and type != 'startRecord'`
+            // const sql = `select * from t_sgrsfyyqrsfbdb where pid_ = '${this.formData.pid}' and type != 'startRecord'`
+            // const sql = `select * from t_bbrsrybdb where pid_ = '${this.formData.pid}' and type != 'startRecord'`
+            console.log(tableName[this.formData.biaoMing], 'key')
+            if (this.formData.pid && this.formData.biaoMing) {
+                this.$common.request('query', { key: tableName[this.formData.biaoMing], params: [this.formData.pid] }).then(res => {
                     console.log(res.variables.data)
                     this.reagentBatchData = res.variables.data || []
                 })

src/views/peopleManages/taskStatistics/index.vue

@@ -1075,10 +1075,13 @@ export default {
                 return a.userId - b.userId
             })
             // 格式化统计图需要的数据
-            this.optionExamStatisticsConfig.xAxis.data = resultData.map(item => item.userName)
-            this.optionExamStatisticsConfig.series[0].data = resultData.map(item => item.count)
-            this.optionExamStatisticsConfig.series[1].data = resultData.map(item => item.passCount)
-            this.optionExamStatisticsConfig.series[2].data = resultData.map(item => item.passRate)
+            // 2025/7/25 bug5015不需要展示包含系统，管理，测试的用户
+            const excludeKeywords = ['系统', '管理', '测试']
+            const newData = resultData.filter(item => !excludeKeywords.some(keyword => item.userName.includes(keyword)))
+            this.optionExamStatisticsConfig.xAxis.data = newData.map(item => item.userName)
+            this.optionExamStatisticsConfig.series[0].data = newData.map(item => item.count)
+            this.optionExamStatisticsConfig.series[1].data = newData.map(item => item.passCount)
+            this.optionExamStatisticsConfig.series[2].data = newData.map(item => item.passRate)
         },
         // 根据部门和时间获取培训统计数据
         async getTrainingStatisticsData () {
@@ -1096,10 +1099,12 @@ export default {
             })
             // console.log('培训', data)
             // 格式化统计图需要的数据
-            this.optionTrainingStatisticsConfig.xAxis.data = data.map(item => item.name_)
-            this.optionTrainingStatisticsConfig.series[0].data = data.map(item => item.planedjoin)
-            this.optionTrainingStatisticsConfig.series[1].data = data.map(item => item.truejoin)
-            this.optionTrainingStatisticsConfig.series[2].data = data.map(item => item.participationRate)
+            const excludeKeywords = ['系统', '管理', '测试']
+            const newData = data.filter(item => !excludeKeywords.some(keyword => item.name_.includes(keyword)))
+            this.optionTrainingStatisticsConfig.xAxis.data = newData.map(item => item.name_)
+            this.optionTrainingStatisticsConfig.series[0].data = newData.map(item => item.planedjoin)
+            this.optionTrainingStatisticsConfig.series[1].data = newData.map(item => item.truejoin)
+            this.optionTrainingStatisticsConfig.series[2].data = newData.map(item => item.participationRate)
         },
         initData ({ selection, selectionDept, filterDept }) {
             this.selection = selection