vue格式优化

src/modules/marking/routes/routes.js

@@ -1,8 +1,6 @@
 import Home from "../../portal/views/Home.vue";
 import marking from "../views/marking.vue";
 import mark_setting_main from "../views/mark_setting_main.vue";
-import mark_setting_adv from "../views/mark_setting_adv.vue";
-import mark_setting_detail from "../views/mark_setting_detail.vue";
 import mark_work from "../views/mark_work.vue";
 import mark_paper_check from "../views/mark_paper_check.vue";
 import mark_setting_work from "../views/mark_setting_work.vue";
@@ -45,14 +43,6 @@ export default [
         path: "mark_setting_fast/:workId/:examId/:name/:courseCode/:courseName", //评卷快速设置主页面
         component: mark_setting_fast
       },
-      {
-        path: "mark_setting_adv", //评卷任务设置主页面
-        component: mark_setting_adv
-      },
-      {
-        path: "mark_setting_detail", //评卷设置明细
-        component: mark_setting_detail
-      },
       {
         path: "mark_work", //评卷工作
         component: mark_work

src/modules/marking/views/mark_setting_adv.vue

@@ -1,128 +0,0 @@
-<style lang="css">
-
-li {
-    list-style-type: none;
-}
-
-.searchFrame {
-    margin-right: 10px;
-    margin-bottom: 10px;
-}
-
-.page{
-  margin-top: 10px;
-}
-</style>
-
-<template>
-  <div>
-    <section class="content">
-      <div class="box box-info">
-        <div class="box-header with-border">
-          <h3 class="box-title">评卷任务设置</h3>
-          <div class="box-tools pull-right"></div>
-        </div>
-        <div class="box-body">
-          <el-form :inline="true" label-position="right" label-width="70px">
-            <el-form-item class="pull-right">
-              <el-button
-                size="small"
-                type="primary"
-                icon="plus"
-                @click="handleAdd"
-                >新增</el-button
-              >
-              <el-button
-                size="small"
-                type="success"
-                icon="caret-left"
-                @click="back"
-                >返回</el-button
-              >
-            </el-form-item>
-          </el-form>
-          <el-table :data="tableData" border style="width: 100%">
-            <el-table-column label="任务名称" min-width="250">
-              <div>
-                <span>{{ row.taskName }}</span>
-              </div>
-            </el-table-column>
-            <el-table-column label="大题满分" min-width="200">
-              <div>
-                <span>{{ row.fullScore }}</span>
-              </div>
-            </el-table-column>
-            <el-table-column label="状态" min-width="200">
-              <div>
-                <span>{{ row.status }}</span>
-              </div>
-            </el-table-column>
-            <el-table-column :context="_self" label="操作">
-              <div>
-                <el-button
-                  size="small"
-                  type="danger"
-                  @click="handleDelete($index, row);"
-                >
-                  删除
-                </el-button>
-              </div>
-            </el-table-column>
-          </el-table>
-          <div class="page pull-right">
-            <el-pagination
-              background
-              @current-change="handleCurrentChange"
-              :current-page="currentPage"
-              :page-size="10"
-              layout="total, prev, pager, next, jumper"
-              :total="total"
-            >
-            </el-pagination>
-          </div>
-        </div>
-      </div>
-    </section>
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      formSearch: {},
-      tableData: [
-        {
-          taskName: "大学英语1-2",
-          fullScore: "20",
-          status: "启用"
-        },
-        {
-          taskName: "大学英语3-4",
-          fullScore: "40",
-          status: "启用"
-        }
-      ],
-      currentPage: 1,
-      total: 10
-    };
-  },
-  methods: {
-    handleAdd() {
-      this.$router.push({
-        path: "/index/mark_setting_detail"
-      });
-    },
-    handleDelete(index, row) {},
-    back() {
-      this.$router.push({
-        path: "/index/mark_setting_main"
-      });
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val;
-      console.log(`当前页: ${val}`);
-    }
-  }
-};
-</script>

src/modules/marking/views/mark_setting_detail.vue

