瀏覽代碼

Merge branch 'online' into Nov16thResetMusic

mo 4 年之前
父節點
當前提交
44f18746af

文件差異過大導致無法顯示
+ 0 - 0
dist/index.html


+ 0 - 1
dist/static/css/chunk-a45dae1e.5b7311b8.css

@@ -1 +0,0 @@
-.table[data-v-127fcaf2]{margin-top:20px}.table[data-v-127fcaf2] .el-table__header .has-gutter tr th{background-color:#edeef0;color:#444}

+ 1 - 1
dist/static/css/chunk-22acce82.780e5ac8.css → dist/static/css/chunk-e142c7fc.301aa819.css

@@ -1 +1 @@
-.schoolCell[data-v-6260081a]{width:400px;color:#333;background-color:#f5f7fa;border-color:#e4e7ed;height:40px;line-height:40px;outline:0;padding:0 15px;border-radius:4px;border:1px solid #dcdfe6;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}[data-v-6260081a] .el-textarea.is-disabled .el-textarea__inner{color:#333}.schoolCell[data-v-4d0e6264]{width:400px;color:#333;background-color:#f5f7fa;border-color:#e4e7ed;height:40px;line-height:40px;outline:0;padding:0 15px;border-radius:4px;border:1px solid #dcdfe6;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}[data-v-4d0e6264] .el-textarea.is-disabled .el-textarea__inner{color:#333}
+.schoolCell[data-v-0e3cc291]{width:400px;color:#333;background-color:#f5f7fa;border-color:#e4e7ed;height:40px;line-height:40px;outline:0;padding:0 15px;border-radius:4px;border:1px solid #dcdfe6;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}[data-v-0e3cc291] .el-textarea.is-disabled .el-textarea__inner{color:#333}.schoolCell[data-v-4d0e6264]{width:400px;color:#333;background-color:#f5f7fa;border-color:#e4e7ed;height:40px;line-height:40px;outline:0;padding:0 15px;border-radius:4px;border:1px solid #dcdfe6;display:inline-block;-webkit-box-sizing:border-box;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}[data-v-4d0e6264] .el-textarea.is-disabled .el-textarea__inner{color:#333}

+ 1 - 0
dist/static/css/chunk-fb916698.04e7de78.css

@@ -0,0 +1 @@
+.table[data-v-7ba4cfc4]{margin-top:20px}.table[data-v-7ba4cfc4] .el-table__header .has-gutter tr th{background-color:#edeef0;color:#444}

文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/app.3531fa5b.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/app.cd87d5d3.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-1341b691.4769ceca.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-22acce82.b096858a.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-a45dae1e.6e5e6a9b.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-ddcb6bce.f76cb9d3.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-e142c7fc.b67a58b9.js


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/chunk-fb916698.91f3c3f6.js


+ 29 - 10
src/views/stuRecodeManager/index.vue

@@ -83,7 +83,10 @@
             <template slot-scope="scope">
             <template slot-scope="scope">
               <div>
               <div>
                 {{ scope.row.username }}
                 {{ scope.row.username }}
-                <p  style="color: #f56c6c">({{ scope.row.userId }})</p >
+                <p style="color: #f56c6c">
+                  (<copy-text>{{ scope.row.userId }}</copy-text
+                  >)
+                </p>
               </div>
               </div>
             </template>
             </template>
           </el-table-column>
           </el-table-column>
@@ -93,20 +96,36 @@
             label="老师姓名"
             label="老师姓名"
           >
           >
             <template slot-scope="scope">
             <template slot-scope="scope">
-                  {{ scope.row.courseSchedule.teacherName }}
-                <p style="color: #f56c6c">({{ scope.row.teacherId }})</p>
+              {{ scope.row.courseSchedule.teacherName }}
+              <p style="color: #f56c6c">
+                (<copy-text>{{ scope.row.teacherId }}</copy-text
+                >)
+              </p>
             </template>
             </template>
           </el-table-column>
           </el-table-column>
           <el-table-column
           <el-table-column
             align="center"
             align="center"
-            prop="courseScheduleId"
-            label="课程编号"
-          ></el-table-column>
-          <el-table-column
-            align="center"
             prop="musicGroupId"
             prop="musicGroupId"
             label="乐团编号"
             label="乐团编号"
-          ></el-table-column>
+          >
+          <template slot-scope="scope">
+            <div>
+              <copy-text>{{ scope.row.musicGroupId }}</copy-text>
+            </div>
+          </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="courseScheduleId"
+            label="课程编号"
+          >
+              <template slot-scope="scope">
+            <div>
+              <copy-text>{{ scope.row.courseScheduleId }}</copy-text>
+            </div>
+          </template>
+          </el-table-column>
+
           <el-table-column
           <el-table-column
             align="center"
             align="center"
             prop="courseSchedule.name"
             prop="courseSchedule.name"
@@ -220,7 +239,7 @@ export default {
   data() {
   data() {
     return {
     return {
       searchForm: {
       searchForm: {
-        studentID: '',
+        studentID: "",
         groupType: "MUSIC",
         groupType: "MUSIC",
         musicGroupId: "",
         musicGroupId: "",
         courseScheduleId: "",
         courseScheduleId: "",

+ 2 - 2
vue.config.js

@@ -20,8 +20,8 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'http://dyme.utools.club' //test环境
 // let target = 'http://dyme.utools.club' //test环境
 // let target = 'http://192.168.3.139:8000' // 箭河
 // let target = 'http://192.168.3.139:8000' // 箭河
 // let target = 'http://192.168.3.38: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 = 'http://192.168.3.57:8000' //勇哥
+let target = 'http://dev.dayaedu.com' // 测试服
 // let target = 'http://192.168.3.196' // 乔
 // let target = 'http://192.168.3.196' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
 module.exports = {

部分文件因文件數量過多而無法顯示