细节修改

src/views/student/area_breed/index.vue

@@ -22,7 +22,7 @@
               </el-table-column>
               <el-table-column prop="name" label="烟草产地">
                 <template slot-scope="scope">
-                  <div v-for="(item, index) in scope.row.tobacco_breed_place" :key="index">
+                  <div v-for="(item, index) in scope.row.tobacco_breed_place" :key="index">{{ item.area }}.
                     {{ item.place_of_production }};
                   </div>
                 </template>

src/views/student/examination_questions/components/TableMoudel.vue

@@ -98,7 +98,7 @@
         <td>得分</td>
         <td style="width: 150px;">
           <div class="select_container">
-            <el-input placeholder="请输入得分" v-model="table_info.fraction" type="number" :min="3"
+            <el-input placeholder="请输入得分" v-model="table_info.fraction" type="number" :min="1"
               :disabled="table_info.examination_question_detail_id != null && table_info.examination_question_detail_id != ''">
             </el-input>
           </div>

src/views/student/examination_questions/detail/index.vue

@@ -54,14 +54,13 @@
     <el-dialog :title="is_updata_type == 'add' ? '新增' : '修改'" :visible.sync="is_dialogVisible" width="60%"
       :before-close="handleClose">
       <div>
-        <table-moudel v-if="is_dialogVisible && Object.keys(province_data).length == 3" ref="detail_info"
-          :table_data="detailed_information" :position_datas="position_data" :province_datas="province_data"
-          :tobacco_all_lists="tobacco_all_lists" :tobacco_grades_all_lists="tobacco_grades_all_lists"
-          :is_updata_type="is_updata_type"
-          :examination_questions_all_lists="examination_questions_all_list"></table-moudel>
+        <table-moudel v-if="is_dialogVisible && province_data != {}" ref="detail_info" :table_data="detailed_information"
+          :position_datas="position_data" :province_datas="province_data" :tobacco_all_lists="tobacco_all_lists"
+          :tobacco_grades_all_lists="tobacco_grades_all_lists" :is_updata_type="is_updata_type"
+          :examination_questions_all_lists="examination_questions_all_list" :key="new Date().getTime()"></table-moudel>
         <div v-else style="text-align: center;">
           <p><i class="el-icon-loading"></i></p>
-          <p>加载中...</p>
+          <p>加载中...,请关闭弹框重新打开</p>
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -93,12 +92,12 @@ import { get_examination_questions_detail, get_province_list, get_tobacco_all_in
 import { exportText } from '@/utils/tool';
 const standard_template = {
   area: "南方",
-  fraction: 3,
+  fraction: 1,
   province_id: "70000",
   breed_name: "中烟100",
   grades_code: "C2F",
-  explain_in_detail: "fasfas",
-  image: "/",
+  explain_in_detail: "",
+  image: "",
   examination_questions_id: null,
   examination_question_detail_id: null,//关联试题id
 }
@@ -307,13 +306,14 @@ export default {
       }
       /* { name_is_value: true } 获取汉字值的列表 */
       get_province_list({ area: val }).then(res => {
-        if (res.length) {
-          // this.province_list = removeNodeInTree(res);
-          this.province_data[val] = removeNodeInTree(res);
-        } else {
-          // this.province_list = [];
-          this.province_data[val] = [];
-        }
+        this.province_data[val] = removeNodeInTree(res);
+        // if (res.length) {
+        //   // this.province_list = removeNodeInTree(res);
+
+        // } else {
+        //   // this.province_list = [];
+        //   this.province_data[val] = [];
+        // }
       })
     },
     //获取全部烟草等级
