From c8daca7ba2dafb6b6167f2c85cf3529d0f74c590 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 04 三月 2026 16:35:04 +0800
Subject: [PATCH] fix:1.班次页面：月度统计时间调整为上月26到本月25；班次支持右键添加批注 2.外购下单：KJNS域订单免检自动更新批次属性；外购下单-全部页新增【更新IFS批次属性】按钮，支持更新已提交订单的批次属性 3.资源要求-设备：设备核查计划：核查负责人回显问题修复；设备使用授权：检验项目导出数据错误问题修复
---
src/views/performance/class/index.vue | 677 ++++++++++++++++++++------------------------------------
1 files changed, 240 insertions(+), 437 deletions(-)
diff --git a/src/views/performance/class/index.vue b/src/views/performance/class/index.vue
index 18e6ed2..c398c77 100644
--- a/src/views/performance/class/index.vue
+++ b/src/views/performance/class/index.vue
@@ -4,123 +4,57 @@
<div class="search_thing">
<div class="search_label">閫夋嫨鏃堕棿锛�</div>
<div class="search_input">
- <el-date-picker
- v-model="query.year"
- type="year"
- size="small"
- format="yyyy"
- placeholder="閫夋嫨骞�"
- @change="refreshTable()"
- style="width: 140px"
- :clearable="false"
- >
+ <el-date-picker v-model="query.year" type="year" size="small" format="yyyy" placeholder="閫夋嫨骞�"
+ @change="refreshTable()" style="width: 140px" :clearable="false">
</el-date-picker>
- <el-select
- v-model="query.month"
- clearable
- placeholder="閫夋嫨鏈�"
- style="width: 140px; margin-left: 16px"
- size="small"
- @change="refreshTable()"
- >
- <el-option
- v-for="item in monthOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
+ <el-select v-model="query.month" clearable placeholder="閫夋嫨鏈�" style="width: 140px; margin-left: 16px"
+ size="small" @change="refreshTable()">
+ <el-option v-for="item in monthOptions" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
- <el-input
- v-model="query.userName"
- placeholder="璇疯緭鍏ヤ汉鍛樺悕绉�"
- size="small"
- style="width: 140px; margin: 0 16px"
- clearable
- @keyup.enter.native="refreshTable()"
- ></el-input>
- <el-select
- v-model="query.laboratory"
- placeholder="璇烽�夋嫨瀹為獙瀹�"
- style="width: 140px"
- size="small"
- clearable
- @change="refreshTable()"
- >
- <el-option
- v-for="item in laboratory"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
+ <el-input v-model="query.userName" placeholder="璇疯緭鍏ヤ汉鍛樺悕绉�" size="small" style="width: 140px; margin: 0 16px"
+ clearable @keyup.enter.native="refreshTable()"></el-input>
+ <el-select v-model="query.laboratory" placeholder="璇烽�夋嫨瀹為獙瀹�" style="width: 140px" size="small" clearable
+ @change="refreshTable()">
+ <el-option v-for="item in laboratory" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</div>
</div>
<div class="search_thing" style="padding-left: 30px">
- <el-button size="small" @click="refresh()">閲� 缃�</el-button>
- <el-button size="small" type="primary" @click="refreshTable()"
- >鏌� 璇�</el-button
- >
+ <el-button size="mini" type="primary" @click="refreshTable()">鏌� 璇�</el-button>
+ <el-button size="mini" @click="refresh()">閲嶇疆</el-button>
</div>
<div class="search_thing btns" style="padding-left: 30px">
- <el-button
- size="small"
- type="primary"
- v-if="checkPermi(['performance:class:time'])"
- @click="configTime"
- >鏃堕棿閰嶇疆</el-button
- >
- <el-button
- size="small"
- type="primary"
- v-if="checkPermi(['performance:class:down'])"
- @click="handleDown"
- :loading="downLoading"
- >瀵� 鍑�</el-button
- >
- <el-button
- size="small"
- type="primary"
- @click="schedulingVisible = true"
- v-if="checkPermi(['performance:class:add'])"
- >鎺� 鐝�</el-button
- >
+ <el-button size="small" type="primary" v-if="checkPermi(['performance:class:time'])"
+ @click="configTime">鏃堕棿閰嶇疆</el-button>
+ <el-button size="small" type="primary" v-if="checkPermi(['performance:class:down'])" @click="handleDown"
+ :loading="downLoading">瀵� 鍑�</el-button>
+ <el-button size="small" type="primary" @click="schedulingVisible = true"
+ v-if="checkPermi(['performance:class:add'])">鎺� 鐝�</el-button>
</div>
</div>
<div class="center" v-loading="pageLoading">
<div class="clearfix" style="width: 100%" v-show="query.month">
<div class="fixed-left">
- <div
- class="content-title"
- style="padding-left: 16px; box-sizing: border-box"
- >
+ <div class="content-title" style="padding-left: 16px; box-sizing: border-box">
浜哄憳鍚嶇О
</div>
- <div
- class="content-user"
- :class="{ hoverType: currentUserIndex == index }"
- v-for="(item, index) in list"
- :key="'e' + index"
- v-on:mouseenter="onMouseEnter(index)"
- v-on:mouseleave="currentUserIndex = null"
- >
+ <div class="content-user" :class="{ hoverType: currentUserIndex == index }" v-for="(item, index) in list"
+ :key="'e' + index" v-on:mouseenter="onMouseEnter(index)" v-on:mouseleave="currentUserIndex = null">
<div class="user-pic">
{{ item.name ? item.name.charAt(0) : "" }}
</div>
<div class="user-info">
- <p
- style="
+ <p style="
font-size: 14px;
color: #3a7bfa;
line-height: 24px;
margin: 0;
- "
- >
+ ">
{{ item.name }}
</p>
- <p
- style="
+ <p style="
color: #999999;
font-size: 12px;
transform: scale(0.8) translateX(-20px);
@@ -128,102 +62,54 @@
width: 150px;
overflow-x: show;
margin: 0;
- "
- >
+ ">
鏃�:{{ item.day0 }},涓�:{{ item.day1 }},澶�:{{ item.day2 }},浼�:{{
item.day3
}},鍋�:{{ item.day4 }},宸�:{{ item.day6 }}
</p>
<p style="margin-top: 4px; margin: 0">
- <span
- style="
+ <span style="
color: #999999;
font-size: 12px;
display: inline-block;
transform: scale(0.8) translateX(-10px);
- "
- >鍚堣鍑哄嫟: </span
- ><span style="font-size: 16px; color: #ff4902"
- >{{
+ ">鍚堣鍑哄嫟: </span><span style="font-size: 16px; color: #ff4902">{{
query.month
? item.monthlyAttendance.totalAttendance
: item.sidebarAnnualAttendance.totalAttendance
- }}澶�</span
- >
+ }}澶�</span>
</p>
</div>
</div>
</div>
<div class="scroll-right">
<div class="content">
- <div
- class="content-title content-title-right"
- style="border-bottom: 0"
- >
- <div
- class="content-title-item"
- v-for="(item, index) in weeks"
- :key="'b' + index"
- >
- <span
- class="month"
- style="position: absolute; top: 0px"
- v-if="item.week == '鍛ㄦ棩'"
- >{{ item.weekNum }}鍛�</span
- >
+ <div class="content-title content-title-right" style="border-bottom: 0">
+ <div class="content-title-item" v-for="(item, index) in weeks" :key="'b' + index">
+ <span class="month" style="position: absolute; top: 0px" v-if="item.week == '鍛ㄦ棩'">{{ item.weekNum
+ }}鍛�</span>
<p style="height: 26px; position: absolute; bottom: 12px">
<span class="day">{{ item.day }}</span>
<span class="week">{{ item.week.charAt(1) }}</span>
</p>
</div>
</div>
- <div
- class="content-body"
- v-for="(item, index) in list"
- :key="'c' + index"
- v-on:mouseenter="onMouseEnter(index)"
- v-on:mouseleave="currentUserIndex = null"
- >
- <div
- class="content-body-item"
- v-for="(m, i) in item.list"
- :key="'d' + i"
- :class="{ hoverType: currentUserIndex == index }"
- >
- <el-dropdown
- trigger="click"
- placement="bottom"
- @command="(e) => handleCommand(e, m)"
+ <div class="content-body" v-for="(item, index) in list" :key="'c' + index"
+ v-on:mouseenter="onMouseEnter(index)" v-on:mouseleave="currentUserIndex = null">
+ <div class="content-body-item" v-for="(m, i) in item.list" :key="'d' + i"
+ :class="{ hoverType: currentUserIndex == index }">
+ <el-dropdown trigger="click" placement="bottom" @command="(e) => handleCommand(e, m)"
:disabled="!checkPermi(['performance:class:edit'])"
- style="width: 100%; height: 100%; cursor: pointer"
- >
- <div
- class="work-box"
- :class="{
- type0: m.shift === '0',
- type1: m.shift === '1',
- type2: m.shift === '2',
- type3: m.shift === '3',
- type4: m.shift === '4',
- type5: m.shift === '5',
- type6: m.shift === '6',
- }"
- >
- <span
- style="cursor: pointer"
- :style="`opacity: ${
- getShiftByDic(m.shift) == '鏃�' ? 0 : 1
- };`"
- >{{ getShiftByDic(m.shift) }}</span
- >
- </div>
+ style="width: 100%; height: 100%; cursor: pointer">
+ <el-tooltip :disabled="!m.annotationText" :content="m.annotationText">
+ <el-tag @contextmenu.prevent.native="handleContextMenu(m,$event)" class="work-box" :type="getDictTypeByShift(m.shift)">{{ getShiftByDic(m.shift) }}</el-tag>
+ </el-tooltip>
+ <i v-if="m.checkinResult==='success'" class="el-icon-success" style="position: relative;top:-20px;color:#67c23a;"></i>
+ <i v-else-if="m.checkinResult==='fail'" class="el-icon-warning" style="position: relative;top:-20px;color:#f56c6c;"></i>
+ <svg v-if="m.annotationText" style="position: relative;top:-62px;left:31px;" t="1772437700487" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6193" width="12" height="12"><path d="M751.228537 117.332567c-1.023063 7.672974-1.470653 15.601715-1.278829 23.466514l1.278829 41.434062-32.418317 25.768406L473.466862 402.639333l-34.656268 27.494825-42.137418-13.747412a332.495559 332.495559 0 0 0-270.280524 28.965478l193.742604 194.637785 49.107037 49.362802 14.51471 14.642593 193.99837 194.829609a331.21673 331.21673 0 0 0 29.732776-271.559353l-13.747413-42.137418 27.494825-34.656268 194.509902-245.535182 25.768406-32.354375 41.434062 1.278829 4.220136 0.127883c6.522028 0 13.044057-0.44759 19.438202-1.406712l-155.377732-155.24985zM734.539817 0c9.719101 0 19.566085 3.644663 27.111177 11.189754l251.034146 250.650499a38.236989 38.236989 0 0 1-5.946555 59.081903 219.255244 219.255244 0 0 1-119.570518 35.359623c-2.301892 0-4.539843 0-6.841736-0.127882L685.752488 601.689078a413.253615 413.253615 0 0 1-71.742311 388.764038 39.451877 39.451877 0 0 1-58.378547 2.941307l-235.752139-236.775202L64.497325 1012.193211a37.277867 37.277867 0 1 1-52.623816-52.7517l255.510048-255.57399L31.631418 467.092319a39.451877 39.451877 0 0 1 3.197072-58.378548 411.399313 411.399313 0 0 1 258.771063-91.244454c43.480188 0 86.832494 6.905677 128.586263 20.461265l245.407299-194.573843A218.871596 218.871596 0 0 1 702.56909 17.264192a37.981223 37.981223 0 0 1 31.970727-17.264192z" fill="#f56c6c" p-id="6194"></path></svg>
<el-dropdown-menu slot="dropdown">
- <el-dropdown-item
- v-for="(n, j) in classType"
- :key="'h' + j"
- :command="n.dictValue"
- >{{ n.dictLabel }}</el-dropdown-item
- >
+ <el-dropdown-item v-for="(n, j) in classType" :key="'h' + j" :command="n.dictValue">{{ n.dictLabel
+ }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
@@ -231,42 +117,26 @@
</div>
</div>
</div>
- <div
- class="clearfix year-table"
- style="width: 100%"
- v-show="!query.month"
- >
+ <div class="clearfix year-table" style="width: 100%" v-show="!query.month">
<div class="fixed-left">
- <div
- class="content-title"
- style="padding-left: 16px; box-sizing: border-box"
- >
+ <div class="content-title" style="padding-left: 16px; box-sizing: border-box">
浜哄憳鍚嶇О
</div>
- <div
- class="content-user"
- :class="{ hoverType: currentUserIndex == index }"
- v-for="(item, index) in yearList"
- :key="'e' + index"
- v-on:mouseenter="onMouseEnter(index)"
- v-on:mouseleave="currentUserIndex = null"
- >
+ <div class="content-user" :class="{ hoverType: currentUserIndex == index }" v-for="(item, index) in yearList"
+ :key="'e' + index" v-on:mouseenter="onMouseEnter(index)" v-on:mouseleave="currentUserIndex = null">
<div class="user-pic">
{{ item.name ? item.name.charAt(0) : "" }}
</div>
<div class="user-info">
- <p
- style="
+ <p style="
font-size: 14px;
color: #3a7bfa;
line-height: 24px;
margin: 0;
- "
- >
+ ">
{{ item.name }}
</p>
- <p
- style="
+ <p style="
color: #999999;
font-size: 12px;
transform: scale(0.8) translateX(-20px);
@@ -274,24 +144,18 @@
width: 150px;
overflow-x: show;
margin: 0;
- "
- >
+ ">
鏃�:{{ item.day0 }},涓�:{{ item.day1 }},澶�:{{ item.day2 }},浼�:{{
item.day3
}},鍋�:{{ item.day4 }},宸�:{{ item.day6 }}
</p>
<p style="margin-top: 4px; margin: 0">
- <span
- style="
+ <span style="
color: #999999;
font-size: 12px;
display: inline-block;
transform: scale(0.8) translateX(-10px);
- "
- >鍚堣鍑哄嫟: </span
- ><span style="font-size: 16px; color: #ff4902"
- >{{ item.work_time }}澶�</span
- >
+ ">鍚堣鍑哄嫟: </span><span style="font-size: 16px; color: #ff4902">{{ item.work_time }}澶�</span>
</p>
</div>
</div>
@@ -299,36 +163,18 @@
<div class="scroll-right">
<div class="content">
<div>
- <div
- class="content-title content-title-right"
- style="border-bottom: 0; height: 52px"
- :style="`display: grid;
- grid-template-columns: repeat(${monthList.length}, 1fr);`"
- >
- <div
- class="content-title-item"
- v-for="(item, index) in monthList"
- :key="'b' + index"
- style="height: 52px"
- >
+ <div class="content-title content-title-right" style="border-bottom: 0; height: 52px" :style="`display: grid;
+ grid-template-columns: repeat(${monthList.length}, 1fr);`">
+ <div class="content-title-item" v-for="(item, index) in monthList" :key="'b' + index"
+ style="height: 52px">
<span class="month">{{ item }}鏈�</span>
</div>
</div>
- <div
- class="content-body"
- v-for="(item, index) in yearList"
- :key="'c' + index"
- v-on:mouseenter="onMouseEnter(index)"
- v-on:mouseleave="currentUserIndex = null"
- :style="`display: grid;
- grid-template-columns: repeat(${monthList.length}, 1fr);`"
- >
- <div
- class="content-body-item"
- v-for="(m, i) in item.monthList"
- :key="'d' + i"
- :class="{ hoverType: currentUserIndex == index }"
- >
+ <div class="content-body" v-for="(item, index) in yearList" :key="'c' + index"
+ v-on:mouseenter="onMouseEnter(index)" v-on:mouseleave="currentUserIndex = null" :style="`display: grid;
+ grid-template-columns: repeat(${monthList.length}, 1fr);`">
+ <div class="content-body-item" v-for="(m, i) in item.monthList" :key="'d' + i"
+ :class="{ hoverType: currentUserIndex == index }">
<p style="color: rgb(153, 153, 153); font-size: 12px">
鍚堣鍑哄嫟锛�<span style="font-size: 14px; color: #000">{{
m.totalMonthAttendance
@@ -346,41 +192,30 @@
</div>
</div>
</div>
- <el-pagination
- background
- @current-change="currentChange"
- :page-size="pageSize"
- :current-page="currentPage"
- layout="total, prev, pager, next, jumper"
- :total="total"
- style="margin-top: 10px; text-align: right; margin-right: 30px"
- >
+ <el-pagination background @current-change="currentChange" :page-size="pageSize" :current-page="currentPage"
+ layout="total, prev, pager, next, jumper" :total="total"
+ style="margin-top: 10px; text-align: right; margin-right: 30px">
</el-pagination>
+ <ul v-show="showMenu"
+ class="contextmenu"
+ :style="{left:menuX+'px',top:menuY+'px'}"
+ @click.stop>
+ <li @click="editAnnotation()">缂栬緫鎵规敞</li>
+ <li class="divider"></li>
+ </ul>
<el-dialog title="鏃堕棿閰嶇疆" :visible.sync="configTimeVisible" width="620px">
<div v-loading="configTimeVisibleLoading" style="min-height: 200px">
<div v-for="(item, index) in timeQuery">
- <div
- class="form"
- style="display: flex; justify-content: space-between"
- >
+ <div class="form" style="display: flex; justify-content: space-between">
<div style="margin-bottom: 12px; width: 200px">
<span class="form_label">鐝锛�</span>
<span v-if="!item.isEdit"> {{ item.type }} </span>
<span class="form_input" v-if="item.isEdit">
- <el-select
- v-model="item.shift"
- placeholder="璇烽�夋嫨"
- style="width: 70%; margin-right: 8px"
- clearable
- size="small"
- >
- <el-option
- v-for="obj in timeTypeList"
- :key="obj.dictValue"
- :label="obj.dictLabel"
- :value="obj.dictValue"
- >
+ <el-select v-model="item.shift" placeholder="璇烽�夋嫨" style="width: 70%; margin-right: 8px" clearable
+ size="small">
+ <el-option v-for="obj in timeTypeList" :key="obj.dictValue" :label="obj.dictLabel"
+ :value="obj.dictValue">
</el-option>
</el-select>
</span>
@@ -395,67 +230,36 @@
}}
</span>
<span class="form_input" v-if="item.isEdit">
- <el-time-select
- placeholder="璧峰鏃堕棿"
- v-model="item.startTime"
- size="small"
- :picker-options="{
- start: '00:00',
- step: '00:15',
- end: '24:00',
- }"
- style="width: 120px"
- >
+ <el-time-select placeholder="璧峰鏃堕棿" v-model="item.startTime" size="small" :picker-options="{
+ start: '00:00',
+ step: '00:15',
+ end: '24:00',
+ }" style="width: 120px">
</el-time-select>
- <el-time-select
- style="width: 120px"
- placeholder="缁撴潫鏃堕棿"
- v-model="item.endTime"
- size="small"
+ <el-time-select style="width: 120px" placeholder="缁撴潫鏃堕棿" v-model="item.endTime" size="small"
:picker-options="{
start: '00:00',
step: '00:15',
end: '24:00',
- }"
- >
+ }">
</el-time-select>
</span>
</div>
<span>
- <i
- class="el-icon-circle-check"
- v-if="item.isEdit"
- style="margin-left: 10px; color: #4b79f2; cursor: pointer"
- @click="saveEdit(item, index)"
- ></i>
- <i
- class="el-icon-edit"
- v-if="!item.isEdit"
- style="margin-left: 10px; color: #4b79f2; cursor: pointer"
- @click="item.isEdit = true"
- ></i>
- <i
- class="el-icon-delete"
- v-if="timeQuery.length > 1"
- style="margin-left: 10px; color: #ff4902; cursor: pointer"
- @click="deleteTime(item, index)"
- ></i>
+ <i class="el-icon-circle-check" v-if="item.isEdit"
+ style="margin-left: 10px; color: #4b79f2; cursor: pointer" @click="saveEdit(item, index)"></i>
+ <i class="el-icon-edit" v-if="!item.isEdit" style="margin-left: 10px; color: #4b79f2; cursor: pointer"
+ @click="item.isEdit = true"></i>
+ <i class="el-icon-delete" v-if="timeQuery.length > 1"
+ style="margin-left: 10px; color: #ff4902; cursor: pointer" @click="deleteTime(item, index)"></i>
</span>
</div>
<el-divider></el-divider>
- <div
- @click="addTimeForm"
- style="color: #4b79f2; cursor: pointer"
- v-if="index === timeQuery.length - 1"
- >
+ <div @click="addTimeForm" style="color: #4b79f2; cursor: pointer" v-if="index === timeQuery.length - 1">
娣诲姞鏃堕棿閰嶇疆
</div>
</div>
- <div
- @click="addTimeForm"
- style="color: #4b79f2"
- v-if="timeQuery.length === 0"
- >
+ <div @click="addTimeForm" style="color: #4b79f2" v-if="timeQuery.length === 0">
娣诲姞鏃堕棿閰嶇疆
</div>
</div>
@@ -466,13 +270,8 @@
<span style="color: red; margin-right: 4px">*</span>鍛ㄦ锛�
</div>
<div class="search_input" style="width: calc(100% - 90px)">
- <el-date-picker
- v-model="schedulingQuery.week"
- type="week"
- format="yyyy 绗� WW 鍛�"
- placeholder="閫夋嫨鍛ㄦ"
- style="width: 100%"
- >
+ <el-date-picker v-model="schedulingQuery.week" type="week" format="yyyy 绗� WW 鍛�" placeholder="閫夋嫨鍛ㄦ"
+ style="width: 100%">
</el-date-picker>
</div>
</div>
@@ -481,20 +280,9 @@
<span style="color: red; margin-right: 4px">*</span>浜哄憳鍚嶇О锛�
</div>
<div class="search_input" style="width: calc(100% - 90px)">
- <el-select
- v-model="schedulingQuery.userId"
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- multiple
- clearable
- collapse-tags
- >
- <el-option
- v-for="item in personList"
- :key="item.id"
- :label="item.name"
- :value="item.id"
- >
+ <el-select v-model="schedulingQuery.userId" placeholder="璇烽�夋嫨" style="width: 100%" multiple clearable
+ collapse-tags>
+ <el-option v-for="item in personList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</div>
@@ -504,26 +292,15 @@
<span style="color: red; margin-right: 4px">*</span>鐝锛�
</div>
<div class="search_input" style="width: calc(100% - 90px)">
- <el-select
- v-model="schedulingQuery.shift"
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- >
- <el-option
- v-for="item in classType"
- :key="item.dictValue"
- :label="item.dictLabel"
- :value="item.dictValue"
- >
+ <el-select v-model="schedulingQuery.shift" placeholder="璇烽�夋嫨" style="width: 100%">
+ <el-option v-for="item in classType" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue">
</el-option>
</el-select>
</div>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="schedulingVisible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="confirmScheduling" :loading="loading"
- >纭� 瀹�</el-button
- >
+ <el-button type="primary" @click="confirmScheduling" :loading="loading">纭� 瀹�</el-button>
</span>
</el-dialog>
</div>
@@ -543,8 +320,10 @@
obtainItemParameterList,
update,
selectUserCondition,
+ editAnnotationText
} from "@/api/performance/class";
export default {
+ name: 'Class',
data() {
return {
query: {
@@ -618,7 +397,7 @@
},
list: [],
currentPage: 1, // 褰撳墠椤�
- pageSize: 6, // 涓�椤�10鏉�
+ pageSize: 20, // 涓�椤�10鏉�
total: 0,
pageLoading: false, // 缁勪欢loading鐨勫睍绀�,榛樿涓簍rue
finishLoding: false, // 鍔犺浇瀹屾垚锛屾樉绀哄凡缁忔病鏈夋洿澶氫簡
@@ -629,31 +408,17 @@
configTimeVisibleLoading: false, // 鏃堕棿閰嶇疆寮规loading
timeTypeList: [],
timeQuery: [],
+ showMenu: false,
+ menuX: 0,
+ menuY: 0,
+ selectedTarget: null,
};
},
watch: {
- // 'query.year'(val){
- // this.monthList = []
- // if(val.getFullYear()==new Date().getFullYear()){
- // for(let i=new Date().getMonth()+1;i>0;i--){
- // this.monthList.push(i)
- // }
- // }else{
- // for (let i=12;i>0;i--) {
- // this.monthList.push(i)
- // }
- // }
- // this.monthList.reverse()
- // },
- // 'query.month'(val){
- // if(!val){
- // this.currentPage = 1;
- // this.yearList = []
- // this.initYear()
- // }
- // }
+
},
mounted() {
+ document.addEventListener('click', this.handleClickOutside)
this.selectEnumByCategory();
this.obtainItemParameterList();
this.getUsers();
@@ -667,9 +432,65 @@
this.monthList.push(i);
}
this.monthList.reverse();
- // this.getPower();
+ },
+ destroyed() {
+ document.removeEventListener('click', this.handleClickOutside)
},
methods: {
+ handleContextMenu(target,e) {
+ // 闃绘娴忚鍣ㄩ粯璁ゅ彸閿彍鍗�
+ e.preventDefault()
+
+ const menuMinWidth = 105
+ const offsetLeft = this.$el.getBoundingClientRect().left // container margin left
+ const offsetWidth = this.$el.offsetWidth // container width
+ const maxLeft = offsetWidth - menuMinWidth // left boundary
+ const left = e.clientX - offsetLeft + 15 // 15: margin right
+
+ if (left > maxLeft) {
+ this.menuX = maxLeft
+ } else {
+ this.menuX = left
+ }
+ this.menuY = e.clientY - 60
+ // 鏄剧ず鑿滃崟
+ this.selectedTarget = target
+ this.showMenu = true
+ },
+ editAnnotation() {
+ // 鐐瑰嚮鑿滃崟鍚庡叧闂彍鍗�
+ this.showMenu = false
+ if(this.selectedTarget && !this.selectedTarget.shift){
+ this.$message.warning('璇峰厛閫夋嫨鐝')
+ return
+ }
+ this.$prompt('', '缂栬緫鎵规敞', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ inputType:'textarea',
+ inputPlaceholder:'濉啓鎵规敞鍐呭',
+ inputPattern: /^.{0,100}$/,
+ inputErrorMessage: '鏈�澶ц緭鍏�100涓瓧绗�'
+ }).then(({ value }) => {
+ editAnnotationText({
+ id:this.selectedTarget.id,
+ annotationText:value
+ }).then(res=>{
+ this.refreshTable()
+ this.$message.success("鎻愪氦鎴愬姛")
+ })
+ }).catch(() => { });
+ },
+ handleClickOutside() {
+ this.showMenu = false
+ },
+ getDictTypeByShift(e) {
+ let obj = this.classType.find((m) => m.dictValue == e);
+ if (obj) {
+ return obj.listClass;
+ }
+ return "";
+ },
refresh() {
this.list = [];
this.yearList = [];
@@ -727,8 +548,8 @@
(i == 0 && strArr[i] == 0
? ""
: i > 0 && strArr[i] == 0 && strArr[i - 1] == 0
- ? ""
- : changeNum[strArr[i]] + (strArr[i] == 0 ? unit[0] : unit[i])) +
+ ? ""
+ : changeNum[strArr[i]] + (strArr[i] == 0 ? unit[0] : unit[i])) +
newNum;
}
return newNum;
@@ -753,7 +574,6 @@
laboratory: this.query.laboratory,
}).then((res) => {
this.pageLoading = false;
- if (res.code == 201) return;
this.total = res.data.page.total;
this.list = res.data.page.records.map((item) => {
for (let key in item.monthlyAttendance) {
@@ -764,6 +584,7 @@
}
return item;
});
+ console.log(this.list)
let headerList = res.data.headerList;
this.weeks = [];
headerList.forEach((item) => {
@@ -774,7 +595,9 @@
};
this.weeks.push(obj);
});
- });
+ }).catch(() => {
+ this.pageLoading = false;
+ })
},
initYear() {
this.pageLoading = true;
@@ -787,7 +610,6 @@
laboratory: this.query.laboratory,
}).then((res) => {
this.pageLoading = false;
- if (res.code == 201) return;
this.total = res.data.total;
this.yearList = res.data.records.map((item) => {
for (let key in item.year) {
@@ -847,7 +669,6 @@
})
.then((res) => {
this.loading = false;
- if (res.code == 201) return;
this.$message.success("鎿嶄綔鎴愬姛");
this.schedulingVisible = false;
this.schedulingQuery = {
@@ -872,7 +693,6 @@
this.configTimeVisibleLoading = true;
list()
.then((res) => {
- if (res.code == 201) return;
if (res.data.length > 0) {
res.data.forEach((item) => {
item.isEdit = false;
@@ -924,14 +744,12 @@
// 缂栬緫
newObj.id = item.id;
shiftUpdate(newObj).then((res) => {
- if (res.code == 201) return;
this.$message.success("鎿嶄綔鎴愬姛");
this.getTimeList();
});
} else {
// 鏂板
shiftAdd(newObj).then((res) => {
- if (res.code == 201) return;
this.$message.success("鎿嶄綔鎴愬姛");
this.getTimeList();
});
@@ -942,7 +760,6 @@
shiftRemove({
id: item.id,
}).then((res) => {
- if (res.code == 201) return;
this.$message.success("鎿嶄綔鎴愬姛");
this.getTimeList();
});
@@ -1024,17 +841,13 @@
id: m.id,
shift: e,
}).then((res) => {
- if (res.code == 201) return;
this.$message.success("鎿嶄綔鎴愬姛");
m.shift = e;
});
}
},
getUsers() {
- selectUserCondition().then((res) => {
- if (res.code === 201) {
- return;
- }
+ selectUserCondition({ type: 1 }).then((res) => {
let arr = res.data;
this.personList = arr;
});
@@ -1056,17 +869,11 @@
};
</script>
-<style scoped>
+<style scoped lang="scss">
.class-page {
padding: 10px;
}
-.form_title {
- height: 36px;
- display: flex;
- flex-direction: row;
- justify-content: space-between;
- font-weight: 800;
-}
+
.search {
height: 50px;
display: flex;
@@ -1085,16 +892,19 @@
font-size: 14px;
text-align: right;
}
+
.search_input {
display: flex;
align-items: center;
}
+
.btns {
position: absolute;
right: 16px;
top: 50%;
transform: translate(0, -50%);
}
+
.center {
width: 100%;
height: calc(100vh - 220px);
@@ -1102,43 +912,56 @@
overflow-y: auto;
display: flex;
}
->>> .scroll-pagination {
+
+>>>.scroll-pagination {
overflow-y: scroll;
scrollbar-width: none;
}
->>> .scroll-pagination::-webkit-scrollbar {
+
+>>>.scroll-pagination::-webkit-scrollbar {
display: none;
}
+
.fixed-left {
float: left;
- width: 220px; /* 宸﹁竟鍖哄煙瀹藉害 */
+ width: 220px;
+ /* 宸﹁竟鍖哄煙瀹藉害 */
background-color: #fff;
- box-shadow: 2px -2px 5px rgba(51, 51, 51, 0.12); /* 宸﹁竟闃村奖 */
+ box-shadow: 2px -2px 5px rgba(51, 51, 51, 0.12);
+ /* 宸﹁竟闃村奖 */
}
+
.clearfix::after {
content: "";
display: table;
clear: both;
}
+
.scroll-right {
- width: calc(100% - 220px); /* 鍑忓幓宸﹁竟鍖哄煙瀹藉害 */
- min-height: calc(100% - 10px); /* 瑙嗗彛楂樺害 */
+ width: calc(100% - 220px);
+ /* 鍑忓幓宸﹁竟鍖哄煙瀹藉害 */
+ min-height: calc(100% - 10px);
+ /* 瑙嗗彛楂樺害 */
margin-left: 220px;
overflow-x: scroll;
}
.content {
- min-height: calc(100% - 10px); /* 瑙嗗彛楂樺害 */
+ min-height: calc(100% - 10px);
+ /* 瑙嗗彛楂樺害 */
}
+
.content-title {
height: 58px;
line-height: 58px;
border-bottom: 1px solid #eeeeee;
}
+
.content-title-right {
display: flex;
align-items: center;
}
+
.content-title-item {
height: 100%;
width: 50px;
@@ -1151,6 +974,7 @@
flex-direction: column;
position: relative;
}
+
.content-title-item .month {
font-size: 12px;
color: #3a7bfa;
@@ -1161,19 +985,23 @@
text-align: center;
line-height: 22px;
}
+
.content-title-item .day {
font-size: 14px;
color: #333333;
margin-right: 4px;
}
+
.content-title-item .week {
font-size: 12px;
color: #999999;
}
+
.content-body {
display: flex;
align-items: center;
}
+
.content-body-item {
height: 70px;
width: 50px;
@@ -1184,71 +1012,15 @@
border-right: 1px solid #eeeeee;
border-bottom: 1px solid #eeeeee;
}
+
.work-box {
width: 100%;
height: 100%;
display: flex;
align-items: center;
- justify-content: space-around;
- background: #edeff2;
- border-radius: 8px 8px 8px 8px;
- color: #999;
- font-size: 14px;
-}
-.work-box.type0 {
- background: rgba(58, 123, 250, 0.15);
- color: #3a7bfa !important;
-}
-.work-box.type0 span {
- color: #3a7bfa !important;
-}
-.work-box.type1 {
- background: #e3dcfe;
- color: #635998 !important;
-}
-.work-box.type1 span {
- color: #635998 !important;
-}
-.work-box.type2 {
- background: #fae2ca;
- color: #bc8d5e !important;
-}
-.work-box.type2 span {
- color: #bc8d5e !important;
-}
-.work-box.type3 {
- background: #e1f3d8;
- color: #67c23a !important;
-}
-.work-box.type3 span {
- color: #67c23a !important;
-}
-.work-box.type4 {
- background: #fde2e2;
- color: #f56c6c !important;
-}
-.work-box.type4 span {
- color: #f56c6c !important;
-}
-.work-box.type5 {
- background: #ff46c145;
- color: #ff46c0 !important;
-}
-.work-box.type5 span {
- color: #ff46c0 !important;
-}
-.work-box.type6 {
- background: #00036418;
- color: #000464 !important;
-}
-.work-box.type6 span {
- color: #000464 !important;
-}
-.work-box-left {
- display: flex;
justify-content: center;
- flex-direction: column;
- line-height: 24px;
+ border-radius: 8px 8px 8px 8px;
+ font-size: 14px;
}
.content-user {
width: 100%;
@@ -1258,6 +1030,7 @@
display: flex;
align-items: center;
}
+
.user-pic {
width: 50px;
height: 50px;
@@ -1269,19 +1042,24 @@
line-height: 50px;
margin-left: 10px;
}
+
.user-info {
flex: 1;
margin-left: 10px;
}
+
.hoverType {
background: rgba(58, 123, 250, 0.03);
}
+
.year-table {
width: 100%;
}
+
.year-table .scroll-right {
flex: 1;
}
+
.year-table .month {
font-size: 14px;
color: #3a7bfa;
@@ -1292,9 +1070,11 @@
text-align: center;
line-height: 30px;
}
+
.year-table .content-title-item {
width: 100%;
}
+
.year-table .content-body-item {
width: 100%;
height: 70px;
@@ -1303,4 +1083,27 @@
flex-direction: column;
justify-content: center;
}
+
+/* 鑷畾涔夊彸閿彍鍗曟牱寮� */
+.contextmenu {
+ margin: 0;
+ background: #fff;
+ z-index: 3000;
+ position: absolute;
+ list-style-type: none;
+ padding: 5px 0;
+ border-radius: 4px;
+ font-size: 12px;
+ font-weight: 400;
+ color: #333;
+ box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
+ li {
+ margin: 0;
+ padding: 7px 16px;
+ cursor: pointer;
+ &:hover {
+ background: #eee;
+ }
+ }
+}
</style>
--
Gitblit v1.9.3