sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改时间格式化

dev
姜玉琦 2024-09-20 10:12:35 +08:00
parent 8477670166
commit 4bb2097e5c
6 changed files with 253 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-ui/src/views/project/projectChecking/index.vue
View File

@ -275,9 +275,7 @@
<el-input v-model="form.intro" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="验收时间" prop="checkingDate">
<el-date-picker style="width: 100%" v-model="form.checkingDate" type="datetime" placeholder="选择日期时间"
default-time="10:00:00" value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
<el-date-picker v-model="form.checkingDate" type="date" placeholder="选择验收时间" style="width: 100%" value-format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
<el-form-item label="验收结果" prop="checkResult" v-if="false">
<el-radio v-model="form.checkResult" v-for="dict in dict.type.project_checking_result" :label="dict.value"

3
ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue
View File

@ -203,8 +203,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="验收时间" prop="checkingDate">
<el-date-picker style="width: 100%" v-model="form.checkingDate" type="date" placeholder="选择日期时间" value-format="yyyy-MM-dd">
</el-date-picker>
<el-date-picker v-model="form.checkingDate" type="date" placeholder="选择日期时间" style="width: 100%" value-format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
</el-col>
</el-row>

11
ruoyi-ui/src/views/work/emergencyDrill/emergencyDrillDrawer.vue
View File

@ -10,7 +10,8 @@
<template slot="title">
<div>{{ drawerTitle + " 【应急演练管理】" }}</div>
</template>
<el-tabs type="card"
<el-tabs
type="card"
v-model="activeName"
style="margin-left: 20px; margin-right: 20px"
@tab-click="getworkTrainList"
@ -208,12 +209,12 @@
</el-form-item>
<el-form-item label="演练日期" prop="beginDate">
<el-date-picker
style="width: 100%"
v-model="form.beginDate"
type="date"
placeholder="选择日期时间"
>
</el-date-picker>
placeholder="选择演练日期"
style="width: 100%"
value-format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
<el-form-item label="演练内容" prop="trainContent">
<el-input

313
ruoyi-ui/src/views/work/emergencyDrill/index.vue
View File