@@ -1,374 +0,0 @@
-<style lang="css">
-
-li {
-    list-style-type: none;
-}
-
-.searchFrame {
-    margin-right: 10px;
-    margin-bottom: 10px;
-}
-
-.page{
-  margin-top: 10px;
-}
-
-.row{
-  margin-top: 10px;
-  margin-bottom: 10px;
-}
-</style>
-
-<template>
-  <div>
-    <section class="content">
-      <div class="box box-info">
-        <div class="box-header with-border">
-          <h3 class="box-title">评卷设置明细</h3>
-          <div class="box-tools pull-right"></div>
-        </div>
-        <div class="box-body">
-          <el-form
-            :model="formTask"
-            :rule="rules"
-            ref="formTask"
-            label-position="right"
-            label-width="70px"
-          >
-            <el-row :gutter="10">
-              <el-col>
-                <el-form-item class="pull-right">
-                  <el-button
-                    type="primary"
-                    icon="circle-check"
-                    @click="handleSave"
-                    >保存</el-button
-                  >
-                  <el-button type="success" icon="caret-left" @click="back"
-                    >返回</el-button
-                  >
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="10">
-              <el-col :xs="8" :sm="8" :md="8" :lg="8">
-                <el-form-item label="名称" prop="taskName">
-                  <el-input
-                    placeholder="名称"
-                    v-model="formTask.taskName"
-                  ></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-
-            <el-row :gutter="10">
-              <el-col :xs="8" :sm="8" :md="8" :lg="8">
-                <el-form-item label="满分" prop="fullScore">
-                  <el-input
-                    placeholder="满分"
-                    v-model="formTask.fullScore"
-                  ></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="8" :sm="8" :md="8" :lg="8">
-                <el-form-item label="多评次数" prop="mutipleMark">
-                  <el-select
-                    v-model="formTask.mutipleMark"
-                    placeholder="多评次数"
-                  >
-                    <el-option
-                      v-for="item in mutipleMarkSelect"
-                      :label="item.label"
-                      :value="item.value"
-                      :key="item.value"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-
-            <el-row :gutter="10">
-              <el-col :xs="8" :sm="8" :md="8" :lg="8">
-                <el-form-item label="误差值" prop="zoneError">
-                  <el-input
-                    placeholder="误差值"
-                    v-model="formTask.zoneError"
-                  ></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="8" :sm="8" :md="8" :lg="8">
-                <el-form-item label="仲裁" prop="abitrate">
-                  <el-select
-                    v-model="formTask.abitrate"
-                    placeholder="仲裁"
-                  >
-                    <el-option
-                      v-for="item in abitrateSelect"
-                      :label="item.label"
-                      :value="item.value"
-                      :key="item.value"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-
-            <el-row :gutter="10">
-              <el-col :xs="8" :sm="8" :md="8" :lg="8">
-                <el-form-item label="计分方法" prop="scoring">
-                  <el-select
-                    v-model="formTask.scoring"
-                    placeholder="计分方法"
-                  >
-                    <el-option
-                      v-for="item in scoringSelect"
-                      :label="item.label"
-                      :value="item.value"
-                      :key="item.value"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-
-            <el-row :gutter="10">
-              <el-col :xs="15" :sm="15" :md="15" :lg="15">
-                <el-form-item label="试题范围" prop="range">
-                  <el-select
-                    multiple
-                    v-model="formTask.range"
-                    placeholder="试题范围"
-                  >
-                    <el-option
-                      v-for="item in rangeSelect"
-                      :label="item.label"
-                      :value="item.value"
-                      :key="item.value"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-
-            <el-row :gutter="10">
-              <el-col :xs="15" :sm="15" :md="15" :lg="15">
-                <el-form-item label="给分步骤" prop="itemData">
-                  <el-button type="primary" icon="plus" @click="handleItemAdd"
-                    >新增</el-button
-                  >
-                </el-form-item>
-                <el-table :data="formTask.itemData" border style="width: 100%">
-                  <el-table-column label="名称" min-width="200">
-                    <div>
-                      <span>{{ row.itemName }}</span>
-                    </div>
-                  </el-table-column>
-                  <el-table-column label="满分" min-width="100">
-                    <div>
-                      <span>{{ row.fullScore }}</span>
-                    </div>
-                  </el-table-column>
-                  <el-table-column label="间隔分" min-width="100">
-                    <div>
-                      <span>{{ row.interval }}</span>
-                    </div>
-                  </el-table-column>
-                  <el-table-column :context="_self" label="操作">
-                    <div>
-                      <el-button
-                        size="small"
-                        type="danger"
-                        @click="handleItemDelete($index, row);"
-                      >
-                        删除
-                      </el-button>
-                    </div>
-                  </el-table-column>
-                </el-table>
-              </el-col>
-            </el-row>
-
-            <div class="row"></div>
-
-            <el-row :gutter="10">
-              <el-col :xs="15" :sm="15" :md="15" :lg="15">
-                <el-form-item label="评卷员" prop="markerData">
-                  <el-button type="primary" icon="plus" @click="handleMarkerAdd"
-                    >新增</el-button
-                  >
-                </el-form-item>
-                <el-table
-                  :data="formTask.markerData"
-                  border
-                  style="width: 100%"
-                >
-                  <el-table-column label="姓名" min-width="100">
-                    <div>
-                      <span>{{ row.userName }}</span>
-                    </div>
-                  </el-table-column>
-                  <el-table-column label="登录名" min-width="100">
-                    <div>
-                      <span>{{ row.loginName }}</span>
-                    </div>
-                  </el-table-column>
-                  <el-table-column label="角色" min-width="100">
-                    <div>
-                      <span>{{ row.role }}</span>
-                    </div>
-                  </el-table-column>
-                  <el-table-column :context="_self" label="操作">
-                    <div>
-                      <el-button
-                        size="small"
-                        type="danger"
-                        @click="handleMarkerDelete($index, row);"
-                      >
-                        删除
-                      </el-button>
-                    </div>
-                  </el-table-column>
-                </el-table>
-              </el-col>
-            </el-row>
-          </el-form>
-        </div>
-      </div>
-    </section>
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      mutipleMarkSelect: [
-        {
-          value: "2",
-          label: "2评"
-        },
-        {
-          value: "3",
-          label: "3评"
-        },
-        {
-          value: "4",
-          label: "4评"
-        },
-        {
-          value: "5",
-          label: "5评"
-        }
-      ],
-      abitrateSelect: [
-        {
-          value: "abitrate_back",
-          label: "评委重评"
-        },
-        {
-          value: "leader_score",
-          label: "科组长打分"
-        }
-      ],
-      scoringSelect: [
-        {
-          value: "direct_avg",
-          label: "直接均分法"
-        },
-        {
-          value: "remove_hl_avg",
-          label: "去高低均分法"
-        }
-      ],
-      rangeSelect: [
-        {
-          value: "1-1",
-          label: "一(1)"
-        },
-        {
-          value: "1-2",
-          label: "一(2)"
-        },
-        {
-          value: "1-3",
-          label: "一(3)"
-        },
-        {
-          value: "1-4",
-          label: "一(4)"
-        },
-        {
-          value: "2-1",
-          label: "二(1)"
-        },
-        {
-          value: "2-2",
-          label: "二(2)"
-        },
-        {
-          value: "3-1",
-          label: "三(1)"
-        },
-        {
-          value: "3-2",
-          label: "三(2)"
-        }
-      ],
-      formTask: {
-        taskName: "",
-        fullScore: "",
-        mutipleMark: "",
-        zoneError: "",
-        abitrate: "",
-        scoring: "",
-        range: "",
-        itemData: [
-          { itemName: "一(1)", fullScore: "3", interval: "1" },
-          { itemName: "一(2)", fullScore: "4", interval: "1" }
-        ],
-        markerData: []
-      },
-      rules: {
-        taskName: [{ required: true, message: "请输入名称", trigger: "blur" }],
-        fullScore: [{ required: true, message: "请输入满分", trigger: "blur" }],
-        mutipleMark: [
-          { required: true, message: "请输入多评次数", trigger: "blur" }
-        ],
-        zoneError: [
-          { required: true, message: "请输入误差值", trigger: "blur" }
-        ],
-        abitrate: [{ required: true, message: "请输入仲裁", trigger: "blur" }],
-        scoring: [
-          { required: true, message: "请输入计分方法", trigger: "blur" }
-        ],
-        range: [{ required: true, message: "请输入试题范围", trigger: "blur" }],
-        itemData: [
-          { required: true, message: "请输入给分步骤", trigger: "blur" }
-        ],
-        markerData: [
-          { required: true, message: "请输入评卷员", trigger: "blur" }
-        ]
-      },
-      markType: ""
-    };
-  },
-  methods: {
-    handleSave() {},
-    handleChange() {},
-    handleItemAdd() {},
-    handleMarkerAdd() {},
-    handleItemDelete(index, row) {},
-    handleMarkerDelete(index, row) {},
-    back() {
-      this.$router.push({
-        path: "/index/mark_setting_adv"
-      });
-    }
-  },
-  created() {}
-};
-</script>

