release-v1.0 #1

Merged
panchichun merged 57 commits from release-v1.0 into main 2024-09-13 17:04:18 +08:00
5 changed files with 38 additions and 175 deletions
Showing only changes of commit ce04b79efd - Show all commits

View File

@ -81,13 +81,13 @@
<div class="rt"> <div class="rt">
<el-table v-loading="downLoading" :data="toolDownStatList"> <el-table v-loading="downLoading" :data="toolDownStatList">
<el-table-column type="index" label="序号" width="50" align="center"/> <el-table-column type="index" label="序号" width="50" align="center"/>
<el-table-column label="文档编号" align="center" key="docCode" prop="docCode" /> <el-table-column label="文档编号" key="docCode" prop="docCode" />
<el-table-column label="文档名称" align="center" key="docName" prop="docName" :show-overflow-tooltip="true" /> <el-table-column label="文档名称" key="docName" prop="docName" :show-overflow-tooltip="true" />
<el-table-column label="下载次数" align="center" key="docDownNum" prop="docDownNum" width="120" /> <el-table-column label="下载次数" align="center" key="docDownNum" prop="docDownNum"/>
<el-table-column <el-table-column
label="操作" label="操作"
align="center" align="center"
width="250" width="100"
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
> >
<template slot-scope="scope"> <template slot-scope="scope">
@ -116,10 +116,11 @@
@close="detailDrawerOpen = false" @close="detailDrawerOpen = false"
> >
<el-table :data="toolDownDetailStatList" v-loading="loading"> <el-table :data="toolDownDetailStatList" v-loading="loading">
<el-table-column label="下载用户" align="center" key="nickName" prop="nickName" min-width="120" /> <el-table-column type="index" label="序号" width="50" align="center"/>
<el-table-column label="附件名称" align="center" key="attName" prop="attName" :show-overflow-tooltip="true" /> <el-table-column label="附件名称" key="attName" prop="attName" :show-overflow-tooltip="true" />
<el-table-column label="下载次数" align="center" key="toolDownNum" prop="toolDownNum" min-width="120" /> <el-table-column label="下载用户" key="nickName" prop="nickName" width="120" />
<el-table-column label="下载时间" align="center" key="createTime" prop="createTime" min-width="120" /> <el-table-column label="下载次数" align="center" key="toolDownNum" prop="toolDownNum" width="120" />
<el-table-column label="下载时间" align="center" key="createTime" prop="createTime" width="200" />
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"

View File

@ -96,13 +96,13 @@
<div class="rt"> <div class="rt">
<el-table v-loading="downLoading" :data="toolDownStatList"> <el-table v-loading="downLoading" :data="toolDownStatList">
<el-table-column type="index" label="序号" width="50" align="center"/> <el-table-column type="index" label="序号" width="50" align="center"/>
<el-table-column label="工具编号" align="center" key="toolCode" prop="toolCode" /> <el-table-column label="工具编号" key="toolCode" prop="toolCode" />
<el-table-column label="工具名称" align="center" key="toolName" prop="toolName" :show-overflow-tooltip="true" /> <el-table-column label="工具名称" key="toolName" prop="toolName" :show-overflow-tooltip="true" />
<el-table-column label="下载次数" align="center" key="toolDownNum" prop="toolDownNum" width="120" /> <el-table-column label="下载次数" align="center" key="toolDownNum" prop="toolDownNum" />
<el-table-column <el-table-column
label="操作" label="操作"
align="center" align="center"
width="250" width="100"
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
> >
<template slot-scope="scope"> <template slot-scope="scope">
@ -130,11 +130,12 @@
@open="openEvent" @open="openEvent"
@close="detailDrawerOpen = false" @close="detailDrawerOpen = false"
> >
<el-table :data="toolDownDetailStatList" v-loading="loading"> <el-table :data="toolDownDetailStatList" v-loading="loading" height="500px">
<el-table-column label="下载用户" align="center" key="nickName" prop="nickName" min-width="120" /> <el-table-column label="序号" width="60" type="index" align="center"></el-table-column>
<el-table-column label="附件名称" align="center" key="attName" prop="attName" :show-overflow-tooltip="true" /> <el-table-column label="附件名称" key="attName" prop="attName" :show-overflow-tooltip="true" />
<el-table-column label="下载次数" align="center" key="toolDownNum" prop="toolDownNum" min-width="120" /> <el-table-column label="下载用户" key="nickName" prop="nickName" width="120" />
<el-table-column label="下载时间" align="center" key="createTime" prop="createTime" min-width="120" /> <el-table-column label="下载次数" align="center" key="toolDownNum" prop="toolDownNum" width="120" />
<el-table-column label="下载时间" align="center" key="createTime" prop="createTime" width="220" />
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"

