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

gx

SanHQin 4 days ago
parent
ca02804074
commit
7832dc1af2
10 changed files with 68 additions and 11 deletions
Split View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.7fa0a9cf25182cd2e4925c2b6c421640.css
  3. 0 0
      dist/static/css/app.7fa0a9cf25182cd2e4925c2b6c421640.css.map
  4. 0 0
      dist/static/js/app.6dab276a60b449d68566.js
  5. 0 0
      dist/static/js/app.6dab276a60b449d68566.js.map
  6. 0 0
      dist/static/js/manifest.161e82026ac2ae03ab6f.js.map
  7. 18 4
      src/components/pages/sassPlatform/index.vue
  8. 16 2
      src/components/pages/test/add/setInfo/index.vue
  9. 15 1
      src/components/pages/test/index.vue
  10. 18 3
      src/components/pages/testPerson/test/index.vue

+ 1 - 1
dist/index.html
View File 

@@ -32,7 +32,7 @@
 
       width: 100%;
 
       background: #e6eaf0;
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.2bfb2ba2eb11589cc4c5a87c9d0107b1.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.161e82026ac2ae03ab6f.js></script><script type=text/javascript src=./static/js/vendor.b7212920b6e58d14a873.js></script><script type=text/javascript src=./static/js/app.a5d035db1fffa1300c98.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.7fa0a9cf25182cd2e4925c2b6c421640.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.161e82026ac2ae03ab6f.js></script><script type=text/javascript src=./static/js/vendor.b7212920b6e58d14a873.js></script><script type=text/javascript src=./static/js/app.6dab276a60b449d68566.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.7fa0a9cf25182cd2e4925c2b6c421640.css


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


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


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


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


+ 18 - 4
src/components/pages/sassPlatform/index.vue
View File 

@@ -47,7 +47,16 @@ export default {
 
       oid: this.$route.query.oid,
 
       org: this.$route.query.org,
 
       role:this.$route.query.role,
 
-      userData:null
 
+      userData:null,
 
+      liYuanOrgList:["3823a6a5-1b6e-11f0-a66a-005056924926",
 
+				"292e34dc-1b6e-11f0-a66a-005056924926",
 
+				"21d6b367-1b6e-11f0-a66a-005056924926",
 
+				"1a1a172d-1b6e-11f0-a66a-005056924926",
 
+				"1197f86b-1b6e-11f0-a66a-005056924926",
 
+				"f235659b-1b6d-11f0-a66a-005056924926",
 
+				"d87b62d3-1b6d-11f0-a66a-005056924926",
 
+				"c25ea59b-1b6d-11f0-a66a-005056924926",
 
+      ]
 
     }
 
   },
 
   computed:{
 
@@ -73,11 +82,16 @@ export default {
 
         let params = {
 
         oid: "",//this.oid
 
       };
 
+      let _url = "selectTestType"
 
+            if(this.liYuanOrgList.includes(this.org)){
 
+              _url = "selectTestType_liYuan"
 
+            }
 
+
 
       this.ajax
 
-        .get(this.$store.state.api + "selectTestType", params)
 
+        .get(this.$store.state.api + _url, params)
 
         .then(res => {
 
           let _data = res.data[0];
 
-          let _type1 = _data.filter(i => i.pid == "");
 
+          let _type1 = _data.filter(i => !i.pid);
 
           _type1.forEach((i,index) => {
 
             let _typeList = [];
 
             _typeList = _data.filter(i2 => i2.pid == i.id);
 
@@ -85,7 +99,7 @@ export default {
 
             let _children = [{name:"表单管理",type:"formManage",typeId:i.id,navIndex:`${index}-0`}]
 
             i.open = false;
 
 
-            if(i.id=='e18d88b3-e828-11ef-b508-005056924926'){
 
+            if(i.id=='e18d88b3-e828-11ef-b508-005056924926' || i.id=="4cdce114-8a00-11f0-9c7b-005056924926"){
 
 
 
               if(this.userData && this.userData.type === 1 && this.userData.role == 1){

+ 16 - 2
src/components/pages/test/add/setInfo/index.vue
View File 

@@ -245,6 +245,15 @@ export default {
 
             type2List:[],
 
             type1Value:"",
 
             type2Value:"",
 
+            liYuanOrgList:["3823a6a5-1b6e-11f0-a66a-005056924926",
 
+						"292e34dc-1b6e-11f0-a66a-005056924926",
 
+						"21d6b367-1b6e-11f0-a66a-005056924926",
 
+						"1a1a172d-1b6e-11f0-a66a-005056924926",
 
+						"1197f86b-1b6e-11f0-a66a-005056924926",
 
+						"f235659b-1b6d-11f0-a66a-005056924926",
 
+						"d87b62d3-1b6d-11f0-a66a-005056924926",
 
+						"c25ea59b-1b6d-11f0-a66a-005056924926",
 
+          ]
 
         }
 
     },
 
     computed: {
 
@@ -441,12 +450,17 @@ export default {
 
             let params = {
 
                 oid: this.oid,
 
             };
 
+            let _url = "selectTestType"
 
+            if(this.liYuanOrgList.includes(this.org)){
 
+              _url = "selectTestType_liYuan"
 
+            }
 
+
 
             this.ajax
 
-                .get(this.$store.state.api + "selectTestType", params)
 
+                .get(this.$store.state.api + _url, params)
 
                 .then((res) => {
 
                     this.typeArray = res.data[0];
 
                     let _data = res.data[0];
 
-                    let _type1 = _data.filter(i=>i.pid == '');
 
+                    let _type1 = _data.filter(i=>!i.pid);
 
                     _type1.forEach(i=>{
 
                       let _children = [];
 
                       _children = _data.filter(i2=>i2.pid == i.id);

+ 15 - 1
src/components/pages/test/index.vue
View File 

@@ -505,6 +505,15 @@ export default {
 
             typeJArray: [],
 
             zscore: 0,
 
 						checkList:[],
 
+            liYuanOrgList:["3823a6a5-1b6e-11f0-a66a-005056924926",
 
+						"292e34dc-1b6e-11f0-a66a-005056924926",
 
+						"21d6b367-1b6e-11f0-a66a-005056924926",
 
+						"1a1a172d-1b6e-11f0-a66a-005056924926",
 
+						"1197f86b-1b6e-11f0-a66a-005056924926",
 
+						"f235659b-1b6d-11f0-a66a-005056924926",
 
+						"d87b62d3-1b6d-11f0-a66a-005056924926",
 
+						"c25ea59b-1b6d-11f0-a66a-005056924926",
 
+          ]
 
         };
 
     },
 
     computed: {
 
@@ -1199,8 +1208,13 @@ export default {
 
             let params = {
 
                 oid: this.oid,
 
             };
 
+            let _url = "selectTestType"
 
+            if(this.liYuanOrgList.includes(this.org)){
 
+              _url = "selectTestType_liYuan"
 
+            }
 
+
 
             this.ajax
 
-                .get(this.$store.state.api + "selectTestType", params)
 
+                .get(this.$store.state.api + _url, params)
 
                 .then((res) => {
 
                     this.typeArray = res.data[0];
 
                     this.getData()

+ 18 - 3
src/components/pages/testPerson/test/index.vue
View File 

@@ -274,6 +274,15 @@ export default {
 
       navIndex:'0-5',
 
       showCard:'portraitOfTeacher',
 
       showFormId:"",
 
+      liYuanOrgList:["3823a6a5-1b6e-11f0-a66a-005056924926",
 
+				"292e34dc-1b6e-11f0-a66a-005056924926",
 
+				"21d6b367-1b6e-11f0-a66a-005056924926",
 
+				"1a1a172d-1b6e-11f0-a66a-005056924926",
 
+				"1197f86b-1b6e-11f0-a66a-005056924926",
 
+				"f235659b-1b6d-11f0-a66a-005056924926",
 
+				"d87b62d3-1b6d-11f0-a66a-005056924926",
 
+				"c25ea59b-1b6d-11f0-a66a-005056924926",
 
+      ]
 
     };
 
   },
 
   computed: {
 
@@ -611,11 +620,17 @@ export default {
 
       let params = {
 
         oid: "",//this.oid
 
       };
 
+
 
+      let _url = "selectTestType"
 
+      if(this.liYuanOrgList.includes(this.org)){
 
+        _url = "selectTestType_liYuan"
 
+      }
 
+
 
       this.ajax
 
-        .get(this.$store.state.api + "selectTestType", params)
 
+        .get(this.$store.state.api + _url, params)
 
         .then(res => {
 
           let _data = res.data[0];
 
-          let _type1 = _data.filter(i => i.pid == "");
 
+          let _type1 = _data.filter(i => !i.pid);
 
           _type1.forEach((i,index) => {
 
             let _typeList = [];
 
             _typeList = _data.filter(i2 => i2.pid == i.id);
 
@@ -623,7 +638,7 @@ export default {
 
             let _children = [{name:"资料提交",type:"formSubmit",typeId:i.id,navIndex:`${index}-0`}]
 
             i.open = false;
 
 
-            if(i.id=='e18d88b3-e828-11ef-b508-005056924926'){
 
+            if(i.id=='e18d88b3-e828-11ef-b508-005056924926' || i.id == "4cdce114-8a00-11f0-9c7b-005056924926"){
 
               _children.push(...[
 
                 {name:"年度考核",type:"annualAssessment",navIndex:`${index}-1`},
 
                 {name:"培训活动",type:"trainingActivity",navIndex:`${index}-2`},

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