瀏覽代碼

feat: 新需求

zhangjie 17 小時之前
父節點
當前提交
c60e0cb73d
共有 2 個文件被更改,包括 17 次插入2 次删除
  1. 7 1
      src/modules/examwork/view/ipConfig.vue
  2. 10 1
      src/modules/marking/views/MarkWork.vue

+ 7 - 1
src/modules/examwork/view/ipConfig.vue

@@ -12,8 +12,11 @@
             <el-select
               v-model="formSearch.orgId"
               class="input"
-              filterable
               clearable
+              filterable
+              remote
+              :remote-method="getOrgList4Search"
+              :loading="getOrgList4SearchLoading"
               placeholder="请选择"
             >
               <el-option
@@ -207,6 +210,9 @@
               >获取本机ip</el-button
             >
           </div>
+          <p style="line-height: 20px; margin: 5px 0 0; color: #888">
+            若IP最后一位不固定,请填报IP段,例如:XXX.XXX.XXX.1-254
+          </p>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input

+ 10 - 1
src/modules/marking/views/MarkWork.vue

@@ -182,7 +182,12 @@
                           >开启评卷</el-button
                         >
                       </el-dropdown-item>
-                      <el-dropdown-item v-if="scope.row.status == 1">
+                      <el-dropdown-item
+                        v-if="
+                          scope.row.status == 1 &&
+                          currentPagePrivileges.APPEND_TASK
+                        "
+                      >
                         <el-button
                           type="primary"
                           size="mini"
@@ -306,7 +311,10 @@
 <script>
 import { mapState } from "vuex";
 import { MARKING_API, MARKING_LOGIC_API } from "@/constants/constants";
+import pagePrivilege from "../../oe/mixin/pagePrivilege.js";
+
 export default {
+  mixins: [pagePrivilege],
   data() {
     return {
       formSearch: {
@@ -359,6 +367,7 @@ export default {
       closeClickModal: false,
       saveLoading: false,
       oldWorkName: "",
+      currentPagePrivileges: { APPEND_TASK: false },
     };
   },
   computed: {