View File

@ -85,7 +85,7 @@
<div class="pllist"> <div class="pllist">
<template v-if="discussionsList && discussionsList.length > 0"> <template v-if="discussionsList && discussionsList.length > 0">
<div class="list" v-for="(item,index) in discussionsList" :key="item.id"> <div class="list" v-for="(item,index) in discussionsList" :key="item.id">
<div class="luser"><span class="xuser">{{getFirstChar(item.nickName)}}</span></div> <div class="luser"><span class="xuser" :style="{backgroundColor: extractColorByName(item.nickName)}">{{getFirstChar(item.nickName)}}</span></div>
<div class="ltext"> <div class="ltext">
<div class="nt"><span class="name">{{item.nickName}}</span><span class="time">{{ parseTime(item.createTime, '{y}-{m}-{d} {h}:{i}') }}</span></div> <div class="nt"><span class="name">{{item.nickName}}</span><span class="time">{{ parseTime(item.createTime, '{y}-{m}-{d} {h}:{i}') }}</span></div>
<div class="te">{{item.content}}</div> <div class="te">{{item.content}}</div>
@ -105,7 +105,7 @@
<!--第二层级--> <!--第二层级-->
<template v-if="item.repliesList && item.repliesList.length > 0"> <template v-if="item.repliesList && item.repliesList.length > 0">
<div class="list" v-for="(repItem,repIdex) in item.repliesList" :key="repItem.id"> <div class="list" v-for="(repItem,repIdex) in item.repliesList" :key="repItem.id">
<div class="luser"><span class="xuser">{{getFirstChar(repItem.nickName)}}</span></div> <div class="luser"><span class="xuser" :style="{backgroundColor: extractColorByName(repItem.nickName)}">{{getFirstChar(repItem.nickName)}}</span></div>
<div class="ltext"> <div class="ltext">
<div class="nt"><span class="name">{{repItem.nickName}}</span><span class="time">{{ parseTime(repItem.createTime, '{y}-{m}-{d} {h}:{i}') }}</span></div> <div class="nt"><span class="name">{{repItem.nickName}}</span><span class="time">{{ parseTime(repItem.createTime, '{y}-{m}-{d} {h}:{i}') }}</span></div>
<div class="te">{{repItem.content}}</div> <div class="te">{{repItem.content}}</div>
@ -388,6 +388,14 @@
}); });
}) })
}, },
extractColorByName(name) {
let temp = [];
temp.push("#");
for (let index = 0; index < name.length; index++) {
temp.push(parseInt(name[index].charCodeAt(0), 10).toString(16));
}
return temp.slice(0, 5).join('').slice(0, 4);
},
getFirstChar(value) { getFirstChar(value) {
if(!value){return ''} if(!value){return ''}
return value.charAt(0); return value.charAt(0);

View File

@ -37,7 +37,8 @@
</el-card><!--el-card--> </el-card><!--el-card-->
<el-card> <el-card>
<el-table :data="tableData1" style="width: 100%" height="529"> <el-table :data="tableData1" style="width: 100%" height="529" v-loading="loading">
<el-table-column label="序号" width="60" type="index" align="center"></el-table-column>
<el-table-column label="申请类型"> <el-table-column label="申请类型">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.applyType === 'publish'">发布申请</span> <span v-if="scope.row.applyType === 'publish'">发布申请</span>
@ -182,6 +183,8 @@
drawer1: false, drawer1: false,
drawer2: false, drawer2: false,
drawerShow: false, drawerShow: false,
loading: false,
tableData1: [],
path: 'views/workflowList/addWorkflow/', path: 'views/workflowList/addWorkflow/',
code: '', code: '',
data: undefined, data: undefined,
@ -198,160 +201,7 @@
recordStatus: "", recordStatus: "",
}, },
applyDetail: {}, applyDetail: {},
applyToolDetail: {}, applyToolDetail: {}
tableData1: [
{
prop1: '使用申请',
prop2: '进行中',
prop3: '直接领导审核',
prop4: '赵宇',
prop5: '2024/02/09 12:00',
prop6: '2024/02/09 12:00',
},
{
prop1: '使用申请',
prop2: '已办结',
prop3: '直接领导审核',
prop4: '钱多多',
prop5: '2024/02/09 12:00',
prop6: '2024/02/09 12:00',
},
{
prop1: '使用申请',
prop2: '进行中',
prop3: '直接领导审核',
prop4: '赵宇',
prop5: '2024/02/09 12:00',
prop6: '2024/02/09 12:00',
},
{
prop1: '使用申请',
prop2: '已办结',
prop3: '直接领导审核',
prop4: '钱多多',
prop5: '2024/02/09 12:00',
prop6: '2024/02/09 12:00',
},
{
prop1: '使用申请',
prop2: '进行中',
prop3: '直接领导审核',
prop4: '赵宇',
prop5: '2024/02/09 12:00',
prop6: '2024/02/09 12:00',
},
{
prop1: '使用申请',
prop2: '已办结',
prop3: '直接领导审核',
prop4: '钱多多',
prop5: '2024/02/09 12:00',
prop6: '2024/02/09 12:00',
},
{
prop1: '使用申请',
prop2: '进行中',
prop3: '直接领导审核',
prop4: '赵宇',
prop5: '2024/02/09 12:00',
prop6: '2024/02/09 12:00',
},
{
prop1: '使用申请',
prop2: '已办结',
prop3: '直接领导审核',
prop4: '钱多多',
prop5: '2024/02/09 12:00',
prop6: '2024/02/09 12:00',
},
{
prop1: '使用申请',
prop2: '进行中',
prop3: '直接领导审核',
prop4: '赵宇',
prop5: '2024/02/09 12:00',
prop6: '2024/02/09 12:00',
},
{
prop1: '使用申请',
prop2: '已办结',
prop3: '直接领导审核',
prop4: '钱多多',
prop5: '2024/02/09 12:00',
prop6: '2024/02/09 12:00',
}
],
tableData2: [
{
prop1: '0021',
prop2: '工具名称1',
prop3: '人力资源部/培训组',
prop4: '赵宇',
prop5: '网络工具',
},
{
prop1: '0022',
prop2: '工具名称2',
prop3: '人力资源部/招聘组',
prop4: '钱多多',
prop5: '网络工具',
},
{
prop1: '0023',
prop2: '工具名称3',
prop3: '人力资源部/薪资组',
prop4: '孙瑶',
prop5: '网络工具',
}
],
tableData3: [
{
prop1: '部门领导审核',
prop2: '张宇',
prop3: '管理员审核 ',
prop4: '赵定',
prop5: '同意',
prop6: '2024/02/09 12:00',
prop7: '2024/02/09 12:03',
prop8: '耗时0天',
prop9: '已完成',
},
{
prop1: '管理员审核',
prop2: '赵定',
prop3: '直接领导审核 ',
prop4: '钱多多',
prop5: '同意',
prop6: '2024/02/09 12:00',
prop7: '2024/02/09 12:03',
prop8: '耗时0天',
prop9: '已完成',
}
],
tableData4: [
{
prop1: '部门领导审核',
prop2: '张宇',
prop3: '管理员审核 ',
prop4: '赵定',
prop5: '同意',
prop6: '2024/02/09 12:00',
prop7: '2024/02/09 12:03',
prop8: '耗时0天',
prop9: '已完成',
},
{
prop1: '管理员审核',
prop2: '赵定',
prop3: '直接领导审核 ',
prop4: '钱多多',
prop5: '同意',
prop6: '2024/02/09 12:00',
prop7: '2024/02/09 12:03',
prop8: '耗时0天',
prop9: '已完成',
}
],
} }
}, },
created() { created() {

View File

@ -9,7 +9,7 @@
</el-form-item> </el-form-item>
</div> </div>
<div class="sr"> <div class="sr">
<el-button type="primary" icon="el-icon-search" @click="handleQuery" v-loading="loading">搜索</el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh-left" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh-left" @click="resetQuery">重置</el-button>
</div> </div>
</div><!--search 搜索--> </div><!--search 搜索-->
@ -19,6 +19,7 @@
<el-tabs v-model="activeName" @tab-click="state"> <el-tabs v-model="activeName" @tab-click="state">
<el-tab-pane :label="'待办('+ statustotal+')'" name="taskToDo"> <el-tab-pane :label="'待办('+ statustotal+')'" name="taskToDo">
<el-table :data="postList" style="width: 100%" height="529" v-loading="loading"> <el-table :data="postList" style="width: 100%" height="529" v-loading="loading">
<el-table-column label="序号" width="60" type="index" align="center"></el-table-column>
<el-table-column prop="procDefName" label="流程类型"></el-table-column> <el-table-column prop="procDefName" label="流程类型"></el-table-column>
<el-table-column prop="title" label="流程标题"></el-table-column> <el-table-column prop="title" label="流程标题"></el-table-column>
<el-table-column prop="curActDefName" label="当前环节"></el-table-column> <el-table-column prop="curActDefName" label="当前环节"></el-table-column>
@ -51,6 +52,7 @@
</el-tab-pane><!--el-tab-pane--> </el-tab-pane><!--el-tab-pane-->
<el-tab-pane :label="'已办('+doneTotal+')'" name="taskDealed"> <el-tab-pane :label="'已办('+doneTotal+')'" name="taskDealed">
<el-table :data="postList" style="width: 100%" height="529" v-loading="loading"> <el-table :data="postList" style="width: 100%" height="529" v-loading="loading">
<el-table-column label="序号" width="60" type="index" align="center"></el-table-column>
<el-table-column prop="procDefName" label="流程类型"></el-table-column> <el-table-column prop="procDefName" label="流程类型"></el-table-column>
<el-table-column prop="title" label="流程标题"></el-table-column> <el-table-column prop="title" label="流程标题"></el-table-column>
<el-table-column prop="curActDefName" label="处理环节"></el-table-column> <el-table-column prop="curActDefName" label="处理环节"></el-table-column>
@ -83,6 +85,7 @@
</el-tab-pane><!--el-tab-pane--> </el-tab-pane><!--el-tab-pane-->
<el-tab-pane :label="'办结('+finishedTotal+')'" name="taskFinish"> <el-tab-pane :label="'办结('+finishedTotal+')'" name="taskFinish">
<el-table :data="postList" style="width: 100%" height="529" v-loading="loading"> <el-table :data="postList" style="width: 100%" height="529" v-loading="loading">
<el-table-column label="序号" width="60" type="index" align="center"></el-table-column>
<el-table-column prop="procDefName" label="流程类型"></el-table-column> <el-table-column prop="procDefName" label="流程类型"></el-table-column>
<el-table-column prop="title" label="流程标题"></el-table-column> <el-table-column prop="title" label="流程标题"></el-table-column>
<el-table-column prop="startUserName" label="发起人"></el-table-column> <el-table-column prop="startUserName" label="发起人"></el-table-column>