Commit be4cf4ce authored by wanghao's avatar wanghao

1 上传MES 返回内容,记录,及界面展示。

parent 89b80c11
...@@ -17,9 +17,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -17,9 +17,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectUploadMesResultHistoryList" parameterType="UploadMesResultHistory" resultMap="UploadMesResultHistoryResult"> <select id="selectUploadMesResultHistoryList" parameterType="UploadMesResultHistory" resultMap="UploadMesResultHistoryResult">
<include refid="selectUploadMesResultHistoryVo"/> <include refid="selectUploadMesResultHistoryVo"/>
<where> <where>
<if test="createTime != null "> and f_create_time = #{createTime}</if> <if test="message != null and message != ''"> and f_message like concat ('%',#{message},'%')</if>
<if test="message != null and message != ''"> and f_message = #{message}</if>
</where> </where>
order by f_id desc
</select> </select>
<select id="selectUploadMesResultHistoryById" parameterType="Long" resultMap="UploadMesResultHistoryResult"> <select id="selectUploadMesResultHistoryById" parameterType="Long" resultMap="UploadMesResultHistoryResult">
......
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="创建时间" prop="createTime"> <el-form-item label="内容" prop="message">
<el-date-picker clearable size="small" <el-input v-model="queryParams.message" placeholder="请输入内容模糊搜索" clearable size="small" @keyup.enter.native="handleQuery"/>
v-model="queryParams.createTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择创建时间">
</el-date-picker>
</el-form-item> </el-form-item>
<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>
...@@ -25,7 +20,6 @@ ...@@ -25,7 +20,6 @@
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="内容" align="center" prop="message" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
...@@ -50,7 +44,7 @@ ...@@ -50,7 +44,7 @@
<el-dialog :title="title" :visible.sync="open" width="900px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="内容" prop="message"> <el-form-item label="内容" prop="message">
<el-input v-model="form.message" type="textarea" rows="20" placeholder="请输入内容" /> <el-input v-model="form.message" type="textarea" rows="20" disabled placeholder="请输入内容" />
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-dialog> </el-dialog>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment