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

src/components/pages/test/examine/conpoments/personPage.vue

@@ -0,0 +1,26 @@
+<template>
+  <div>
+    <div v-if="pType==0">
+      按人员专任教师
+    </div>
+    <div v-if="pType==1">
+      按人员班主任
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    pType: {
+      //0专任教师 1班主任
+      type: Number,
+      default: 0
+    }
+  },
+  data() {
+    return {};
+  }
+};
+</script>
+<style scoped></style>

src/components/pages/test/examine/conpoments/targetPage.vue

@@ -0,0 +1,31 @@
+<template>
+  <div>
+    <div v-if="pType==0">
+      按指标专任教师
+    </div>
+    <div v-if="pType==1">
+      按指标班主任
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    pType: {
+      //0专任教师 1班主任
+      type: Number,
+      default: 0
+    }
+  },
+  data() {
+    return {};
+  },
+
+  mounted() {},
+
+  methods: {}
+};
+</script>
+
+<style scoped></style>

src/components/pages/test/examine/index.vue

@@ -1,15 +1,100 @@
 <template>
-  <div>
-    审核页面
+  <div class="testExamine">
+    <div class="testTit">
+      <div class="teaLis">
+        <div
+          class="teal"
+          @click="cutPage(0)"
+          :class="[pType == 0 ? 'Tbor' : '']"
+        >
+          专任教师
+        </div>
+        <div
+          class="teal"
+          @click="cutPage(1)"
+          :class="[pType == 1 ? 'Tbor' : '']"
+        >
+          班主任
+        </div>
+      </div>
+      <div style="margin-right: 100px;">
+        <el-select v-model="cutTable" placeholder="请选择">
+          <el-option
+            v-for="item in cutTabOpts"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </div>
+    </div>
+    <div class="testCon">
+      <targetPage :pType="pType" v-if="cutTable == 0"></targetPage>
+      <personPage :pType="pType" v-if="cutTable == 1"></personPage>
+    </div>
   </div>
 </template>
 
 <script>
-export default {
+import personPage from "./conpoments/personPage.vue";
+import targetPage from "./conpoments/targetPage";
 
-}
+export default {
+  components: {
+    personPage,
+    targetPage
+  },
+  data() {
+    return {
+      pType: 0,
+      cutTable: 0,
+      cutTabOpts: [
+        {
+          value: 0,
+          label: "按指标"
+        },
+        {
+          value: 1,
+          label: "按人员"
+        }
+      ]
+    };
+  },
+  methods: {
+    cutPage(e) {
+      this.pType = e;
+    }
+  }
+};
 </script>
 
-<style>
-
-</style>
+<style scoped>
+.testExamine {
+  width: 100%;
+  height: 100%;
+  padding: 10px;
+  box-sizing: border-box;
+  background-color: #fff;
+}
+.testExamine > .testTit {
+  height: 100px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.teaLis {
+  display: flex;
+}
+.teal {
+  padding: 10px 20px;
+  cursor: pointer;
+}
+.Tbor {
+  border-bottom: 2px rgba(54, 129, 252, 1) solid;
+}
+.testCon {
+  box-sizing: border-box;
+  padding: 20px;
+}
+</style>

src/components/pages/testPerson/test/test.vue

@@ -1,6 +1,9 @@
 <template>
     <div class="i_body_box">
         <div class="check_nav">
+            <div class="nav all" v-show="false" :class="{ active: type == '1' }" @click="checkType('1')">
+                年度考核
+            </div>
             <div class="nav all" :class="{ active: type == '' }" @click="checkType('')">
                 全部
             </div>
@@ -19,10 +22,11 @@
             </div>
         </div>
         <div class="check_box" v-loading="loading">
-            <div class="noneData" v-if="!worksArray.length" style="text-align: center; margin-top: 20px;">
+            <examine v-if="type==1"></examine>
+            <div class="noneData"  v-if="!worksArray.length && type!=1" style="text-align: center; margin-top: 20px;">
                 暂无数据
             </div>
-            <div class="test_panel" v-for="(item, index) in worksArray" :key="index">
+            <div class="test_panel" v-if="type!=1" v-for="(item, index) in worksArray" :key="index">
                 <div class="test_panel_title">
                     <div class="title" :style="{paddingLeft: (item.array.length > 0 || item.carray.length > 0) ? '0' : '30px'}" @click="openWork(index)">
                         <span class="open" :class="{active: item.open}" v-if="item.array.length > 0 || item.carray.length > 0"></span>
@@ -112,6 +116,7 @@
 </template>
 
 <script>
+import examine from '../examine/index'
 export default {
     props: {
         userid: {
@@ -121,6 +126,9 @@ export default {
             type: String,
         },
     },
+    components:{
+        examine
+    },
     data() {
         return {
             type: "",

src/router/index.js

@@ -129,7 +129,7 @@ import contrastObservation from '@/components/pages/contrastObservation/index'//
 import pblCourse from '@/components/pages/pblCourse/index'
 import guide from '@/components/pages/pblCourse/guide'
 import testExamine from '@/components/pages/test/examine'
-
+import testPersonExamine from '@/components/pages/testPerson/examine'
 // 全局修改默认配置，点击空白处不能关闭弹窗
 ElementUI.Dialog.props.closeOnClickModal.default = false
 Vue.use(Router).use(ElementUI)
@@ -1109,6 +1109,14 @@ export default new Router({
 					meta:{
 						requireAuth:''//不需要鉴权
 					}
+				},
+                 {//testPerson
+					path:"/testPersonExamine",
+					name:"testPersonExamine",
+					component:testPersonExamine,
+					meta:{
+						requireAuth:''//不需要鉴权
+					}
 				}
     ]
 })