@@ -332,16 +332,29 @@ export default {
 
     //新增信息
     addInformation() {
-      this.is_updata_type = 'add';
-      this.detailed_information = { ...standard_template };
-      this.detailed_information['question_no'] = this.table_list.length + 1;
-      //获取当前试题配置图片
-      get_image_path(this.examination_questions_id).then(res => {
-        if (res.code == 200) {
-          this.detailed_information['image'] = res.message || '/';
-          this.is_dialogVisible = true;
-        }
-      })
+      console.log('省市区数据');
+      console.log(this.province_data);
+      if (Object.keys(this.province_data).length == 3) {
+        this.is_updata_type = 'add';
+        this.detailed_information = { ...standard_template };
+        this.detailed_information['question_no'] = this.table_list.length + 1;
+        //获取当前试题配置图片
+        get_image_path(this.examination_questions_id).then(res => {
+          if (res.code == 200) {
+            this.detailed_information['image'] = res.message || '/';
+            this.is_dialogVisible = true;
+          }
+        })
+      } else {
+        const h = this.$createElement;
+        this.$notify({
+          title: '提示',
+          // message: h('i', { style: 'color: teal' }, '这是提示文案这是提示文案这是提示文案这是提示文案这是提示文案这是提示文案这是提示文案这是提示文案'),
+          message: '数据加载中，请稍后',
+          duration: 1000,
+        });
+      }
+
     },
     //修改信息
     updateInformation(index, item) {
@@ -350,18 +363,27 @@ export default {
       console.log('item单条信息');
       console.log(item);
       //获取详情
-      let { id, area, fraction, province_id, breed_name, grades_code, explain_in_detail, image, examination_questions_id, examination_question_detail_id } = { ...item };
-      this.detailed_information = { id, area, fraction, province_id, breed_name, grades_code, explain_in_detail, image };
-      /* examination_questions_id, examination_question_detail_id  */
-      if (item.quote) {
-        this.detailed_information['examination_questions_id'] = item.quote.examination_questions_id;
-        this.detailed_information['examination_question_detail_id'] = item.quote.id;
+      if (Object.keys(this.province_data).length == 3) {
+        let { id, area, fraction, province_id, breed_name, grades_code, explain_in_detail, image, examination_questions_id, examination_question_detail_id } = { ...item };
+        this.detailed_information = { id, area, fraction, province_id, breed_name, grades_code, explain_in_detail, image };
+        if (item.quote) {
+          this.detailed_information['examination_questions_id'] = item.quote.examination_questions_id;
+          this.detailed_information['examination_question_detail_id'] = item.quote.id;
+        } else {
+          this.detailed_information['examination_questions_id'] = null;
+          this.detailed_information['examination_question_detail_id'] = null;
+        }
+        this.detailed_information['question_no'] = index + 1;
+        this.is_dialogVisible = true;
       } else {
-        this.detailed_information['examination_questions_id'] = null;
-        this.detailed_information['examination_question_detail_id'] = null;
+        const h = this.$createElement;
+        this.$notify({
+          title: '提示',
+          // message: h('i', { style: 'color: teal' }, '这是提示文案这是提示文案这是提示文案这是提示文案这是提示文案这是提示文案这是提示文案这是提示文案'),
+          message: '数据加载中，请稍后',
+          duration: 1000,
+        });
       }
-      this.detailed_information['question_no'] = index + 1;
-      this.is_dialogVisible = true;
     },
     //删除
     deleteInformation(item) {

src/views/student/examination_questions/list/index.vue

@@ -56,7 +56,7 @@
               <!-- <el-button v-if="scope.row.status == '1'" size="mini" type="text" style="color: #000;"
                   @click="examinationQuestionsPublish(scope.row)" title="试题发布">发布</el-button>
                 <el-button v-if="scope.row.status != '6'" size="mini" type="text" style="color: #F56C6C;"
-                                                                                                        @click="deleteInformation(scope.row)">停用</el-button> -->
+                                                                                                          @click="deleteInformation(scope.row)">停用</el-button> -->
 
                 <el-popover placement="right" width="160">
                   <div>
@@ -198,14 +198,14 @@ import TableHead from '@/components/TableHead/index';
 import { get_examination_questions_list, add_examination_questions, updata_examination_questions, create_answer_card, examination_questions_copy, examination_questions_publish, delete_examination_questions, get_examination_questions_all, get_student_all, examination_reservation, examination_batch_reservation, updata_examination_questions_status } from '@/api/student';
 import { exportText } from '@/utils/tool';
 const standard_template = {
-  title: "河南把烟测试2",
+  title: "",
   type: "把烟",
-  opening_tip: " 1.考生按照省级承办机构公布的报名流程进行网。",
+  opening_tip: " ",
   begin_date: "",
   end_date: "",
-  duration: "240",
+  duration: "60",
   examiners_max: 100,
-  remarks: "a"
+  remarks: ""
 }
 export default {
   data() {

src/views/student/personnel/index.vue

@@ -107,8 +107,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="工作信息">
-                <el-input v-model="detailed_information.work_info" placeholder="工作信息" type="textarea" :rows="2"
+              <el-form-item label="工作单位">
+                <el-input v-model="detailed_information.work_info" placeholder="工作单位"
                   :disabled="is_updata_type == 'view'"></el-input>
               </el-form-item>
             </el-col>

src/views/student/test_results/detail/index.vue

@@ -9,7 +9,7 @@
       <el-card class="box-card" v-if="questions_list.length > 0">
         <answer-card :questions_lists="questions_list" :test_results_lists="test_results_list"></answer-card>
       </el-card>
-      <el-card class="box-card">
+      <el-card class="box-card" v-if="false">
         <div>
           <div class="line_header">易错、对等级分析</div>
           <el-row>