修改linux下路径不对问题

This commit is contained in:
jinqiming 2021-11-26 17:41:42 +08:00
parent 4caeef0090
commit b47eb5c1eb
5 changed files with 17 additions and 22 deletions

View File

@ -14,7 +14,7 @@ spring:
# 从数据源开关/默认关闭 # 从数据源开关/默认关闭
enabled: false enabled: false
url: url:
username: username:
password: password:
# 初始连接数 # 初始连接数
initialSize: 5 initialSize: 5

View File

@ -63,24 +63,24 @@ public class FormController{
* 跳转form表单首页 * 跳转form表单首页
* @return 首页url路径 * @return 首页url路径
*/ */
@GetMapping("/formIndex") @GetMapping("formIndex")
public String fromPreview() { public String fromPreview() {
return "/formIndex"; return "formIndex";
} }
@GetMapping("/preview.html") @GetMapping("preview.html")
public String preview() { public String preview() {
return "/preview"; return "preview";
} }
@GetMapping("/handwrittenSignature.html") @GetMapping("handwrittenSignature.html")
public String handwrittenSignature() { public String handwrittenSignature() {
return "/handwrittenSignature"; return "handwrittenSignature";
} }
@GetMapping("/editorMenu.html") @GetMapping("editorMenu.html")
public String editorMenu() { public String editorMenu() {
return "/editorMenu"; return "editorMenu";
} }
/** /**
@ -129,12 +129,12 @@ public class FormController{
* 预览 * 预览
* @return 预览页 * @return 预览页
*/ */
@GetMapping("/fromPreview") @GetMapping("fromPreview")
public String fromPreview(@RequestParam Long id, ModelMap mmap) { public String fromPreview(@RequestParam Long id, ModelMap mmap) {
SysFormInstance sysFormInstance = sysFormInstanceService.selectSysFormInstanceById(id); SysFormInstance sysFormInstance = sysFormInstanceService.selectSysFormInstanceById(id);
mmap.put("formId",id); mmap.put("formId",id);
mmap.put("name",sysFormInstance.getFormName()); mmap.put("name",sysFormInstance.getFormName());
return "/fromPreview"; return "fromPreview";
} }
/** /**

View File

@ -81,7 +81,7 @@ public class SysFormInstanceController extends BaseController
public String fromPreview(@PathVariable("id") Long id,ModelMap mmap) public String fromPreview(@PathVariable("id") Long id,ModelMap mmap)
{ {
mmap.put("formId",id); mmap.put("formId",id);
return "/fromPreview"; return "fromPreview";
} }
/** /**
* 获取表单内容 * 获取表单内容

View File

@ -52,7 +52,7 @@
<h4 class="modal-title text-primary">表单二维码</h4> <h4 class="modal-title text-primary">表单二维码</h4>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="form-group"> <div class="form-group" style="margin-left: 40px">
<img class="imgcode" width="85%"/> <img class="imgcode" width="85%"/>
</div> </div>
</div> </div>
@ -102,7 +102,7 @@
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> '); actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="fromDetail(\'' + row.id+ '\')"><i class="fa fa-add"></i>填写表单</a> '); actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="fromDetail(\'' + row.id+ '\')"><i class="fa fa-add"></i>填写表单</a> ');
actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="formRecordDetail(\'' + row.id+ '\')"><i class="fa fa-eyes"></i>查看表单</a> '); actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="formRecordDetail(\'' + row.id+ '\')"><i class="fa fa-eyes"></i>查看表单</a> ');
actions.push('<a class="btn btn-success btn-xs" data-toggle="modal" data-target="#formQRCode" th:data-id="' + row.id+ '" ><i class="fa fa-add"></i>二维码</a> '); actions.push('<a class="btn btn-success btn-xs" data-toggle="modal" data-target="#formQRCode" onclick="createQRCode(\'' + row.id+ '\')" ><i class="fa fa-add"></i>二维码</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>'); actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join(''); return actions.join('');
} }
@ -126,17 +126,12 @@
} }
function createQRCode(id) { function createQRCode(id) {
var detailUrl="/createQRCode?id="+id; var url ="/createQRCode?id="+id;
$.modal.open("表单二维码", detailUrl); $(".imgcode").attr("src", url);
} }
$('#formQRCode').on('show.bs.modal', function (event) { $('#formQRCode').on('show.bs.modal', function (event) {
var button = $(event.relatedTarget) var button = $(event.relatedTarget)
console.log("=====>"+JSON.stringify(button));
var id = button.data('id')
console.log("=====>"+id);
var url ="/createQRCode?id="+id;
$(".imgcode").attr("src", url);
}); });
</script> </script>

View File

@ -36,7 +36,7 @@
$(function() { $(function() {
var options = { var options = {
url: "/from/instance/recordList", url: "/from/instance/recordList",
removeUrl: "/from/instance/removeRecord", removeUrl: "/from/instance/removeRecord",
queryParams:queryParams, queryParams:queryParams,
modalName: "数据记录", modalName: "数据记录",
columns: [{ columns: [{