#
luxiaotao1123
2022-03-01 5dfdb0d5eee1357a76bd6594d01e650f0035fefd
#
3个文件已修改
96 ■■■■ 已修改文件
src/main/java/com/zy/sc/common/web/UploadController.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/sc/manager/controller/IssueController.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/issue/issue_detl.html 74 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/sc/common/web/UploadController.java
@@ -46,7 +46,7 @@
    public R sensorUpload(MultipartFile file, @RequestParam("issueId") Long issueId) {
        Issue issue = issueService.selectById(issueId);
        if (null == issue) {
            return R.error("设备不存在");
            return R.error("故障不存在");
        }
        String img = issue.getImg();
        JSONArray jsonArray = JSON.parseArray(img);
@@ -66,6 +66,14 @@
        String upload = ossService.upload(inputStream,file.getOriginalFilename());
        if (Cools.isEmpty(upload)) {
            return R.error("上传OSS服务失败");
        }
        jsonArray.add(upload);
        // 持久化
        issue.setImg(jsonArray.toJSONString());
        issue.setUpdateBy(getUserId());
        issue.setUpdateTime(new Date());
        if (!issueService.updateById(issue)) {
            return R.error("上传图片失败");
        }
        return R.ok(Cools.add("src", upload));
    }
@@ -91,7 +99,7 @@
        issue.setUpdateBy(getUserId());
        issue.setUpdateTime(new Date());
        if (!issueService.updateById(issue)) {
            return R.error("保持数据库失败");
            return R.error("删除图片失败");
        }
        return R.ok("删除成功");
    }
src/main/java/com/zy/sc/manager/controller/IssueController.java
@@ -78,6 +78,16 @@
        return R.ok();
    }
    @RequestMapping(value = "/issue/process/auth")
    @ManagerAuth
    public R process(Issue issue){
        if (Cools.isEmpty(issue) || null==issue.getId()){
            return R.error();
        }
        issueService.updateById(issue);
        return R.ok();
    }
    @RequestMapping(value = "/issue/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Long[] ids){
src/main/webapp/views/issue/issue_detl.html
@@ -76,15 +76,6 @@
<!-- 正文开始 -->
<form class="layui-form" id="formAdvForm" lay-filter="formAdvForm">
    <div class="layui-fluid" style="padding-bottom: 75px;">
        <!-- 定位 -->
<!--        <div class="layui-card">-->
<!--            <div class="layui-card-header">定位</div>-->
<!--            <div class="layui-card-body">-->
<!--                <div class="upload-box clear">-->
<!--                    <div id="map" style="width: 100%; height: 200px"></div>-->
<!--                </div>-->
<!--            </div>-->
<!--        </div>-->
        <!-- 图片 -->
        <div class="layui-card">
            <div class="layui-card-header">图片</div>
@@ -109,6 +100,7 @@
            <div class="layui-card-body">
                <div class="layui-form-item layui-row">
                    <input name="id" type="hidden" />
                    <div class="layui-inline layui-col-md4">
                        <label class="layui-form-label">故障编号:</label>
                        <div class="layui-input-block">
@@ -140,27 +132,42 @@
                        </div>
                    </div>
                    <div class="layui-inline layui-col-md4">
                        <label class="layui-form-label">发生日期:</label>
                        <div class="layui-input-block">
                            <input name="startTime$" placeholder="请选择时间" class="layui-input icon-date" autocomplete="off" disabled/>
                        </div>
                    </div>
                    <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
                        <legend style="font-size: 13px">请补充</legend>
                    </fieldset>
                    <div class="layui-inline layui-col-md4">
                        <label class="layui-form-label">解决人员:</label>
                        <div class="layui-input-block">
                            <input name="dealer" placeholder="请输入..." class="layui-input" />
                        </div>
                    </div>
<!--                    <div class="layui-inline layui-col-md4">-->
<!--                        <label class="layui-form-label">更新日期:</label>-->
<!--                        <div class="layui-input-block">-->
<!--                            <input id="lastTime" name="lastTime$" placeholder="请选择时间" class="layui-input icon-date" autocomplete="off"/>-->
<!--                        </div>-->
<!--                    </div>-->
                    <div class="layui-inline layui-col-md4">
                        <label class="layui-form-label">发生日期:</label>
                        <label class="layui-form-label">流程:</label>
                        <div class="layui-input-block">
                            <input name="startTime$" placeholder="请选择时间" class="layui-input icon-date" autocomplete="off" disabled/>
                            <select name="settle">
                                <option value="2">提交</option>
                                <option value="3">已读</option>
                                <option value="4">作业</option>
                                <option value="5">完成</option>
                                <option value="6">取消</option>
                            </select>
                        </div>
                    </div>
                    <div class="layui-inline layui-col-md4">
                        <label class="layui-form-label">处理日期:</label>
                        <div class="layui-input-block">
                            <input id="endTime" name="endTime$" placeholder="请选择时间" class="layui-input icon-date" autocomplete="off"/>
                        </div>
                    </div>
                    <div class="layui-inline layui-col-md4">
                        <label class="layui-form-label">更新日期:</label>
                        <div class="layui-input-block">
                            <input id="lastTime" name="lastTime$" placeholder="请选择时间" class="layui-input icon-date" autocomplete="off"/>
                        </div>
                    </div>
                </div>
@@ -178,6 +185,9 @@
                            <textarea name="title" placeholder="未知" class="layui-textarea" disabled></textarea>
                        </div>
                    </div>
                    <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
                        <legend style="font-size: 13px">请补充</legend>
                    </fieldset>
                    <div class="layui-inline layui-col-md12">
                        <label class="layui-form-label">故障原因:</label>
                        <div class="layui-input-block">
@@ -349,8 +359,34 @@
            init();
            return false;
        });
        form.on('submit(save)', function (data) {
            alert(1)
        form.on('submit(save)', function (elem) {
            let data = elem.field;
            let param = {
                id: Number(data.id),
                uuid: data.uuid,
                dealer: data.dealer,
                endTime: data.endTime,
                lastTime: data.lastTime,
                reason: data.reason,
                deal: data.deal,
                settle: Number(data.settle)
            }
            $.ajax({
                url: baseUrl + "/issue/process/auth",
                headers: {'token': localStorage.getItem('token')},
                method: 'POST',
                data: param,
                contentType:'application/json;charset=UTF-8',
                success: function (res) {
                    if (res.code === 200) {
                        layer.msg(res.msg, {icon: 1})
                    } else if (res.code === 403) {
                        top.location.href = baseUrl + "/";
                    } else {
                        layer.msg(res.msg, {icon: 2})
                    }
                }
            })
            return false;
        });