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

update

lsc 3 months ago
parent
30a2745f63
commit
7a2855d5b2
24 changed files with 226 additions and 101 deletions
Split View Show Diff Stats
  1. 6 6
      build/webpack.base.conf.js
  2. 1 1
      dist/index.html
  3. 0 0
      dist/static/css/app.5789dfc46182c96cda4a4d9744d96f90.css
  4. 0 0
      dist/static/css/app.5789dfc46182c96cda4a4d9744d96f90.css.map
  5. 0 0
      dist/static/css/app.a7d10369702dd5a1a907de32bbee63a1.css
  6. 0 0
      dist/static/css/app.a7d10369702dd5a1a907de32bbee63a1.css.map
  7. 0 0
      dist/static/js/0.4f3b05586c3acc102a54.js
  8. 0 0
      dist/static/js/0.4f3b05586c3acc102a54.js.map
  9. 0 0
      dist/static/js/app.8c9a72de982ed41aa2d6.js
  10. 0 0
      dist/static/js/app.8c9a72de982ed41aa2d6.js.map
  11. 0 0
      dist/static/js/app.9cc5a346959b1874f35c.js
  12. 0 0
      dist/static/js/app.9cc5a346959b1874f35c.js.map
  13. 0 2
      dist/static/js/manifest.161e82026ac2ae03ab6f.js
  14. 0 0
      dist/static/js/manifest.161e82026ac2ae03ab6f.js.map
  15. 0 0
      dist/static/js/manifest.3eade43afd174522bb8a.js.map
  16. 0 0
      dist/static/js/vendor.de15001ce66f032e9274.js
  17. 0 0
      dist/static/js/vendor.de15001ce66f032e9274.js.map
  18. 77 77
      src/components/pages/aiAddCourse/addCourse.vue
  19. 30 2
      src/components/pages/test/databoard.vue
  20. 34 0
      src/components/pages/test/examine/index.vue
  21. 32 1
      src/components/pages/testPerson/examine/index.vue
  22. 30 1
      src/components/pages/testPerson/portrait/index.vue
  23. 7 2
      src/components/pages/testPerson/test/index.vue
  24. 9 9
      src/components/pages/testPerson/test/test.vue

+ 6 - 6
build/webpack.base.conf.js
View File 

