修复ok 问题，，，课程名称下拉，，，，

backend/src/dashoo.cn/modi_webapi/app/api/class/class.go

@@ -51,7 +51,7 @@ func (c *Controller) GetAllClass(r *ghttp.Request) {
 			records.Current = page.Current
 			records.Total = count
 			records.Records = result
-			response.Json(r, 0, "ok", records)
+			response.Json(r, 0, "", records)
 		}
 	}
 }
@@ -83,7 +83,7 @@ func (c *Controller) AddClass(r *ghttp.Request) {
 		id, _ := result.LastInsertId()
 		Class.Id = int(id)
 		records.Records = Class
-		response.Json(r, 0, "ok", records)
+		response.Json(r, 0, "", records)
 	}
 }
 
@@ -99,7 +99,7 @@ func (c *Controller) GetOneClass(r *ghttp.Request) {
 	} else {
 		var records response.PagedRecords
 		records.Records = result
-		response.Json(r, 0, "ok", records)
+		response.Json(r, 0, "", records)
 	}
 
 }
@@ -133,7 +133,7 @@ func (c *Controller) UpdateClass(r *ghttp.Request) {
 	} else {
 		var records response.PagedRecords
 		records.Records = Class
-		response.Json(r, 0, "ok", records)
+		response.Json(r, 0, "", records)
 	}
 }
 

backend/src/dashoo.cn/modi_webapi/app/api/course/detail/detail.go

@@ -53,7 +53,7 @@ func (c CourseDetailController) GetPageList(r *ghttp.Request) {
 		records.Size = page.Size
 		records.Total = total
 		records.Records = detailList
-		response.Json(r, 0, "ok", records)
+		response.Json(r, 0, "", records)
 	}
 
 }
@@ -124,7 +124,7 @@ func (c CourseDetailController) GetDetailById(r *ghttp.Request) {
 	if detail, err := service.GetDetailById(Id); err != nil {
 		response.Json(r, 1, err.Error())
 	} else {
-		response.Json(r, 0, "ok", detail)
+		response.Json(r, 0, "", detail)
 	}
 }
 

backend/src/dashoo.cn/modi_webapi/app/api/demo/class.go

@@ -37,7 +37,7 @@ func (c *ClassController) GetList(r *ghttp.Request) {
 	if err != nil {
 		response.Json(r, 1, err.Error())
 	} else {
-		response.Json(r, 0, "ok", res)
+		response.Json(r, 0, "", res)
 	}
 }
 
@@ -60,6 +60,6 @@ func (c *ClassController) GetSubjectList(r *ghttp.Request) {
 	if err != nil {
 		response.Json(r, 1, err.Error())
 	} else {
-		response.Json(r, 0, "ok", res)
+		response.Json(r, 0, "", res)
 	}
 }

backend/src/dashoo.cn/modi_webapi/app/api/demo/student.go

@@ -31,7 +31,7 @@ func (c *StudentController) GetDetailById(r *ghttp.Request) {
 	if student, err := servcie.GetStudentByID(StId); err != nil {
 		response.Json(r, 1, err.Error())
 	} else {
-		response.Json(r, 0, "ok", student)
+		response.Json(r, 0, "", student)
 	}
 
 }
@@ -146,6 +146,6 @@ func (c *StudentController) GetPageList(r *ghttp.Request) {
 			records.Total = total
 			records.Records = studentList
 		}
-		response.Json(r, 0, "ok", records)
+		response.Json(r, 0, "", records)
 	}
 }

backend/src/dashoo.cn/modi_webapi/app/api/instrument/instrument.go

@@ -50,7 +50,7 @@ func (c *Controller) GetAllInstrument(r *ghttp.Request) {
 			records.Current = page.Current
 			records.Total = count
 			records.Records = result
-			response.Json(r, 0, "ok", records)
+			response.Json(r, 0, "", records)
 		}
 	}
 }

backend/src/dashoo.cn/modi_webapi/app/api/neo/neo.go

@@ -22,7 +22,7 @@ func (c *Controller) GetStById(r *ghttp.Request) {
 	if err := neo.GetStById(StId, &list); err != nil {
 		response.Json(r, 1, err.Error())
 	} else {
-		response.Json(r, 0, "ok", list)
+		response.Json(r, 0, "", list)
 	}
 
 }
@@ -49,10 +49,10 @@ func (c *Controller) SaveNeo(r *ghttp.Request) {
 		}
 	}
 
-	if err := r.GetToStruct(theNeo); err != nil {
+	if err := r.Parse(theNeo); err != nil {
 		response.Json(r, 1, err.Error())
 	} else {
-		response.Json(r, 0, "ok", theNeo)
+		response.Json(r, 0, "", theNeo)
 	}
 }
 
@@ -67,7 +67,7 @@ func (c *Controller) DeleteNeoById(r *ghttp.Request) {
 	if err := neo.DeleteNeo(where); err != nil {
 		response.Json(r, 1, err.Error())
 	} else {
-		response.Json(r, 0, "ok")
+		response.Json(r, 0, "")
 	}
 }
 
@@ -90,7 +90,7 @@ func (c *Controller) GetList(r *ghttp.Request) {
 		records.Size = page.Size
 		records.Total = total
 		records.Records = list
-		response.Json(r, 0, "ok", records)
+		response.Json(r, 0, "", records)
 	}
 }
 

backend/src/dashoo.cn/modi_webapi/app/api/system/item/item.go

