Merge branch '05/08serverDetail' into test

src/views/serverDetail/index.vue

@@ -84,6 +84,46 @@
             ></el-option>
           </el-select>
         </el-form-item>
+         <el-form-item >
+          <el-select
+            placeholder="实际安排"
+            v-model="searchForm.actualExercisesNumIsAchieve"
+            clearable
+          >
+            <el-option label="符合预期" value="1"></el-option>
+            <el-option label="不符合预期" value="0"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-select
+            placeholder="提交次数"
+            v-model="searchForm.exercisesReplyNumIsAchieve"
+            clearable
+          >
+            <el-option label="符合预期" value="1"></el-option>
+            <el-option label="不符合预期" value="0"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item >
+          <el-select
+            placeholder="评价次数"
+            v-model="searchForm.exercisesMessageNumIsAchieve"
+            clearable
+          >
+            <el-option label="符合预期" value="1"></el-option>
+            <el-option label="不符合预期" value="0"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item >
+          <el-select
+            placeholder="及时评价"
+            v-model="searchForm.exercisesMessageTimelyNumIsAchieve"
+            clearable
+          >
+            <el-option label="符合预期" value="1"></el-option>
+            <el-option label="不符合预期" value="0"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-date-picker
             style="width: 410px"
@@ -153,6 +193,49 @@
             </div>
           </template>
           </el-table-column>
+           <el-table-column align="center" label="预期安排">
+            <template slot-scope="scope">
+              <div>{{ scope.row.expectExercisesNum + "次" }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" width="120" prop>
+            <template slot="header" slot-scope="scope">
+              <p style="position: relative">
+                实际安排
+                <el-tooltip placement="top" popper-class="mTooltip">
+                  <div slot="content">
+                    以周为单位，每周服务指标指定的课程布置作业记一次实际安排
+                  </div>
+                  <!-- <img :src="imageIcon"
+                       class="micon el-tooltip"
+                       style="width:8px height:8px"
+                       alt /> -->
+                  <i
+                    class="el-icon-question"
+                    style="font-size: 18px; color: #f56c6c"
+                  ></i>
+                </el-tooltip>
+              </p>
+            </template>
+            <template slot-scope="scope">
+              <div>{{ scope.row.actualExercisesNum + "次" }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop label="提交次数">
+            <template slot-scope="scope">
+              <div>{{ scope.row.exercisesReplyNum + "次" }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop label="评价次数">
+            <template slot-scope="scope">
+              <div>{{ scope.row.exercisesMessageNum + "次" }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop label="及时评价次数">
+            <template slot-scope="scope">
+              <div>{{ scope.row.exercisesMessageTimelyNum + "次" }}</div>
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             prop="homeworkNum"
@@ -255,7 +338,11 @@ export default {
         reminded: "",
         unDone: "",
         operatorId: "",
-        jobNature:""
+        jobNature:"",
+         actualExercisesNumIsAchieve: null, // 训练次数
+        exercisesMessageNumIsAchieve: null, //评价
+        exercisesMessageTimelyNumIsAchieve: null, //及时评价
+        exercisesReplyNumIsAchieve: null, // 提交次数
       },
       orderDate: [],
       tableList: [],

src/views/stuRecodeManager/index.vue

@@ -1,9 +1,9 @@
-<!--  -->
+<!-- <filter-search @reload="reloadSearch" searchKey="ids" />  -->
 <template>
   <div class="m-container">
     <h2>
       <div class="squrt"></div>
-      学生考勤列表 <filter-search @reload="reloadSearch" searchKey="ids" />
+      学生考勤列表
     </h2>
     <div class="m-core">
       <save-form

src/views/vipClass/vipDetail/components/vipBaseInfo.vue

@@ -274,6 +274,7 @@ export default {
     color: #333;
     padding: 0 15px;
     width: 180px;
+    height: 40px;
   }
 }
 </style>

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.148: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 = {