首頁 探索 說明
登入
CocoRoboLabs
/
pbl-teacher-table
3
0
複刻 0
檔案 問題管理 0 合併請求 0 Wiki
瀏覽代碼

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

lsc 3 月之前
父節點
fffde0537e aae102dd57
當前提交
84e5465e99
共有 28 個文件被更改，包括 1360 次插入 和 78 次删除
統一視圖 顯示文件統計
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.d4129386c1e3827b2cd8da4fcf7f5bd4.css
  3. 0 0
      dist/static/css/app.d4129386c1e3827b2cd8da4fcf7f5bd4.css.map
  4. 0 0
      dist/static/js/app.96e334a2da6400ca8da8.js
  5. 0 0
      dist/static/js/app.96e334a2da6400ca8da8.js.map
  6. 0 0
      dist/static/js/manifest.161e82026ac2ae03ab6f.js.map
  7. 11 2
      src/assets/css/button.css
  8. 二進制
      src/assets/icon/test/type_number_icon.png
  9. 二進制
      src/assets/icon/test/type_number_icon2.png
  10. 9 1
      src/components/pages/appStore/dialog/addAppDialog.vue
  11. 11 1
      src/components/pages/appStore/dialog/selectAppDialog.vue
  12. 15 23
      src/components/pages/appStore/views/appManagement.vue
  13. 224 0
      src/components/pages/sassPlatform/index.vue
  14. 183 0
      src/components/pages/sassPlatform/view/tableView.vue
  15. 1 0
      src/components/pages/test/add/components/addCheckPopover.vue
  16. 22 9
      src/components/pages/test/add/components/checkOrder.vue
  17. 213 0
      src/components/pages/test/add/components/number/index.vue
  18. 9 3
      src/components/pages/test/add/edit/check/index.vue
  19. 258 0
      src/components/pages/test/add/edit/check/number.vue
  20. 13 1
      src/components/pages/test/add/edit/edit/index.vue
  21. 6 2
      src/components/pages/test/add/minxins/minxin.js
  22. 10 0
      src/components/pages/test/check/docxTemplateDialog.vue
  23. 60 0
      src/components/pages/test/check/index.vue
  24. 24 27
      src/components/pages/testPerson/test/index.vue
  25. 2 2
      src/components/pages/testStudent/view/check.vue
  26. 258 0
      src/components/pages/testStudent/view/component/number.vue
  27. 20 4
      src/components/pages/testStudent/view/component/topic.vue
  28. 10 2
      src/router/index.js

+ 1 - 1
dist/index.html
查看文件 

@@ -32,7 +32,7 @@
 
       width: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
       background: #e6eaf0;
 
       font-family: '黑体';
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.47e0c08c1acd45aabacca9d429b38bec.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.c046dd5e92c8da101466.js></script><script type=text/javascript src=./static/js/app.07725c7cec77f8387748.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.d4129386c1e3827b2cd8da4fcf7f5bd4.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.c046dd5e92c8da101466.js></script><script type=text/javascript src=./static/js/app.96e334a2da6400ca8da8.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {
 
     document.documentElement.addEventListener("touchstart", function (event) {

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


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


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


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


文件差異過大導致無法顯示
+ 0 - 0
dist/static/js/manifest.161e82026ac2ae03ab6f.js.map


+ 11 - 2
src/assets/css/button.css
查看文件 

@@ -365,7 +365,8 @@
 
 .pub_test_btn_eva::before,
 
 .pub_test_btn_eva::before,
 
 .pub_test_btn_time::before,
 
 .pub_test_btn_time::before,
 
 .pub_test_btn_file::before,
 
 .pub_test_btn_file::before,
 
-.pub_test_btn_sweep::before {
 
+.pub_test_btn_sweep::before,
 
+.pub_test_btn_number::before {
 
   content: "";
 
   content: "";
 
   width: 18px;
 
   width: 18px;
 
   height: 18px;
 
   height: 18px;
 
@@ -409,6 +410,10 @@
 
 	background-image: url(../icon/test/type_sweep_icon.png);
 
 	background-image: url(../icon/test/type_sweep_icon.png);
 
 }
 
 }
 
 
 
+.pub_test_btn_number::before{
 
+	background-image: url(../icon/test/type_number_icon.png);
 
+}
 
+
 
 .test_icon{
 
 .test_icon{
 
   display: inline-block;
 
   display: inline-block;
 
   width: 18px;
 
   width: 18px;
 
@@ -446,6 +451,10 @@
 
   background-image: url('../icon/test/type_sweep_icon.png');
 
   background-image: url('../icon/test/type_sweep_icon.png');
 
 }
 
 }
 
 
 
+.test_icon_number{
 
+  background-image: url('../icon/test/type_number_icon.png');
 
+}
 
+
 
 .dataBoard_check_box {
 
 .dataBoard_check_box {
 
   display: flex;
 
   display: flex;
 
   align-items: center;
 
   align-items: center;
 
@@ -568,4 +577,4 @@
 
 }
 
 }
 
 .el-table__column-filter-trigger i::before{
 
 .el-table__column-filter-trigger i::before{
 
   content: '';
 
   content: '';
 
-}
 
+}

二進制
src/assets/icon/test/type_number_icon.png
查看文件


二進制
src/assets/icon/test/type_number_icon2.png
查看文件


+ 9 - 1
src/components/pages/appStore/dialog/addAppDialog.vue
查看文件 

@@ -210,7 +210,7 @@ export default {
 
         url: "",
 
         url: "",
 
         type: "",
 
         type: "",
 
         juri: "1",
 
         juri: "1",
 
-        stand: "cn",
 
+        stand: this.region,
 
         json: {
 
         json: {
 
           icon: "",
 
           icon: "",
 
           copy: "0",
 
           copy: "0",
 
@@ -251,6 +251,14 @@ export default {
 
         }
 
         }
 
         return _result;
 
         return _result;
 
       };
 
       };
 
+    },
 
+    region(){
 
+      let _result = "cn";
 
+      let query = this.$route.query["region"]
 
+      if(query && (query == "cn" || query == "hk" || query == "all")){
 
+        _result = query;
 
+      }
 
+      return _result;
 
     }
 
     }
 
   },
 
   },
 
   methods: {
 
   methods: {

+ 11 - 1
src/components/pages/appStore/dialog/selectAppDialog.vue
查看文件 

@@ -99,6 +99,16 @@ export default {
 
       }
 
       }
 
     }
 
     }
 
   },
 
   },
 
+  computed:{
 
+    region(){
 
+      let _result = "cn";
 
+      let query = this.$route.query["region"]
 
+      if(query && (query == "cn" || query == "hk" || query == "all")){
 
+        _result = query;
 
+      }
 
+      return _result;
 
+    }
 
+  },
 
   methods: {
 
   methods: {
 
     open() {
 
     open() {
 
       this.dataList = [];
 
       this.dataList = [];
 
@@ -124,7 +134,7 @@ export default {
 
         label: "", //应用的标签搜索
 
         label: "", //应用的标签搜索
 
         type: "", //应用的类型
 
         type: "", //应用的类型
 
         juri: 99, //应用权限 1:我的  2：组织内  3：所有人   99：未发布
 
         juri: 99, //应用权限 1:我的  2：组织内  3：所有人   99：未发布
 
-        stand: "cn", //cn站还是hk站
 
+        stand: this.region?this.region:'cn', //cn站还是hk站
 
         status:''
 
         status:''
 
       };
 
       };

+ 15 - 23
src/components/pages/appStore/views/appManagement.vue
查看文件 

@@ -784,27 +784,11 @@ export default {
 
       collect: [],
 
       collect: [],
 
       editAppCard: null,
 
       editAppCard: null,
 
       bannerObj: null,
 
       bannerObj: null,
 
-      userName: null
 
+      userName: null,
 
+      // region:this.$route.query["region"]
 
     };
 
     };
 
   },
 
   },
 
   computed: {
 
   computed: {
 
-    isImageOrSvg() {
 
-      return value => {
 
-        let _result = 0; //啥也不是
 
-        if (value) {
 
-          const svgPattern = /<svg.*<\/svg>/;
 
-          const imagePattern = /\.(jpeg|jpg|gif|png|svg|bmp|webp)$/i; // 图片链接的正则表达式
 
-          const urlPattern = /^(http|https):\/\/[^ "]+$/; // 网络地址的正则表达式
 
-
 
-          if (svgPattern.test(value)) {
 
-            _result = 1;
 
-          } else if (urlPattern.test(value) && imagePattern.test(value)) {
 
-            _result = 2;
 
-          }
 
-        }
 
-        return _result;
 
-      };
 
-    },
 
     showMenu() {
 
     showMenu() {
 
       return data => {
 
       return data => {
 
         let _result = false;
 
         let _result = false;
 
@@ -818,6 +802,14 @@ export default {
 
         }
 
         }
 
         return _result;
 
         return _result;
 
       };
 
       };
 
+    },
 
+    region(){
 
+      let _result = "cn";
 
+      let query = this.$route.query["region"]
 
+      if(query && (query == "cn" || query == "hk" || query == "all")){
 
+        _result = query;
 
+      }
 
+      return _result;
 
     }
 
     }
 
   },
 
   },
 
   watch: {
 
   watch: {
 
@@ -849,7 +841,7 @@ export default {
 
         label: this.selectLabel, //应用的标签搜索
 
         label: this.selectLabel, //应用的标签搜索
 
         type: this.showType, //应用的类型
 
         type: this.showType, //应用的类型
 
         juri: this.selectJuri, //应用权限 1:我的  2：组织内  3：所有人
 
         juri: this.selectJuri, //应用权限 1:我的  2：组织内  3：所有人
 
-        stand: "cn", //cn站还是hk站
 
+        stand: this.region?this.region:'cn', //cn站还是hk站
 
         status: this.statusType
 
         status: this.statusType
 
       };
 
       };
 
 
 
@@ -1112,7 +1104,7 @@ export default {
 
             url: data.url, //app链接
 
             url: data.url, //app链接
 
             type: data.type, //app类型
 
             type: data.type, //app类型
 
             juri: data.juri, //app权限 1:我的 2:组织 3:所有人
 
             juri: data.juri, //app权限 1:我的 2:组织 3:所有人
 
-            stand: "cn", //语言
 
+            stand: this.region?this.region:'cn', //语言
 
             json: JSON.stringify(data.json) //其他信息
 
             json: JSON.stringify(data.json) //其他信息
 
           }
 
           }
 
         ];
 
         ];
 
@@ -1143,7 +1135,7 @@ export default {
 
             url: data.url, //app链接
 
             url: data.url, //app链接
 
             type: data.type, //app类型
 
             type: data.type, //app类型
 
             juri: data.juri, //app权限 1:我的 2:组织 3:所有人
 
             juri: data.juri, //app权限 1:我的 2:组织 3:所有人
 
-            stand: "cn", //语言
 
+            stand: this.region?this.region:'cn', //语言
 
             json: JSON.stringify(data.json) //其他信息
 
             json: JSON.stringify(data.json) //其他信息
 
           }
 
           }
 
         ];
 
         ];
 
@@ -1177,7 +1169,7 @@ export default {
 
           url: data.url, //app链接
 
           url: data.url, //app链接
 
           type: data.type, //app类型
 
           type: data.type, //app类型
 
           juri: data.juri, //app权限 1:我的 2:组织 3:所有人
 
           juri: data.juri, //app权限 1:我的 2:组织 3:所有人
 
-          stand: "cn", //语言
 
+          stand: this.region?this.region:'cn', //语言
 
           json: JSON.stringify(data.json) //其他信息
 
           json: JSON.stringify(data.json) //其他信息
 
         }
 
         }
 
       ];
 
       ];
 
