Merge branch 'zcwy-0306' into zcwy-zsx0223

# Conflicts:
#	src/components/drawers/project/ProjectEvalManage.vue

src/api/configPublic.js

@@ -61,3 +61,6 @@ http.interceptors.response.use(
 );
 
 export default http;
+export function timeoutUpload(uploadTime) {
+    http.defaults.timeout = uploadTime;
+}

src/api/evaluation.js

@@ -0,0 +1,37 @@
+// 测评上传
+import http from "./configPublic";
+const ACTIVITYAPI = '/activityApi'
+import {getCookieForName} from "@/api/method";
+//查询测评
+export const list = (obj) => http.post(`${ACTIVITYAPI}/evaluation/list`,obj)
+//导入
+export const importList = (obj) => http.post(`${ACTIVITYAPI}/evaluation/import`,obj, {
+  headers: { "Content-Type": "multipart/form-data",token:getCookieForName("token") },
+})
+//保存
+export const save = (obj) => http.post(`${ACTIVITYAPI}/evaluation/save`,obj)
+//保存测评详情
+export const saveEvaluationDetail = (obj) => http.post(`${ACTIVITYAPI}/evaluation/detail/saveEvaluationDetail`,obj)
+//测评封面上传
+export const uploadImage = (obj) => http.post(`${ACTIVITYAPI}/evaluation/upload-image`,obj,{
+  headers: { "Content-Type": "multipart/form-data",token:getCookieForName("token") },
+})
+//权限管理
+export const adminList = (obj) => http.post(`${ACTIVITYAPI}/permission/adminList`,obj)
+//权限启用
+export const updateStatus = (obj) => http.post(`${ACTIVITYAPI}/permission/updateStatus`,obj)
+//测评删除
+export const deleteList = (obj) => http.post(`${ACTIVITYAPI}/evaluation/delete`,obj)
+//测评详情展示
+export const getPage = (obj) => http.post(`${ACTIVITYAPI}/evaluation/detail/getPage`,obj)
+//测评详情删除
+export const deleteById = (obj) => http.post(`${ACTIVITYAPI}/evaluation/detail/deleteById`,obj)
+//测评清空
+export const clear = (obj) => http.post(`${ACTIVITYAPI}/evaluation/clear`,obj)
+//保存启用的人员信息
+export const savePermission = (obj) => http.post(`${ACTIVITYAPI}/permission/savePermission`,obj)
+//权限列表
+export const saveLists = (obj) => http.post(`${ACTIVITYAPI}/permission/list`,obj)
+//删除配置管理
+export const deleteId = (obj) => http.post(`${ACTIVITYAPI}/permission/delete`,obj)
+

src/components/BreadCrumb.vue

@@ -538,6 +538,29 @@
                     },
                   ];
                 }
