bug fix

src/modules/grading/marker/store.js

@@ -1,67 +1,73 @@
-const state = {
-  paramsSet: {},
-  page: {
-    current: 1,
-    size: 12,
-    total: 0,
-    totalPage: 1
-  },
-  steps: {},
-  curStep: { name: "", count: 0 },
-  areas: [],
-  curArea: {},
-  curSubject: {},
-  curUserRoleType: "",
-  IS_MARKER: false,
-  IS_MARK_LEADER: false
-};
-const mutations = {
-  setParamSet(state, paramsSet) {
-    state.paramsSet = paramsSet;
-  },
-  setPage(state, page) {
-    state.page = Object.assign({}, state.page, page);
-  },
-  setSteps(state, steps) {
-    state.steps = steps;
-  },
-  setCurStep(state, curStep) {
-    state.curStep = curStep;
-  },
-  setAreas(state, areas) {
-    state.areas = areas;
-  },
-  setCurArea(state, curArea) {
-    state.curArea = curArea;
-  },
-  setCurSubject(state, curSubject) {
-    state.curSubject = curSubject;
-  },
-  setCurUserRoleType(state, curUserRoleType) {
-    state.curUserRoleType = curUserRoleType;
-    state.IS_MARKER = curUserRoleType === "MARKER";
-    state.IS_MARK_LEADER = curUserRoleType === "MARK_LEADER";
-  },
-  clearState(state) {
-    state.paramsSet = {};
-    state.page = {
-      current: 1,
-      size: 12,
-      total: 0,
-      totalPage: 1
-    };
-    state.steps = {};
-    state.curStep = { name: "", count: 0 };
-    state.curArea = {};
-    state.curSubject = {};
-    state.curUserRoleType = "";
-    state.IS_MARKER = false;
-    state.IS_MARK_LEADER = false;
-  }
-};
-
-export default {
-  namespaced: true,
-  state,
-  mutations
-};
+const state = {
+  paramsSet: {},
+  page: {
+    current: 1,
+    size: 12,
+    total: 0,
+    totalPage: 1
+  },
+  steps: {},
+  curStep: { name: "", count: 0 },
+  areas: [],
+  curArea: {},
+  curSubject: {},
+  curUserRoleType: "",
+  IS_MARKER: false,
+  IS_MARK_LEADER: false
+};
+const mutations = {
+  setParamSet(state, paramsSet) {
+    state.paramsSet = paramsSet;
+  },
+  setPage(state, page) {
+    if (
+      Object.prototype.hasOwnProperty.call(page, "totalPage") &&
+      !page.totalPage
+    )
+      page.totalPage = 1;
+
+    state.page = Object.assign({}, state.page, page);
+  },
+  setSteps(state, steps) {
+    state.steps = steps;
+  },
+  setCurStep(state, curStep) {
+    state.curStep = curStep;
+  },
+  setAreas(state, areas) {
+    state.areas = areas;
+  },
+  setCurArea(state, curArea) {
+    state.curArea = curArea;
+  },
+  setCurSubject(state, curSubject) {
+    state.curSubject = curSubject;
+  },
+  setCurUserRoleType(state, curUserRoleType) {
+    state.curUserRoleType = curUserRoleType;
+    state.IS_MARKER = curUserRoleType === "MARKER";
+    state.IS_MARK_LEADER = curUserRoleType === "MARK_LEADER";
+  },
+  clearState(state) {
+    state.paramsSet = {};
+    state.page = {
+      current: 1,
+      size: 12,
+      total: 0,
+      totalPage: 1
+    };
+    state.steps = {};
+    state.curStep = { name: "", count: 0 };
+    state.curArea = {};
+    state.curSubject = {};
+    state.curUserRoleType = "";
+    state.IS_MARKER = false;
+    state.IS_MARK_LEADER = false;
+  }
+};
+
+export default {
+  namespaced: true,
+  state,
+  mutations
+};

src/modules/main/PaperManage.vue

@@ -1,105 +1,94 @@
 <template>
   <div class="paper-manage page-container-flex ">
