Startseite Erkunden Hilfe
Anmelden
CocoRoboLabs
/
pbl-teacher-table
3
0
Fork 0
Dateien Issues 0 Pull-Requests 0 Wiki
Quellcode durchsuchen

update

lsc vor 1 Jahr
Ursprung
2d956a9389
Commit
389c1cfd76
23 geänderte Dateien mit 139 neuen und 20 gelöschten Zeilen
Geteilte Ansicht Diff-Statistik anzeigen
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.8ab6e42101205c72fd5a0c43a1999174.css
  3. 0 0
      dist/static/css/app.8ab6e42101205c72fd5a0c43a1999174.css.map
  4. BIN
      dist/static/img/bz_icon_data.1882026.png
  5. BIN
      dist/static/img/bz_icon_data_active.6254a5a.png
  6. BIN
      dist/static/img/hx_icon_data.be59b10.png
  7. BIN
      dist/static/img/hx_icon_data_active.3816a5e.png
  8. 0 0
      dist/static/js/app.4547dc6dbc2a01daa436.js
  9. 0 0
      dist/static/js/app.4547dc6dbc2a01daa436.js.map
  10. 0 0
      dist/static/js/manifest.3512a67a6213c2df4180.js.map
  11. 17 0
      src/assets/css/button.css
  12. BIN
      src/assets/icon/dataCheck/bz_icon_data.png
  13. BIN
      src/assets/icon/dataCheck/bz_icon_data_active.png
  14. BIN
      src/assets/icon/dataCheck/hx_icon_data.png
  15. BIN
      src/assets/icon/dataCheck/hx_icon_data_active.png
  16. 1 1
      src/components/pages/dataBoardNew/course/chartList/bar.vue
  17. 1 1
      src/components/pages/dataBoardNew/course/chartList/subjuect.vue
  18. 7 3
      src/components/pages/dataBoardNew/course/index.vue
  19. 1 1
      src/components/pages/dataBoardNew/project/chartList/subjuect.vue
  20. 7 3
      src/components/pages/dataBoardNew/project/index.vue
  21. 101 7
      src/components/pages/test/check/index.vue
  22. 0 1
      src/components/pages/test/index.vue
  23. 3 2
      src/components/pages/test/shareBox/index.vue

+ 1 - 1
dist/index.html
Datei anzeigen 

@@ -25,7 +25,7 @@
 
       height: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
-    }</style><link href=./static/css/app.77dce3e782e39be143af829a02623e36.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.920758910306febc0621.js></script><script type=text/javascript src=./static/js/app.1a6c612a258f36438d0b.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.8ab6e42101205c72fd5a0c43a1999174.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.920758910306febc0621.js></script><script type=text/javascript src=./static/js/app.4547dc6dbc2a01daa436.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/css/app.8ab6e42101205c72fd5a0c43a1999174.css


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/css/app.8ab6e42101205c72fd5a0c43a1999174.css.map


BIN
dist/static/img/bz_icon_data.1882026.png
Datei anzeigen


BIN
dist/static/img/bz_icon_data_active.6254a5a.png
Datei anzeigen


BIN
dist/static/img/hx_icon_data.be59b10.png
Datei anzeigen


BIN
dist/static/img/hx_icon_data_active.3816a5e.png
Datei anzeigen


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/js/app.4547dc6dbc2a01daa436.js


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/js/app.4547dc6dbc2a01daa436.js.map


Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 0
dist/static/js/manifest.3512a67a6213c2df4180.js.map


+ 17 - 0
src/assets/css/button.css
Datei anzeigen 

@@ -401,6 +401,15 @@
 
   background-image: url('../icon/dataCheck/djzz_icon_data.png');
 
 }
 
 
+.dataBoard_check_box>.hx_icon::before {
 
+  background-image: url('../icon/dataCheck/hx_icon_data.png');
 
+}
 
+
 
+.dataBoard_check_box>.bz_icon::before {
 
+  background-image: url('../icon/dataCheck/bz_icon_data.png');
 
+}
 
+
 
