update

src/api.js

@@ -132,6 +132,9 @@ export default {
     getPapersList: params => {
         return axios.get(`${baseURL}/api/admin/papers/list`, { params: params })
     },
+    getPapersSearch: params => {
+        return axios.get(`${baseURL}/api/admin/papers/search`, { params: params })
+    },
     // 识别测试
     tryRecPaper: params => {
         return axios.post(`${baseURL}/api/admin/papers/rec/try`, params)
@@ -152,4 +155,17 @@ export default {
     delPaperInfo: params => {
         return axios.delete(`${baseURL}/api/admin/papers`, { params: params })
     },
+    // 阅卷任务
+    getMarkTaskList: params => {
+        return axios.get(`${baseURL}/api/admin/marktask/list`, { params: params })
+    },
+    addMarkTask: params => {
+        return axios.post(`${baseURL}/api/admin/marktask`, params)
+    },
+    editMarkTask: params => {
+        return axios.put(`${baseURL}/api/admin/marktask`, params)
+    },
+    delMarkTask: params => {
+        return axios.delete(`${baseURL}/api/admin/marktask`, { params: params })
+    },
 }

src/views/papers/cutPaper.vue

@@ -22,11 +22,11 @@
     <el-row>
       <el-col :span="4">
         <div style="padding:0px 10px;">
-          <img width="100%" src="http://118.190.145.217/demo.png" />
+          <img width="100%" src="http://118.190.145.217/upload/demo.png" />
         </div>
       </el-col>
       <el-col :span="14" style="background:#fff;">
-        <img id="image" ref="image" width="100%" src="http://118.190.145.217/demo.png" />
+        <img id="image" ref="image" width="100%" src="http://118.190.145.217/upload/demo.png" />
       </el-col>
       <el-col :span="6">
         <div style="padding:0px 10px;overflow-y: auto;height: 450px;">

src/views/tasks/Index.vue

@@ -31,66 +31,30 @@
       </el-row>
     </el-form>
     <el-table v-loading="loading" :data="list" style="width: 100%; margin-top: 10px" height="50vh">
-      <el-table-column align="center" prop="name" label="班级" />
-      <el-table-column align="center" prop="phone" label="年级" />
-      <el-table-column label="教师">
-        <template slot-scope="scope">
-          <el-link type="primary">查看</el-link>
-        </template>
-      </el-table-column>
-      <el-table-column label="学生">
-        <template slot-scope="scope">
-          <el-link type="primary">查看</el-link>
-        </template>
-      </el-table-column>
+      <el-table-column align="center" prop="name" label="名称" />
+      <el-table-column align="center" prop="phone" label="试卷" />
       <el-table-column align="center" prop="ctime" label="创建时间" />
       <el-table-column align="center" prop="date" label="操作" width="320">
         <template slot-scope="scope">
           <el-button @click="edit(scope.row.id)" size="mini" type="warning">编辑</el-button>
-          <el-button @click="openUploadPaper" size="mini" type="primary">上传试卷</el-button>
+          <el-button @click="openUploadPaper(scope.row.id)" size="mini" type="primary">上传试卷</el-button>
           <el-button @click="del(scope.row.id)" size="mini" type="danger">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
     <Page ref="pageButton" :current="form.page" :page_size="form.page_size" :total="total" @pageChange="gopage" />
     <!-- 新增医生 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog title="新增/编辑阅卷任务" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="医生类型" prop="role">
-          <el-select v-model="form.role" placeholder="请选择医生类型" filterable>
-            <el-option v-for="item in $const.doctorRoleList" :key="item.value" :label="item.label" :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="带教医生" prop="parent_id" v-if="form.role == 3">
-          <el-select v-model="form.parent_id" placeholder="请输入医生姓名" clearable filterable size="mini">
-            <el-option v-for="item in doctorList" :key="item.value" :label="item.name" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="名称" prop="name">
           <el-input clearable v-model="form.name" placeholder="请输入名称"></el-input>
         </el-form-item>
-        <el-form-item label="手机号" prop="phone">
-          <el-input clearable v-model="form.phone" placeholder="请输入手机号"></el-input>
-        </el-form-item>
-
-        <el-form-item label="医院" prop="hospital_name">
-          <el-input clearable v-model="form.hospital_name" placeholder="请输入医院"></el-input>
+        <el-form-item label="试卷模板" prop="role">
+          <el-select v-model="form.paper_id" placeholder="请选择试卷模板" filterable>
+            <el-option v-for="item in papersList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <!-- <el-form-item label="图片" prop>
-          <el-upload
-            class="avatar-uploader"
-            action="/api/admin/uploadfile"
-            :data="{watermark:0}"
-            :show-file-list="false"
-            :on-success="handleAvatarSuccess"
-            :before-upload="beforeAvatarUpload"
-          >
-            <img v-if="form.img" :src="form.img" class="avatar" />
-            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-          </el-upload>
-        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -116,12 +80,13 @@
         <el-col :span="12">
           <el-upload
             class="upload-demo"
-            action="http://118.190.145.217:8091/api/admin/uploadfile"
+            action="http://118.190.145.217:8091/api/admin/papers/uploadpaper"
             :on-preview="handlePreview"
             :on-remove="handleRemove"
+            :on-success="handleUploadSuccess"
             :file-list="fileList"
             list-type="picture"
-            :data="{taskid:1}"
+            :data="{taskid:taskid}"
             multiple
             >
             <el-button size="small" type="primary">点击上传</el-button>
@@ -159,6 +124,9 @@
         doctorList: [],
         rules: {},
         uploadDialogVisible: false,
+        fileList:[],
+        papersList:[],
+        taskid:null
       };
     },
     methods: {
@@ -170,12 +138,13 @@
           type: "warning",
         }).then(() => {
           this.$api
-            .delDoctorInfo({
+            .delMarkTask({
               id: id,
             })
             .then((res) => {
+              console.log(res,3333333333333)
               if (!res.data.code) {
-                this.$msgSuccess("删除成功");
+                this.msgSuccess("删除成功");
                 this.getData();
               } else {
                 this.$msgError(res.data.message);
@@ -192,19 +161,16 @@
       },
       getData() {
         this.loading = true;
-        this.$api.getDoctorsList(this.queryParams).then((res) => {
-          this.list = res.data.data.list;
-          this.total = res.data.data.total;
-          this.loading = false;
-        });
-
         this.$api
-          .getDoctorsSearchList({})
+          .getPapersSearch({})
           .then((res) => {
-            this.doctorList = res.data.data;
-            this.$set(this.doctorList, res.data.data);
-            // this.loading = false;
+            this.papersList = res.data.data;
+            this.loading = false
           });
+        this.$api.getMarkTaskList().then(res=>{
+          this.total = res.data.data.total;
+          this.list = res.data.data.list;
+        })
       },
       handleAdd() {
         this.open = true;
@@ -227,7 +193,7 @@
         this.$refs["form"].validate((valid) => {
           if (valid) {
             if (this.form.id != null) {
-              this.$api.editDoctorInfo(this.form).then((res) => {
+              this.$api.editMarkTask(this.form).then((res) => {
                 if (res.data.code == 0) {
                   this.msgSuccess("成功!");
                   this.open = false;
@@ -237,7 +203,7 @@
                 }
               });
             } else {
-              this.$api.addDoctorInfo(this.form).then((res) => {
+              this.$api.addMarkTask(this.form).then((res) => {
                 if (res.data.code == 0) {
                   this.msgSuccess("成功!");
                   this.open = false;
@@ -266,11 +232,19 @@
           this.doctorList = [];
         }
       },
-      openUploadPaper() {
+      openUploadPaper(id) {
         this.uploadDialogVisible = true
+        this.taskid = id
       },
       handlePreview(file) {
         console.log(file);
+      },
+      handleUploadSuccess(res,file){
+        // this.fileList.push({"url":res.data.url,"name":res.data.name,"status":"success"})
+        // console.log(file,444444444444)
+      },
+      handleRemove(e){
+        console.log(e)
       }
     },
     created() {
@@ -293,6 +267,6 @@
       line-height: 130px;
   }
   .el-upload-list--picture .el-upload-list__item-thumbnail{
-    width:125px;
+    width:125px;  
   }
 </style>