소스 검색

feat: update jenkins.sh

chenhao 2 년 전
부모
커밋
bb1da3bb2b
4개의 변경된 파일69개의 추가작업 그리고 13개의 파일을 삭제
  1. 3 3
      jenkins.sh
  2. 6 0
      src/api/statistics.ts
  3. 36 10
      src/modules/quality/self-check/index.vue
  4. 24 0
      types/api.d.ts

+ 3 - 3
jenkins.sh

@@ -14,10 +14,10 @@ pwd
 yarn
 yarn
 npm run build
 npm run build
 
 
-mkdir -p ~/project/marking-cet/static-new/temp
-cp -r  dist ~/project/marking-cet/static-new/temp
+mkdir -p ~/project/marking-cet/static/temp
+cp -r  dist ~/project/marking-cet/static/temp
 
 
-cd ~/project/marking-cet/static-new
+cd ~/project/marking-cet/static
 if [ -d "dist" ]; then
 if [ -d "dist" ]; then
   rm -rf dist/*
   rm -rf dist/*
 fi
 fi

+ 6 - 0
src/api/statistics.ts

@@ -9,6 +9,12 @@ const StatisticsApi: DefineApiModule<Statistics.ApiMap> = {
     },
     },
   },
   },
   /** 质量统计-自查一致性分析-离差列表 */
   /** 质量统计-自查一致性分析-离差列表 */
+  selfCheckAnalysisDiffList: {
+    url: '/api/statistic/check/analysis/diff/list',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  },
   /** 质量统计-抽查情况统计 */
   /** 质量统计-抽查情况统计 */
   statisticCheckOverview: '/api/statistic/check/overview',
   statisticCheckOverview: '/api/statistic/check/overview',
   /** 质量统计-主观题校验 */
   /** 质量统计-主观题校验 */

+ 36 - 10
src/modules/quality/self-check/index.vue

@@ -9,13 +9,22 @@
     </div>
     </div>
     <div class="p-base flex justify-between">
     <div class="p-base flex justify-between">
       <el-card class="flex-1" shadow="never">
       <el-card class="flex-1" shadow="never">
-        <base-table :columns="columns1" :data="selfCheckAnalysisList"></base-table>
+        <base-table
+          :columns="columns1"
+          :data="selfCheckAnalysisList"
+          highlight-current-row
+          @current-change="onCheckSelfCheckAnalysis"
+        ></base-table>
       </el-card>
       </el-card>
       <el-card class="flex-1 m-l-base m-r-base center-card" shadow="never">
       <el-card class="flex-1 m-l-base m-r-base center-card" shadow="never">
-        <base-table></base-table>
+        <base-table
+          :columns="columns2"
+          highlight-current-row
+          @current-change="onCheckSelfCheckAnalysisDiff"
+        ></base-table>
       </el-card>
       </el-card>
       <el-card class="flex-1" shadow="never">
       <el-card class="flex-1" shadow="never">
-        <base-table></base-table>
+        <base-table :columns="columns3"></base-table>
       </el-card>
       </el-card>
     </div>
     </div>
   </div>
   </div>
@@ -23,7 +32,7 @@
 
 
 <script setup lang="ts" name="QualitySelfCheck">
 <script setup lang="ts" name="QualitySelfCheck">
 /** 自查一致性分析 */
 /** 自查一致性分析 */
-import { reactive, watch, computed } from 'vue'
+import { reactive, watch, computed, ref } from 'vue'
 import { ElButton, ElCard } from 'element-plus'
 import { ElButton, ElCard } from 'element-plus'
 import { omit } from 'lodash-es'
 import { omit } from 'lodash-es'
 import BaseForm from '@/components/element/BaseForm.vue'
 import BaseForm from '@/components/element/BaseForm.vue'
