提交 6c5d9e7c 编写于 作者: 刘英杰's avatar 刘英杰

增加换班记录

上级 5b47cdc4
流水线 #22930 已通过 ,包含阶段
in 55 second
.selectTitleIcon[data-v-1768d875]:hover{transform:scale(1.3);cursor:pointer}
\ No newline at end of file
.selectTitleIcon[data-v-5264dda1]:hover{transform:scale(1.3);cursor:pointer}
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel="shortcut icon" href=favicon.ico><title>值班管理</title><link href=css/app.f8f860e0.css rel=stylesheet></head><body><script charset=utf-8 src="https://map.qq.com/api/gljs?v=1.exp&key=ZNMBZ-NYOEO-WNMWL-SJF4C-MWKQT-KJB7W"></script><script src=/a/manager/identify/identify.js></script><noscript><strong>请开启 JavaScript 功能来使用 党建管理系统。</strong></noscript><div id=app></div><script src=js/chunk-vendors.c0d93cbb.js></script><script src=js/app.5d219dda.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"><link rel="shortcut icon" href=favicon.ico><title>值班管理</title><link href=css/app.f8f860e0.css rel=stylesheet></head><body><script charset=utf-8 src="https://map.qq.com/api/gljs?v=1.exp&key=ZNMBZ-NYOEO-WNMWL-SJF4C-MWKQT-KJB7W"></script><script src=/a/manager/identify/identify.js></script><noscript><strong>请开启 JavaScript 功能来使用 党建管理系统。</strong></noscript><div id=app></div><script src=js/chunk-vendors.c0d93cbb.js></script><script src=js/app.bab9d7f4.js></script></body></html>
\ No newline at end of file \ No newline at end of file
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0e1fbe"],{"7d83":function(e,t,a){"use strict";a.r(t);var n=function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",[a("Card",{ref:"card",scopedSlots:e._u([{key:"title",fn:function(){return[a("div",{staticStyle:{height:"30px",display:"flex","align-items":"center"}},[a("h3",[e._v("换班日志")])])]},proxy:!0},{key:"extra",fn:function(){return[a("div",{staticStyle:{display:"flex"}},[a("Input",{staticStyle:{width:"15vw"},attrs:{placeholder:"请输入姓名搜索..."},model:{value:e.params.name1,callback:function(t){e.$set(e.params,"name1",t)},expression:"params.name1"}}),a("Button",{staticStyle:{"margin-left":"20px"},attrs:{type:"primary"},on:{click:e.searchBt}},[e._v("搜索")])],1)]},proxy:!0}])},[a("Table",{staticClass:"ivu-mt",attrs:{columns:e.columns,data:e.tableData,loading:e.loading,size:e.tableSize},scopedSlots:e._u([{key:"sign",fn:function(t){var a=t.row;return[e._v("\n "+e._s(e.publicObject.signState[a.sign])+"\n ")]}}])}),a("div",{staticClass:"ivu-text-left ivu-mt "},[a("Page",{attrs:{total:e.total,current:e.params.pageIndex,"show-total":"","show-sizer":"","page-size":e.params.pageSize},on:{"update:current":function(t){return e.$set(e.params,"pageIndex",t)},"on-change":e.handleChangePage,"on-page-size-change":e.handleChangePageSize}})],1)],1)],1)},i=[],s=(a("7f7f"),a("96cf"),a("1da1")),l=a("967e"),r=a.n(l),c=a("5e9b"),o=a("806c"),d=a("e3ea"),p={name:"list",computed:{publicObject:function(){return d["b"]}},data:function(){return{grid:{xl:8,lg:12,md:24,sm:24,xs:24},columns:[{title:"序号",type:"index",align:"center",show:!0,width:80},{title:"姓名",key:"name",align:"center",show:!0,minWidth:100},{title:"工号",key:"card_name",align:"center",show:!0,minWidth:100},{title:"描述",key:"remark",align:"center",show:!0,minWidth:100},{title:"地址",key:"address",align:"center",show:!0,minWidth:100},{title:"签到状态",slot:"sign",align:"center",show:!0,minWidth:100},{title:"经纬度",key:"address_locatioin",align:"center",show:!0,minWidth:100},{title:"图片",key:"file_link",align:"center",show:!0,minWidth:100}],loading:!1,tableData:[],tableSize:"default",tableFullscreen:!1,total:0,collapse:!1,params:{pageIndex:1,pageSize:10,college_id:"",grade:"",classId_Name:"",status:"",name:"",name1:""}}},watch:{"params.name1":function(e,t){e||(this.params.name="",this.params.pageSize=10,this.params.pageIndex=1,this.getData())}},created:function(){},mounted:function(){this.getData()},methods:{searchBt:function(){this.params.name=this.params.name1,this.getData()},getData:function(){var e=this;o["getInitListRequest"](Object(s["a"])(r.a.mark((function t(){var a,n;return r.a.wrap((function(t){while(1)switch(t.prev=t.next){case 0:return e.loading=!0,a={page_index:e.params.pageIndex,page_size:e.params.pageSize,name:e.params.name},t.next=4,c["w"](a);case 4:n=t.sent,e.total=n.response.data_count,e.tableData=n.response.data,e.loading=!1;case 8:case"end":return t.stop()}}),t)}))))},add:function(){this.$refs.addEdit.add()},edit:function(e){this.$refs.addEdit.edit(e)},del:function(e){console.log("删除"),this.$Message.info("删除成功")},cancel:function(){this.$Message.info("You click cancel")},handleChangePage:function(e){this.params.pageIndex=e,this.getData()},handleChangePageSize:function(e){this.params.pageSize=e,this.getData()}}},u=p,g=a("2877"),h=Object(g["a"])(u,n,i,!1,null,null,null);t["default"]=h.exports}}]);
\ No newline at end of file
此差异已折叠。
此差异已折叠。
...@@ -524,3 +524,12 @@ export function UserWalk(data) { ...@@ -524,3 +524,12 @@ export function UserWalk(data) {
}); });
} }
//获取值班日志
export function GetWatchLogList(data) {
return request({
url: `/api/Log/api/Log/GetWatchLogList?name=${data.name}&page_size=${data.page_size}&page_index=${data.page_index}`,
method: 'get',
});
}
...@@ -44,7 +44,9 @@ import './libs/iview-pro/iview-pro.css'; ...@@ -44,7 +44,9 @@ import './libs/iview-pro/iview-pro.css';
if (window) window.$t = (key, value) => i18n.t(key, value); if (window) window.$t = (key, value) => i18n.t(key, value);
import * as hooks from '@/hooks/index' import * as hooks from '@/hooks/index'
import publicConfig from '@/publicConfig/index'
Vue.prototype.publicConfig = publicConfig
Vue.prototype.hooks = hooks; Vue.prototype.hooks = hooks;
Vue.prototype.prototypeLoading = false; Vue.prototype.prototypeLoading = false;
Vue.use(plugins); Vue.use(plugins);
......
...@@ -19,6 +19,10 @@ export default { ...@@ -19,6 +19,10 @@ export default {
path: `${pre}-peopleList`, path: `${pre}-peopleList`,
title: '用户管理' title: '用户管理'
}, },
{
path: `${pre}-shiftChangeLog`,
title: '换班日志',
},
{ {
path: `${pre}-actionLog`, path: `${pre}-actionLog`,
title: '操作日志', title: '操作日志',
......
...@@ -158,7 +158,8 @@ ...@@ -158,7 +158,8 @@
</Select> </Select>
</FormItem> </FormItem>
<FormItem label="值班日期" prop="watch_date"> <FormItem label="值班日期" prop="watch_date">
<DatePicker type="date" @on-change="dutyDate" :options="options1" placeholder="请选择值班日期" <DatePicker type="date" v-model="formValidate.watch_date" @on-change="dutyDate" :options="options1"
placeholder="请选择值班日期"
style="width: 100%"/> style="width: 100%"/>
</FormItem> </FormItem>
<FormItem label="值班要求" prop="watch_remark"> <FormItem label="值班要求" prop="watch_remark">
...@@ -839,6 +840,7 @@ ...@@ -839,6 +840,7 @@
case 'addDuty' : case 'addDuty' :
// this.addDutySearchSelectList() // this.addDutySearchSelectList()
this.publicModalTitle = '增添值班数据' this.publicModalTitle = '增添值班数据'
this.formValidate.watch_date = ''
this.$refs['formValidate'].resetFields() this.$refs['formValidate'].resetFields()
this.addDuty = true this.addDuty = true
break; break;
......
<template>
<div>
<Card ref="card">
<template #title>
<div style="height: 30px;display: flex;align-items: center">
<h3>换班日志</h3>
</div>
</template>
<template #extra>
<div style="display: flex;">
<Input v-model="params.name1" placeholder="请输入姓名搜索..." style="width: 15vw;"></Input>
<Button type="primary" style="margin-left: 20px" @click="searchBt">搜索</Button>
</div>
</template>
<Table
:columns="columns"
:data="tableData"
class="ivu-mt"
:loading="loading"
:size="tableSize"
>
<template #sign="{row}">
{{ publicObject.signState[row.sign] }}
</template>
<!-- <template slot-scope="{ row }" slot="action">-->
<!-- <Button size="small" type="primary" @click="edit(row)">编辑</Button>-->
<!-- <Poptip confirm transfer title="你确定删除吗?" @on-ok="del(row)" @on-cancel="cancel">-->
<!-- <Button size="small" type="error" style="margin-left: 20px">删除</Button>-->
<!-- </Poptip>-->
<!-- </template>-->
</Table>
<div class="ivu-text-left ivu-mt ">
<Page
:total="total"
:current.sync="params.pageIndex"
show-total
show-sizer
:page-size="params.pageSize"
@on-change="handleChangePage"
@on-page-size-change="handleChangePageSize"
/>
</div>
</Card>
</div>
</template>
<script>
import * as api from '../../api/lezRequest'
import * as hooks from '@/hooks/index'
import {publicObject} from "../../publicConfig";
export default {
name: 'list',
computed: {
publicObject() {
return publicObject
}
},
data() {
return {
grid: {
xl: 8,
lg: 12,
md: 24,
sm: 24,
xs: 24
},
columns: [
{
title: '序号',
type: 'index',
align: 'center',
show: true,
width: 80
},
{
title: '姓名',
key: 'name',
align: 'center',
show: true,
minWidth: 100,
},
{
title: '工号',
key: 'card_name',
align: 'center',
show: true,
minWidth: 100,
},
{
title: '描述',
key: 'remark',
align: 'center',
show: true,
minWidth: 100,
},
{
title: '地址',
key: 'address',
align: 'center',
show: true,
minWidth: 100,
},
{
title: '签到状态',
slot: 'sign',
align: 'center',
show: true,
minWidth: 100,
},
{
title: '经纬度',
key: 'address_locatioin',
align: 'center',
show: true,
minWidth: 100,
},
{
title: '图片',
key: 'file_link',
align: 'center',
show: true,
minWidth: 100,
},
// {
// title: '操作',
// align: 'center',
// minWidth: 180,
// fixed: 'right',
// show: true,
// slot: 'action'
// }
],
loading: false,
tableData: [],
tableSize: 'default',
tableFullscreen: false,
total: 0,
collapse: false,
params: {
pageIndex: 1,
pageSize: 10,
college_id: '',
grade: '',
classId_Name: '',
status: '',
name: '',
name1: '',
}
}
},
watch: {
'params.name1'(newValue, oldValue) {
if (!newValue) {
this.params.name = ''
this.params.pageSize = 10
this.params.pageIndex = 1
this.getData()
}
}
},
// 查询条件初始化
created() {
},
mounted() {
this.getData()
},
methods: {
searchBt() {
this.params.name = this.params.name1
this.getData()
},
// 查询
getData() {
hooks.getInitListRequest(async () => {
this.loading = true
let data = {
page_index: this.params.pageIndex,
page_size: this.params.pageSize,
name: this.params.name,
}
const res = await api.GetWatchLogList(data)
this.total = res.response.data_count
this.tableData = res.response.data
this.loading = false
})
},
// 新增
add() {
this.$refs.addEdit.add()
},
// 修改
edit(row) {
this.$refs.addEdit.edit(row)
},
// 删除
del(row) {
console.log('删除');
this.$Message.info('删除成功');
},
// 取消删除
cancel() {
this.$Message.info('You click cancel');
},
// 切换第几页
handleChangePage(pageNumber) {
this.params.pageIndex = pageNumber
this.getData()
},
// 切换每页条数
handleChangePageSize(size) {
this.params.pageSize = size
this.getData()
},
}
}
</script>
export const publicObject = {
signState: ['未签到', '签到', '签退']
}
import BasicLayout from '@/layouts/basic-layout'; import BasicLayout from '@/layouts/basic-layout';
const meta = { const meta = {
...@@ -10,7 +9,7 @@ export default { ...@@ -10,7 +9,7 @@ export default {
name: '', name: '',
meta, meta,
component: BasicLayout, component: BasicLayout,
direction:{ direction: {
name: 'initializationSettings' name: 'initializationSettings'
}, },
children: [ children: [
...@@ -44,6 +43,16 @@ export default { ...@@ -44,6 +43,16 @@ export default {
}, },
component: () => import('@/pages/systemConfiguration/peopleList') component: () => import('@/pages/systemConfiguration/peopleList')
}, },
{
path: `systemConfiguration-shiftChangeLog`,
name: `shiftChangeLog`,
meta: {
...meta,
title: '换班日志',
closable: false
},
component: () => import('@/pages/systemConfiguration/shiftChangeLog')
},
{ {
path: `systemConfiguration-actionLog`, path: `systemConfiguration-actionLog`,
name: `actionLog`, name: `actionLog`,
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册 或