@@ -1203,7 +1195,7 @@ export default {
 
         suserid: this.userId, //用户ID
 
         suserid: this.userId, //用户ID
 
         sorg: this.org,
 
         sorg: this.org,
 
         soid: this.oid,
 
         soid: this.oid,
 
-        sstand: "cn"
 
+        sstand: this.region?this.region:'cn'
 
       };
 
       };
 
 
 
       this.ajax
 
       this.ajax

+ 224 - 0
src/components/pages/sassPlatform/index.vue
查看文件 

@@ -0,0 +1,224 @@
 
+<template>
 
+  <div class="sassPlatform">
 
+    <div class="sp_header">
 
+      <!-- <div class="sp_h_logo">
 
+
 
+      </div> -->
 
+      <div class="sp_h_tagArea">
 
+        <span :class="{tagActive:tagIndex==0}" @click="tagIndex = 0">应用中心</span>
 
+        <span :class="{tagActive:tagIndex==1}" @click="tagIndex = 1">智能分析</span>
 
+      </div>
 
+    </div>
 
+    <div class="sp_bottom">
 
+      <div class="sp_b_left">
 
+        <div class="sp_b_l_form" v-for="(item,index) in formTypeList" :key="item.index">
 
+          <span @click="item.open = !item.open">{{ item.name }}<svg :style="`transform: rotate(${item.open?'180':'0'}deg);`" t="1739262423649" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7079" width="200" height="200"><path d="M52.335 261.072c-31.269 30.397-31.269 79.722 0 110.194l403.212 391.718c31.325 30.382 82.114 30.382 113.377 0l403.197-391.718c31.325-30.466 31.325-79.793 0-110.194-31.28-30.449-82.058-30.449-113.39 0l-346.497 336.64-346.457-336.64c-31.325-30.448-82.105-30.448-113.446 0l0 0z" p-id="7080"></path></svg></span>
 
+          <div v-show="item.open" v-if="item.children.length>0">
 
+            <span v-for="(item2,index2) in item.children" :key="item2.index" @click="formTypeTag=item2.index" :class="{formActive:item2.index==formTypeTag}">{{ item2.name }}</span>
 
+          </div>
 
+        </div>
 
+      </div>
 
+      <div class="sp_b_right">
 
+        <tableView/>
 
+      </div>
 
+    </div>
 
+  </div>
 
+</template>
 
+
 
+<script>
 
+import tableView from './view/tableView.vue';
 
+export default {
 
+  components:{
 
+    tableView
 
+  },
 
+  data(){
 
+    return{
 
+      tagIndex:0,
 
+      formTypeList:[
 
+        {
 
+          index:"0",
 
+          name:"教师管理",
 
+          open:false,
 
+          children:[{
 
+            index:'0-0',
 
+            type:"form",
 
+            name:"表单管理",
 
+          },{
 
+            index:'0-1',
 
+            type:"card",
 
+            name:"年度考核",
 
+          },{
 
+            index:'0-2',
 
+            type:"card",
 
+            name:"考核数据可视化",
 
+          }]
 
+        },
 
+        {
 
+          index:"1",
 
+          name:"校园安全",
 
+          open:false,
 
+          children:[{
 
+            index:'1-0',
 
+            type:"form",
 
+            name:"表单管理",
 
+          }]
 
+        },
 
+        {
 
+          index:"2",
 
+          name:"成绩管理",
 
+          open:false,
 
+          children:[{
 
+            index:'2-0',
 
+            type:"form",
 
+            name:"表单管理",
 
+          }]
 
+        },
 
+        {
 
+          index:"3",
 
+          name:"后勤管理",
 
+          open:false,
 
+          children:[{
 
+            index:'3-0',
 
+            type:"form",
 
+            name:"表单管理",
 
+          }]
 
+        },
 
+      ],
 
+      formTypeTag:'',
 
+    }
 
+  },
 
+  methods: {
 
+
 
+  },
 
+}
 
+</script>
 
+
 
+<style scoped>
 
+.sassPlatform{
 
+  width: 100vw;
 
+  height: 100vh;
 
+  margin: 0;
 
+  box-sizing: border-box;
 
+  background-color: white;
 
+}
 
+
 
+.sp_header{
 
+  width: 100%;
 
+  height: 100px;
 
+  display: flex;
 
+  align-items: center;
 
+  justify-content: center;
 
+  box-sizing: border-box;
 
+  border-bottom: solid 1px #BBBBBB;
 
+}
 
+
 
+.sp_h_tagArea{
 
+  width: auto;
 
+  height: auto;
 
+  display: flex;
 
+  align-items: center;
 
+}
 
+
 
+.sp_h_tagArea>span{
 
+  margin-right: 40px;
 
+  cursor: pointer;
 
+  font-size: 20px;
 
+  transition: .2s;
 
+  position: relative;
 
+}
 
+
 
+.sp_h_tagArea>span:hover{
 
+  color: #1684FC;
 
+}
 
+
 
+.tagActive{
 
+  color: #1684FC;
 
+}
 
+
 
+.tagActive::after{
 
+  content: '';
 
+  width: 100%;
 
+  height: 4px;
 
+  background-color: #1684FC;
 
+  position: absolute;
 
+  bottom: -10px;
 
+  left: 0;
 
+  border-radius: 4px;
 
+}
 
+
 
+.sp_bottom{
 
+  width: 100%;
 
+  height: calc(100% - 100px);
 
+  display: flex;
 
+}
 
+
 
+.sp_b_left{
 
+  width: 15%;
 
+  min-width: 200px;
 
+  height: 100%;
 
+  box-sizing: border-box;
 
+  border-right:solid 1px #D5D5D5;
 
+}
 
+
 
+.sp_b_l_form{
 
+  width: 100%;
 
+  height: auto;
 
+  background-color: white;
 
+}
 
+
 
+.sp_b_l_form>span{
 
+  width: 100%;
 
+  height: 60px;
 
+  box-sizing: border-box;
 
+  display: flex;
 
+  align-items: center;
 
+  justify-content: space-between;
 
+  background-color: white;
 
+  padding: 0 30px;
 
+  cursor: pointer;
 
+  transition: .3s;
 
+}
 
+
 
+.sp_b_l_form>span:hover{
 
+  color: #1684FC;
 
+}
 
+
 
+.sp_b_l_form>span>svg{
 
+  width: 15px;
 
+  height: 15px;
 
+}
 
+
 
+.sp_b_l_form>div{
 
+  width: 100%;
 
+  height: auto;
 
+  box-sizing: border-box;
 
+  background-color: #F7F7F7;
 
+}
 
+
 
+.sp_b_l_form>div>span{
 
+  width: 100%;
 
+  height: 60px;
 
+  display: flex;
 
+  align-items: center;
 
+  justify-content: space-between;
 
+  box-sizing: border-box;
 
+  padding: 0 40px;
 
+  cursor: pointer;
 
+  transition: .3s;
 
+}
 
+
 
+.sp_b_l_form>div>span:hover{
 
+  color: #1684FC;
 
+}
 
+
 
+.formActive{
 
+  color: #1684FC;
 
+}
 
+
 
+.sp_b_right{
 
+  flex: 1;
 
+  height: 100%;
 
+}
 
+
 
+
 
+</style>

+ 183 - 0
src/components/pages/sassPlatform/view/tableView.vue
查看文件 

@@ -0,0 +1,183 @@
 
+<template>
 
+  <div class="tableView">
 
+    <div class="tv_header">
 
+      <div class="tv_h_left">
 
+        <span :class="{ tagActive: tagIndex == 0 }" @click="tagIndex = 0"
 
+          >按表单查看</span
 
+        >
 
+        <span :class="{ tagActive: tagIndex == 1 }" @click="tagIndex = 1"
 
+          >按人员查看</span
 
+        >
 
+      </div>
 
+      <div class="tv_h_right">
 
+        <el-input
 
+          placeholder="请输入内容"
 
+          style="width: 300px;margin-right: 30px;"
 
+          v-model="searchValue"
 
+          class="input-with-select"
 
+        >
 
+          <el-button slot="append" icon="el-icon-search"></el-button>
 
+        </el-input>
 
+
 
+        <el-button type="primary">创建表单</el-button>
 
+
 
+        <!-- <el-button type="primary">数据导入</el-button> -->
 
+      </div>
 
+    </div>
 
+    <div class="tv_bottom">
 
+      <el-table
 
+        v-show="tagIndex == 0"
 
+        :data="showTableData"
 
+        border
 
+        style="width: 100%"
 
+      >
 
+        <el-table-column type="index" width="80" label="序号"></el-table-column>
 
+        <el-table-column
 
+          type="title"
 
+          width="400"
 
+          label="表单名称"
 
+        ></el-table-column>
 
+        <el-table-column
 
+          type="type"
 
+          width="200"
 
+          label="所属栏目"
 
+        ></el-table-column>
 
+        <el-table-column
 
+          type="creator"
 
+          width="150"
 
+          label="创建人"
 
+        ></el-table-column>
 
+        <el-table-column
 
+          type="status"
 
+          width="150"
 
+          label="表单状态"
 
+        ></el-table-column>
 
+        <el-table-column
 
+          type="num"
 
+          width="150"
 
+          label="提交数量"
 
+        ></el-table-column>
 
+        <el-table-column fixed="right" label="操作">
 
+          <template slot-scope="scope">
 
+            <el-button type="text" size="small">编辑</el-button>
 
+            <el-button type="text" size="small">查看</el-button>
 
+            <el-button type="text" size="small">复制</el-button>
 
+            <el-button type="text" size="small">提醒</el-button>
 
+            <el-button type="text" size="small">删除</el-button>
 
+          </template>
 
+        </el-table-column>
 
+      </el-table>
 
+      <el-table
 
+        v-show="tagIndex == 1"
 
+        :data="showTableData"
 
+        border
 
+        style="width: 100%"
 
+      >
 
+        <el-table-column type="index" width="80" label="序号"></el-table-column>
 
+        <el-table-column type="name" width="200" label="姓名"></el-table-column>
 
+        <el-table-column
 
+          type="subject"
 
+          width="200"
 
+          label="学科"
 
+        ></el-table-column>
 
+        <el-table-column
 
+          type="class"
 
+          width="200"
 
+          label="年级"
 
+        ></el-table-column>
 
+        <el-table-column
 
+          type="teachingAge"
 
+          width="200"
 
+          label="教龄"
 
+        ></el-table-column>
 
+        <el-table-column
 
+          type="submitted"
 
+          width="200"
 
+          label="已提交数量"
 
+        ></el-table-column>
 
+        <el-table-column
 
+          type="completed"
 
+          width="200"
 
+          label="已完成表单"
 
+        ></el-table-column>
 
+        <el-table-column fixed="right" label="操作">
 
+          <template slot-scope="scope">
 
+            <el-button type="text" size="small">详细</el-button>
 
+          </template>
 
+        </el-table-column>
 
+      </el-table>
 
+    </div>
 
+  </div>
 
+</template>
 
+
 
+<script>
 
+export default {
 
+  data() {
 
+    return {
 
+      tableData: [],
 
+      tableData2: [],
 
+      tagIndex: 0,
 
+      searchValue: "",
 
+      showTableData: []
 
+    };
 
+  }
 
+};
 
+</script>
 
+
 
+<style scoped>
 
+.tableView {
 
+  width: 100%;
 
+  height: 100%;
 
+  box-sizing: border-box;
 
+  padding: 20px;
 
+}
 
+
 
+.tv_header {
 
+  width: 100%;
 
+  height: 100px;
 
+  display: flex;
 
+  align-items: center;
 
+  justify-content: space-between;
 
+  box-sizing: border-box;
 
+  padding: 0 20px;
 
+}
 
+
 
+.tv_h_left > span {
 
+  margin-right: 30px;
 
+  cursor: pointer;
 
+  transition: 0.3s;
 
+  position: relative;
 
+}
 
+
 
