Browse Source

现场提出的修改点

刘洋 2 years ago
parent
commit
40722b6772

+ 3 - 3
src/modules/analysis/marking-progress/components/GroupProgress.vue

@@ -3,10 +3,10 @@
     <base-form size="small" :items="items" :model="model">
       <template #form-item-operation>
         <el-button class="m-l-base" type="primary" @click="onSearch">查询</el-button>
-        <el-button :loading="exportLoading" type="primary" custom-1 @click="onExport">导出</el-button>
-        <el-button :loading="provinceExportLoading" custom-1 type="primary" @click="provinceExport"
+        <!-- <el-button :loading="exportLoading" type="primary" custom-1 @click="onExport">导出</el-button> -->
+        <!-- <el-button :loading="provinceExportLoading" custom-1 type="primary" @click="provinceExport"
           >省份进度导出</el-button
-        >
+        > -->
       </template>
     </base-form>
     <base-table border stripe size="small" :columns="columns" :data="result"></base-table>

+ 11 - 2
src/modules/analysis/personnel-compare/index.vue

@@ -175,8 +175,17 @@ const columns = computed(() => {
 const columns2: any = computed(() => {
   let initColumns = [
     { type: 'selection', width: 55 },
-    { label: '账号', prop: 'loginName', align: 'center', minWidth: 120, fixed: 'left' },
-    { label: '姓名', prop: 'markerName', align: 'center', minWidth: 120, fixed: 'left' },
+    {
+      label: '账号',
+      prop: 'loginName',
+      align: 'center',
+      minWidth: 100,
+      fixed: 'left',
+      formatter(row: any) {
+        return `${row.loginName}-${row.markerName}`
+      },
+    },
+    // { label: '姓名', prop: 'markerName', align: 'center', minWidth: 120, fixed: 'left' },
   ]
   if (allTableData.value.length) {
     let pushColumns = allTableData.value[0].segmentScores.map((item: any) => {

+ 3 - 1
src/modules/analysis/view-marked-detail/index.vue

@@ -5,7 +5,9 @@
       :paper-path="current?.filePath"
       @click="onOperationClick"
     >
-      <el-button class="m-l-base" size="small" type="primary" @click="onEditScore">修改给分</el-button>
+      <el-button :disabled="!current?.taskId" class="m-l-base" size="small" type="primary" @click="onEditScore"
+        >修改给分</el-button
+      >
       <el-button :disabled="!current?.taskId" class="m-l-base m-r-auto" size="small" type="primary" @click="onSendBack"
         >打回</el-button
       >