+
 
 
 .dataBoard_check_box>.active.rl_icon::before {
 
   background-image: url('../icon/dataCheck/rl_icon_data_active.png');
 
@@ -428,4 +437,12 @@
 
 
 .dataBoard_check_box>.active.djzz_icon::before {
 
   background-image: url('../icon/dataCheck/djzz_icon_data_active.png');
 
+}
 
+
 
+.dataBoard_check_box>.active.hx_icon::before {
 
+  background-image: url('../icon/dataCheck/hx_icon_data_active.png');
 
+}
 
+
 
+.dataBoard_check_box>.active.bz_icon::before {
 
+  background-image: url('../icon/dataCheck/bz_icon_data_active.png');
 
 }

BIN
src/assets/icon/dataCheck/bz_icon_data.png
Datei anzeigen


BIN
src/assets/icon/dataCheck/bz_icon_data_active.png
Datei anzeigen


BIN
src/assets/icon/dataCheck/hx_icon_data.png
Datei anzeigen


BIN
src/assets/icon/dataCheck/hx_icon_data_active.png
Datei anzeigen


+ 1 - 1
src/components/pages/dataBoardNew/course/chartList/bar.vue
Datei anzeigen 

@@ -26,7 +26,7 @@ export default {
 
       },
 
       option: {
 
         title: {
 
-          text: "授课时长",
 
+          // text: "授课时长",
 
           textStyle: {
 
             fontSize: 12,
 
           },

+ 1 - 1
src/components/pages/dataBoardNew/course/chartList/subjuect.vue
Datei anzeigen 

@@ -1,6 +1,6 @@
 
 <template>
 
   <div class="data_body">
 
-    <div style="width: 100%; height: 100%;align-items: center;justify-content: center;">
 
+    <div style="width: 100%; height: 100%;display:flex;align-items: center;justify-content: center;">
 
       <!-- <div id="cateRank" class="echart" style="width: 100%; height: 100%"></div> -->
 
       <highcharts :options="option" style="width: 100%; height: 95%;"></highcharts>
 
     </div>

+ 7 - 3
src/components/pages/dataBoardNew/course/index.vue
Datei anzeigen 

@@ -318,14 +318,18 @@
 
           <div class="title">课程协同情况</div>
 
         </div>
 
         <div class="dataBox">
 
-          <WorkTime style="height: calc(100% - 25px)" :personArray="personList" v-if="xtType"></WorkTime>
 
-          <Subjuect style="height: calc(100% - 25px)" v-if="!xtType" :resultSubject="resultSubject"></Subjuect>
 
-          <div class="otherCss">
 
+          <WorkTime style="height: calc(100% - 45px)" :personArray="personList" v-if="xtType"></WorkTime>
 
+          <Subjuect style="height: calc(100% - 45px)" v-if="!xtType" :resultSubject="resultSubject"></Subjuect>
 
+          <!-- <div class="otherCss">
 
             <div v-if="!xtType">转换为人员协同</div>
 
             <div v-if="xtType">转换为学科协同</div>
 
             <div class="otherImg" @click="xtEchart">
 
               <img src="../../../../assets/icon/other.png" alt="" />
 
             </div>
 
+          </div> -->
 
+          <div class="dataBoard_check_box">
 
+            <div class="icon hx_icon" :class="{ active: !xtType }" @click="xtType = false"><span>和弦图</span></div>
 
+            <div class="icon bz_icon" :class="{ active: xtType }" @click="xtType = true"><span>饼状图</span></div>
 
           </div>
 
         </div>
 
       </div>

+ 1 - 1
src/components/pages/dataBoardNew/project/chartList/subjuect.vue
Datei anzeigen 

@@ -1,6 +1,6 @@
 
 <template>
 
   <div class="data_body">
 
-    <div style="width: 100%; height: 100%;align-items: center;justify-content: center;">
 
+    <div style="width: 100%; height: 100%;display:flex;align-items: center;justify-content: center;">
 
       <!-- <div id="cateRank" class="echart" style="width: 100%; height: 100%"></div> -->
 
       <highcharts :options="option" style="width: 100%; height: 95%;"></highcharts>
 
     </div>

+ 7 - 3
src/components/pages/dataBoardNew/project/index.vue
Datei anzeigen 

@@ -253,16 +253,20 @@
 
           <div class="title">项目学科分布</div>
 
         </div>
 
         <div class="dataBox">
 
-          <subjuect style="height: calc(100% - 30px)" v-if="!xtType" 
+          <subjuect style="height: calc(100% - 45px)" v-if="!xtType" 
           :resultSubject="resultSubject"
 
           ></subjuect>
 
-          <WorkTime style="height: calc(100% - 30px)" v-if="xtType" :personArray="personList"></WorkTime>
 
-          <div class="otherCss">
 
+          <WorkTime style="height: calc(100% - 45px)" v-if="xtType" :personArray="personList"></WorkTime>
 
+          <!-- <div class="otherCss">
 
             <div v-if="!xtType">转换为人员协同</div>
 
             <div v-if="xtType">转换为学科协同</div>
 
             <div class="otherImg" @click="xtEchart">
 
               <img src="../../../../assets/icon/other.png" alt="" />
 
             </div>
 
+          </div> -->
 
+          <div class="dataBoard_check_box">
 
+            <div class="icon hx_icon" :class="{ active: !xtType }" @click="xtType = false"><span>和弦图</span></div>
 
+            <div class="icon bz_icon" :class="{ active: xtType }" @click="xtType = true"><span>饼状图</span></div>
 
           </div>
 
         </div>
 
       </div>

+ 101 - 7
src/components/pages/test/check/index.vue
Datei anzeigen 

@@ -65,9 +65,10 @@
 
             <div class="right">
 
               <span :class="{ active: stype == 1 }" @click="checkDataType(1)">按题目查看</span>
 
               <span :class="{ active: stype == 2 }" @click="checkDataType(2)">按人员查看</span>
 
+              <span :class="{ active: stype == 3 }" @click="checkDataType(3)">按数量查看</span>
 
             </div>
 
             <div class="left">
 
-              <div style="margin-right: 10px;position: relative;" v-if="stype == 2">
 
+              <div style="margin-right: 10px;position: relative;" v-if="stype == 2 || stype == 3">
 
                 <el-input v-model="courseName" class="student_input" placeholder="请输入需要搜索的姓名"></el-input>
 
                 <span class="serach_icon" @click="searchCourse"></span>
 
               </div>
 
@@ -205,6 +206,67 @@
 
               </el-table-column>
 
             </el-table>
 
           </div>
 
+          <div class="table_content" v-if="stype == 3">
 
+            <div class="student_table">
 
+              <el-table
 
+                ref="table"
 
+                :data="tableData"
 
+                border
 
+                :height="tableHeight"
 
+                :fit="true"
 
+                v-loading="isLoading"
 
+                style="width: 100%"
 
+                :header-cell-style="{ background: '#f1f1f1', fontSize: '17px' }"
 
+                :row-class-name="tableRowClassName"
 
+              >
 
+                <el-table-column
 
+                  prop="username"
 
+                  label="提交人"
 
+                  min-width="15"
 
+                  align="center"
 
+                >
 
+                </el-table-column>
 
+                <el-table-column
 
+                  prop="time"
 
+                  label="提交时间"
 
+                  min-width="15"
 
+                  align="center"
 
+                >
 
+                </el-table-column>
 
+                <el-table-column
 
+                  prop="time"
 
+                  label="是否批改"
 
+                  min-width="15"
 
+                  align="center"
 
+                >
 
+                  <template slot-scope="scope">
 
+                    <div>{{ scope.row.type == 3 ? '是' : '否' }}</div>
 
+                  </template>
 
+                </el-table-column>
 
+                <el-table-column label="操作" width="200px">
 
+                  <template slot-scope="scope">
 
+                    <el-button
 
+                      @click="getTest(scope.row)"
 
+                      type="primary"
 
+                      size="small"
 
+                      >查看</el-button
 
+                    >
 
+                  <el-button @click="deleteTest(scope.row.id)" type="primary" size="small">删除</el-button>
 
+                  </template>
 
+                </el-table-column>
 
+              </el-table>
 
+            </div>
 
+            <div class="student_page">
 
+              <el-pagination
 
+                background
 
+                layout="prev, pager, next"
 
+                :page-size="pageSize"
 
+                :total="total"
 
+                @current-change="handleCurrentChange"
 
+              >
 
+              </el-pagination>
 
+            </div>
 
+          </div>
 
         </div>
 
       </div>
 
     </div>
 
@@ -356,7 +418,7 @@ export default {
 
       if (this.stype == 1) {
 
         return
 
       }
 
-      this.tableHeight = this.$refs.stepBox.offsetHeight - 100;
 
+      this.tableHeight = this.$refs.stepBox.offsetHeight - 120;
 
       if (this.tableHeight <= 530) {
 
         this.tableHeight = 530;
 
       }
 
@@ -366,7 +428,7 @@ export default {
 
         if (self.stype == 1) {
 
           return
 
         }
 
-        self.tableHeight = this.$refs.stepBox.offsetHeight - 100;
 
+        self.tableHeight = this.$refs.stepBox.offsetHeight - 120;
 
         if (self.tableHeight <= 530) {
 
           self.tableHeight = 530;
 
         }
 
@@ -375,7 +437,7 @@ export default {
 
     },
 
     handleCurrentChange(val) {
 
       this.page = val;
 
-      this.getData();
 
+      this.getData2();
 
     },
 
     getTest(row) {
 
       this.$router.push(
 
@@ -400,12 +462,20 @@ export default {
 
       if (this.stype != type) {
 
         this.stype = type
 
         this.courseName = ''
 
-        this.getData();
 
+        if(type == 3){
 
+          this.getData2();
 
+        }else{
 
+          this.getData();
 
+        }
 
         this.changeHeight();
 
       }
 
     },
 
     searchCourse() {
 
-      this.getData()
 
+      if(this.stype == 3){
 
+        this.getData2()
 
+      }else{
 
+        this.getData()
 
+      }
 
     },
 
     getData() {
 
       this.isLoading = true;
 
@@ -507,6 +577,25 @@ export default {
 
           console.error(err);
 
         });
 
     },
 
+    getData2() {
 
+      this.isLoading = true;
 
+      let params = {
 
+        cid: this.cid,
 
+        page: this.page,
 
+        pageSize: this.pageSize,
 
+        cn: this.courseName
 
+      };
 
+      this.ajax
 
+        .get(this.$store.state.api + "getTestWorksPage3", params)
 
+        .then((res) => {
 
+          this.isLoading = false;
 
+          this.total = res.data[0].length > 0 ? res.data[0][0].num : 0;
 
+          this.tableData = res.data[0];
 
+        })
 
+        .catch((err) => {
 
+          console.error(err);
 
+        });
 
+    },
 
     setJSON(json) {
 
       return json.filter((item) => {
 
         if (item.array) {
 
@@ -690,7 +779,11 @@ export default {
 
             .post(_this.$store.state.api + "deleteTestCourseWorks", params)
 
             .then((res) => {
 
               _this.$message.success("删除成功");
 
-              _this.getData();
 
+              if(_this.stype == 3){
 
+                _this.getData2();
 
+              }else{
 
+                _this.getData();
 
+              }
 
             })
 
             .catch((err) => {
 
               console.error(err);
 
@@ -882,6 +975,7 @@ export default {
 
   padding: 0 15px 10px;
 
   display: flex;
 
   align-items: flex-end;
 
+  height: 50px;
 
 }
 
 
 .search_nav>.right {

+ 0 - 1
src/components/pages/test/index.vue
Datei anzeigen 

@@ -1776,7 +1776,6 @@ export default {
 
 
 .more {
 
     position: relative;
 
-
 
 }
 
 
 .more:hover div {

+ 3 - 2
src/components/pages/test/shareBox/index.vue
Datei anzeigen 

@@ -25,8 +25,8 @@
 
                 </div>
 
                 <div class="info" v-if="pname.length">
 
                     <span>未完成名单：</span>
 
-                    <span>{{ pname.length > 10 ? isSuo ? pname.slice(0,10).join(',')+'...' : pname.join(',') : pname.join(',') }}</span>
 
-                    <span class="more" v-if="pname.length > 10" @click="isSuo = !isSuo">{{ isSuo ? '查看更多' : '收起'}}</span>
 
+                    <span>{{ pname.length > 20 ? isSuo ? pname.slice(0,20).join(',')+'...' : pname.join(',') : pname.join(',') }}</span>
 
+                    <span class="more" v-if="pname.length > 20" @click="isSuo = !isSuo">{{ isSuo ? '查看更多' : '收起'}}</span>
 
                 </div>
 
             </div>
 
             <div class="url_box">
 
@@ -335,6 +335,7 @@ export default {
 
 
 .more{
 
     cursor: pointer;
 
+    color: #0061ff;
 
 }
 
 </style>

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.