Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/api/teacher/index.js

@@ -446,7 +446,17 @@ export function GetTeacherStaticYearRate(data) {
   })
 }
 
-
+/**
+ * 获取教师端每月成长率统计
+ * @param {*} data 
+ */
+export function queryAssessmentTypeList(data) {
+  return request({
+    url: '/TeacherAssessment/GetAssessmentTypeList',
+    method: 'post',
+    data
+  })
+}
 
 
 

src/pages/activity/questionnaireList.vue

@@ -7,7 +7,7 @@
             label="问卷调查名称" maxlength="20" />
         </div>
         <div class="col-3">
-          <q-select @input="resetSearch" clearable filled stack-label option-value="Id" option-label="Name"
+          <q-select @input="resetSearch" filled stack-label option-value="Id" option-label="Name"
             v-model="msg.SurveyType" ref="SurveyType" :options="platList" emit-value map-options label="类型"
             :dense="false" />
         </div>
@@ -53,7 +53,7 @@
           </q-td>
         </template>
       </q-table>
-      <wenjuan-form v-if="isShowWenjuan" :save-obj="objOption" @close="closeSaveForm" @success="resetSearch"></wenjuan-form>
+      <wenjuan-form v-if="isShowWenjuan" :save-obj="objOption" :ID="msg.ActivitySurveyId" @close="closeSaveForm" @success="resetSearch"></wenjuan-form>
     </div>
   </div>
 </template>
@@ -145,6 +145,9 @@
     created() {
     },
     mounted() {
+      if(this.$route.query&&this.$route.query.ID){
+        this.msg.ActivitySurveyId = this.$route.query.ID;
+      }
       this.getPlat();
       this.getList();
     },
@@ -179,12 +182,53 @@
           }
         })
       },
-      addObj(){
-
+      addObj(obj) {
+        if (obj) {
+          this.objOption = obj
+        } else {
+          this.objOption = null
+        }
+        this.isShowWenjuan = true;
       },
       //删除问卷
-      delQuestion(){
-
+      delQuestion(row){
+        let that = this;
+        this.$q.dialog({
+          title: "提示",
+          message: '是否删除该活动信息？',
+          cancel: {
+            label: "取消",
+            flat: true
+          },
+          ok: {
+            label: "确认",
+            flat: true,
+            focus: true
+          }
+        }).onOk(() => {
+          that.apipostDS(
+            "/api/Survey/DelSurvey",
+            {SurveyID:row.ID},
+            res => {
+              if (res.data.resultCode == 1) {
+                that.$q.notify({
+                  icon: 'iconfont icon-chenggong',
+                  color: 'accent',
+                  timeout: 2000,
+                  message: '数据删除成功！',
+                  position: 'top'
+                })
+                that.getList();
+              } else {
+                that.$q.notify({
+                  type: 'negative',
+                  position: "top",
+                  message: res.data.message
+                })
+              }
+            },
+          );
+        });
       },
       closeSaveForm(){
         this.isShowWenjuan=false;

src/pages/teacher/assessmentType.vue

+<style>
+
+
+</style>
+<template>
+  <div class="page-body">
+    <div class="page-search row items-center">
+
+    </div>
+    <div class="page-content">
+      <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat
+        class="sticky-column-table sticky-right-column-table" separator="none" :data="dataList" :columns="columns"
+        row-key="name">
+        <template v-slot:top>
+          <div class="col-2 q-table__title">类型配置</div>
+          <q-space />
+          <div class="page-option">
+            <q-btn color="accent" size="sm" class="q-mr-md" icon="add" label="新增" @click="AddMsg(null)" />
+          </div>
+        </template>
+        <template v-slot:body="props">
+          <q-tr :props="props">
+            <template v-for="(col,cIndex) in props.cols">
+              <q-td v-if="col.name == 'TypeName'" :key="cIndex">{{ col.value }}</q-td>
+              <q-td v-else-if="col.name == 'SubtypeList'" :key="cIndex">
+                <div v-for="(item,sIndex) in col.value" :key="sIndex">
+                  <div class="border-bottom">
+                    {{item.SubTypeName}}
+                  </div>
+                </div>
+              </q-td>
+              <q-td v-else-if="col.name == 'Id'" :key="cIndex">
+                <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
+                  @click="AddMsg(props.row)" />
+                <q-btn flat size="xs" icon="delete" color="negative" class="q-mr-xs" label="删除"
+                  @click="delConsult(props.row.Id)" />
+              </q-td>
+            </template>
+          </q-tr>
+        </template>
+
+        <template v-slot:bottom></template>
+      </q-table>
+    </div>
+  </div>
+</template>
+<script>
+  import {
+    queryAssessmentTypeList,
+  } from '../../api/teacher/index';
+
+  export default {
+    meta: {
+      title: "教师考评配置"
+    },
+    components: {
+
+    },
+    data() {
+      return {
+        loading: false,
+        msg: {
+          rowsPerPage: 1000,
+        },
+        columns: [{
+            name: "TypeName",
+            label: "类别",
+            field: "TypeName",
+            align: "left"
+          },
+          {
+            name: "SubtypeList",
+            label: "内容",
+            field: "SubtypeList",
+            align: "left"
+          },
+          {
+            name: 'Id',
+            label: '操作',
+            field: row => row.Id
+          }
+        ],
+        dataList: [],
+      }
+    },
+    created() {
+
+    },
+    mounted() {
+      this.getAssessmentTypeList()
+    },
+    methods: {
+      getAssessmentTypeList() {
+        this.loading = true;
+        queryAssessmentTypeList(this.msg).then(res => {
+          this.loading = false;
+          console.log("res", res);
+          if (res.Code == 1) {
+            this.dataList = res.Data;
+          }
+        })
+      }
+    }
+  }
+</script>
+<style lang="sass">
+  @import url('~assets/css/table.sass')
+</style>
\ No newline at end of file

src/router/routes.js

@@ -1431,6 +1431,11 @@ const routes = [{
         component: () =>
           import("pages/teacher/yearStatic")
       },
+      {
+        path: "/teacher/assessmentType", //教师季度考评配置
+        component: () =>
+          import("pages/teacher/assessmentType")
+      },
       {
         path: "/exam/examPaper", //试卷管理
         component: () =>