@@ -11,12 +11,12 @@ function resolve(dir) {
 
 
 
 module.exports = {
 
-	devServer: {
 
-		headers: {
 
-			"Cross-Origin-Opener-Policy": "same-origin", // 保护你的源站点免受攻击
 
-			"Cross-Origin-Embedder-Policy": "require-corp", // 保护受害者免受你的源站点的影响
 
-		},
 
-	},
 
+	// devServer: {
 
+	// 	headers: {
 
+	// 		"Cross-Origin-Opener-Policy": "same-origin", // 保护你的源站点免受攻击
 
+	// 		"Cross-Origin-Embedder-Policy": "require-corp", // 保护受害者免受你的源站点的影响
 
+	// 	},
 
+	// },
 
 	context: path.resolve(__dirname, '../'),
 
 	entry: {
 
 		app: './src/main.js'

+ 1 - 1
dist/index.html
View File 

@@ -32,7 +32,7 @@
 
       width: 100%;
 
       background: #e6eaf0;
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.a5fe1f3f4d7d3f3861c2e784a777095a.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.f154a5de151474e647b4.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.5789dfc46182c96cda4a4d9744d96f90.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3eade43afd174522bb8a.js></script><script type=text/javascript src=./static/js/vendor.6bffbf9058a42e825dbc.js></script><script type=text/javascript src=./static/js/app.9cc5a346959b1874f35c.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.5789dfc46182c96cda4a4d9744d96f90.css


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


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


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


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


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


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


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


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


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


+ 0 - 2
dist/static/js/manifest.161e82026ac2ae03ab6f.js
View File 

@@ -1,2 +0,0 @@
 
-!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var i,u,f,s=0,l=[];s<r.length;s++)u=r[s],t[u]&&l.push(t[u][0]),t[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(n&&n(r,c,a);l.length;)l.shift()();if(a)for(s=0;s<a.length;s++)f=o(o.s=a[s]);return f};var r={},t={6:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"4f3b05586c3acc102a54",1:"14e8e8c7e44fc858e4a6",2:"94e1427bfc7ef0b4c685",3:"3a9f53a78da16650e6b8"}[e]+".js";var i=setTimeout(u,12e4);function u(){a.onerror=a.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=u,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
 
-//# sourceMappingURL=manifest.161e82026ac2ae03ab6f.js.map

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


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


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


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


+ 77 - 77
src/components/pages/aiAddCourse/addCourse.vue
View File 

@@ -10734,17 +10734,17 @@ ${_this.unitJson[0].chapterInfo[0].taskJson[index].taskDetail3.replaceAll('#',''
 
           // loading.close();
 
           return;
 
         }
 
-        if (
 
-          ['DOC'].indexOf(
 
-              file.name
 
-                .split(".")
 
-              [file.name.split(".").length - 1].toLocaleUpperCase()
 
-            ) !== -1
 
-          ) {
 
-          this.$message.error("抱歉，小可暂时不支持.doc的文件呢");
 
-          this.inputShow = true;
 
-          return;
 
-        }
 
+        // if (
 
+        //   ['DOC'].indexOf(
 
+        //       file.name
 
+        //         .split(".")
 
+        //       [file.name.split(".").length - 1].toLocaleUpperCase()
 
+        //     ) !== -1
 
+        //   ) {
 
+        //   this.$message.error("抱歉，小可暂时不支持.doc的文件呢");
 
+        //   this.inputShow = true;
 
+        //   return;
 
+        // }
 
 
         if (type == 3) {
 
           var b = [
 
@@ -10840,75 +10840,75 @@ ${_this.unitJson[0].chapterInfo[0].taskJson[index].taskDetail3.replaceAll('#',''
 
           _this.infoisAllSize = event.target.files.length;
 
           // _this.infoisAllSize = (file.size / 1024 / 1024).toFixed(2);
 
         }
 
-        if (
 
-          ['DOC'].indexOf(
 
-              file.name
 
-                .split(".")
 
-              [file.name.split(".").length - 1].toLocaleUpperCase()
 
-            ) !== -1
 
-          ) {
 
-          // this.$message.error("抱歉，小可暂时不支持.doc的文件呢");
 
-          // this.inputShow = true;
 
-          let params = convertApi.createParams()
 
-          params.add('file', file)
 
-          try {
 
-            let result = await convertApi.convert('doc', 'docx', params);
 
-            // Get result file URL
 
-            file = await fetch(result.files[0].Url).then(res => res.blob()).then(blob => {
 
-              return new File([blob], result.files[0].FileName, { type: 'application/octet-stream' });
 
-            });
 
-            console.log(result)
 
-            console.log(file)
 
-          } catch (error) {
 
-            cfindex2++;
 
-            if(type == 14){
 
-              _this.teacherinfoisFinishSize = cfindex2;
 
-            }else if(type == 16){
 
-              _this.mubiaoinfoisFinishSize = cfindex2;
 
-            }else if(type == 17){
 
-              _this.xuanzeinfoisFinishSize = cfindex2;
 
-            }else if(type == 18){
 
-              _this.pingjiainfoisFinishSize[tindex] = cfindex2;
 
-            }else if(type == 19){
 
-              _this.knowinfoisFinishSize = cfindex2;
 
-            }else if(type == 20){
 
-              _this.knowinfoisFinishSize2 = cfindex2;
 
-            }else {
 
-              _this.infoisFinishSize = cfindex2;
 
-            }
 
-            setTimeout(() => {
 
-              if (
 
-                cfindex2 == event.target.files.length ||
 
-                cfindex2 > event.target.files.length
 
-              ) {
 
-                if(type == 14){
 
-                  _this.teacherinfoproVisible = false;
 
-                }else if(type == 16){
 
-                  _this.mubiaoinfoproVisible = false;
 
-                }else if(type == 17){
 
-                  _this.xuanzeinfoproVisible = false;
 
-                }else if(type == 18){
 
-                  _this.pingjiainfoproVisible[tindex] = false;
 
-                }else if(type == 19){
 
-                  _this.knowinfoproVisible = false;
 
-                }else if(type == 20){
 
-                  _this.knowinfoproVisible2 = false;
 
-                }else{
 
-                  _this.infoproVisible = false;
 
-                }
 
-              }
 
+        // if (
 
+        //   ['DOC'].indexOf(
 
+        //       file.name
 
+        //         .split(".")
 
+        //       [file.name.split(".").length - 1].toLocaleUpperCase()
 
+        //     ) !== -1
 
+        //   ) {
 
+        //   // this.$message.error("抱歉，小可暂时不支持.doc的文件呢");
 
+        //   // this.inputShow = true;
 
+        //   let params = convertApi.createParams()
 
+        //   params.add('file', file)
 
+        //   try {
 
+        //     let result = await convertApi.convert('doc', 'docx', params);
 
+        //     // Get result file URL
 
+        //     file = await fetch(result.files[0].Url).then(res => res.blob()).then(blob => {
 
+        //       return new File([blob], result.files[0].FileName, { type: 'application/octet-stream' });
 
+        //     });
 
+        //     console.log(result)
 
+        //     console.log(file)
 
+        //   } catch (error) {
 
+        //     cfindex2++;
 
+        //     if(type == 14){
 
+        //       _this.teacherinfoisFinishSize = cfindex2;
 
+        //     }else if(type == 16){
 
+        //       _this.mubiaoinfoisFinishSize = cfindex2;
 
+        //     }else if(type == 17){
 
+        //       _this.xuanzeinfoisFinishSize = cfindex2;
 
+        //     }else if(type == 18){
 
+        //       _this.pingjiainfoisFinishSize[tindex] = cfindex2;
 
+        //     }else if(type == 19){
 
+        //       _this.knowinfoisFinishSize = cfindex2;
 
+        //     }else if(type == 20){
 
+        //       _this.knowinfoisFinishSize2 = cfindex2;
 
+        //     }else {
 
+        //       _this.infoisFinishSize = cfindex2;
 
+        //     }
 
+        //     setTimeout(() => {
 
+        //       if (
 
+        //         cfindex2 == event.target.files.length ||
 
+        //         cfindex2 > event.target.files.length
 
+        //       ) {
 
+        //         if(type == 14){
 
+        //           _this.teacherinfoproVisible = false;
 
+        //         }else if(type == 16){
 
+        //           _this.mubiaoinfoproVisible = false;
 
+        //         }else if(type == 17){
 
+        //           _this.xuanzeinfoproVisible = false;
 
+        //         }else if(type == 18){
 
+        //           _this.pingjiainfoproVisible[tindex] = false;
 
+        //         }else if(type == 19){
 
+        //           _this.knowinfoproVisible = false;
 
+        //         }else if(type == 20){
 
+        //           _this.knowinfoproVisible2 = false;
 
+        //         }else{
 
+        //           _this.infoproVisible = false;
 
+        //         }
 
+        //       }
 
             
-              _this.$forceUpdate();
 
-            }, 1000);
 
-            _this.inputShow = true;
 
-            _this.$message.error("抱歉，小可暂时不支持.doc的文件呢");
 
-            // 捕捉到这个convertApi.convert报错就不要往下走了
 
-            return; // 直接返回，不继续执行后续代码
 
-          }
 
+        //       _this.$forceUpdate();
 
+        //     }, 1000);
 
+        //     _this.inputShow = true;
 
+        //     _this.$message.error("抱歉，小可暂时不支持.doc的文件呢");
 
+        //     // 捕捉到这个convertApi.convert报错就不要往下走了
 
+        //     return; // 直接返回，不继续执行后续代码
 
+        //   }
 
 
 
-          // return;
 
-        }
 
+        //   // return;
 
+        // }
 
 
         _this.$forceUpdate();
 
         if (file) {

+ 30 - 2
src/components/pages/test/databoard.vue
View File 

@@ -52,10 +52,10 @@
 
         <div class="bbox" v-loading="tabLoading">
 
             <div class="bbox_nav">
 
                 <div class="teaLis">
 
-                    <div class="teal" @click="cutPage(2)" :class="[pType == 2 ? 'Tbor' : '']">
 
+                    <div class="teal" @click="cutPage(2)" :class="[pType == 2 ? 'Tbor' : '']" v-if="bArray.length">
 
                         专任教师
 
                     </div>
 
-                    <div class="teal" @click="cutPage(1)" :class="[pType == 1 ? 'Tbor' : '']">
 
+                    <div class="teal" @click="cutPage(1)" :class="[pType == 1 ? 'Tbor' : '']" v-if="aArray.length">
 
                         班主任
 
                     </div>
 
                 </div>
 
@@ -118,6 +118,8 @@ export default {
 
             data: [],
 
             typeInfo: [],
 
             teacherArray: [],
 
+            aArray:[],
 
+            bArray:[],
 
         };
 
     },
 
     computed: {
 
@@ -133,6 +135,30 @@ export default {
 
         }
 
     },
 
     methods: {
 
+        getPageBase2(type) {
 
+            let params = {
 
+                typ: type,
 
+                org: this.org,
 
+                oid: this.oid
 
+            };
 
+            this.ajax
 
+                .get(this.$store.state.api + "selectTestExamineBase", params)
 
+                .then(res => {
 
+                console.log('1111111111111111111111', res.data);
 
+                
+                if(type == 1){
 
+                    this.aArray = res.data[0];
 
+                }else {
 
+                    this.bArray = res.data[0];
 
+                    if(!this.bArray.length){
 
+                        this.cutPage(2)
 
+                    }
 
+                }
 
+                })
 
+                .catch(error => {
 
+                console.log(error);
 
+            });
 
+        },
 
         goTo(path) {
 
             this.$router.push(path);
 
         },
 
@@ -358,6 +384,8 @@ export default {
 
         },
 
     },
 
     mounted() {
 
+        this.getPageBase2(1)
 
+        this.getPageBase2(2)
 
         this.getTypeInfo()
 
     },
 
 };

+ 34 - 0
src/components/pages/test/examine/index.vue
View File 

@@ -4,6 +4,7 @@
 
       <div class="teaLis">
 
         <div
 
           class="teal"
 
+          v-if="bArray.length"
 
           @click="cutPage(2)"
 
           :class="[pType == 2 ? 'Tbor' : '']"
 
         >
 
@@ -11,6 +12,7 @@
 
         </div>
 
         <div
 
           class="teal"
 
+          v-if="aArray.length"
 
           @click="cutPage(1)"
 
           :class="[pType == 1 ? 'Tbor' : '']"
 
         >
 
@@ -71,6 +73,10 @@ export default {
 
   },
 
   data() {
 
     return {
 
+      aArray: [],
 
+      bArray: [],
 
+      oid: this.$route.query.oid,
 
+      org: this.$route.query.org,
 
       pType: 2,
 
       cutTable: 0,
 
       teacherName: "",
 
@@ -86,7 +92,35 @@ export default {
 
       ]
 
     };
 
   },
 
+  mounted () {
 
+      this.getPageBase2(1)
 
+      this.getPageBase2(2)
 
+  },
 
   methods: {
 
+    getPageBase2(type) {
 
+      let params = {
 
+        typ: type,
 
+        org: this.org,
 
+        oid: this.oid
 
+      };
 
+      this.ajax
 
+        .get(this.$store.state.api + "selectTestExamineBase", params)
 
+        .then(res => {
 
+          console.log('1111111111111111111111', res.data);
 
+          
+          if(type == 1){
 
+            this.aArray = res.data[0];
 
+          }else {
 
+            this.bArray = res.data[0];
 
+            if(!this.bArray.length){
 
+              this.pType = 1
 
+            }
 
+          }
 
+        })
 
+        .catch(error => {
 
+          console.log(error);
 
+        });
 
+    },
 
     cutPage(e) {
 
       this.pType = e;
 
     },

+ 32 - 1
src/components/pages/testPerson/examine/index.vue
View File 

@@ -5,6 +5,7 @@
 
         <div
 
           class="teal"
 
           @click="cutPage(2)"
 
+          v-if="bArray.length"
 
           :class="[pType == 2 ? 'Tbor' : '']"
 
         >
 
           专任教师
 
@@ -12,6 +13,7 @@
 
         <div
 
           class="teal"
 
           @click="cutPage(1)"
 
+          v-if="aArray.length"
 
           :class="[pType == 1 ? 'Tbor' : '']"
 
         >
 
           班主任考核
 
@@ -205,7 +207,9 @@ export default {
 
       org: this.$route.query.org, //组织id
 
       role: this.$route.query.role,
 
       ifmUrl: "", //数据来源地址
 
-      diaIframe: false //数据来源弹框
 
+      diaIframe: false, //数据来源弹框
 
+      aArray: [],
 
+      bArray: [],
 
     };
 
   },
 
   watch: {
 
@@ -217,9 +221,13 @@ export default {
 
   activated() {
 
     // 当组件被激活时调用
 
     this.getPageBase();
 
+    this.getPageBase2(1)
 
+    this.getPageBase2(2)
 
   },
 
   mounted() {
 
     this.getPageBase();
 
+    this.getPageBase2(1)
 
+    this.getPageBase2(2)
 
     // console.log(JSON.stringify(this.TeaTabJson));
 
   },
 
   methods: {
 
@@ -431,6 +439,29 @@ export default {
 
           console.log(error);
 
         });
 
     },
 
+    // 获取页面基础ui信息
 
+    getPageBase2(type) {
 
+      let params = {
 
+        typ: type,
 
+        org: this.org,
 
+        oid: this.oid
 
+      };
 
+      this.ajax
 
+        .get(this.$store.state.api + "selectTestExamineBase", params)
 
+        .then(res => {
 
+          if(type == 1){
 
+            this.aArray = res.data[0];
 
+          }else {
 
+            this.bArray = res.data[0];
 
+            if(!this.bArray.length){
 
+              this.pType = 1
 
+            }
 
+          }
 
+        })
 
+        .catch(error => {
 
+          console.log(error);
 
+        });
 
+    },
 
     async handleData() {
 
       for (const e of this.PageBaseData) {
 
         for (const k of e.children) {

+ 30 - 1
src/components/pages/testPerson/portrait/index.vue
View File 

@@ -142,11 +142,13 @@
 
         <div>
 
           <el-button-group>
 
             <el-button
 
+              v-if="bArray.length"
 
               @click="changeAnnualAssessmentStatus(2)"
 
               :type="annualAssessmentStatus === 2 ? 'primary' : ''"
 
               >专任教师</el-button
 
             >
 
             <el-button
 
+              v-if="aArray.length"
 
               @click="changeAnnualAssessmentStatus(1)"
 
               :type="annualAssessmentStatus === 1 ? 'primary' : ''"
 
               >班主任</el-button
 
@@ -354,10 +356,35 @@ export default {
 
       userid: this.$route.query.userid,
 
       oid: this.$route.query.oid,
 
       org: this.$route.query.org,
 
-      teacherName: ""
 
+      teacherName: "",
 
+      aArray: [],
 
+      bArray: [],
 
     };
 
   },
 
   methods: {
 
+    // 获取页面基础ui信息
 
+    getPageBase2(type) {
 
+      let params = {
 
+        typ: type,
 
+        org: this.org,
 
+        oid: this.oid
 
+      };
 
+      this.ajax
 
+        .get(this.$store.state.api + "selectTestExamineBase", params)
 
+        .then(res => {
 
+          if(type == 1){
 
+            this.aArray = res.data[0];
 
+          }else {
 
+            this.bArray = res.data[0];
 
+            if(!this.bArray.length){
 
+              this.changeAnnualAssessmentStatus(1)
 
+            }
 
+          }
 
+        })
 
+        .catch(error => {
 
+          console.log(error);
 
+        });
 
+    },
 
     changeAnnualAssessmentStatus(status) {
 
       if (this.annualAssessmentLoading) return;
 
       this.annualAssessmentStatus = status;
 
@@ -721,6 +748,8 @@ export default {
 
     },
 
   },
 
   mounted() {
 
+    this.getPageBase2(1)
 
+    this.getPageBase2(2)
 
     this.getAnnualAssessmentEChartsData();
 
     this.getData();
 
     this.getCardData();

+ 7 - 2
src/components/pages/testPerson/test/index.vue
View File 

@@ -234,6 +234,8 @@ export default {
 
   data() {
 
     return {
 
       type: 5,
 
+      org: this.$route.query.org,
 
+      role: this.$route.query.role,
 
       ExamineBase: []
 
     };
 
   },
 
@@ -534,9 +536,9 @@ export default {
 
           return;
 
         });
 
     },
 
-    getPageBase() {
 
+    getPageBase(type = 1) {
 
       let params = {
 
-        typ: 1,
 
+        typ: type,
 
         org: this.org,
 
         oid: this.oid
 
       };
 
@@ -544,6 +546,9 @@ export default {
 
         .get(this.$store.state.api + "selectTestExamineBase", params)
 
         .then(res => {
 
           this.ExamineBase = res.data[0];
 
+          if(type == 1 && !res.data[0].length){
 
+            this.getPageBase(2)
 
+          }
 
           // console.log("selectTestExamineBase", res.data);
 
         })
 
         .catch(error => {

+ 9 - 9
src/components/pages/testPerson/test/test.vue
View File 

@@ -273,24 +273,24 @@ export default {
 
         }
 
     },
 
     methods: {
 
-        getPageBase() {
 
+        getPageBase(type = 1) {
 
             let params = {
 
-                typ: 1,
 
+                typ: type,
 
                 org: this.org,
 
                 oid: this.oid
 
             };
 
             this.ajax
 
                 .get(this.$store.state.api + "selectTestExamineBase", params)
 
                 .then(res => {
 
-                    this.ExamineBase = res.data[0]
 
-                    // if ( this.ExamineBase.length > 0) {
 
-                    //     this.type=1
 
-                    // }
 
-                    // console.log("selectTestExamineBase", res.data);
 
+                this.ExamineBase = res.data[0];
 
+                if(type == 1 && !res.data[0].length){
 
+                    this.getPageBase(2)
 
+                }
 
+                // console.log("selectTestExamineBase", res.data);
 
                 })
 
                 .catch(error => {
 
-                    console.log(error);
 
-                });
 
+                console.log(error);
 
+            });
 
         },
 
         isDeadlinePassed(deadline) {
 
             let _line = new Date(deadline)

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