新分支

src/api/system/user/index.ts

@@ -26,6 +26,10 @@ export const getUserPage = (params: PageParam) => {
 export const getAllUser = () => {
   return request.get({ url: '/system/user/all' })
 }
+// 查询所有用户列表
+export const getDeptUser = (params: PageParam) => {
+  return request.get({ url: '/system/user/getDeptUser', params })
+}
 
 // 查询用户详情
 export const getUser = (id: number) => {

src/api/work/totalscore/index.ts

@@ -0,0 +1,41 @@
+import request from '@/config/axios'
+
+// 作品总分 VO
+export interface TotalScoreVO {
+  id: number // id
+  workName: string // 作品名
+  overallRating: string // 总评分
+}
+
+// 作品总分 API
+export const TotalScoreApi = {
+  // 查询作品总分分页
+  getTotalScorePage: async (params: any) => {
+    return await request.get({ url: `/work/total-score/page`, params })
+  },
+
+  // 查询作品总分详情
+  getTotalScore: async (id: number) => {
+    return await request.get({ url: `/work/total-score/get?id=` + id })
+  },
+
+  // 新增作品总分
+  createTotalScore: async (data: TotalScoreVO) => {
+    return await request.post({ url: `/work/total-score/create`, data })
+  },
+
+  // 修改作品总分
+  updateTotalScore: async (data: TotalScoreVO) => {
+    return await request.put({ url: `/work/total-score/update`, data })
+  },
+
+  // 删除作品总分
+  deleteTotalScore: async (id: number) => {
+    return await request.delete({ url: `/work/total-score/delete?id=` + id })
+  },
+
+  // 导出作品总分 Excel
+  exportTotalScore: async (params) => {
+    return await request.download({ url: `/work/total-score/export-excel`, params })
+  }
+}

src/views/work/allocation/AllocationForm.vue

@@ -7,19 +7,33 @@
       label-width="100px"
       v-loading="formLoading"
     >
-      <el-form-item label="部门id" prop="deptId">
+      <el-form-item label="选择部门" >
         <el-tree-select
-          v-model="formData.deptId"
+          v-model="deptId"
           :data="deptTree"
           :props="defaultProps"
           check-strictly
           default-expand-all
-          placeholder="请选择评分组"
+          placeholder="选择部门"
           value-key="deptId"
+          @change="dataTreeSelectUser"
         />
-<!--        <el-form-item label="上级部门" prop="parentId">-->
-<!--        -->
-<!--        </el-form-item>-->
+
+      </el-form-item>
+      <el-form-item label="选择专家" >
+        <el-select
+          v-model="formData.userIds"
+          placeholder="选择专家"
+          multiple
+          style="width: 240px"
+        >
+          <el-option
+            v-for="item in userData"
+            :key="item.id"
+            :label="item.nickname"
+            :value="item.id"
+          />
+        </el-select>
       </el-form-item>
     </el-form>
     <template #footer>
@@ -33,6 +47,8 @@ import { AllocationApi, AllocationVO } from '@/api/work/allocation'
 import {getSimpleDeptList} from "@/api/system/dept";
 import * as DeptApi from "@/api/system/dept";
 import {handleTree} from "@/utils/tree";
+import * as UserApi from "@/api/system/user";
+import {getDeptUser} from "@/api/system/user";
 
 /** 作品分配给部门 表单 */
 defineOptions({ name: 'AllocationForm' })
@@ -42,16 +58,20 @@ const message = useMessage() // 消息弹窗
 
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
+
+
+const deptId = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
   id: undefined,
   workTypeId: undefined,
-  deptId: undefined
+  userIds: []
 })
 const formRules = reactive({
 })
 const formRef = ref() // 表单 Ref
