Browse Source

修改判断

lex-xin 4 years ago
parent
commit
69a24f5975
2 changed files with 10 additions and 10 deletions
  1. 6 6
      src/views/teamDetail/teamCourseList.vue
  2. 4 4
      vue.config.js

+ 6 - 6
src/views/teamDetail/teamCourseList.vue

@@ -22,17 +22,17 @@
       >
         <el-form-item>
           <el-input
-            v-model.trim="searchForm.search"
+          type="number"
+            v-model.trim="searchForm.courseIdSearch"
             clearable
-            placeholder="课程编号/课程名称"
+            placeholder="课程编号"
           />
         </el-form-item>
         <el-form-item>
           <el-input
-          type="number"
-            v-model.trim="searchForm.courseIdSearch"
+            v-model.trim="searchForm.search"
             clearable
-            placeholder="课程编号"
+            placeholder="课程编号/课程名称"
           />
         </el-form-item>
         <el-form-item>
@@ -526,7 +526,7 @@
           </div>
         </el-form-item>
         <el-form-item label="学员考勤" v-if="maskForm.status != 'NOT_START'">
-          <div class="inputStyle" :class="maskForm.isCallNames != 1 ? 'red' : null">{{ maskForm.isCallNames == 1 ? '正常' : '异常' }}</div>
+          <div class="inputStyle" :class="maskForm.errorAttendanceNum != 0 ? 'red' : null">{{ maskForm.errorAttendanceNum != 0 ? '异常' : '正常' }}</div>
         </el-form-item>
         <el-form-item label="老师考勤" v-if="maskForm.status != 'NOT_START'">
           <div class="inputStyle" :class="maskForm.signInStatusEnum == 1 && maskForm.signOutStatusEnum == 1? null : 'red'">{{ maskForm.signInStatusEnum == 1 && maskForm.signOutStatusEnum == 1 ? '正常' : '异常' }}</div>

+ 4 - 4
vue.config.js

@@ -20,8 +20,8 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'http://192.168.3.139:8000' // 箭河
 // let target = 'http://192.168.3.38:8000' //邹璇
 // let target = 'http://192.168.3.57:8000' //勇哥
-let target = 'http://dev.dayaedu.com' // 测试服
-// let target = 'https://test.dayaedu.com' //开发环境
+// let target = 'http://dev.dayaedu.com' // 测试服
+let target = 'https://test.dayaedu.com' //开发环境
 // let target = 'http://192.168.3.134' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
@@ -55,7 +55,7 @@ module.exports = {
     //   warnings: false,
     //   errors: true
     // },
-    https: false,
+    https: true,
     proxy: {
       // change xxx-api/login => mock/login
       // detail: https://cli.vuejs.org/config/#devserver-proxy
@@ -64,7 +64,7 @@ module.exports = {
       // http://192.168.3.134
       // http://47.114.176.40:8000
       '/api-auth': {
-        target: 'http://dev.dayaedu.com',
+        target: 'https://test.dayaedu.com',
         changeOrigin: true,
         pathRewrite: {
           '^api-auth': ''