@@ -98,6 +107,9 @@ const items = computed<EpFormItem[]>(() => {
 
 
 const { fetch: selfCheckAnalysis, result: selfCheckAnalysisList } = useFetch('selfCheckAnalysis')
 const { fetch: selfCheckAnalysis, result: selfCheckAnalysisList } = useFetch('selfCheckAnalysis')
 
 
+const { onCurrentChange: onCheckSelfCheckAnalysis, current: currentSelfCheckAnalysis } =
+  useTableCheck(selfCheckAnalysisList)
+
 const columns1: EpTableColumn<ExtractArrayValue<ExtractApiResponse<'selfCheckAnalysis'>>>[] = [
 const columns1: EpTableColumn<ExtractArrayValue<ExtractApiResponse<'selfCheckAnalysis'>>>[] = [
   { label: '序号', type: 'index', width: 100 },
   { label: '序号', type: 'index', width: 100 },
   { label: '评卷员', prop: 'markerName' },
   { label: '评卷员', prop: 'markerName' },
@@ -105,12 +117,26 @@ const columns1: EpTableColumn<ExtractArrayValue<ExtractApiResponse<'selfCheckAna
   { label: '平均离差', prop: 'avgDiff' },
   { label: '平均离差', prop: 'avgDiff' },
 ]
 ]
 
 
-const columns2: EpTableColumn[] = [
-  { label: '离差值', prop: '' },
-  { label: '离差个数', prop: '' },
+const { fetch: getSelfCheckAnalysisDiffList, result: selfCheckAnalysisDiffList } = useFetch('selfCheckAnalysisDiffList')
+
+const { onCurrentChange: onCheckSelfCheckAnalysisDiff, current } = useTableCheck(selfCheckAnalysisDiffList)
+
+const columns2: EpTableColumn<ExtractArrayValue<ExtractApiResponse<'selfCheckAnalysisDiffList'>>>[] = [
+  { label: '离差值', prop: 'diff' },
+  {
+    label: '离差个数',
+    formatter(row) {
+      return `${row.papers?.length}`
+    },
+  },
 ]
 ]
 
 
-const columns3: EpTableColumn[] = []
+const columns3: EpTableColumn[] = [
+  { label: '密号', prop: 'secretNumber' },
+  { label: '分数', prop: 'markScore' },
+  { label: '上次分数', prop: 'lastMarkScore' },
+  { label: '评卷时间', prop: 'markTime' },
+]
 
 
 function onSearch() {
 function onSearch() {
   selfCheckAnalysis({ ...omit(model, 'time'), startTime: model.time[0], endTime: model.time[1] })
   selfCheckAnalysis({ ...omit(model, 'time'), startTime: model.time[0], endTime: model.time[1] })
@@ -121,7 +147,7 @@ onOptionInit(onSearch)
 
 
 <style scoped lang="scss">
 <style scoped lang="scss">
 .center-card {
 .center-card {
-  min-width: 240px;
-  max-width: 240px;
+  min-width: 260px;
+  max-width: 260px;
 }
 }
 </style>
 </style>

+ 24 - 0
types/api.d.ts

@@ -1170,6 +1170,29 @@ declare module 'api-type' {
 
 
     type SelfCheckAnalysis = BaseDefine<SelfCheckAnalysisReq, SelfCheckAnalysisResponse[]>
     type SelfCheckAnalysis = BaseDefine<SelfCheckAnalysisReq, SelfCheckAnalysisResponse[]>
 
 
+    interface elfCheckAnalysisDiffListItemPaper {
+      diff: number
+      lastMarkScore: number
+      markScore: number
+      markTime: string
+      secretNumber: string
+      taskId: number
+    }
+
+    interface SelfCheckAnalysisDiffListItem {
+      diff: number
+      papers: elfCheckAnalysisDiffListItemPaper[]
+    }
+
+    type SelfCheckAnalysisDiffList = BaseDefine<
+      {
+        markerId?: number
+        questionMainNumber?: number
+        subjectCode: string
+      },
+      SelfCheckAnalysisDiffListItem[]
+    >
+
     /** 质量分析- 抽查情况统计 */
     /** 质量分析- 抽查情况统计 */
     interface StatisticCheckInfo {
     interface StatisticCheckInfo {
       customCheckCount: number
       customCheckCount: number
@@ -1499,6 +1522,7 @@ declare module 'api-type' {
       /** 质量统计-自查一致性分析 */
       /** 质量统计-自查一致性分析 */
       selfCheckAnalysis: SelfCheckAnalysis
       selfCheckAnalysis: SelfCheckAnalysis
       /** 质量统计-自查一致性分析-离差列表 */
       /** 质量统计-自查一致性分析-离差列表 */
+      selfCheckAnalysisDiffList: SelfCheckAnalysisDiffList
       /** 质量统计-抽查情况统计 */
       /** 质量统计-抽查情况统计 */
       statisticCheckOverview: StatisticCheckOverview
       statisticCheckOverview: StatisticCheckOverview
       /** 质量统计-主观题校验 */
       /** 质量统计-主观题校验 */