+.tv_h_left > span:hover {
 
+  color: #1684fc;
 
+}
 
+
 
+.tagActive {
 
+  color: #1684fc;
 
+}
 
+
 
+.tagActive::after {
 
+  content: "";
 
+  width: 100%;
 
+  height: 2px;
 
+  position: absolute;
 
+  bottom: -5px;
 
+  left: 0;
 
+  background-color: #1684fc;
 
+}
 
+
 
+.tv_h_right {
 
+  width: auto;
 
+  height: auto;
 
+  display: flex;
 
+}
 
+
 
+.tv_bottom {
 
+  width: 100%;
 
+  height: calc(100% - 100px);
 
+  overflow: auto;
 
+  padding: 0 20px;
 
+  box-sizing: border-box;
 
+}
 
+</style>

+ 1 - 0
src/components/pages/test/add/components/addCheckPopover.vue
查看文件 

@@ -27,6 +27,7 @@
 
                   pub_test_btn_time: item.value == 8,
 
                   pub_test_btn_time: item.value == 8,
 
                   pub_test_btn_choose2: item.value == 9,
 
                   pub_test_btn_choose2: item.value == 9,
 
 									pub_test_btn_sweep: item.value == 12,
 
 									pub_test_btn_sweep: item.value == 12,
 
+                  pub_test_btn_number:item.value == 13
 
                 }"
 
                 }"
 
               >
 
               >
 
                 {{ item.label }}
 
                 {{ item.label }}

+ 22 - 9
src/components/pages/test/add/components/checkOrder.vue
查看文件 

@@ -123,13 +123,16 @@
 
 																<div v-if="item3.type == 12">
 
 																<div v-if="item3.type == 12">
 
 																	<sweep :cJson="item3.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}-${index2}-${index3}`" :isOpen="item3.type == 12 && checkC === `x${index1}-${index2}-${index3}`"/>
 
 																	<sweep :cJson="item3.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}-${index2}-${index3}`" :isOpen="item3.type == 12 && checkC === `x${index1}-${index2}-${index3}`"/>
 
 																</div>
 
 																</div>
 
+                                <div v-if="item3.type == 13">
 
+																	<number :cJson="item3.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}-${index2}-${index3}`" :isOpen="item3.type == 13 && checkC === `x${index1}-${index2}-${index3}`"/>
 
+																</div>
 
                             </div>
 
                             </div>
 
 														<div class="addCheckBox" v-if="checkC === `x${index1}-${index2}-${index3}` && etype==='edit'" @click.stop="">
 
 														<div class="addCheckBox" v-if="checkC === `x${index1}-${index2}-${index3}` && etype==='edit'" @click.stop="">
 
 															<addCheckPopover @addCheck="addCheck" @addQtype="addQtype"/>
 
 															<addCheckPopover @addCheck="addCheck" @addQtype="addQtype"/>
 
 														</div>
 
 														</div>
 
                         </div>
 
                         </div>
 
                     </div>
 
                     </div>
 
-                    <div v-else-if="item2.ttype == 1 && canEdit.indexOf(item2.type) !== -1 && etype == 'edit'" 
+                    <div v-else-if="item2.ttype == 1 && canEdit.indexOf(item2.type) !== -1 && etype == 'edit'"
 
                         class="edit_box">
 
                         class="edit_box">
 
                         <div v-if="item2.type == 1">
 
                         <div v-if="item2.type == 1">
 
                             <choiceX :cJson="item2.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}-${index2}`" :isOpen="item2.type == 1 && checkC === `x${index1}-${index2}`"></choiceX>
 
                             <choiceX :cJson="item2.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}-${index2}`" :isOpen="item2.type == 1 && checkC === `x${index1}-${index2}`"></choiceX>
 
@@ -169,6 +172,9 @@
 
 												<div v-else-if="item2.type == 12">
 
 												<div v-else-if="item2.type == 12">
 
 													<sweep :cJson="item2.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}-${index2}`" :isOpen="item2.type == 12 && checkC === `x${index1}-${index2}`"/>
 
 													<sweep :cJson="item2.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}-${index2}`" :isOpen="item2.type == 12 && checkC === `x${index1}-${index2}`"/>
 
 												</div>
 
 												</div>
 
+                        <div v-else-if="item2.type == 13">
 
+													<number :cJson="item2.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}-${index2}`" :isOpen="item2.type == 13 && checkC === `x${index1}-${index2}`"/>
 
+												</div>
 
                     </div>
 
                     </div>
 
 										<div class="addCheckBox" v-if="checkC === `x${index1}-${index2}` && etype==='edit'" @click.stop="">
 
 										<div class="addCheckBox" v-if="checkC === `x${index1}-${index2}` && etype==='edit'" @click.stop="">
 
 											<addCheckPopover @addCheck="addCheck" @addQtype="addQtype"/>
 
 											<addCheckPopover @addCheck="addCheck" @addQtype="addQtype"/>
 
@@ -178,7 +184,7 @@
 
             <div v-else-if="item1.ttype == 1 && canEdit.indexOf(item1.type) !== -1 && etype == 'edit'" class="edit_box">
 
             <div v-else-if="item1.ttype == 1 && canEdit.indexOf(item1.type) !== -1 && etype == 'edit'" class="edit_box">
 
                 <div v-if="item1.type == 1">
 
                 <div v-if="item1.type == 1">
 
                     <choiceX :cJson="item1.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}`" :isOpen="item1.type == 1 && checkC === `x${index1}`"></choiceX>
 
                     <choiceX :cJson="item1.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}`" :isOpen="item1.type == 1 && checkC === `x${index1}`"></choiceX>
 
-										
+
 
                     <!-- <choiceDialog v-if="item1.type == 1 && checkC === `x${index1}`" :cJson="cJson" @setJson="setJson">
 
                     <!-- <choiceDialog v-if="item1.type == 1 && checkC === `x${index1}`" :cJson="cJson" @setJson="setJson">
 
                     </choiceDialog> -->
 
                     </choiceDialog> -->
 
                 </div>
 
                 </div>
 
@@ -215,6 +221,9 @@
 
 								<div v-else-if="item1.type == 12">
 
 								<div v-else-if="item1.type == 12">
 
 									<sweep :cJson="item1.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}`" :isOpen="item1.type == 12 && checkC === `x${index1}`"/>
 
 									<sweep :cJson="item1.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}`" :isOpen="item1.type == 12 && checkC === `x${index1}`"/>
 
 								</div>
 
 								</div>
 
+                <div v-else-if="item1.type == 13">
 
+									<number :cJson="item1.json" :cJson2="cJson" @setJson="setJson" :index="`x${index1}`" :isOpen="item1.type == 13 && checkC === `x${index1}`"/>
 
+								</div>
 
             </div>
 
             </div>
 
 						<div class="addCheckBox" v-if="checkC === `x${index1}` && etype==='edit'" @click.stop="">
 
 						<div class="addCheckBox" v-if="checkC === `x${index1}` && etype==='edit'" @click.stop="">
 
 							<addCheckPopover @addCheck="addCheck" @addQtype="addQtype"/>
 
 							<addCheckPopover @addCheck="addCheck" @addQtype="addQtype"/>
 
@@ -259,6 +268,7 @@ import courseDialog2 from './course2/index.vue'
 
 import courseX2 from './course2/course.vue'
 
 import courseX2 from './course2/course.vue'
 
 import addCheckPopover from './addCheckPopover.vue'
 
 import addCheckPopover from './addCheckPopover.vue'
 
 import sweep from './sweep/index'
 
 import sweep from './sweep/index'
 