+                if (n.indexOf("/evaluationupload") !== -1 || n.indexOf("/EvaluationUpload") !== -1) {
+                  state.list = [
+                    {
+                      name: "测评",
+                    },
+                    {
+                      name: '测评报告'
+                    }
+                  ];
+                }
+                if (n.indexOf("/evadown") !== -1 || n.indexOf("/EvaDown") !== -1) {
+                  state.list = [
+                    {
+                      name: "测评",
+                    },
+                    {
+                      name: '测评报告'
+                    },
+                    {
+                      name: route.query.name
+                    }
+                  ];
+                }
                 if (n.indexOf("/download") !== -1 || n.indexOf("/download") !== -1) {
                   state.list = [
                     {

src/components/NavLeft.vue

@@ -422,6 +422,35 @@
           </div>
           <router-link to="/qamanage">问答管理</router-link>
         </a-menu-item>
+        <a-sub-menu key="sub23" @titleClick="titleClick" v-if="checkMenu('evaluationupload')">
+          <template #icon>
+            <div class="imgBox">
+              <img
+                  style="width: 16px; height: 16px"
+                  src="../assets/images/navleft/grateful.png"
+              />
+            </div>
+          </template>
+          <template #title>测评</template>
+          <a-menu-item key="sub23-1" v-if="checkMenu('evaluationupload')">
+            <span
+                :class="{
+                circleActive: selectedKeys[0] === 'sub23-1' ? true : false,
+                circle: selectedKeys[0] === 'sub23-1' ? false : true,
+              }"
+            ></span>
+            <router-link to="/evaluationupload">测评上传</router-link>
+          </a-menu-item>
+          <a-menu-item key="sub23-2">
+            <span
+                :class="{
+                circleActive: selectedKeys[0] === 'sub22-2' ? true : false,
+                circle: selectedKeys[0] === 'sub22-2' ? false : true,
+              }"
+            ></span>
+            <a target="_blank" :href="evaluationManagement">测评管理</a>
+          </a-menu-item>
+        </a-sub-menu>
         <a-menu-item key="sub15" @titleClick="titleClick" v-if="checkMenu('download')">
           <div class="imgBox">
             <img
@@ -647,6 +676,9 @@
         <a-menu-item key="sub15" @titleClick="titleClick">
           <router-link to="/download">问答</router-link>
         </a-menu-item>
+        <a-menu-item key="sub23" @titleClick="titleClick">
+          <router-link to="/evaluationupload">测评</router-link>
+        </a-menu-item>
         <a-menu-item key="sub18" v-if="checkMenu('OldSystemManage')">
 
         <router-link target="_blank" to="/oldsystemmanage">旧版</router-link>
@@ -698,7 +730,8 @@ export default {
         "sub19",
         "sub20",
         "sub21",
-        "sub22"
+        "sub22",
+        "sub23",
       ],
       openKeys: localStorage.getItem("openKeys")
           ? JSON.parse(localStorage.getItem("openKeys"))
@@ -908,6 +941,12 @@ export default {
           selectedKeys: "sub14",
           pagename: "问答管理",
         },
+        {
+          href: "/evaluationupload",
+          openKeys: "sub23",
+          selectedKeys: "sub23-1",
+          pagename: "测评上传",
+        },
         {
           href: "/download",
           openKeys: "sub15",
@@ -1009,7 +1048,8 @@ export default {
         },
 
       ],
-      oldManage: window.location.protocol + process.env.VUE_APP_OLD_MANAGE
+      oldManage: window.location.protocol + process.env.VUE_APP_OLD_MANAGE,
+      evaluationManagement: window.location.protocol + process.env.VUE_APP_EVA_MANAGE
     });
 
     const onOpenChange = (openKeys) => {

src/components/drawers/project/ProjectEvalManage.vue

@@ -430,10 +430,7 @@ export default {
 
     // 导出数据
     function exportTaskStu() {
-      if(!props.datasource.projectTaskId){
-        props.datasource.projectTaskId = ''
-      }
-      window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.projectTaskId}&taskType=${props.datasource.type}`)
+      window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`)
       // window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?pageNo=${state.currentPage}&pageSize=${state.pageSize}&currentStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.projectTaskId}&status=${state.name}&studentName=${state.projectName}`)
     }
 

src/store/index.js

@@ -67,6 +67,8 @@ export default createStore({
     },
     SET_PERMISSION(state, permissions) {
       state.menus = permissions;
+      state.menus = [...permissions,'/evaluationupload'];
+      console.log(state.menus,"state.menus");
     }
 
   },

src/views/evaluation/EvaDown.vue

