From 5a9d0f40597936895fc605e6114423178040d977 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com>
Date: Thu, 29 Sep 2022 13:42:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=B1=BB=E5=9E=8B=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/index.js                            |  8 ++--
 .../safetyEducation/addCourse.vue             | 38 +++++++++----------
 .../safetyEducation/courseManage.vue          |  1 +
 3 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/src/store/index.js b/src/store/index.js
index f03d839a..ec69a772 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -45,8 +45,8 @@ export default new Vuex.Store({
     // UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试
     // FILEURL:'http://10.0.1.43:6023/image/',//测试
     BASEURL: baseUrl ? baseUrl : window.location.protocol + '//' + window.location.host + '/', //
-    UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', //
-    FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口
+    // UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', //
+    // FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口
     /* 2022-05-16 */
     // tag: 部署河南项目时，需要打开这两行代码
     // UPLOADURL: 'http://124.71.178.44:100/upload/image',
@@ -56,8 +56,8 @@ export default new Vuex.Store({
     // UPLOADURL: 'http://182.90.224.237:7000/upload/image',
     // FILEURL: 'http://182.90.224.237:7000/image/',
     // 邱平毅的
-    // UPLOADURL: 'http://192.168.34.216:6023/upload/image',
-    // FILEURL: 'http://192.168.34.216:6023/image/',
+    UPLOADURL: 'http://192.168.34.216:6023/upload/image',
+    FILEURL: 'http://192.168.34.216:6023/image/',
 
     // UPLOADURL:'http://'+"61.190.32.219:9050"+'/upload/image',//正式
     // FILEURL:'http://'+"61.190.32.219:9050"+'/image/',//正式
diff --git a/src/views/projectFront/safetyEducation/addCourse.vue b/src/views/projectFront/safetyEducation/addCourse.vue
index eda9c6cd..115de8d3 100644
--- a/src/views/projectFront/safetyEducation/addCourse.vue
+++ b/src/views/projectFront/safetyEducation/addCourse.vue
@@ -30,10 +30,10 @@
           </el-select>
         </el-form-item>
         <!-- 课程分类 -->
-        <el-form-item :label="$t('message.safetyEducation.courseClass')" prop="classifyId">
+        <el-form-item :label="$t('message.safetyEducation.courseClass')" prop="classifyName">
           <el-select :disabled="classifyId!=''"
             style="width: 100%"
-            v-model="ruleForm.classifyId"
+            v-model="ruleForm.classifyName"
             :placeholder="$t('message.safetyEducation.pleaseEnter')"
           >
             <el-option
@@ -331,7 +331,8 @@ export default {
         questionList: [],
         totalScore: "",
         videoType: 1,
-        classifyId:''
+        classifyId:'',
+        classifyName:""
       },
       indexList: [
         "A",
@@ -396,7 +397,7 @@ export default {
           // 请选择课程类型
           { required: true, message: this.$t('message.safetyEducation.rulesA2'), trigger: "change" },
         ],
-        classifyId:[
+        classifyName:[
           // 请选择课程分类
           { required: true, message: this.$t('message.safetyEducation.rulesA3'), trigger: "change" }
         ],
@@ -427,9 +428,10 @@ export default {
     };
   },
   mounted(){
-    
     // console.log(process.env.NODE_ENV)
     if(this.classifyId != ''){
+      this.ruleForm.classifyName= this.$route.query.name
+      console.log('=====',this.ruleForm.classifyName)
       this.ruleForm.classifyId=parseInt(this.classifyId)
     }
     this.styleType = this.$store.state.userInfo.styleType
@@ -457,14 +459,14 @@ export default {
   //     deep:true,
   //   }
   // },
-  watch:{
-    'radio1':{
-      handler(newVal,oldVal){
-        console.log(newVal,oldVal)
-      },
-      immediate:true,
-    }
-  },
+  // watch:{
+  //   'radio1':{
+  //     handler(newVal,oldVal){
+  //       console.log(newVal,oldVal)
+  //     },
+  //     immediate:true,
+  //   }
+  // },
   methods: {
     //生成二维码
     createQRcode(index){
@@ -511,6 +513,7 @@ export default {
     getDetailData(){
       safeEducationQuestionDetailApi({eduId:this.eduId}).then(res=>{
         this.ruleForm=res.result.safeEducation
+        this.ruleForm.classifyName = this.$route.query.name
       })
     },
     addOptions() {
@@ -525,7 +528,7 @@ export default {
     editBefore(data,index){
       this.qusTitle = "编辑试题"
       this.dialogVisible=true
-      console.log('编辑回显的信息',data)
+      // console.log('编辑回显的信息',data)
       this.$nextTick(()=>{
         this.addEditForm=JSON.parse(JSON.stringify(data))
         var optionList=data.optionList
@@ -696,13 +699,8 @@ export default {
     //获取课程分类
     getClassifyList() {
         educationClassifyListApi({sn: this.ruleForm.projectSn}).then(result => {
+          console.log('获取课程分类',result)
             this.classifyList = result.result;
-            // console.log('this.classifyList',this.classifyList)
-            // this.classifyList.find((item)=>{
-            //   if(this.classifyId == item.id){
-            //     this.ruleForm.classifyId = item.classifyName
-            //   }
-            // })
         })
     },
     handleSizeChange(value) {
diff --git a/src/views/projectFront/safetyEducation/courseManage.vue b/src/views/projectFront/safetyEducation/courseManage.vue
index da5c95f8..424f1820 100644
--- a/src/views/projectFront/safetyEducation/courseManage.vue
+++ b/src/views/projectFront/safetyEducation/courseManage.vue
@@ -239,6 +239,7 @@ export default {
     },
     editBefore(item) {
       this.itemId = item.id;
+      console.log('展示')
       this.pageType = "detail";
     },
     deleteBefore(item) {