+import number from './number/index.vue'
 
 export default {
 
 export default {
 
     mixins: [minxinVue],
 
     mixins: [minxinVue],
 
     components: {
 
     components: {
 
@@ -277,7 +287,8 @@ export default {
 
         courseDialog2,
 
         courseDialog2,
 
         courseX2,
 
         courseX2,
 
 				addCheckPopover,
 
 				addCheckPopover,
 
-				sweep
 
+				sweep,
 
+        number
 
     },
 
     },
 
     props: {
 
     props: {
 
         checkJson: {
 
         checkJson: {
 
@@ -298,7 +309,7 @@ export default {
 
         return {
 
         return {
 
             manualJson: [],
 
             manualJson: [],
 
             isdrag: "",
 
             isdrag: "",
 
-            canEdit: [1, 3, 5, 6, 7, 8, 11,12],
 
+            canEdit: [1, 3, 5, 6, 7, 8, 11,12,13],
 
             ctype: "",
 
             ctype: "",
 
             dragType: "",
 
             dragType: "",
 
             oldIndex: "",
 
             oldIndex: "",
 
@@ -335,7 +346,9 @@ export default {
 
                         className += " test_icon_time"
 
                         className += " test_icon_time"
 
                     }else if (item.type == 12){
 
                     }else if (item.type == 12){
 
 												className += " test_icon_sweep"
 
 												className += " test_icon_sweep"
 
-										}
 
+										}else if(item.type==13){
 
+                        className += ' test_icon_number'
 
+                    }
 
 										let itemType = item.type;
 
 										let itemType = item.type;
 
 										if(itemType===1){
 
 										if(itemType===1){
 
 											if(item.json.type===1){
 
 											if(item.json.type===1){
 
@@ -484,7 +497,7 @@ export default {
 
                 name = this.manualJson[_check[0]].array[_check[1]].name ? this.manualJson[_check[0]].array[_check[1]].name : ''
 
                 name = this.manualJson[_check[0]].array[_check[1]].name ? this.manualJson[_check[0]].array[_check[1]].name : ''
 
             }
 
             }
 
             this.groupName = name
 
             this.groupName = name
 
-            this.groupDaliog = true 
+            this.groupDaliog = true
 
             this.groupIndex = index
 
             this.groupIndex = index
 
         },
 
         },
 
         updateGroupName(){
 
         updateGroupName(){
 
@@ -501,7 +514,7 @@ export default {
 
             }
 
             }
 
             this.$forceUpdate();
 
             this.$forceUpdate();
 
             this.$emit("changeJson", this.manualJson);
 
             this.$emit("changeJson", this.manualJson);
 
-            this.groupDaliog = false 
+            this.groupDaliog = false
 
         },
 
         },
 
         editCheck(index, item) {
 
         editCheck(index, item) {
 
 
 
@@ -622,7 +635,7 @@ export default {
 
 
 
             /* 修改选中的并且切换的题目 */
 
             /* 修改选中的并且切换的题目 */
 
             this.setJsonCheck(newItems)
 
             this.setJsonCheck(newItems)
 
-            
+
 
 
 
             this.$emit("changeJson", [...newItems]);
 
             this.$emit("changeJson", [...newItems]);
 
             this.typeIndex = "";
 
             this.typeIndex = "";
 
@@ -993,6 +1006,6 @@ export default {
 
 .addCheckBox{
 
 .addCheckBox{
 
 	position: absolute;
 
 	position: absolute;
 
 	bottom: -50px;
 
 	bottom: -50px;
 
-	
+
 
 }
 
 }
 
 </style>
 
 </style>

+ 213 - 0
src/components/pages/test/add/components/number/index.vue
查看文件 

@@ -0,0 +1,213 @@
 
+<template>
 
+  <div class="c_box">
 
+    <div class="mask" v-show="!isOpen"></div>
 
+    <!-- <div v-if="!cJson">暂未设置题目</div> -->
 
+    <!-- <div class="set_box" v-if="!cJson">填写者回答区</div> -->
 
+
 
+    <div class="choice_box">
 
+      <!-- <div class="title"><div>{{ `（${option[cJson.type].name}）` }}</div><div v-html="cJson.title"></div></div> -->
 
+      <div class="title">
 
+        <div style="display: flex;">
 
+          <!-- <span @click.stop="updateTitle()" style="min-width:fit-content">{{
 
+            `（${option[cJson.type].name}）`
 
+          }}</span> -->
 
+          <span v-if="!updateList.title" @click.stop="updateTitle()">{{
 
+            cJson.title ? cJson.title : "输入问题"
 
+          }}</span>
 
+					<!-- <span v-if="!cJson.title && !updateList.title" class="t_empty" @click.stop="updateTitle()">请填写标题</span> -->
 
+          <input
 
+            v-if="updateList.title"
 
+            ref="titleRef"
 
+            class="editInput"
 
+            v-model="checkJson.title"
 
+            @blur="save"
 
+            @keyup.enter="save"
 
+            placeholder="输入问题"
 
+          />
 
+
 
+        </div>
 
+        <!-- </div><div v-html="cJson.title"></div> -->
 
+      </div>
 
+      <div class="detail" v-if="!updateList.detail" @click.stop="updateDetail()">{{ cJson.detail?cJson.detail:"暂无描述" }}</div>
 
+			  <input
 
+          v-if="updateList.detail"
 
+          ref="detailRef"
 
+          class="editInput"
 
+          v-model="checkJson.detail"
 
+          @blur="save"
 
+          style="margin-top: 10px;color: rgb(136, 139, 146);"
 
+          @keyup.enter="save"
 
+          placeholder="请填写描述说明"
 
+        />
 
+      <div class="choices">
 
+        <el-select v-model="checkJson.type" placeholder="请选择数字类型">
 
+        <el-option
 
+          v-for="item in numberTypeList"
 
+          :key="item.value"
 
+          :label="item.label"
 
+          :value="item.value">
 
+        </el-option>
 
+      </el-select>
 
+        <!-- <el-input-number v-model="num" :precision="numberType" ></el-input-number> -->
 
+      </div>
 
+    </div>
 
+  </div>
 
+</template>
 
+
 
+<script>
 
+export default {
 
+  props: {
 
+    cJson: {
 
+      type: Object
 
+    },
 
+    cJson2: {
 
+      type: Object
 
+    },
 
+    isOpen: {
 
+      type: Boolean,
 
+      default: false
 
+    },
 
+    index: {
 
+      type: String,
 
+      default: ""
 
+    }
 
+  },
 
+  data() {
 
+    return {
 
+      option: {
 
+        1: { name: "问答题" }
 
+        // 2: { name: '多选题' }
 
+      },
 
+      checkJson: {},
 
+      number:"",
 
+      updateList: {
 
+        title: false,
 
+        detail:false,
 
+        brief: false,
 
+        answer: false
 
+      },
 
+      numberTypeList:[
 
+        {value:"1",label:"整数"},
 
+        {value:"2",label:"保留一位小数"},
 
+        {value:"3",label:"保留两位小数"},
 
+        {value:"4",label:"百分比"}
 
+      ],
 
+    };
 
+  },
 
+  computed:{
 
+    numberType(){
 
+      let _result = 0;
 
+      if(this.checkJson.type=='1'){//整数
 
+        _result = 0;
 
+      }else if(this.checkJson.type=='2'){//保留一位小数
 
+        _result = 1;
 
+      }else if(this.checkJson.type=='3'){//保留两位小数
 
+        _result = 2;
 
+      }else if(this.checkJson.type=='4'){//百分比
 
+        _result = 0;
 
+      }
 
+
 
+      return _result;
 
+    }
 
+  },
 
+  watch: {
 
+    checkJson: {
 
+      handler(newVal) {
 
+        // console.log("测试测试保存",newVal)
 
+        this.$emit("setJson", newVal, this.index);
 
+        console.log("gapW", this.cJson);
 
+      },
 
+      deep: true
 
+    },
 
+    isOpen(newValue) {
 
+      if (newValue) {
 
+        if (!this.cJson2 || Object.keys(this.cJson2).length == 0) {
 
+          this.checkJson = {
 
+            title: "标题",
 
+            type: 1,
 
+            answer: ""
 
+          };
 
+        } else {
 
+          this.checkJson = this.depthCopy(this.cJson2);
 
+        }
 
+      }
 
+    }
 
+  },
 
+  methods: {
 
+    depthCopy(s) {
 
+      return JSON.parse(JSON.stringify(s));
 
+    },
 
+    numberPan() {
 
+      if (/[^\d]/.test(this.checkJson.score) || this.checkJson.score < 0) {
 
+        this.$message.error("请输入大于0的数字");
 
+        this.checkJson.score = "";
 
+      }
 
+    },
 
+    updateTitle() {
 
+      this.updateList.title = true;
 
+      this.$nextTick(() => {
 
+        // 聚焦到输入框
 
+        this.$refs["titleRef"].focus();
 
+      });
 
+    },
 
+    updateDetail(){
 
+      this.updateList.detail = true;
 
+      this.$nextTick(() => {
 
+        // 聚焦到输入框
 
+        this.$refs["detailRef"].focus();
 
+      });
 
+    },
 
+    updateAnswer() {
 
+      this.updateList.answer = true;
 
+      this.$nextTick(() => {
 
+        // 聚焦到输入框
 
+        this.$refs["answerRef"].focus();
 
+      });
 
+    },
 
+    save() {
 
+      for (let key in this.updateList) {
 
+        this.updateList[key] = false;
 
+      }
 
+    }
 
+  },
 
+  mounted() {
 
+    this.checkJson = this.depthCopy(this.cJson)
 
+  }
 
+};
 
+</script>
 
+
 
+<style scoped>
 
+@import "../../global_styles.css";
 
+
 
+.binfo_input {
 
+  width: 100%;
 
+  margin: 0;
 
+  padding: 12px 14px;
 
+  display: block;
 
+  min-width: 0;
 
+  outline: none;
 
+  box-sizing: border-box;
 
+  background: none;
 
+  border: none;
 
+  border-radius: 4px;
 
+  background: #fff;
 
+  font-size: 16px;
 
+  resize: none;
 
+  font-family: "Microsoft YaHei";
 
+  min-height: 48px;
 
+  /* border: 1px solid #3682fc00; */
 
+  border: 1.5px solid #cad1dc;
 
+}
 
+
 
+.binfo_textarea {
 
+  border: 1.5px solid #cad1dc;
 
+  font-size: 16px;
 
+  resize: none;
 
+  /* background: #f6f6f6; */
 
+  font-family: "Microsoft YaHei";
 
+}
 
+
 
+.binfo_input:focus-visible {
 
+  border: 1.5px solid #3681fc !important;
 
+}
 
+</style>

+ 9 - 3
src/components/pages/test/add/edit/check/index.vue
查看文件 

@@ -15,6 +15,7 @@
 
             <timeV :tindex="index" :cJson.sync="item.json" v-if="item.type == 8"></timeV>
 
             <timeV :tindex="index" :cJson.sync="item.json" v-if="item.type == 8"></timeV>
 
             <courseV2 :tindex="index" :cJson.sync="item.json" v-if="item.type == 11"></courseV2>
 
             <courseV2 :tindex="index" :cJson.sync="item.json" v-if="item.type == 11"></courseV2>
 
 						<sweep :tindex="index" :cJson.sync="item.json" v-if="item.type == 12"/>
 
 						<sweep :tindex="index" :cJson.sync="item.json" v-if="item.type == 12"/>
 
+            <number :tindex="index" :cJson.sync="item.json" v-if="item.type == 13"/>
 
             <!-- <span v-else>暂未设置题目</span> -->
 
             <!-- <span v-else>暂未设置题目</span> -->
 
           </div>
 
           </div>
 
           <div v-for="(item2, index2) in item.array" :key="`${index}-${index2}`" class="check_box_xia">
 
           <div v-for="(item2, index2) in item.array" :key="`${index}-${index2}`" class="check_box_xia">
 
@@ -28,6 +29,7 @@
 
               <timeV :tindex="index2" :cJson.sync="item2.json" v-if="item2.type == 8"></timeV>
 
               <timeV :tindex="index2" :cJson.sync="item2.json" v-if="item2.type == 8"></timeV>
 
               <courseV2 :tindex="index2" :cJson.sync="item2.json" v-if="item2.type == 11"></courseV2>
 
               <courseV2 :tindex="index2" :cJson.sync="item2.json" v-if="item2.type == 11"></courseV2>
 
 							<sweep :tindex="index2" :cJson.sync="item2.json" v-if="item2.type == 12"></sweep>
 
 							<sweep :tindex="index2" :cJson.sync="item2.json" v-if="item2.type == 12"></sweep>
 
+              <number :tindex="index2" :cJson.sync="item2.json" v-if="item2.type == 13"></number>
 
               <!-- <span v-else>暂未设置题目</span> -->
 
               <!-- <span v-else>暂未设置题目</span> -->
 
             </div>
 
             </div>
 
           </div>
 
           </div>
 
@@ -45,6 +47,7 @@
 
             <timeV :tindex="index" :cJson.sync="item.json" v-if="item.type == 8"></timeV>
 
             <timeV :tindex="index" :cJson.sync="item.json" v-if="item.type == 8"></timeV>
 
             <courseV2 :tindex="index" :cJson.sync="item.json" v-if="item.type == 11"></courseV2>
 
             <courseV2 :tindex="index" :cJson.sync="item.json" v-if="item.type == 11"></courseV2>
 
 						<sweep :tindex="index" :cJson.sync="item.json" v-if="item.type == 12"></sweep>
 
 						<sweep :tindex="index" :cJson.sync="item.json" v-if="item.type == 12"></sweep>
 
+            <number :tindex="index" :cJson.sync="item.json" v-if="item.type == 13"></number>
 
             <!-- <span v-else>暂未设置题目</span> -->
 
             <!-- <span v-else>暂未设置题目</span> -->
 
           </div>
 
           </div>
 
           <div v-for="(item2, index2) in item.array" :key="`${index}-${index2}`" class="check_box_xia">
 
           <div v-for="(item2, index2) in item.array" :key="`${index}-${index2}`" class="check_box_xia">
 
@@ -58,6 +61,7 @@
 
               <timeV :tindex="index2" :cJson.sync="item2.json" v-if="item2.type == 8"></timeV>
 
               <timeV :tindex="index2" :cJson.sync="item2.json" v-if="item2.type == 8"></timeV>
 
               <courseV2 :tindex="index2" :cJson.sync="item2.json" v-if="item2.type == 11"></courseV2>
 
               <courseV2 :tindex="index2" :cJson.sync="item2.json" v-if="item2.type == 11"></courseV2>
 
 							<sweep :tindex="index2" :cJson.sync="item2.json" v-if="item2.type == 12"></sweep>
 
 							<sweep :tindex="index2" :cJson.sync="item2.json" v-if="item2.type == 12"></sweep>
 
+              <number :tindex="index2" :cJson.sync="item2.json" v-if="item2.type == 13"></number>
 
               <!-- <span v-else>暂未设置题目</span> -->
 
               <!-- <span v-else>暂未设置题目</span> -->
 
             </div>
 
             </div>
 
           </div>
 
           </div>
 
@@ -83,6 +87,7 @@ import evaV from './eva.vue';
 
 import timeV from './time.vue';
 
 import timeV from './time.vue';
 
 import courseV2 from './course2.vue';
 
 import courseV2 from './course2.vue';
 
 import sweep from './sweep.vue'
 
 import sweep from './sweep.vue'
 
+import number from './number.vue';
 
 export default {
 
 export default {
 
   props: {
 
   props: {
 
     cJson: {
 
     cJson: {
 
@@ -100,7 +105,8 @@ export default {
 
     evaV,
 
     evaV,
 
     timeV,
 
     timeV,
 
     courseV2,
 
     courseV2,
 
-		sweep
 
+		sweep,
 
+    number
 
   },
 
   },
 
   data() {
 
   data() {
 
     return {
 
     return {
 
@@ -162,7 +168,7 @@ export default {
 
       },
 
       },
 
       deep: true
 
       deep: true
 
     },
 
     },
 
-    
+
 
   },
 
   },
 
   methods: {
 
   methods: {
 
     setPage(index){
 
     setPage(index){
 
@@ -337,4 +343,4 @@ export default {
 
 
 
 .p_page {
 
 .p_page {
 
   margin: 0 10px;
 
   margin: 0 10px;
 
-}</style>
 
+}</style>

+ 258 - 0
src/components/pages/test/add/edit/check/number.vue
查看文件 

@@ -0,0 +1,258 @@
 
+<template>
 
+  <div class="c_box">
 
+      <!-- <div class="mask"></div> -->
 
+      <div v-if="!checkJson">暂未设置题目</div>
 
+      <div v-else class="choice_box">
 
+          <!-- <div class="title"><div>{{ `（${option[checkJson.type].name}）` }}</div><div v-html="checkJson.title"></div></div> -->
 
+          <div class="c_title">
 
+              <div class="title">
 
+                  <div  style="display: flex;align-items: center;">
 
+                      <!-- + `（${option[checkJson.type].name}）` -->
 
+                  <span class="g_t_index" style="min-width: fit-content;">{{ tindex + 1}}</span>
 
+                  <span>{{ checkJson.title }}</span>
 
+                  <!-- <span style="min-width: fit-content;color: #efa030;">{{ checkJson.score ? '（分值：'+checkJson.score+'分）' : '' }}</span> -->
 
+              </div>
 
+              <!-- <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>{{ checkJson.answer }}</span>
 
+                  </span>
 
+              </span> -->
 
+                  <!-- </div><div v-html="checkJson.title"></div> -->
 
+              </div>
 
+              <!-- <div class="p_box" v-if="isTeacher == 1 && checkJson.score">
 
+                  <el-input v-model="checkJson.score2" class="c_input" @change="numberPan" placeholder="请输入得分"></el-input><span style="margin: 0 10px;">/</span><span>{{ checkJson.score }}分</span>
 
+              </div>
 
+              <div class="p_box" v-if="isTeacher == 2 && checkJson.score2">
 
+                  <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">
 
+            <el-input-number :controls="false" v-model="checkJson.answer2" :precision="numberTypePrecision" :placeholder="numberTypePlaceholder[checkJson.type]"></el-input-number>
 
+            <span v-if="checkJson.type=='4'">%</span>
 
+              <!-- <textarea  :readonly="checktype == 2" rows="2" v-autoHeight="68" class="binfo_input binfo_textarea" cols v-model="checkJson.answer"
 
+                  placeholder=""></textarea> -->
 
+          </div>
 
+      </div>
 
+  </div>
 
+</template>
 
+
 
+<script>
 
+export default {
 
+  props: {
 
+      tindex:{
 
+          type: Number
 
+      },
 
+      cJson: {
 
+          type: Object,
 
+      },
 
+      checktype: {
 
+          type: Number,
 
+          default: 1
 
+      },
 
+      see:{
 
+          type:Boolean,
 
+          default:false
 
+      },
 
+      isTeacher: {
 
+          type: Number,
 
+          default: 2
 
+      }
 
+  },
 
+  data() {
 
+      return {
 
+          option: {
 
+              1: { name: '字数' },
 
+          },
 
+          userid:this.$route.query.userid,
 
+          checkJson: undefined,
 
+          numberTypePlaceholder:{
 
+            "1":"请输入整数",
 
+            "2":"请输入数字并保留一位小数",
 
+            "3":"请输入数字并保留两位小数",
 
+            "4":"请输入百分比"
 
+          },
 
+      }
 
+  },
 
+  watch: {
 
+      checkJson: {
 
+          handler(newValue) {
 
+              this.$emit('update:cJson', newValue)
 
+          },
 
+          deep: true
 
+      },
 
+      cJson: {
 
+          handler(newValue) {
 
+              if(newValue.answer2 !== this.checkJson.answer2){
 
+                  this.checkJson = this.depthCopy(newValue)
 
+                  this.$forceUpdate()
 
+              }
 
+          },
 
+          deep: true
 
+      },
 
+  },
 
+  computed:{
 
+    numberTypePrecision(){
 
+      let _result = 0;
 
+      if(this.checkJson.type=='1'){
 
+        _result = 0
 
+      }else if(this.checkJson.type=='2'){
 
+        _result = 1
 
+      }else if(this.checkJson.type=='3'){
 
+        _result = 2
 
+      }else if(this.checkJson.type=='4'){
 
+        _result = 0
 
+      }
 
+
 
+      return _result
 
+    }
 
+  },
 
+  methods: {
 
+      depthCopy(s) {
 
+          return JSON.parse(JSON.stringify(s));
 
+      },
 
+  },
 
+  mounted() {
 
+      this.checkJson = this.cJson ? this.depthCopy(this.cJson) : undefined
 
+      if(this.checkJson.answer2){
 
+          setTimeout(() => {
 
+              this.checkJson.answer2 += "*0*%*";
 
+              setTimeout(() => {
 
+                  this.checkJson.answer2 = this.checkJson.answer2.replaceAll("*0*%*", "");
 
+              }, 0);
 
+          }, 100);
 
+      }
 
+  }
 
+}
 
+</script>
 
+
 
+<style scoped>
 
+.c_box {
 
+  width: 100%;
 
+  position: relative;
 
+  padding-left: 45px;
 
+}
 
+
 
+.mask {
 
+  position: absolute;
 
+  height: 100%;
 
+  width: 100%;
 
+  z-index: 2;
 
+}
 
+
 
+.choice_box {
 
+  white-space: pre-line;
 
+}
 
+
 
+.choice_box> .c_title .title {
 
+  font-weight: bold;
 
+  width: 100%;
 
+  word-break: break-all;
 
+}
 
+
 
+.choice_box> .c_title {
 
+  display: flex;
 
+  justify-content: space-between;
 
+}
 
+
 
+.choice_box> .c_title .p_box{
 
+  margin-left: 5px;
 
+  min-width: fit-content;
 
+  display: flex;
 
+  align-items: center;
 
+}
 
+
 
+.choice_box>.choices {
 
+  margin-top: 10px;
 
+}
 
+
 
+.choices>span{
 
+  font-size: 20px;
 
+}
 
+
 
+.binfo_input {
 
+  width: 100%;
 
+  margin: 0;
 
+  padding: 12px 14px;
 
+  display: block;
 
+  min-width: 0;
 
+  outline: none;
 
+  box-sizing: border-box;
 
+  background: none;
 
+  border: none;
 
+  border-radius: 4px;
 
+  background: #fff;
 
+  font-size: 16px;
 
+  resize: none;
 
+  font-family: 'Microsoft YaHei';
 
+  min-height: 48px;
 
+  /* border: 1px solid #3682fc00; */
 
+  border: 1.5px solid #CAD1DC;
 
+}
 
+
 
+.binfo_textarea {
 
+  border: 1.5px solid #CAD1DC;
 
+  font-size: 16px;
 
+  resize: none;
 
+  /* background: #f6f6f6; */
 
+  font-family: 'Microsoft YaHei';
 
+}
 
+
 
+.binfo_input:focus-visible {
 
+  border: 1.5px solid #3681FC !important;
 
+}
 
+
 
+.c_input {
 
+  width: 90px;
 
+}
 
+
 
+.c_input >>> .el-input__inner{
 
+  padding: 0 5px;
 
+  text-align: right;
 
+}
 
+
 
+.g_t_index{
 
+color: #3681FC;
 
+font-size: 28px;
 
+font-weight: bold;
 
+position: relative;
 
+margin-right: 30px;
 
+margin-left: -40px;
 
+}
 
+
 
+.g_t_index+span{
 
+font-weight: bold;
 
+font-size: 18px;
 
+}
 
+
 
+.g_t_index::after{
 
+content: "";
 
+width: 18px;
 
+height: 2px;
 
+position: absolute;
 
+right: -18px;
 
+top: 50%;
 
+transform: translateY(-50%);
 
+background: #3681FC;
 
+}
 
+
 
+.g_t_index::before{
 
+content: "";
 
+width: 6px;
 
+height: 6px;
 
+border-right: 2px solid #3681FC;
 
+border-top: 2px solid #3681FC;
 
+position: absolute;
 
+right: -15px;
 
+top: 50%;
 
+transform: rotate(45deg) translateY(-5px);
 
+}
 
+
 
+.choices>textarea{
 
+border-color: #E7E7E7;
 
+border-radius: 8px;
 
+}
 
+</style>

+ 13 - 1
src/components/pages/test/add/edit/edit/index.vue
查看文件 

@@ -267,7 +267,6 @@
 
 import checkOrder from "../../components/checkOrder.vue";
 
 import checkOrder from "../../components/checkOrder.vue";
 
 import minxinVue from "../../minxins/minxin";
 
 import minxinVue from "../../minxins/minxin";
 
 import addCheckPopover from "../../../add/components/addCheckPopover.vue";
 
 import addCheckPopover from "../../../add/components/addCheckPopover.vue";
 
-import { ref } from "vue-demi";
 
 export default {
 
 export default {
 
   components: {
 
   components: {
 
     checkOrder,
 
     checkOrder,
 
@@ -486,6 +485,12 @@ export default {
 
             title: "",
 
             title: "",
 
             detail: ""
 
             detail: ""
 
           };
 
           };
 
+        }else if (topicType == 13) {
 
+          json.json = {
 
+            title: "",
 
+            detail: "",
 
+            type:'1'
 
+          };
 
         }
 
         }
 
         if (_json.array) {
 
         if (_json.array) {
 
           if (type == 3 && _check.length == 2) {
 
           if (type == 3 && _check.length == 2) {
 
@@ -609,6 +614,13 @@ export default {
 
               title: "",
 
               title: "",
 
               detail: ""
 
               detail: ""
 
             };
 
             };
 
+          } else if (topicType == 13) {
 
+            json1.json = {
 
+              title: "",
 
+              detail: "",
 
+              answer:'',
 
+              type:"1",//1：整数、2：保留一位小数、3：保留两位小数 4：百分数
 
+            };
 
           }
 
           }
 
           this.manualJson.push(json1);
 
           this.manualJson.push(json1);
 
           this.$forceUpdate();
 
           this.$forceUpdate();

+ 6 - 2
src/components/pages/test/add/minxins/minxin.js
查看文件 

@@ -52,7 +52,10 @@ const minxin = {
 
 				{
 
 				{
 
 					value:12,
 
 					value:12,
 
 					label:"扫一扫"
 
 					label:"扫一扫"
 
-				}
 
+				},{
 
+          value:13,
 
+          label:"数字"
 
+        }
 
       ]))),
 
       ]))),
 
       optionsPin:JSON.parse(converter(JSON.stringify([
 
       optionsPin:JSON.parse(converter(JSON.stringify([
 
        {
 
        {
 
@@ -76,7 +79,8 @@ const minxin = {
 
         9: "单选",
 
         9: "单选",
 
         10: "多选",
 
         10: "多选",
 
         11: "课程",
 
         11: "课程",
 
-				12:"扫一扫"
 
+				12:"扫一扫",
 
+        13:"数字"
 
       }))),
 
       }))),
 
       buttonOptions: JSON.parse(converter(JSON.stringify([
 
       buttonOptions: JSON.parse(converter(JSON.stringify([
 
         { name: "分组", type: 1 },
 
         { name: "分组", type: 1 },

+ 10 - 0
src/components/pages/test/check/docxTemplateDialog.vue
查看文件 

@@ -383,6 +383,16 @@ export default {
 
             value: _item2.file
 
             value: _item2.file
 
           });
 
           });
 
           _index++;
 
           _index++;
 
+        }else if(_item.type == 13){
 
+          //数字
 
+          let _item2 = _item.json;
 
+          _list.push({
 
+            name:_item2.title,
 
+            field:`ti_${_index}`,
 
+            type:"text",
 
+            value:`${_item2.answer2}${_item2.type=='4'?'%':''}`
 
+          })
 
+          _index++;
 
         }
 
         }
 
       }
 
       }
 
       return _list;
 
       return _list;

+ 60 - 0
src/components/pages/test/check/index.vue
查看文件 

@@ -641,6 +641,42 @@
 
                   {{ courses }}
 
                   {{ courses }}
 
                 </div> -->
 
                 </div> -->
 
               </div>
 
               </div>
 
+              <div class="content1" v-if="item.type == 13">
 
+                <div class="left">
 
+                  <div class="title">
 
+                    <span>数字</span>
 
+                    <span>次数</span>
 
+                    <span>比例</span>
 
+                  </div>
 
+                  <div
 
+                    class="data"
 
+                    v-for="(data, index2) in item.array"
 
+                    :key="index + '-' + index2"
 
+                  >
 
+                    <span>
 
+                      <span>{{ data.name }}</span>
 
+                    </span>
 
+                    <span>{{ data.count }}</span>
 
+                    <span>
 
+                      <el-progress
 
+                        style="display: flex; align-items: center"
 
+                        :stroke-width="12"
 
+                        color="#3681fc"
 
+                        :percentage="
 
+                          data.count
 
+                            ? parseFloat(
 
+                                ((data.count / item.count) * 100).toFixed(2)
 
+                              )
 
+                            : 0
 
+                        "
 
+                      ></el-progress>
 
+                    </span>
 
+                  </div>
 
+                </div>
 
+                <div class="right">
 
+                  <checkPie :dataJ="item.array"></checkPie>
 
+                </div>
 
+              </div>
 
             </div>
 
             </div>
 
           </div>
 
           </div>
 
           <!-- 按题目手机端 !isDesktop-->
 
           <!-- 按题目手机端 !isDesktop-->
 
@@ -1052,6 +1088,7 @@
 
                   {{ courses }}
 
                   {{ courses }}
 
                 </div> -->
 
                 </div> -->
 
               </div>
 
               </div>
 
+
 
             </div>
 
             </div>
 
           </div>
 
           </div>
 
           <div
 
           <div
 
@@ -1302,6 +1339,12 @@
 
                   >
 
                   >
 
                     {{ scope.row.array[index].json.answer2 }}
 
                     {{ scope.row.array[index].json.answer2 }}
 
                   </div>
 
                   </div>
 
+                  <div
 
+                    v-if="scope.row.array[index].type == 13"
 
+                    style="display: flex; flex-wrap: wrap"
 
+                  >
 
+                    {{ scope.row.array[index].json.answer2 }}<span>{{  scope.row.array[index].json.type=='4'?'%':'' }}</span>
 
+                  </div>
 
                 </template>
 
                 </template>
 
               </el-table-column>
 
               </el-table-column>
 
               <el-table-column
 
               <el-table-column
 
@@ -2475,6 +2518,23 @@ export default {
 
                 );
 
                 );
 
                 let _answer = uniqueArray;
 
                 let _answer = uniqueArray;
 
                 topic.answer2 = _answer;
 
                 topic.answer2 = _answer;
 
+              }else if(topic.type == 13){
 
+                if (el2.array[i].json.answer2!=='') {
 
+                  let _answer = String(el2.array[i].json.answer2);
 
+                  let _type = el2.array[i].json.type;
 
+                  console.log("👉",el2.array[i].json)
 
+                  if(_type=='4')_answer+='%';
 
+                  if(!topic.array)topic.array=[];
 
+                  if(topic.array.findIndex(i=>i.name==_answer)!=-1){
 
+                    topic.array.find(i=>i.name==_answer).count++;
 
+                  }else{
 
+                    topic.array.push({
 
+                      name:_answer,
 
+                      count:1
 
+                    })
 
+                  }
 
+                  topic.count++;
 
+                }
 
               }
 
               }
 
             }
 
             }
 
             console.log("topictopictopictopic", topic);
 
             console.log("topictopictopictopic", topic);

+ 24 - 27
src/components/pages/testPerson/test/index.vue
查看文件 

@@ -1,7 +1,7 @@
 
 <template>
 
 <template>
 
   <div class="i_body">
 
   <div class="i_body">
 
-    <div class="i_b_left">
 
-      <div class="i_b_l_top">
 
+    <div class="i_b_left" :style="`width:${isFold?'70px':'15%'};min-width:${isFold?'70px':'200px'}`">
 
+      <div class="i_b_l_top" :style="`padding:${isFold?' 20px 5px':'20px'}`">
 
         <div @click="checkType(5)" :class="{ i_b_l_t_active: type == 5 }">
 
         <div @click="checkType(5)" :class="{ i_b_l_t_active: type == 5 }">
 
           <svg
 
           <svg
 
             width="20"
 
             width="20"
 
@@ -23,7 +23,7 @@
 
             </g>
 
             </g>
 
           </svg>
 
           </svg>
 
 
 
-          <span>教师画像</span>
 
+          <span v-show="!isFold">教师画像</span>
 
         </div>
 
         </div>
 
         <div
 
         <div
 
           @click="checkType(6)"
 
           @click="checkType(6)"
 
@@ -50,7 +50,7 @@
 
             />
 
             />
 
           </svg>
 
           </svg>
 
 
 
-          <span>年度考核</span>
 
+          <span v-show="!isFold">年度考核</span>
 
         </div>
 
         </div>
 
         <div @click="checkType(1)" :class="{ i_b_l_t_active: type == 1 }">
 
         <div @click="checkType(1)" :class="{ i_b_l_t_active: type == 1 }">
 
           <svg
 
           <svg
 
@@ -73,7 +73,7 @@
 
               </g>
 
               </g>
 
             </g>
 
             </g>
 
           </svg>
 
           </svg>
 
-          <span>资料提交</span>
 
+          <span v-show="!isFold">资料提交</span>
 
         </div>
 
         </div>
 
         <div
 
         <div
 
           @click="checkType(2)"
 
           @click="checkType(2)"
 
@@ -98,7 +98,7 @@
 
             </g>
 
             </g>
 
           </svg>
 
           </svg>
 
 
 
-          <span>培训活动</span>
 
+          <span v-show="!isFold">培训活动</span>
 
         </div>
 
         </div>
 
         <div @click="checkType(3)" :class="{ i_b_l_t_active: type == 3 }">
 
         <div @click="checkType(3)" :class="{ i_b_l_t_active: type == 3 }">
 
           <svg
 
           <svg
 
@@ -118,7 +118,7 @@
 
             </g>
 
             </g>
 
           </svg>
 
           </svg>
 
 
 
-          <span>教学活动</span>
 
+          <span v-show="!isFold">教学活动</span>
 
         </div>
 
         </div>
 
         <div @click="checkType(4)" :class="{ i_b_l_t_active: type == 4 }">
 
         <div @click="checkType(4)" :class="{ i_b_l_t_active: type == 4 }">
 
           <svg
 
           <svg
 
@@ -142,7 +142,7 @@
 
             </g>
 
             </g>
 
           </svg>
 
           </svg>
 
 
 
-          <span>教研活动</span>
 
+          <span v-show="!isFold">教研活动</span>
 
         </div>
 
         </div>
 
 
 
         <!-- <span>更多</span>
 
         <!-- <span>更多</span>
 
@@ -167,16 +167,7 @@
 
 
 
       <div class="i_b_l_bottom">
 
       <div class="i_b_l_bottom">
 
         <span>
 
         <span>
 
-          <svg
 
-            width="16"
 
-            height="16"
 
-            viewBox="0 0 16 16"
 
-            xmlns="http://www.w3.org/2000/svg"
 
-          >
 
-            <path d="M14 4.5H2V3.5H14V4.5Z" fill-opacity="0.9" />
 
-            <path d="M14 8.5H2V7.5H14V8.5Z" fill-opacity="0.9" />
 
-            <path d="M2 12.5H14V11.5H2V12.5Z" fill-opacity="0.9" />
 
-          </svg>
 
+          <svg @click="isFold = !isFold" :style="`transform: rotate(${isFold?'0':'180'}deg);`"  t="1739254286361" class="icon" viewBox="0 0 1317 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6102" width="200" height="200"><path fill="#868686" d="M1310.815586 480.686203L1055.295 257.418828a14.717485 14.717485 0 0 0-21.293382 4.070794 15.343761 15.343761 0 0 0-3.444518 9.707277v445.282197a14.717485 14.717485 0 0 0 14.717485 14.717485 13.151795 13.151795 0 0 0 9.394139-3.757656l255.520586-223.267374a14.717485 14.717485 0 0 0 0-20.667107zM1242.864646 1023.35431H73.607456A64.506422 64.506422 0 0 1 0.646308 950.393162 64.506422 64.506422 0 0 1 73.607456 877.432014h1169.25719A64.506422 64.506422 0 0 1 1315.825793 950.393162a64.506422 64.506422 0 0 1-72.961147 72.961148zM1242.864646 146.567986H73.607456A64.506422 64.506422 0 0 1 0.646308 73.606838 64.506422 64.506422 0 0 1 73.607456 0.64569h1169.25719A64.506422 64.506422 0 0 1 1315.825793 73.606838a64.506422 64.506422 0 0 1-72.961147 72.961148zM804.471484 584.961148H73.607456A64.506422 64.506422 0 0 1 0.646308 512 64.506422 64.506422 0 0 1 73.607456 439.038852h730.864028A64.506422 64.506422 0 0 1 877.432632 512a64.506422 64.506422 0 0 1-72.961148 72.961148z" p-id="6103"></path></svg>
 
         </span>
 
         </span>
 
       </div>
 
       </div>
 
     </div>
 
     </div>
 
@@ -196,7 +187,7 @@
 
         <span @click="checkType(4)" :class="{active:type == 4}">教研活动</span>
 
         <span @click="checkType(4)" :class="{active:type == 4}">教研活动</span>
 
       </div>
 
       </div>
 
       <div>
 
       <div>
 
-       
+
 
       </div>
 
       </div>
 
     </div> -->
 
     </div> -->
 
     <!-- <el-button type="primary" class="bgColor" @click="returnA()">表单中心</el-button> -->
 
     <!-- <el-button type="primary" class="bgColor" @click="returnA()">表单中心</el-button> -->
 
@@ -214,6 +205,7 @@ import Course from "../../course/index.vue";
 
 import trActivity from "./trActivity.vue";
 
 import trActivity from "./trActivity.vue";
 
 import examine from "../examine/index";
 
 import examine from "../examine/index";
 
 import portrait from "../portrait/index";
 
 import portrait from "../portrait/index";
 
+import { transform } from "lodash";
 
 export default {
 
 export default {
 
   props: {
 
   props: {
 
     userid: {
 
     userid: {
 
@@ -236,7 +228,8 @@ export default {
 
       type: 5,
 
       type: 5,
 
       org: this.$route.query.org,
 
       org: this.$route.query.org,
 
       role: this.$route.query.role,
 
       role: this.$route.query.role,
 
-      ExamineBase: []
 
+      ExamineBase: [],
 
+      isFold:false,
 
     };
 
     };
 
   },
 
   },
 
   computed: {
 
   computed: {
 
@@ -631,6 +624,8 @@ export default {
 
 .i_b_l_top > div > svg {
 
 .i_b_l_top > div > svg {
 
   width: 20px;
 
   width: 20px;
 
   height: 20px;
 
   height: 20px;
 
+  min-width: 20px;
 
+  min-height: 20px;
 
   fill: #00000099;
 
   fill: #00000099;
 
   margin-right: 15px;
 
   margin-right: 15px;
 
   margin-left: 10px;
 
   margin-left: 10px;
 
@@ -646,22 +641,24 @@ export default {
 
   width: 100%;
 
   width: 100%;
 
   height: 80px;
 
   height: 80px;
 
   box-sizing: border-box;
 
   box-sizing: border-box;
 
-  padding: 0 30px;
 
+  padding: 0 25px;
 
   display: flex;
 
   display: flex;
 
   align-items: center;
 
   align-items: center;
 
   border-top: solid 1px #e7e7e7;
 
   border-top: solid 1px #e7e7e7;
 
 }
 
 }
 
 
 
 .i_b_l_bottom > span {
 
 .i_b_l_bottom > span {
 
-  width: 25px;
 
-  height: 25px;
 
+  width: 20px;
 
+  height: 20px;
 
   cursor: pointer;
 
   cursor: pointer;
 
+
 
 }
 
 }
 
 
 
 .i_b_l_bottom > span > svg {
 
 .i_b_l_bottom > span > svg {
 
-  fill: #000000;
 
-  width: 100%;
 
-  height: 100%;
 
+  width: 20px;
 
+  height: 20px;
 
+  min-width: 20px;
 
+  min-height: 20px;
 
 }
 
 }
 
 
 
 .i_b_right {
 
 .i_b_right {
 
@@ -671,7 +668,7 @@ export default {
 
   box-sizing: border-box;
 
   box-sizing: border-box;
 
   padding: 0 10px;
 
   padding: 0 10px;
 
 }
 
 }
 
-/* 
+/*
 
 .i_body_title {
 
 .i_body_title {
 
   font-size: 20px;
 
   font-size: 20px;
 
   height: 30px;
 
   height: 30px;

+ 2 - 2
src/components/pages/testStudent/view/check.vue
查看文件 

@@ -121,7 +121,7 @@ export default {
 
           console.log(this.testType);
 
           console.log(this.testType);
 
           this.look = res.data[0][0].look
 
           this.look = res.data[0][0].look
 
 
 
-          
+
 
           this.cJson = JSON.parse(res.data[2][0].courseJson)
 
           this.cJson = JSON.parse(res.data[2][0].courseJson)
 
           this.loading = false
 
           this.loading = false
 
           this.$forceUpdate();
 
           this.$forceUpdate();
 
@@ -243,4 +243,4 @@ export default {
 
   margin: 0 auto;
 
   margin: 0 auto;
 
   box-sizing: border-box;
 
   box-sizing: border-box;
 
 }
 
 }
 
-</style>
 
+</style>

+ 258 - 0
src/components/pages/testStudent/view/component/number.vue
查看文件 

@@ -0,0 +1,258 @@
 
+<template>
 
+  <div class="c_box">
 
+      <!-- <div class="mask"></div> -->
 
+      <div v-if="!checkJson">暂未设置题目</div>
 
+      <div v-else class="choice_box">
 
+          <!-- <div class="title"><div>{{ `（${option[checkJson.type].name}）` }}</div><div v-html="checkJson.title"></div></div> -->
 
+          <div class="c_title">
 
+              <div class="title">
 
+                  <div  style="display: flex;align-items: center;">
 
+                      <!-- + `（${option[checkJson.type].name}）` -->
 
+                  <span class="g_t_index" style="min-width: fit-content;">{{ tindex + 1}}</span>
 
+                  <span>{{ checkJson.title }}</span>
 
+                  <!-- <span style="min-width: fit-content;color: #efa030;">{{ checkJson.score ? '（分值：'+checkJson.score+'分）' : '' }}</span> -->
 
+              </div>
 
+              <!-- <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>{{ checkJson.answer }}</span>
 
+                  </span>
 
+              </span> -->
 
+                  <!-- </div><div v-html="checkJson.title"></div> -->
 
+              </div>
 
+              <!-- <div class="p_box" v-if="isTeacher == 1 && checkJson.score">
 
+                  <el-input v-model="checkJson.score2" class="c_input" @change="numberPan" placeholder="请输入得分"></el-input><span style="margin: 0 10px;">/</span><span>{{ checkJson.score }}分</span>
 
+              </div>
 
+              <div class="p_box" v-if="isTeacher == 2 && checkJson.score2">
 
+                  <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">
 
+            <el-input-number :controls="false" v-model="checkJson.answer2" :precision="numberTypePrecision" :placeholder="numberTypePlaceholder[checkJson.type]"></el-input-number>
 
+            <span v-if="checkJson.type=='4'">%</span>
 
+              <!-- <textarea  :readonly="checktype == 2" rows="2" v-autoHeight="68" class="binfo_input binfo_textarea" cols v-model="checkJson.answer"
 
+                  placeholder=""></textarea> -->
 
+          </div>
 
+      </div>
 
+  </div>
 
+</template>
 
+
 
+<script>
 
+export default {
 
+  props: {
 
+      tindex:{
 
+          type: Number
 
+      },
 
+      cJson: {
 
+          type: Object,
 
+      },
 
+      checktype: {
 
+          type: Number,
 
+          default: 1
 
+      },
 
+      see:{
 
+          type:Boolean,
 
+          default:false
 
+      },
 
+      isTeacher: {
 
+          type: Number,
 
+          default: 2
 
+      }
 
+  },
 
+  data() {
 
+      return {
 
+          option: {
 
+              1: { name: '字数' },
 
+          },
 
+          userid:this.$route.query.userid,
 
+          checkJson: undefined,
 
+          numberTypePlaceholder:{
 
+            "1":"请输入整数",
 
+            "2":"请输入数字并保留一位小数",
 
+            "3":"请输入数字并保留两位小数",
 
+            "4":"请输入百分比"
 
+          },
 
+      }
 
+  },
 
+  watch: {
 
+      checkJson: {
 
+          handler(newValue) {
 
+              this.$emit('update:cJson', newValue)
 
+          },
 
+          deep: true
 
+      },
 
+      cJson: {
 
+          handler(newValue) {
 
+              if(newValue.answer2 !== this.checkJson.answer2){
 
+                  this.checkJson = this.depthCopy(newValue)
 
+                  this.$forceUpdate()
 
+              }
 
+          },
 
+          deep: true
 
+      },
 
+  },
 
+  computed:{
 
+    numberTypePrecision(){
 
+      let _result = 0;
 
+      if(this.checkJson.type=='1'){
 
+        _result = 0
 
+      }else if(this.checkJson.type=='2'){
 
+        _result = 1
 
+      }else if(this.checkJson.type=='3'){
 
+        _result = 2
 
+      }else if(this.checkJson.type=='4'){
 
+        _result = 0
 
+      }
 
+
 
+      return _result
 
+    }
 
+  },
 
+  methods: {
 
+      depthCopy(s) {
 
+          return JSON.parse(JSON.stringify(s));
 
+      },
 
+  },
 
+  mounted() {
 
+      this.checkJson = this.cJson ? this.depthCopy(this.cJson) : undefined
 
+      if(this.checkJson.answer2){
 
+          setTimeout(() => {
 
+              this.checkJson.answer2 += "*0*%*";
 
+              setTimeout(() => {
 
+                  this.checkJson.answer2 = this.checkJson.answer2.replaceAll("*0*%*", "");
 
+              }, 0);
 
+          }, 100);
 
+      }
 
+  }
 
+}
 
+</script>
 
+
 
+<style scoped>
 
+.c_box {
 
+  width: 100%;
 
+  position: relative;
 
+  padding-left: 45px;
 
+}
 
+
 
+.mask {
 
+  position: absolute;
 
+  height: 100%;
 
+  width: 100%;
 
+  z-index: 2;
 
+}
 
+
 
+.choice_box {
 
+  white-space: pre-line;
 
+}
 
+
 
+.choice_box> .c_title .title {
 
+  font-weight: bold;
 
+  width: 100%;
 
+  word-break: break-all;
 
+}
 
+
 
+.choice_box> .c_title {
 
+  display: flex;
 
+  justify-content: space-between;
 
+}
 
+
 
+.choice_box> .c_title .p_box{
 
+  margin-left: 5px;
 
+  min-width: fit-content;
 
+  display: flex;
 
+  align-items: center;
 
+}
 
+
 
+.choice_box>.choices {
 
+  margin-top: 10px;
 
+}
 
+
 
+.choices>span{
 
+  font-size: 20px;
 
+}
 
+
 
+.binfo_input {
 
+  width: 100%;
 
+  margin: 0;
 
+  padding: 12px 14px;
 
+  display: block;
 
+  min-width: 0;
 
+  outline: none;
 
+  box-sizing: border-box;
 
+  background: none;
 
+  border: none;
 
+  border-radius: 4px;
 
+  background: #fff;
 
+  font-size: 16px;
 
+  resize: none;
 
+  font-family: 'Microsoft YaHei';
 
+  min-height: 48px;
 
+  /* border: 1px solid #3682fc00; */
 
+  border: 1.5px solid #CAD1DC;
 
+}
 
+
 
+.binfo_textarea {
 
+  border: 1.5px solid #CAD1DC;
 
+  font-size: 16px;
 
+  resize: none;
 
+  /* background: #f6f6f6; */
 
+  font-family: 'Microsoft YaHei';
 
+}
 
+
 
+.binfo_input:focus-visible {
 
+  border: 1.5px solid #3681FC !important;
 
+}
 
+
 
+.c_input {
 
+  width: 90px;
 
+}
 
+
 
+.c_input >>> .el-input__inner{
 
+  padding: 0 5px;
 
+  text-align: right;
 
+}
 
+
 
+.g_t_index{
 
+color: #3681FC;
 
+font-size: 28px;
 
+font-weight: bold;
 
+position: relative;
 
+margin-right: 30px;
 
+margin-left: -40px;
 
+}
 
+
 
+.g_t_index+span{
 
+font-weight: bold;
 
+font-size: 18px;
 
+}
 
+
 
+.g_t_index::after{
 
+content: "";
 
+width: 18px;
 
+height: 2px;
 
+position: absolute;
 
+right: -18px;
 
+top: 50%;
 
+transform: translateY(-50%);
 
+background: #3681FC;
 
+}
 
+
 
+.g_t_index::before{
 
+content: "";
 
+width: 6px;
 
+height: 6px;
 
+border-right: 2px solid #3681FC;
 
+border-top: 2px solid #3681FC;
 
+position: absolute;
 
+right: -15px;
 
+top: 50%;
 
+transform: rotate(45deg) translateY(-5px);
 
+}
 
+
 
+.choices>textarea{
 
+border-color: #E7E7E7;
 
+border-radius: 8px;
 
+}
 
+</style>

+ 20 - 4
src/components/pages/testStudent/view/component/topic.vue
查看文件 

@@ -29,6 +29,8 @@
 
               :see="see" :isTeacher="isTeacher" @getTestWorkByCid="getTestWorkByCid" @publish2="publish2" :issetPage.sync="issetPage" :tid="tid"></courseV2>
 
               :see="see" :isTeacher="isTeacher" @getTestWorkByCid="getTestWorkByCid" @publish2="publish2" :issetPage.sync="issetPage" :tid="tid"></courseV2>
 
 							<sweep :tindex="index" :cJson.sync="item.json" :checktype="checktype" v-else-if="item.type == 12"
 
 							<sweep :tindex="index" :cJson.sync="item.json" :checktype="checktype" v-else-if="item.type == 12"
 
 							:see="see" :isTeacher="isTeacher"></sweep>
 
 							:see="see" :isTeacher="isTeacher"></sweep>
 
+              <number :tindex="index" :cJson.sync="item.json" :checktype="checktype" v-else-if="item.type == 13"
 
+							:see="see" :isTeacher="isTeacher"></number>
 
             <!-- <span v-else>暂未设置题目</span> -->
 
             <!-- <span v-else>暂未设置题目</span> -->
 
           </div>
 
           </div>
 
           <div v-for="(item2, index2) in item.array" :key="`${index}-${index2}`" class="check_box_xia">
 
           <div v-for="(item2, index2) in item.array" :key="`${index}-${index2}`" class="check_box_xia">
 
@@ -49,6 +51,8 @@
 
                 :see="see" :isTeacher="isTeacher"></timeV>
 
                 :see="see" :isTeacher="isTeacher"></timeV>
 
 								<sweep :tindex="index2" :cJson.sync="item2.json" :checktype="checktype" v-else-if="item2.type == 12"
 
 								<sweep :tindex="index2" :cJson.sync="item2.json" :checktype="checktype" v-else-if="item2.type == 12"
 
 								:see="see" :isTeacher="isTeacher"></sweep>
 
 								:see="see" :isTeacher="isTeacher"></sweep>
 
+                <number :tindex="index2" :cJson.sync="item2.json" :checktype="checktype" v-else-if="item2.type == 13"
 
+								:see="see" :isTeacher="isTeacher"></number>
 
               <!-- <span v-else>暂未设置题目</span> -->
 
               <!-- <span v-else>暂未设置题目</span> -->
 
             </div>
 
             </div>
 
           </div>
 
           </div>
 
@@ -75,6 +79,8 @@
 
               :see="see" :isTeacher="isTeacher" @getTestWorkByCid="getTestWorkByCid" @publish2="publish2" :issetPage.sync="issetPage" :tid="tid"></courseV2>
 
               :see="see" :isTeacher="isTeacher" @getTestWorkByCid="getTestWorkByCid" @publish2="publish2" :issetPage.sync="issetPage" :tid="tid"></courseV2>
 
 							<sweep :tindex="index" :cJson.sync="item.json" :checktype="checktype" v-else-if="item.type == 12"
 
 							<sweep :tindex="index" :cJson.sync="item.json" :checktype="checktype" v-else-if="item.type == 12"
 
                :see="see" :isTeacher="isTeacher"></sweep>
 
                :see="see" :isTeacher="isTeacher"></sweep>
 
+               <number :tindex="index" :cJson.sync="item.json" :checktype="checktype" v-else-if="item.type == 13"
 
+               :see="see" :isTeacher="isTeacher"></number>
 
             <!-- <span v-else>暂未设置题目</span> -->
 
             <!-- <span v-else>暂未设置题目</span> -->
 
           </div>
 
           </div>
 
           <div v-for="(item2, index2) in item.array" :key="`${index}-${index2}`" class="check_box_xia">
 
           <div v-for="(item2, index2) in item.array" :key="`${index}-${index2}`" class="check_box_xia">
 
@@ -97,6 +103,8 @@
 
                 :see="see" :isTeacher="isTeacher" @getTestWorkByCid="getTestWorkByCid" @publish2="publish2" :issetPage.sync="issetPage" :tid="tid"></courseV2>
 
                 :see="see" :isTeacher="isTeacher" @getTestWorkByCid="getTestWorkByCid" @publish2="publish2" :issetPage.sync="issetPage" :tid="tid"></courseV2>
 
 							<sweep :tindex="index2" :cJson.sync="item2.json" :checktype="checktype" v-else-if="item2.type == 12"
 
 							<sweep :tindex="index2" :cJson.sync="item2.json" :checktype="checktype" v-else-if="item2.type == 12"
 
                :see="see" :isTeacher="isTeacher"></sweep>
 
                :see="see" :isTeacher="isTeacher"></sweep>
 
+               <number :tindex="index2" :cJson.sync="item2.json" :checktype="checktype" v-else-if="item2.type == 13"
 
+               :see="see" :isTeacher="isTeacher"></number>
 
               <!-- <span v-else>暂未设置题目</span> -->
 
               <!-- <span v-else>暂未设置题目</span> -->
 
             </div>
 
             </div>
 
           </div>
 
           </div>
 
@@ -124,6 +132,7 @@ import evaV from './eva.vue';
 
 import timeV from './time.vue';
 
 import timeV from './time.vue';
 
 import courseV2 from './course2.vue';
 
 import courseV2 from './course2.vue';
 
 import sweep from './sweep'
 
 import sweep from './sweep'
 
+import number from "./number.vue";
 
 export default {
 
 export default {
 
   props: {
 
   props: {
 
     cJson: {
 
     cJson: {
 
@@ -169,6 +178,7 @@ export default {
 
     timeV,
 
     timeV,
 
     courseV2,
 
     courseV2,
 
 		sweep,
 
 		sweep,
 
+    number
 
   },
 
   },
 
   data() {
 
   data() {
 
     return {
 
     return {
 
@@ -280,7 +290,7 @@ export default {
 
         let checkArray = _json.filter((item) => {
 
         let checkArray = _json.filter((item) => {
 
           if (item.array) {
 
           if (item.array) {
 
             item.array = item.array.filter((item2) => {
 
             item.array = item.array.filter((item2) => {
 
-              if (item2.ttype == 1 && item2.json && !item2.json.answer2 && item2.type != 6 && item2.type != 7 && item2.type != 8 && item2.type != 12) {
 
+              if (item2.ttype == 1 && item2.json && !item2.json.answer2 && item2.type != 6 && item2.type != 7 && item2.type != 8 && item2.type != 12  && item2.type != 13) {
 
                 item2.json.answer2 = [];
 
                 item2.json.answer2 = [];
 
               } else if (item2.ttype == 1 && item2.json && !item2.json.answer2 && item2.type == 6) {
 
               } else if (item2.ttype == 1 && item2.json && !item2.json.answer2 && item2.type == 6) {
 
                 item2.json.answer2 = this.gcourseid ? this.gcourseid : item2.json.courses[0];
 
                 item2.json.answer2 = this.gcourseid ? this.gcourseid : item2.json.courses[0];
 
@@ -290,10 +300,12 @@ export default {
 
                 item2.json.answer2 = '';
 
                 item2.json.answer2 = '';
 
               }else if (item2.ttype == 1 && item2.json && !item2.json.answer2 && item2.json.answer2 !== 0 && item2.type == 12 ) {
 
               }else if (item2.ttype == 1 && item2.json && !item2.json.answer2 && item2.json.answer2 !== 0 && item2.type == 12 ) {
 
                 item2.json.answer2 = '';
 
                 item2.json.answer2 = '';
 
+              }else if (item2.ttype == 1 && item2.json && !item2.json.answer2 && item2.json.answer2 !== 0 && item2.type == 13 ) {
 
+                item2.json.answer2 = '';
 
               }
 
               }
 
               if (item2.array) {
 
               if (item2.array) {
 
                 item2.array = item2.array.filter((item3) => {
 
                 item2.array = item2.array.filter((item3) => {
 
-                  if (item3.ttype == 1 && item3.json && !item3.json.answer2 && item3.type != 6 && item3.type != 7 && item3.type != 8 && item3.type != 12) {
 
+                  if (item3.ttype == 1 && item3.json && !item3.json.answer2 && item3.type != 6 && item3.type != 7 && item3.type != 8 && item3.type != 12 && item3.type != 13) {
 
                     item3.json.answer2 = [];
 
                     item3.json.answer2 = [];
 
                   } else if (item3.ttype == 1 && item3.json && !item3.json.answer2 && item3.type == 6) {
 
                   } else if (item3.ttype == 1 && item3.json && !item3.json.answer2 && item3.type == 6) {
 
                     item3.json.answer2 = this.gcourseid ? this.gcourseid : item3.json.courses[0];
 
                     item3.json.answer2 = this.gcourseid ? this.gcourseid : item3.json.courses[0];
 
@@ -303,6 +315,8 @@ export default {
 
                     item3.json.answer2 = '';
 
                     item3.json.answer2 = '';
 
                   }else if (item3.ttype == 1 && item3.json && !item3.json.answer2 && item3.json.answer2 !== 0 && item3.type == 12) {
 
                   }else if (item3.ttype == 1 && item3.json && !item3.json.answer2 && item3.json.answer2 !== 0 && item3.type == 12) {
 
                     item3.json.answer2 = '';
 
                     item3.json.answer2 = '';
 
+                  }else if (item3.ttype == 1 && item3.json && !item3.json.answer2 && item3.json.answer2 !== 0 && item3.type == 13) {
 
+                    item3.json.answer2 = '';
 
                   }
 
                   }
 
 
 
                   return item3;
 
                   return item3;
 
@@ -313,7 +327,7 @@ export default {
 
               );
 
               );
 
             });
 
             });
 
           }
 
           }
 
-          if (item.ttype == 1 && item.json && !item.json.answer2 && item.type != 6 && item.type != 7 && item.type != 8 && item.type != 12) {
 
+          if (item.ttype == 1 && item.json && !item.json.answer2 && item.type != 6 && item.type != 7 && item.type != 8 && item.type != 12 && item.type != 13) {
 
             item.json.answer2 = [];
 
             item.json.answer2 = [];
 
           } else if (item.ttype == 1 && item.json && !item.json.answer2 && item.type == 6) {
 
           } else if (item.ttype == 1 && item.json && !item.json.answer2 && item.type == 6) {
 
             item.json.answer2 = this.gcourseid ? this.gcourseid : item.json.courses[0];
 
             item.json.answer2 = this.gcourseid ? this.gcourseid : item.json.courses[0];
 
@@ -323,6 +337,8 @@ export default {
 
             item.json.answer2 = '';
 
             item.json.answer2 = '';
 
           }else if (item.ttype == 1 && item.json && !item.json.answer2 && item.json.answer2 !== 0 && item.type == 12) {
 
           }else if (item.ttype == 1 && item.json && !item.json.answer2 && item.json.answer2 !== 0 && item.type == 12) {
 
             item.json.answer2 = '';
 
             item.json.answer2 = '';
 
+          }else if (item.ttype == 1 && item.json && !item.json.answer2 && item.json.answer2 !== 0 && item.type == 13) {
 
+            item.json.answer2 = '';
 
           }
 
           }
 
           console.log(item.array);
 
           console.log(item.array);
 
           return (item.ttype != 1 && item.array.length > 0) || item.ttype == 1;
 
           return (item.ttype != 1 && item.array.length > 0) || item.ttype == 1;
 
@@ -448,4 +464,4 @@ export default {
 
 .p_page {
 
 .p_page {
 
   margin: 0 10px;
 
   margin: 0 10px;
 
 }
 
 }
 
-</style>
 
+</style>

+ 10 - 2
src/router/index.js
查看文件 

@@ -144,6 +144,7 @@ import testAi from '@/components/pages/testAi'
 
 import cocoroboffmpeg from '@/components/pages/cocoroboffmpeg'
 
 import cocoroboffmpeg from '@/components/pages/cocoroboffmpeg'
 
 import appStore from '@/components/pages/appStore'
 
 import appStore from '@/components/pages/appStore'
 
 import knowledge from '@/components/pages/knowledge/index'
 
 import knowledge from '@/components/pages/knowledge/index'
 
+import sassPlatform from '@/components/pages/sassPlatform/index'
 
 // 全局修改默认配置，点击空白处不能关闭弹窗
 
 // 全局修改默认配置，点击空白处不能关闭弹窗
 
 ElementUI.Dialog.props.closeOnClickModal.default = false
 
 ElementUI.Dialog.props.closeOnClickModal.default = false
 
 Vue.use(Router).use(ElementUI)
 
 Vue.use(Router).use(ElementUI)
 
@@ -1241,6 +1242,13 @@ export default new Router({
 
 					meta:{
 
 					meta:{
 
 						requireAuth:''//不需要鉴权
 
 						requireAuth:''//不需要鉴权
 
 					}
 
 					}
 
-				}
 
+				},{
 
+          path:"/sassPlatform",
 
+          name:"sassPlatform",
 
+          component:sassPlatform,
 
+          meta:{
 
+            requireAuth:""//不需要鉴权
 
+          }
 
+        }
 
     ]
 
     ]
 
-})
 
+})

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