@@ -0,0 +1,329 @@
+<template>
+  <div class="returneva">
+    <router-link to="/evaluationupload">
+      <div style="display: flex">
+        <img class="img2" src="../../assets/images/leveladd/back.png" />
+        <div class="return">返回</div>
+      </div>
+    </router-link>
+  </div>
+  <div class="evadown">
+    <div class="down_header">
+      <div class="down_header_title" @click="downloadAll">
+        <div class="down_header_btn" v-if="downloadShow">
+          <div class="btnText">全量下载</div>
+        </div>
+      </div>
+      <div class="down_header_title" style="display: flex;">
+        <div class="down_header_search">
+          <a-input
+            v-model:value="searchName"
+            placeholder="查询姓名或工号或导入者"
+            style="width: 270px; height: 40px; border-radius: 8px;margin-right: 14px;"
+          />
+        </div>
+        <div class="down_header_btn btn1" @click="searchList">
+          <div class="search"></div>
+          <span class="btnText">搜索</span>
+        </div>
+        <div class="down_header_btn btn2" @click="searchNo">
+          <div class="search"></div>
+          <span class="btnText">重置</span>
+        </div>
+      </div>
+    </div>
+    <div class="tablelist">
+      <a-table
+        :columns="columns"
+        :data-source="tableData"
+        :loading="tableLoading"
+        :scroll="{ x: 'max-content' }"
+        :pagination="pagination"
+      >
+      <template #operation="{ record, column }">
+        <a-space>
+          <a-button type="link" v-if="downloadShow" @click="downloadItem(record)">
+            <a-tooltip>
+              <template #title>下载</template>
+              <span class="download"></span>
+            </a-tooltip>
+          </a-button>
+          <a-button type="link" v-if="deleteIds" @click="deleteItem(record)">
+            <a-tooltip>
+              <template #title>删除</template>
+              <span class="delete"></span>
+            </a-tooltip>
+          </a-button>
+        </a-space>
+      </template>
+      </a-table>
+    </div>
+  </div>
+</template>
+
+<script>
+import { ref,onMounted, reactive,toRefs,computed,watch } from "vue";
+import dialog from "@/utils/dialog";
+import { getPage,deleteById } from "@/api/evaluation";
+import { useRoute } from "vue-router";
+import { message } from "ant-design-vue";
+import { useStore } from "vuex";
+import {boeRequest} from "@/api/request";
+  export default {
+    name: "evadown",
+    components: {},
+    setup() {
+      const store = useStore();
+      const userInfo = computed(()=>store.state.userInfo)
+      const route = useRoute();
+      const state = reactive({
+        downloadShow: route.query.permission=='true'?true:false,
+        deleteIds: route.query.deleteIds=='true'?true:false,
+        searchName: '',
+        tableLoading: false,
+        tableData:[],
+        total: 0,
+        params: {
+          pageNo: 1,
+          pageSize: 10,
+        },
+      })
+      const columns = ref([
+        {
+          title: "姓名",
+          dataIndex: "studentName",
+          key: "studentName",
+          className: "h",
+          ellipsis: true,
+          align: "center",
+          width: 100,
+        },
+        {
+          title: "工号",
+          dataIndex: "workNum",
+          key: "workNum",
+          className: "h",
+          ellipsis: true,
+          align: "center",
+          width: 100,
+        },
+        {
+          title: "评测名称",
+          dataIndex: "evaluationName",
+          key: "evaluationName",
+          className: "h",
+          ellipsis: true,
+          align: "center",
+          width: 100,
+        },
+        {
+          title: "上传人",
+          dataIndex: "uploadName",
+          key: "uploadName",
+          className: "h",
+          ellipsis: true,
+          align: "center",
+          width: 100,
+        },
+        {
+          title: "上传日期",
+          dataIndex: "updateTime",
+          key: "updateTime",
+          className: "h",
+          ellipsis: true,
+          align: "center",
+          width: 100,
+        },
+        {
+          title: "操作",
+          width: "20%",
+          dataIndex: "operation",
+          key: "operation",
+          align: "center",
+          slots: { customRender: "operation" },
+        },
+      ])
+      const pagination = computed(() => ({
+        total: state.total,
+        showSizeChanger: true,
+        showQuickJumper: false,
+        current: state.params.pageNo,
+        pageSize: state.params.pageSize,
+        onChange: changePagination,
+      }))
+      const changePagination = (page,pageSize) => {
+        state.params.pageNo = page
+        state.params.pageSize = pageSize
+        listData()
+      }
+      watch(()=>state.params.pageSize,(val)=>{
+        state.params.pageNo = 1
+        listData()
+      })
+      const downloadAll = (record) => {
+        if(state.total == 0){
+          message.info('请先上传报告')
+          return
+        }
+        window.open(`/activityApi/evaluation/download?id=${route.query.id}`);
+      }
+      const listData = async () => {
+        state.tableLoading = true
+        await boeRequest('/activityApi/evaluation/detail/getPage post',{
+          pid:route.query.id,
+          pageNo: state.params.pageNo,
+          pageSize: state.params.pageSize,
+          searchParam:state.searchName
+        }).then((res)=>{
+          if(res.code === 200){
+            state.tableLoading = false
+            state.tableData = res.data.records,
+            state.total = res.data.total
+          }
+        })
+        // await getPage({
+        //   pid:route.query.id,
+        //   pageNo: state.params.pageNo,
+        //   pageSize: state.params.pageSize,
+        //   searchParam:state.searchName
+        // }).then((res) => {
+        //   if(res.code === 200){
+        //     state.tableLoading = false
+        //     state.tableData = res.data.records,
+        //     console.log(state.tableData,'data')
+        //     state.total = res.data.total
+        //   }
+        // })
+      }
+      const searchList = () => {
+        state.params.pageNo = 1
+        listData()
+      }
+      const searchNo = () => {
+        state.searchName = ''
+        state.params.pageNo = 1
+        listData()
+      }
+      const downloadItem = (record) => {
+        window.open(`/activityApi/evaluation/detail/downloadById?id=${record.id}`)
+      };
+      const deleteItem = (record) => {
+        dialog({
+          content: '请您确认是否要删除该报告？',
+          ok: () => {
+            deleteById({id:record.id,kid:record.kid,pid:route.query.id}).then((res)=>{
+              message.success('删除成功')
+              listData()
+            })
+          },
+        });
+      };
+      
+      onMounted(() => {
+        listData()
+      })
+      return {
+        ...toRefs(state),
+        columns,
+        deleteItem,
+        downloadItem,
+        pagination,
+        listData,
+        searchList,
+        searchNo,
+        downloadAll,
+        userInfo,
+      }
+    },
+  }
+</script>
+
+<style lang="scss" scoped>
+.returneva{
+  position: absolute;
+  right: 0;
+  top: 139px;
+  .img2{
+    width: 42px;
+    height: 42px;
+  }
+  .return{
+    font-size: 14px;
+    margin-top: 10px;
+    margin-right: 102px;
+  }
+}
+.evadown {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  .down_header{
+    margin-left: 38px;
+    margin-right: 38px;
+    margin-top: 30px;
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: wrap;
+    .down_header_title{
+      margin-right: 20px;
+      margin-bottom: 20px;
+      
+      .down_header_btn {
+        padding: 0px 26px 0px 26px;
+        height: 38px;
+        background: #4ea6ff;
+        border-radius: 8px;
+        border: 1px solid rgba(64, 158, 255, 1);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin-right: 14px;
+        flex-shrink: 0;
+        cursor: pointer;
+
+        .search {
+          background-size: 100%;
+        }
+
+        .btnText {
+          font-size: 14px;
+          font-weight: 400;
+          color: #ffffff;
+          line-height: 36px;
+          margin-left: 5px;
+        }
+      }
+      .btn1 {
+        .search {
+          width: 15px;
+          height: 17px;
+          background-image: url("../../assets/images/courseManage/search0.png");
+        }
+      }
+      .btn2 {
+        .search {
+          width: 16px;
+          height: 18px;
+          background-image: url("../../assets/images/courseManage/reset0.png");
+        }
+      }
+    }
+  }
+  .tablelist{
+    padding: 10px 35px;
+    .download{
+      width: 19px;
+      height: 20px;
+      background: url("../../assets/images/evaluation/download.png") no-repeat;
+      background-size: 100%;
+    }
+    .delete{
+      width: 19px;
+      height: 20px;
+      background: url("../../assets/images/evaluation/delete.png") no-repeat;
+      background-size: 100%;
+    }
+  }
+}
+</style>