@@ -41,7 +41,7 @@ func (c *ItemController) GetDetailById(r *ghttp.Request) {
 	} else {
 		commonmsg := rsp.CommonMsg
 		if commonmsg.Code == 0 {
-			response.Json(r, 0, "ok", rsp.Entity)
+			response.Json(r, 0, "", rsp.Entity)
 		} else {
 			response.Json(r, 1, commonmsg.Msg)
 		}

backend/src/dashoo.cn/modi_webapi/app/api/system/itemdetail/itemdetail.go

@@ -41,7 +41,7 @@ func (c *ItemDetailController) GetDetailById(r *ghttp.Request) {
 	} else {
 		commonmsg := rsp.CommonMsg
 		if commonmsg.Code == 0 {
-			response.Json(r, 0, "ok", rsp.Entity)
+			response.Json(r, 0, "", rsp.Entity)
 		} else {
 			response.Json(r, 1, commonmsg.Msg)
 		}
@@ -166,7 +166,7 @@ func (c *ItemDetailController) GetPageList(r *ghttp.Request) {
 		records.Size = page.Size
 		records.Total = int(rsp.RecordCount)
 		records.Records = rsp.List
-		response.Json(r, 0, "ok", records)
+		response.Json(r, 0, "", records)
 	}
 
 }

backend/src/dashoo.cn/modi_webapi/app/api/system/user/user.go

@@ -56,7 +56,7 @@ func SignIn(r *ghttp.Request) (string, string, interface{}) {
 		response.Json(r, 1, err.Error())
 		r.ExitAll()
 	}
-	//response.Json(r, 0, "ok")
+	//response.Json(r, 0, "")
 	return theUser.UserName, uuid, nil
 }
 
@@ -99,10 +99,10 @@ func (c *Controller) UpdateById(r *ghttp.Request) {
 	}
 
 	//theUser := new(user.BaseUser)
-	if err := r.GetToStruct(theUser); err != nil {
+	if err := r.Parse(theUser); err != nil {
 		response.Json(r, 1, err.Error())
 	} else {
-		response.Json(r, 0, "ok", theUser)
+		response.Json(r, 0, "", theUser)
 	}
 }
 

frontend_web/src/views/course/detail/editForm.vue

@@ -11,7 +11,16 @@
              size="small">
       <el-form-item prop="CourseName"
                     label="课程名">
-        <el-input v-model="formdata.CourseName"></el-input>
+         <el-select v-model="formdata.CourseName" filterable
+                   style="width: 100%">
+          <el-option v-for="item in CourseNameList"
+                     :key="item.ItemName"
+                     :label="item.ItemName"
+                     :value="item.ItemName">
+          </el-option>
+        </el-select>
+
+
       </el-form-item>
       <el-form-item label="授课教师"
                     prop="Teacher">
@@ -104,6 +113,7 @@ export default {
     ClassId: Number,
     RoomList: Array,
     TeacherList: Array,
+     CourseNameList:Array,
     DayOfWeekList: Array
   },
   data () {
@@ -113,6 +123,7 @@ export default {
       checkedTimes: [],
       Teachers: [],
       TimeList: [],
+      
       formdata: {
         Id: '',
         CourseId: '',
@@ -182,12 +193,16 @@ export default {
   },
   mounted () {
     this.getTimeList()
+    this.getCourseNameList()
   },
   methods: {
     dialogOpen () {
       this.$refs.form.resetFields()
       this.initData()
     },
+
+  
+
     initData () {
       let _this = this
       if (this.id > 0) {
@@ -225,6 +240,7 @@ export default {
         _this.formdata.WeekTitle = ''
         _this.formdata.DayOfWeek = ''
         _this.formdata.Time = []
+        _this.formdata.CourseName=[]
         _this.checkedTimes = [] // 多选选中项、
       }
     },

frontend_web/src/views/course/detail/index.vue

@@ -131,6 +131,7 @@
                :RoomList="RoomList"
                :TeacherList="TeacherList"
                :DayOfWeekList="DayOfWeekList"
+               :CourseNameList="CourseNameList"
                @submit="doRefresh" />
   </d2-container>
 </template>
@@ -156,6 +157,7 @@ export default {
       RoomList: [],
       TeacherList: [],
       DayOfWeekList: [],
+      CourseNameList:[],
       page: {
         current: 1,
         size: 10,
@@ -199,10 +201,21 @@ export default {
     }
     this.getTeacherList()
     this.getDayOfWeekList()
+    this.getCourseNameList()
     this.getRoomList(params)
     this.doRefresh()
   },
   methods: {
+         // 获取课程列表
+    getCourseNameList () {
+       itemDetailApi.getItemDetailByItemCode({ ItemCode: 'Course' })
+        .then(res => {
+          this.CourseNameList = res
+        })
+        .catch(err => {
+          console.error(err)
+        })
+    },
 
     // 获取教师列表
     getTeacherList (query) {
@@ -211,6 +224,7 @@ export default {
         _this.loading = true
         itemDetailApi.getItemDetailByItemCode({ ItemCode: 'Teacher' })
           .then(res => {
+            
             _this.loading = false
             this.TeacherList = res
           })
@@ -285,7 +299,7 @@ export default {
       }
       detailApi.getList(query)
         .then(res => {
-          _this.activities = res.records ? res.records : []
+          _this.activities = res.records ? res.records:[]
           _this.page.current = res.current
           _this.page.size = res.size
           _this.page.total = res.total