Home Explore Help
Sign In
CocoRoboLabs
/
pbl-teacher-table
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

gx

SanHQin 1 week ago
parent
e91482f72d
commit
1a2669e296
8 changed files with 56 additions and 6 deletions
Split View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.a266439dc2e6b650a711633aaae23d3c.css
  3. 0 0
      dist/static/css/app.a266439dc2e6b650a711633aaae23d3c.css.map
  4. 0 0
      dist/static/js/app.dde2d87b73ef53e1ff6f.js
  5. 0 0
      dist/static/js/app.dde2d87b73ef53e1ff6f.js.map
  6. 0 0
      dist/static/js/manifest.161e82026ac2ae03ab6f.js.map
  7. 36 0
      src/components/pages/test/examine/conpoments/targetPage.vue
  8. 19 5
      src/components/pages/workPage/index.vue

+ 1 - 1
dist/index.html
View File 

@@ -32,7 +32,7 @@
 
       width: 100%;
 
       background: #e6eaf0;
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.44bfb834df8da1905f34564a0dc2601d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.161e82026ac2ae03ab6f.js></script><script type=text/javascript src=./static/js/vendor.b7212920b6e58d14a873.js></script><script type=text/javascript src=./static/js/app.786b7e910afc23ee0faf.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.a266439dc2e6b650a711633aaae23d3c.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.161e82026ac2ae03ab6f.js></script><script type=text/javascript src=./static/js/vendor.b7212920b6e58d14a873.js></script><script type=text/javascript src=./static/js/app.dde2d87b73ef53e1ff6f.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.a266439dc2e6b650a711633aaae23d3c.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.a266439dc2e6b650a711633aaae23d3c.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.dde2d87b73ef53e1ff6f.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.dde2d87b73ef53e1ff6f.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.161e82026ac2ae03ab6f.js.map


+ 36 - 0
src/components/pages/test/examine/conpoments/targetPage.vue
View File 

@@ -226,6 +226,19 @@
 
               </div>
 
             </template>
 
           </el-table-column>
 
+          <!-- <el-table-column
 
+            :show-overflow-tooltip="true"
 
+            align="center"
 
+            label="状态"
 
+          >
 
+            <template slot-scope="scope">
 
+             <div v-if="scope.row.numCount" class="taskArea">
 
+              <div v-if="scope.row.numCount == scope.row.isReviewCount" class="isComputedTask">已完成</div>
 
+              <div v-if="scope.row.numCount != scope.row.isReviewCount" class="waitComputedTask">代办</div>
 
+             </div>
 
+             <span v-else>/</span>
 
+            </template>
 
+          </el-table-column> -->
 
           <el-table-column
 
             :sortable="true"
 
             :sort-method="sortCogMethod"
 
@@ -1657,6 +1670,8 @@ export default {
 
       for (const e of this.tableData) {
 
         if (e.orgData.length > 0) {
 
           e.orgData = await this.computedScoTest(e.orgData, e.userid);
 
+          e.isReviewCount = e.orgData.reduce((sum, i) => sum + (i.isReviewNum || 0), 0)
 
+          e.numCount = e.orgData.reduce((sum, i) => sum + (i.num || 0), 0)
 
         }
 
       }
 
     },
 
@@ -2181,4 +2196,25 @@ input[type="number"] {
 
   -webkit-appearance: none;
 
   margin: 0;
 
 }
 
+
 
+.taskArea{
 
+  display: flex;
 
+  justify-content: center;
 
+}
 
+
 
+.waitComputedTask{
 
+  padding: 10px 20px;
 
+  background: #FEF5EC;
 
+  border: solid 1px #FAD0A1;
 
+  color: #F7933B;
 
+  border-radius: 4px;
 
+}
 
+
 
+.isComputedTask{
 
+  padding: 10px 20px;
 
+  background: #E6F9EA;
 
+  border: solid 1px #A6E9B6;
 
+  color: #21ba45;
 
+  border-radius: 4px;
 
+}
 
 </style>

+ 19 - 5
src/components/pages/workPage/index.vue
View File 

@@ -100,9 +100,8 @@
 
             />
 
           </svg>
 
 
-          <span style="display: flex;align-items: center;"
 
-            >{{ item.type == 1 ? "单选题：" : "多选题："
 
-            }}<span v-html="renderedFormula(item.teststitle)"></span>
 
+          <span
 
+            ><span v-html="renderedFormula(`<span style='color: #3681FC;''>${item.type == 1 ? '(单选题)：' : '(多选题)：'}</span>${item.teststitle}`)"></span>
 
           </span>
 
         </div>
 
         <div
 
@@ -722,24 +721,39 @@ export default {
 
 
 .s_b_m_ti_title {
 
   display: flex;
 
-  align-items: center;
 
+  align-items: flex-start;
 
 }
 
 
 .s_b_m_ti_title > span:nth-of-type(1) {
 
   font-size: 30px;
 
   font-weight: bold;
 
   color: #3681fc;
 
+  min-height: 30px;
 
+  display: flex;
 
+  align-items: center;
 
+  justify-content: center;
 
+  margin-top: -3px;
 
 }
 
 
 .s_b_m_ti_title > svg {
 
   width: 30px;
 
   height: 30px;
 
-  margin: 0 20px 0 5px;
 
+  min-width: 30px;
 
+  min-height: 30px;
 
+  margin: 0 10px 0 0px;
 
 }
 
 
 .s_b_m_ti_title > span:nth-of-type(2) {
 
   font-size: 20px;
 
   font-weight: bold;
 
+  display: flex;
 
+  flex-wrap: wrap;
 
+  align-items: center;
 
+  min-height: 30px;
 
+  line-height: 30px;
 
+  color: #1f1f1f;
 
+
 
+
 
 }
 
 
 .s_b_m_ti_title > div {

Some files were not shown because too many files changed in this diff