@ -1,39 +1,102 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item label="项目名称" prop="projectId">
<el-select v-model="queryParams.projectId" filterable placeholder="请选择项目" clearable @change="doQuerySub">
<el-option v-for="(item, index) in projectOptions" :key="index" :label="item.projectName" :value="item.id">
<el-select
v-model="queryParams.projectId"
filterable
placeholder="请选择项目"
clearable
@change="doQuerySub"
>
<el-option
v-for="(item, index) in projectOptions"
:key="index"
:label="item.projectName"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="总包单位" prop="trainNatureName">
<el-input v-model="queryParams.trainNatureName" placeholder="请输入总包单位" clearable @keyup.enter.native="handleQuery" />
<el-input
v-model="queryParams.trainNatureName"
placeholder="请输入总包单位"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="演练类型" prop="dataType">
<el-select v-model="queryParams.dataType" @keyup.enter.native="handleQuery" placeholder="请选择演练类型" clearable>
<el-option v-for="dict in dict.type.work_train_data_type" v-show="dict.raw.remark == '1'" :key="dict.value"
:label="dict.label" :value="dict.value" />
<el-select
v-model="queryParams.dataType"
@keyup.enter.native="handleQuery"
placeholder="请选择演练类型"
clearable
>
<el-option
v-for="dict in dict.type.work_train_data_type"
v-show="dict.raw.remark == '1'"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="演练标题" prop="trainTitle">
<el-input v-model="queryParams.trainTitle" placeholder="请输入演练标题" clearable @keyup.enter.native="handleQuery" />
<el-input
v-model="queryParams.trainTitle"
placeholder="请输入演练标题"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="责任主体" prop="projectDeptId" v-if="false">
<el-select v-model="queryParams.projectDeptId" placeholder="请选择责任主体" clearable>
<el-option v-for="dict in depts" :key="dict.deptId" :label="dict.deptName" :value="dict.deptId"></el-option>
<el-select
v-model="queryParams.projectDeptId"
placeholder="请选择责任主体"
clearable
>
<el-option
v-for="dict in depts"
:key="dict.deptId"
:label="dict.deptName"
:value="dict.deptId"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="演练时间">
<el-date-picker v-model="daterangeMarksTime" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
<el-date-picker
v-model="daterangeMarksTime"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item label="提交时间">
<el-date-picker v-model="daterangeTime" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
<el-date-picker
v-model="daterangeTime"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
@ -84,35 +147,74 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> -->
<el-table v-loading="loading" :data="workTrainList" @selection-change="handleSelectionChange" stripe>
<el-table
v-loading="loading"
:data="workTrainList"
@selection-change="handleSelectionChange"
stripe
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="项目名称" align="center" prop="projectName" width="200" />
<el-table-column label="演练主图" align="center" prop="mainImage" width="200">
<template slot-scope="scope">
<el-image ref="preview" style="width: 50px; height: 50px" :src="getImageUrl(scope.row.mainImage)"
@click="onPreview(scope.row.mainImage)"></el-image>
<el-image
ref="preview"
style="width: 50px; height: 50px"
:src="getImageUrl(scope.row.mainImage)"
@click="onPreview(scope.row.mainImage)"
></el-image>
</template>
</el-table-column>
<el-table-column label="演练类型" align="center" prop="dataType">
<template slot-scope="scope">
<el-select v-model="scope.row.dataType" placeholder="请选择演练类型" style="width: 100%"
@change="setDataType(scope.row.id, $event)">
<el-option v-for="dict in dict.type.work_train_data_type" v-show="dict.raw.remark == '1'" :key="dict.value"
:label="dict.label" :value="dict.value"></el-option>
<el-select
v-model="scope.row.dataType"
placeholder="请选择演练类型"
style="width: 100%"
@change="setDataType(scope.row.id, $event)"
>
<el-option
v-for="dict in dict.type.work_train_data_type"
v-show="dict.raw.remark == '1'"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="演练标题" align="center" prop="trainTitle" width="150" show-overflow-tooltip />
<el-table-column
label="演练标题"
align="center"
prop="trainTitle"
width="150"
show-overflow-tooltip
/>
<el-table-column label="参与人数" align="center" prop="trainParticipants" />
<el-table-column label="演练时间" align="center" prop="beginDate" width="100">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.beginDate, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<el-table-column label="演练内容" align="center" prop="trainContent" width="150" show-overflow-tooltip />
<el-table-column label="协同部门" align="center" prop="trainDeptNames" width="220" show-overflow-tooltip>
<el-table-column
label="演练内容"
align="center"
prop="trainContent"
width="150"
show-overflow-tooltip
/>
<el-table-column
label="协同部门"
align="center"
prop="trainDeptNames"
width="220"
show-overflow-tooltip
>
<template slot-scope="scope">
<div class="div_tag" v-for="dept in getTrainDeptNames(scope.row.trainDeptNames)">
<div
class="div_tag"
v-for="dept in getTrainDeptNames(scope.row.trainDeptNames)"
>
<el-tag>{{ dept }}</el-tag>
</div>
</template>
@ -129,56 +231,123 @@
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button v-if="scope.row.trainFile" size="mini" type="text" icon="el-icon-paperclip"
@click="handleDownload(scope.row)" v-hasPermi="['work:emergencyDrill:edit']">下载文件</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['work:workTrain:edit']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['work:workTrain:remove']">删除</el-button>
<el-button
v-if="scope.row.trainFile"
size="mini"
type="text"
icon="el-icon-paperclip"
@click="handleDownload(scope.row)"
v-hasPermi="['work:emergencyDrill:edit']"
>下载文件</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['work:workTrain:edit']"
>修改</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['work:workTrain:remove']"
>删除</el-button
>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改演练演练对话框 -->
<el-dialog :title="title" :visible.sync="open" width="680px" append-to-body :close-on-click-modal="false"
:close-on-press-escape="false">
<el-dialog
:title="title"
:visible.sync="open"
width="680px"
append-to-body
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="项目名称">
<el-input placeholder="请输入项目名称" v-model="form.projectName" :disabled="true"></el-input>
<el-input
placeholder="请输入项目名称"
v-model="form.projectName"
:disabled="true"
></el-input>
</el-form-item>
<el-form-item label="演练主图" prop="mainImage">
<image-upload v-model="form.mainImage" :limit="1" />
</el-form-item>
<el-form-item label="演练类型" prop="dataType">
<el-select v-model="form.dataType" filterable placeholder="请选择演练类型" style="width: 100%">
<el-option v-for="dict in dict.type.work_train_data_type" v-show="dict.raw.remark == '1'" :key="dict.value"
:label="dict.label" :value="dict.value"></el-option>
<el-select
v-model="form.dataType"
filterable
placeholder="请选择演练类型"
style="width: 100%"
>
<el-option
v-for="dict in dict.type.work_train_data_type"
v-show="dict.raw.remark == '1'"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="演练标题" prop="trainTitle">
<el-input placeholder="请输入演练标题" v-model="form.trainTitle"></el-input>
</el-form-item>
<el-form-item label="参与人数" prop="trainParticipants">
<el-input v-model="form.trainParticipants" type="number" placeholder="请输入参与人数">
<el-input
v-model="form.trainParticipants"
type="number"
placeholder="请输入参与人数"
>
<i slot="suffix">人</i>
</el-input>
</el-form-item>
<el-form-item label="演练日期" prop="beginDate">
<el-date-picker style="width: 100%" v-model="form.beginDate" type="date" placeholder="选择日期时间">
</el-date-picker>
<el-date-picker
v-model="form.beginDate"
type="date"
placeholder="选择演练日期"
style="width: 100%"
value-format="yyyy-MM-dd"
></el-date-picker>
</el-form-item>
<el-form-item label="演练内容" prop="trainContent">
<el-input type="textarea" v-model="form.trainContent" placeholder="请输入演练内容" />
<el-input
type="textarea"
v-model="form.trainContent"
placeholder="请输入演练内容"
/>
</el-form-item>
<el-form-item label="相关文件" prop="trainFile">
<FileUpload @input="fileInput" :limit="9" v-model="files" />
</el-form-item>
<el-form-item label="协同部门" prop="workTrainDeptList">
<el-select v-model="form.workTrainDeptList" multiple placeholder="请选择协同部门" style="width: 100%">
<el-option v-for="item in deptOptions" :key="item.deptId" :label="item.deptName" :value="item.deptId">
<el-select
v-model="form.workTrainDeptList"
multiple
placeholder="请选择协同部门"
style="width: 100%"
>
<el-option
v-for="item in deptOptions"
:key="item.deptId"
:label="item.deptName"
:value="item.deptId"
>
</el-option>
</el-select>
</el-form-item>
@ -244,8 +413,8 @@ export default {
pageNum: 1,
pageSize: 10,
projectName: "",
projectId:null,
trainDeptIds:null,
projectId: null,
trainDeptIds: null,
trainType: 1,
dataType: null,
isDel: null,
@ -275,8 +444,8 @@ export default {
},
previewList: [],
files: [],
projectOptions:[],
depts:[],
projectOptions: [],
depts: [],
};
},
created() {
@ -285,37 +454,39 @@ export default {
// this.depts = d?.data || [];
// });
this.$api.publics.getMyProjectList({}).then((response) => {
this.projectOptions = response.rows;
});
this.projectOptions = response.rows;
});
},
methods: {
doQuerySub() {
let prjId=this.queryParams.projectId;
let prjId = this.queryParams.projectId;
let tmps = this.prjDept2 && this.prjDept2[prjId] ? this.prjDept2[prjId] || [] : [];
if (tmps.length > 0 || !prjId) {
if (tmps.length == 1) {
this.queryParams.trainDeptIds = tmps[0].deptId;
} else {
this.queryParams.trainDeptIds = '';
this.queryParams.trainDeptIds = "";
}
return;
}
this.$api.publics.queryUnitList({
projectId: prjId,
unitTypes: "2".split(","),
}).then((d) => {
let objs = d.rows || [];
if (!this.prjDept2) {
this.prjDept2 = {};
}
this.prjDept2[prjId] = objs;
this.depts = objs;
if (objs.length == 1) {
this.queryParams.trainDeptIds = objs[0].deptId;
} else {
this.queryParams.trainDeptIds = '';
}
});
this.$api.publics
.queryUnitList({
projectId: prjId,
unitTypes: "2".split(","),
})
.then((d) => {
let objs = d.rows || [];
if (!this.prjDept2) {
this.prjDept2 = {};
}
this.prjDept2[prjId] = objs;
this.depts = objs;
if (objs.length == 1) {
this.queryParams.trainDeptIds = objs[0].deptId;
} else {
this.queryParams.trainDeptIds = "";
}
});
},
setDataType(rowid, val) {
updateWorkTrainDataType({ id: rowid, dataType: val });
@ -472,7 +643,7 @@ export default {
this.getList();
this.$modal.msgSuccess("删除成功");
})
.catch(() => { });
.catch(() => {});
},
/** 演练演练协同部门序号 */
rowWorkTrainDeptIndex({ row, rowIndex }) {

3
ruoyi-ui/src/views/work/workTrain/index.vue
View File

@ -164,8 +164,7 @@
</el-input>
</el-form-item>
<el-form-item label="培训日期" prop="beginDate">
<el-date-picker style="width: 100%" v-model="form.beginDate" type="date" placeholder="选择日期时间">
</el-date-picker>
<el-date-picker v-model="form.beginDate" type="date" placeholder="选择日期时间" style="width: 100%" value-format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
<el-form-item label="培训内容" prop="trainContent">
<el-input type="textarea" v-model="form.trainContent" placeholder="请输入培训内容" />

3
ruoyi-ui/src/views/work/workTrain/workTrainDrawer.vue
View File

@ -208,10 +208,11 @@
</el-form-item>
<el-form-item label="培训日期" prop="beginDate">
<el-date-picker
style="width: 100%"
v-model="form.beginDate"
type="date"
placeholder="选择日期时间"
style="width: 100%"
value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>