From 6bbb4faa43448d4c9ba3f25b7f0efcd6aed3b450 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期二, 20 六月 2023 16:14:37 +0800
Subject: [PATCH] 修改青羊试卷添加

---
 vue.config.js                 |    2 +-
 src/views/answer/list.vue     |    8 +++++++-
 src/views/exam/paper/edit.vue |   39 +++++++++++++++++++++++++++++++++++----
 3 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/src/views/answer/list.vue b/src/views/answer/list.vue
index ba864ef..c84f010 100644
--- a/src/views/answer/list.vue
+++ b/src/views/answer/list.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParam" ref="queryForm" :inline="true">
+    <el-form :model="queryParam" ref="queryForm" :inline="true " style="display: flex">
 <!--      <el-form-item label="璇剧洰锛�" >-->
 <!--        <el-select v-model="queryParam.subjectId"  clearable>-->
 <!--          <el-option v-for="item in subjects" :key="item.id" :value="item.id" :label="item.name"></el-option>-->
@@ -14,6 +14,10 @@
     </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="submitForm">鏌ヨ</el-button>
+      </el-form-item>
+      <el-form-item style="flex: 1;
+    text-align: right;">
+       <span>{{avgSource}}鍒�</span>
       </el-form-item>
     </el-form>
 
@@ -49,6 +53,7 @@
   components: { Pagination },
   data () {
     return {
+      avgSource:null,
       queryParam: {
         paperName:'',
         userName:'',
@@ -70,6 +75,7 @@
       this.listLoading = true
       examPaperAnswerApi.page(this.queryParam).then(data => {
         const re = data.response
+        this.avgSource = re.list[0].avgSource
         this.tableData = re.list
         this.total = re.total
         this.queryParam.pageIndex = re.pageNum
diff --git a/src/views/exam/paper/edit.vue b/src/views/exam/paper/edit.vue
index c9607e7..6317a3b 100644
--- a/src/views/exam/paper/edit.vue
+++ b/src/views/exam/paper/edit.vue
@@ -33,17 +33,17 @@
             <span>鎬绘暟鍒嗭細</span>
           </el-col>
           <el-col :span="9" v-if="form.paperType==7">
-            <el-input v-model="form.name"/>
+            <el-input disabled v-model="form.aggregateSource"/>
           </el-col>
         </el-row>
       </el-form-item>
-      <el-form-item :key="index" :label="titleItem.label+':'" required v-for="(titleItem,index) in subjectIdList" v-if="form.paperType ==7">
+      <el-form-item :key="index" :label="titlejs(key)"  required  v-for="(value,key,index) in form.subjectSource" v-if="form.paperType ==7">
         <el-row >
           <el-col :span="3" >
             <span>棰樼洰鏁伴噺锛�</span>
           </el-col>
           <el-col :span="9">
-            <el-input v-model="titleItem.name" style="width: 80%"/>
+            <el-input v-model="form.subjectSource[key]" style="width: 80%"/>
           </el-col>
         </el-row>
       </el-form-item>
@@ -126,6 +126,7 @@
     return {
       subjectIdList:[],
       form: {
+        aggregateSource:100,
         id: null,
         departmentIds: [],
         subjectId: [],
@@ -133,7 +134,8 @@
         limitDateTime: [],
         name: '',
         suggestTime: null,
-        titleItems: []
+        titleItems: [],
+        subjectSource:null
       },
       subjectFilter: null,
       formLoading: false,
@@ -186,6 +188,16 @@
     }
   },
   methods: {
+    titlejs(val){
+      console.log(val)
+      let str = ''
+        this.subjectFilter.forEach(item=>{
+          if (item.id == val){
+            str = item.name
+          }
+        })
+      return str
+    },
     subjectIdEvent(e){
       console.log(e,this.$refs.subjectIdRef.selected)
       let arr=[]
@@ -204,21 +216,40 @@
       if (arr.length>1){
         //瑾槑鏄毃姗�
         this.subjectIdList = arr
+        let obj1={}
+        arr.forEach((item,index)=>{
+          let obj={
+            item
+          }
+          for (let i in obj) {
+            i=item.id
+            obj[i]= ''
+            obj1[i] = ''
+            console.log('閿悕锛�', i);
+            console.log('閿�硷細', obj[i]);
+          }
+        })
+        this.form.subjectSource = obj1
+        console.log(this.form.subjectSource)
         // this.form.paperType = 7
         this.form.titleItems = []
       }else {
+        this.form.subjectSource={}
         this.subjectIdList = []
         this.form.paperType = 1
       }
     },
     submitForm () {
       let _this = this
+      console.log(this.subjectIdList)
+      console.log(this.form.subjectSource)
       this.$refs.form.validate((valid) => {
         if (valid) {
           this.formLoading = true
           if (this.subjectIdList.length=1){
             this.form.subjectId= this.form.subjectId
           }
+
           examPaperApi.edit(this.form).then(re => {
             if (re.code === 1) {
               _this.$message.success(re.message)
diff --git a/vue.config.js b/vue.config.js
index 6d1c6dc..2284dab 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -19,7 +19,7 @@
     hotOnly: false,
     proxy: {
       '/api': {
-        target: 'http://192.168.3.220:8000',
+        target: 'http://192.168.3.228:8000',
         changeOrigin: true
       }
     }

--
Gitblit v1.8.0