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

Merge branch 'beta' of https://git.cocorobo.cn/CocoRoboLabs/pbl-teacher-table into beta

lsc 1 month ago
parent
10c7e885e0 0b5f5f1c2d
commit
f03f275e2b
11 changed files with 37 additions and 12 deletions
Split View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.c8dd94107a21fb0ff7417f23045ce8e1.css
  3. 0 0
      dist/static/css/app.c8dd94107a21fb0ff7417f23045ce8e1.css.map
  4. 0 0
      dist/static/js/app.2f6cddf142bc8cc22045.js
  5. 0 0
      dist/static/js/app.2f6cddf142bc8cc22045.js.map
  6. 0 0
      dist/static/js/manifest.161e82026ac2ae03ab6f.js.map
  7. 2 1
      src/components/pages/appStore/dialog/selectAppDialog.vue
  8. 23 1
      src/components/pages/appStore/views/appManagement.vue
  9. 3 5
      src/components/pages/test/add/components/choice/choice.vue
  10. 3 1
      src/components/pages/testStudent/view/component/choice.vue
  11. 5 3
      src/components/pages/testStudent/view/component/gap.vue

+ 1 - 1
dist/index.html
View File 

@@ -32,7 +32,7 @@
 
       width: 100%;
 
       background: #e6eaf0;
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.2873a0d3b25ff22f93f837c0c86b0ac8.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.de15001ce66f032e9274.js></script><script type=text/javascript src=./static/js/app.166e196eeda3650a8916.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.c8dd94107a21fb0ff7417f23045ce8e1.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.de15001ce66f032e9274.js></script><script type=text/javascript src=./static/js/app.2f6cddf142bc8cc22045.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.c8dd94107a21fb0ff7417f23045ce8e1.css


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


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


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


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


+ 2 - 1
src/components/pages/appStore/dialog/selectAppDialog.vue
View File 

@@ -124,7 +124,8 @@ export default {
 
         label: "", //应用的标签搜索
 
         type: "", //应用的类型
 
         juri: 99, //应用权限 1:我的  2：组织内  3：所有人   99：未发布
 
-        stand: "cn" //cn站还是hk站
 
+        stand: "cn", //cn站还是hk站
 
+        status:''
 
       };
 
 
       this.ajax

+ 23 - 1
src/components/pages/appStore/views/appManagement.vue
View File 

@@ -117,6 +117,21 @@
 
                 :value="item.value"
 
               ></el-option>
 
             </el-select>
 
+
 
+            <el-select
 
+              v-model="statusType"
 
+              placeholder="请选择状态"
 
+              @change="changeSelectType"
 
+              style="width: 110px;margin-right: 10px;"
 
+            >
 
+              <el-option
 
+                v-for="item in statusList"
 
+                :key="item.value"
 
+                :label="item.label"
 
+                :value="item.value"
 
+              ></el-option>
 
+            </el-select>
 
+
 
             <el-input
 
               v-model="searchText"
 
               style="width: 250px;margin-right: 10px;"
 
@@ -749,6 +764,12 @@ export default {
 
         // { index: 98,label:"已发布"},
 
         // { index: 99,label:"未发布"},
 
       ],
 
+      statusList:[
 
+        {value:'',label:'所有状态'},
 
+        {value:1,label:"测试"},
 
+        {value:2,label:"稳定"}
 
+      ],
 
+      statusType:'',
 
       labelSelect: [
 
         { value: "", label: "所有类型" },
 
         { value: "agent", label: "智能体" },
 
@@ -827,7 +848,8 @@ export default {
 
         label: this.selectLabel, //应用的标签搜索
 
         type: this.showType, //应用的类型
 
         juri: this.selectJuri, //应用权限 1:我的  2：组织内  3：所有人
 
-        stand: "cn" //cn站还是hk站
 
+        stand: "cn", //cn站还是hk站
 
+        status:this.statusType
 
       };
 
 
       this.ajax

+ 3 - 5
src/components/pages/test/add/components/choice/choice.vue
View File 

@@ -43,7 +43,6 @@
 
           <div
 
             class="choice_c"
 
             v-if="cJson.type == 2"
 
-            @click.stop="updateAnswer(index)"
 
           >
 
             <el-checkbox
 
               class="choiceInput"
 
@@ -76,7 +75,6 @@
 
           <div
 
             class="choice_c"
 
             v-if="cJson.type == 1"
 
-            @click.stop="updateAnswer(index)"
 
           >
 
             <el-radio
 
               class="choiceInput"
 
@@ -294,9 +292,9 @@ export default {
 
   content: "（正确答案）";
 
 } */
 
 
-.choice:hover > .choice_c > .deleteChoice {
 
+/* .choice:hover > .choice_c > .deleteChoice {
 
   display: flex;
 
-}
 
+} */
 
 
 .deleteChoice {
 
   max-width: 25px;
 
@@ -312,7 +310,7 @@ export default {
 
   cursor: pointer;
 
   font-weight: bold;
 
   font-size: 16px;
 
-  display: none;
 
+  display: flex;
 
   padding-right: 0 !important;
 
   align-items: center;
 
   justify-content: center;

+ 3 - 1
src/components/pages/testStudent/view/component/choice.vue
View File 

@@ -23,6 +23,8 @@
 
                         }}分</span>
 
                 </div>
 
             </div>
 
+            <div class="detail" v-if="checkJson.detail" v-html="checkJson.detail"
 
+                style="color: #00000066;margin-top: 5px;"></div>
 
             <div class="choices">
 
                 <div class="choice" v-for="(item, index) in checkJson.array" :key="index">
 
                     <div class="choice_c" v-if="checkJson.type == 2" @click="check(checkJson.type, index)"><el-checkbox v-model="checkJson.answer2"
 
@@ -292,4 +294,4 @@ export default {
 
 	cursor: pointer;
 
 	margin-bottom: 10px;
 
 }
 
-</style>
 
+</style>

+ 5 - 3
src/components/pages/testStudent/view/component/gap.vue
View File 

@@ -15,9 +15,9 @@
 
                 <span style="color: #efa030;display: flex;margin-top: 5px;line-height: 18px;">
 
                     <span style="min-width: fit-content;" v-if="!checkJson.answer && see">暂无参考答案</span>
 
                     <span style="min-width: fit-content;display: flex;" v-else-if="see">
 
-                        <span style="min-width: fit-content;">参考答案：</span> 
+                        <span style="min-width: fit-content;">参考答案：</span>
 
                         <span>{{ checkJson.answer }}</span>
 
-                    </span> 
+                    </span>
 
                     <!-- <span style="min-width: fit-content;margin-left: 10px;">{{ checkJson.score ? '分值：'+checkJson.score+'分' : '' }}</span> -->
 
                 </span>
 
                     <!-- </div><div v-html="checkJson.title"></div> -->
 
@@ -29,6 +29,8 @@
 
                     <span>{{ checkJson.score2 }}分</span><span style="margin: 0 10px;">/</span><span>{{ checkJson.score }}分</span>
 
                 </div>
 
             </div>
 
+            <div class="detail" v-if="checkJson.detail" v-html="checkJson.detail"
 
+                style="color: #00000066;margin-top: 5px;"></div>
 
             <div class="choices">
 
                 <textarea  :readonly="checktype == 2" rows="2" v-autoHeight="68" class="binfo_input binfo_textarea" cols v-model="checkJson.answer2"
 
                     placeholder=""></textarea>
 
@@ -335,4 +337,4 @@ export default {
 
 	border-color: #E7E7E7;
 
 	border-radius: 8px;
 
 }
 
-</style>
 
+</style>

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