-    <div class="part-box part-box-filter part-box-head">
-      <div class="part-box-head-left">
-        <Form ref="FilterForm" label-position="left" inline>
-          <FormItem>
-            <Select
-              v-model="filter.subject"
-              @on-change="subjectChange"
-              placeholder="科目"
-            >
-              <Option
-                v-for="(item, index) in subjects"
-                :key="index"
-                :value="item.subject"
-                :label="item.name"
-              ></Option>
-            </Select>
-          </FormItem>
-          <FormItem>
-            <Select v-model="filter.areaCode" placeholder="选择考区" clearable>
-              <Option
-                v-for="area in areas"
-                :key="area.id"
-                :value="area.areaCode"
-                :label="area.areaName"
-              ></Option>
-            </Select>
-          </FormItem>
-          <FormItem>
-            <Input
-              v-model="filter.startNumber"
-              type="text"
-              placeholder="输入开始编号"
-              clearable
-            />
-          </FormItem>
-          <FormItem>
-            <Input
-              v-model="filter.endNumber"
-              type="text"
-              placeholder="输入结束编号"
-              clearable
-            />
-          </FormItem>
-          <FormItem>
-            <Select
-              v-model="paperType"
-              @on-change="typeChange"
-              placeholder="类型"
-            >
-              <Option
-                v-for="(val, key) in CAFA_EXCEPTION_TYPE"
-                :key="key"
-                :value="key"
-                :label="val"
-              ></Option>
-            </Select>
-          </FormItem>
-          <FormItem>
-            <Select
-              v-model="filter.scanUserId"
-              placeholder="选择采集账号"
-              clearable
-            >
-              <Option
-                v-for="user in scanUsers"
-                :key="user.id"
-                :value="user.id"
-                :label="user.loginName"
-              ></Option>
-            </Select>
-          </FormItem>
-          <FormItem>
-            <Input
-              v-model.trim="filter.studentName"
-              placeholder="输入姓名"
-              clearable
-            ></Input>
-          </FormItem>
-          <FormItem>
-            <Select v-model="filter.sortBy" placeholder="排序方式" clearable>
-              <Option
-                v-for="(val, key) in SORT_RULE_TYPE"
-                :key="key"
-                :value="key"
-                :label="val"
-              ></Option>
-            </Select>
-          </FormItem>
-          <FormItem>
-            <Button
-              size="small"
-              class="btn-form-search"
-              type="primary"
-              @click="toPage(1)"
-              >查询</Button
-            >
-          </FormItem>
-        </Form>
-      </div>
-      <div class="part-box-head-right">
+    <div class="part-box">
+      <Form ref="FilterForm" label-position="left" inline>
+        <FormItem>
+          <Select
+            v-model="filter.subject"
+            @on-change="subjectChange"
+            placeholder="科目"
+          >
+            <Option
+              v-for="(item, index) in subjects"
+              :key="index"
+              :value="item.subject"
+              :label="item.name"
+            ></Option>
+          </Select>
+        </FormItem>
+        <FormItem>
+          <Select v-model="filter.areaCode" placeholder="选择考区" clearable>
+            <Option
+              v-for="area in areas"
+              :key="area.id"
+              :value="area.areaCode"
+              :label="area.areaName"
+            ></Option>
+          </Select>
+        </FormItem>
+        <FormItem>
+          <Input
+            v-model="filter.startNumber"
+            type="text"
+            placeholder="输入开始编号"
+            clearable
+          />
+        </FormItem>
+        <FormItem>
+          <Input
+            v-model="filter.endNumber"
+            type="text"
+            placeholder="输入结束编号"
+            clearable
+          />
+        </FormItem>
+        <FormItem>
+          <Select
+            v-model="paperType"
+            @on-change="typeChange"
+            placeholder="类型"
+          >
+            <Option
+              v-for="(val, key) in CAFA_EXCEPTION_TYPE"
+              :key="key"
+              :value="key"
+              :label="val"
+            ></Option>
+          </Select>
+        </FormItem>
+        <FormItem>
+          <Select
+            v-model="filter.scanUserId"
+            placeholder="选择采集账号"
+            clearable
+          >
+            <Option
+              v-for="user in scanUsers"
+              :key="user.id"
+              :value="user.id"
+              :label="user.loginName"
+            ></Option>
+          </Select>
+        </FormItem>
+        <FormItem>
+          <Input
+            v-model.trim="filter.studentName"
+            placeholder="输入姓名"
+            clearable
+          ></Input>
+        </FormItem>
+        <FormItem>
+          <Select v-model="filter.sortBy" placeholder="排序方式" clearable>
+            <Option
+              v-for="(val, key) in SORT_RULE_TYPE"
+              :key="key"
+              :value="key"
+              :label="val"
+            ></Option>
+          </Select>
+        </FormItem>
+      </Form>
+      <div class="box-justify">
         <Button
           type="success"
           shape="circle"
@@ -107,6 +96,13 @@
           @click="toExportMark"
           >导出标记试卷</Button
         >
+        <Button
+          size="small"
+          class="btn-form-search"
+          type="primary"
+          @click="toPage(1)"
+          >查询</Button
+        >
       </div>
     </div>