src/modules/marking/views/mark_setting_main.vue

@@ -204,13 +204,7 @@ li {
 </template>
 
 <script>
-import {
-  CORE_API,
-  EXAM_WORK_API,
-  MARKING_API,
-  DATA_PROCESS_API,
-  OE_API
-} from "../constants/constants";
+import { MARKING_API, DATA_PROCESS_API } from "../constants/constants";
 import { mapState } from "vuex";
 export default {
   data() {
@@ -278,12 +272,6 @@ export default {
         path: url
       });
     },
-    advanceSetting(index, row) {
-      this.paperId = row.pk;
-      this.$router.push({
-        path: "/index/mark_setting_adv"
-      });
-    },
     filterSetting() {
       if (!this.formSearch.courseCode && !this.formSearch.courseName) {
         return;
@@ -380,9 +368,11 @@ export default {
       console.log(file);
     },
     uploadProgress(event, file, fileList) {
+      console.log(fileList.length);
       console.log("uploadProgress");
     },
     uploadSuccess(response, file, fileList) {
+      console.log(fileList.length);
       console.log("uploadSuccess");
       console.log(response);
       if (!response || response.length == 0) {
@@ -401,6 +391,7 @@ export default {
       }
     },
     uploadError(err, file, fileList) {
+      console.log(fileList.length);
       var result = err.message.match(/\{.+}/);
       var errMessage = JSON.parse(result[0]).desc;
       this.$notify({