+const userData = ref() // 表单 Ref
 
 const deptTree = ref() // 树形结构
 const defaultProps = {
@@ -61,6 +81,9 @@ const defaultProps = {
   isLeaf: 'leaf',
   emitPath: false // 用于 cascader 组件：在选中节点改变时，是否返回由该节点所在的各级菜单的值所组成的数组，若设置 false，则只返回该节点的值
 }
+const queryParams = reactive({
+  deptId: undefined,
+})
 //获得部门树
 const getTree = async () => {
   deptTree.value = []
@@ -70,10 +93,20 @@ const getTree = async () => {
   // dept.children = handleTree(data)
   // console.log(dept)
   deptTree.value = handleTree(await DeptApi.getSimpleDeptList())
+
+
+}
+const dataTreeSelectUser = async () => {
+
+  queryParams.deptId=deptId.value
+  userData.value = await UserApi.getDeptUser(queryParams)
+  console.log(userData.value)
+
 }
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
   await getTree()
+  userData.value = await UserApi.getSimpleUserList()
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type

src/views/work/score/index.vue

@@ -1,56 +1,64 @@
 <template>
-  <el-row>
-    <el-col :span="3" style="background-color: white;margin-right: 10px;padding: 10px">
-      <p style="margin: auto">
-        作品类型
-      </p>
-      <el-divider style="margin-top: 15px;margin-bottom: 5px"/>
-      <div class="infinite-list" style="max-height:700px;min-height:200px;overflow-y:auto">
-        <el-tree
-          style="max-width: 280px;"
-          :data="typeList"
-          :props="defaultProps"
-          @node-click="handleNodeClick"
-        />
-      </div>
-    </el-col>
-    <el-col :span="3" style="background-color: white;padding: 10px;margin-right: 10px">
-      <el-table v-loading="loading" :data="workList" :stripe="true" :show-overflow-tooltip="true" style="height:700px">
-        <el-table-column label="作品" align="left" prop="workName">
-          <template #default="scope">
-            <el-button
-              link
-              @click="lookWork(scope.row)"
-              type="primary"
-            >
-              {{ scope.row.workName }}
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-col>
-    <el-col :span="16" style="background-color: white;padding: 10px;margin-right: 10px">
-     <el-row>
-       <el-col :span="16">
-         <p>正在评分作品：{{file.workName}}</p>
-         <audio v-if="file.format==='mp3'" :src="file.url" controls>
-         </audio>
-         <video v-if="file.format==='mp4'"
-                :src="file.url" controls></video>
-         <img v-if="file.format==='jpg'||file.format==='png'"
-              :src="file.url" alt=""/>
-         <div v-if="file.format==='pdf'" >
-           <VueOfficePddf :src="file.url" class="docx-class"/>
-         </div>
-       </el-col>
-       <el-col :span="8">
-         <div v-if="file.manuscriptAndMaterial!==''">
-           <VueOfficePddf :src="file.manuscriptAndMaterial" class="docx-class"/>
-         </div>
-       </el-col>
-     </el-row>
-    </el-col>
-  </el-row>
+
+  <div class="common-layout" style="width: 100%">
+    <el-container >
+      <el-aside width="300" style="margin-right: 10px">
+        <div style="width:200px;margin: auto">
+          作品类型
+        </div>
+        <el-divider style="width:220px;margin-top: 15px;margin-bottom: 5px"/>
+        <el-card class="infinite-list" style="margin: auto;width: 200px;max-height:700px;min-height:80px;overflow-y:auto">
+          <el-tree
+            style="max-width: 280px;"
+            :data="typeList"
+            :props="defaultProps"
+            @node-click="handleNodeClick"
+          />
+        </el-card>
+      </el-aside>
+      <el-main>
+        <el-row>
+          <el-col :span="3" style="background-color: white;padding: 10px;margin-right: 10px">
+            <el-table v-loading="loading" :data="workList" :stripe="true"
+                      :show-overflow-tooltip="true" style="height:700px">
+              <el-table-column label="作品" align="left" prop="workName">
+                <template #default="scope">
+                  <el-button
+                    link
+                    @click="lookWork(scope.row)"
+                    type="primary"
+                  >
+                    {{ scope.row.workName }}
+                  </el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-col>
+          <el-col :span="16" style="background-color: white;padding: 10px;margin-right: 10px">
+            <el-row>
+              <el-col :span="16">
+                <p>正在评分作品：{{ file.workName }}</p>
+                <audio v-if="file.format==='mp3'" :src="file.url" controls>
+                </audio>
+                <video v-if="file.format==='mp4'"
+                       :src="file.url" controls></video>
+                <img v-if="file.format==='jpg'||file.format==='png'"
+                     :src="file.url" alt=""/>
+                <div v-if="file.format==='pdf'">
+                  <VueOfficePddf :src="file.url" class="docx-class"/>
+                </div>
+              </el-col>
+              <el-col :span="8">
+                <div v-if="file.manuscriptAndMaterial!==''">
+                  <VueOfficePddf :src="file.manuscriptAndMaterial" class="docx-class"/>
+                </div>
+              </el-col>
+            </el-row>
+          </el-col>
+        </el-row>
+      </el-main>
+    </el-container>
+  </div>
 
 
   <!-- 表单弹窗：添加/修改 -->
@@ -69,11 +77,12 @@ import {TypeApi} from "@/api/work/type";
 import {workApi} from "@/api/work/work";
 import {ref} from 'vue'
 import VueOfficePddf from '@vue-office/pdf'
-const file=ref({
-  format:'',
-  url:'',
-  workName:'',
-  manuscriptAndMaterial:''
+
+const file = ref({
+  format: '',
+  url: '',
+  workName: '',
+  manuscriptAndMaterial: ''
 });
 /** 作品评分 列表 */
 defineOptions({name: 'Score'})
@@ -110,7 +119,7 @@ interface Tree {
 
 const loading = ref(true) // 列表的加载中
 const list = ref<ScoreVO[]>([]) // 列表的数据
-const typeList = ref<Tree[]>([]) // 列表的数据
+const typeList = ref([]) // 列表的数据
 const total = ref(0) // 列表的总页数
 const queryParams = reactive({
   pageNo: 1,
@@ -130,18 +139,18 @@ const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 
 const handleNodeClick = (data: Tree) => {
-  file.value={workName: "", manuscriptAndMaterial: "", format: "", url: ""}
+  file.value = {workName: "", manuscriptAndMaterial: "", format: "", url: ""}
   workQueryParams.categoryId = data.id
   getWorkLists()
 }
 
 const lookWork = (value) => {
-  file.value={workName: "", manuscriptAndMaterial: "", format: "", url: ""}
+  file.value = {workName: "", manuscriptAndMaterial: "", format: "", url: ""}
   console.log(value)
-  file.value.format=value.format
-  file.value.url=value.workUrl
-  file.value.workName=value.workName
-  file.value.manuscriptAndMaterial=value.manuscriptAndMaterial
+  file.value.format = value.format
+  file.value.url = value.workUrl
+  file.value.workName = value.workName
+  file.value.manuscriptAndMaterial = value.manuscriptAndMaterial
 }
 const workList = ref<workVO[]>([]) // 列表的数据
 const getTypeList = async () => {
@@ -149,12 +158,23 @@ const getTypeList = async () => {
   try {
     const datas = await TypeApi.getScoreTreeList(typeQueryParams)
     console.log(datas.valueOf())
-    typeList.value = handleTree(datas, 'id', 'parentId')
+    typeList.value = handleTreeAll(datas, 'id', 'parentId')
     // list.value = data.list
   } finally {
     loading.value = false
   }
 }
+const handleTreeAll=(data,id,parentId) => {
+  let arr=[]
+  let type=''
+  for (let i = 0; i < data.length; i++) {
+    strParent(data[i],data)
+  }
+  return arr
+}
+const strParent = (obj,data) => {
+
+}
 
 const workQueryParams = reactive({
   workName: undefined,
@@ -165,11 +185,11 @@ const getWorkLists = async () => {
   try {
     const data = await workApi.getworkList(workQueryParams)
     workList.value = data.list
-    if (workList.value.length>0){
-      file.value.format=workList.value[0].format
-      file.value.url=workList.value[0].workUrl
-      file.value.workName=workList.value[0].workName
-      file.value.manuscriptAndMaterial=workList.value[0].manuscriptAndMaterial
+    if (workList.value.length > 0) {
+      file.value.format = workList.value[0].format
+      file.value.url = workList.value[0].workUrl
+      file.value.workName = workList.value[0].workName
+      file.value.manuscriptAndMaterial = workList.value[0].manuscriptAndMaterial
     }
 
     console.log(workList.value)

src/views/work/totalscore/TotalScoreForm.vue

@@ -0,0 +1,96 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="作品名" prop="workName">
+        <el-input v-model="formData.workName" placeholder="请输入作品名" />
+      </el-form-item>
+      <el-form-item label="总评分" prop="overallRating">
+        <el-input v-model="formData.overallRating" placeholder="请输入总评分" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { TotalScoreApi, TotalScoreVO } from '@/api/work/totalscore'
+
+/** 作品总分 表单 */
+defineOptions({ name: 'TotalScoreForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  workName: undefined,
+  overallRating: undefined
+})
+const formRules = reactive({
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await TotalScoreApi.getTotalScore(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as TotalScoreVO
+    if (formType.value === 'create') {
+      await TotalScoreApi.createTotalScore(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await TotalScoreApi.updateTotalScore(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    workName: undefined,
+    overallRating: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>

src/views/work/totalscore/index.vue

@@ -0,0 +1,198 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="作品名" prop="workName">
+        <el-input
+          v-model="queryParams.workName"
+          placeholder="请输入作品名"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="总评分" prop="overallRating">
+        <el-input
+          v-model="queryParams.overallRating"
+          placeholder="请输入总评分"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-220px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['work:total-score:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['work:total-score:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="id" align="center" prop="id" />
+      <el-table-column label="作品名" align="center" prop="workName" />
+      <el-table-column label="总评分" align="center" prop="overallRating" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center" min-width="120px">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['work:total-score:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['work:total-score:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <TotalScoreForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { TotalScoreApi, TotalScoreVO } from '@/api/work/totalscore'
+import TotalScoreForm from './TotalScoreForm.vue'
+
+/** 作品总分 列表 */
+defineOptions({ name: 'TotalScore' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<TotalScoreVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  workName: undefined,
+  overallRating: undefined,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await TotalScoreApi.getTotalScorePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await TotalScoreApi.deleteTotalScore(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await TotalScoreApi.exportTotalScore(queryParams)
+    download.excel(data, '作品总分.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>