ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.增加新页面

This commit is contained in:
kingsfighter 2020-09-28 20:37:17 +08:00
parent 4fa833f471
commit dcd65c8082
7 changed files with 504 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ruoyi-admin/src/main/java/com/ruoyi/dfm/controller/CompareAnalysisController.java Normal file
View File

@ -0,0 +1,29 @@
package com.ruoyi.dfm.controller;
import com.ruoyi.common.core.controller.BaseController;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
/**
* 对比分析控制器
*/
@Controller
@RequestMapping("/compareAnalysis.do")
public class CompareAnalysisController extends BaseController {
private static final Logger log = LoggerFactory.getLogger(CompareAnalysisController.class);
/**
* 获取信息查询页面
*
* @param mmap
* @return
*/
@GetMapping("")
public String index(ModelMap mmap) {
return "dfm/compareAnalysis";
}
}

29
ruoyi-admin/src/main/java/com/ruoyi/dfm/controller/DataImportController.java Normal file
View File

@ -0,0 +1,29 @@
package com.ruoyi.dfm.controller;
import com.ruoyi.common.core.controller.BaseController;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
/**
* 信息查询控制器
*/
@Controller
@RequestMapping("/dataImport.do")
public class DataImportController extends BaseController {
private static final Logger log = LoggerFactory.getLogger(DataImportController.class);
/**
* 获取信息查询页面
*
* @param mmap
* @return
*/
@GetMapping("")
public String index(ModelMap mmap) {
return "dfm/dataImport";
}
}

29
ruoyi-admin/src/main/java/com/ruoyi/dfm/controller/InfoQueryController.java Normal file
View File

@ -0,0 +1,29 @@
package com.ruoyi.dfm.controller;
import com.ruoyi.common.core.controller.BaseController;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
/**
* 信息查询控制器
*/
@Controller
@RequestMapping("/infoQuery.do")
public class InfoQueryController extends BaseController {
private static final Logger log = LoggerFactory.getLogger(InfoQueryController.class);
/**
* 获取信息查询页面
*
* @param mmap
* @return
*/
@GetMapping("")
public String index(ModelMap mmap) {
return "dfm/infoQuery";
}
}

29
ruoyi-admin/src/main/java/com/ruoyi/dfm/controller/YieldPredictionController.java Normal file
View File

@ -0,0 +1,29 @@
package com.ruoyi.dfm.controller;
import com.ruoyi.common.core.controller.BaseController;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
/**
* 良率预测控制器
*/
@Controller
@RequestMapping("/yieldPrediction.do")
public class YieldPredictionController extends BaseController {
private static final Logger log = LoggerFactory.getLogger(YieldPredictionController.class);
/**
* 获取信息查询页面
*
* @param mmap
* @return
*/
@GetMapping("")
public String index(ModelMap mmap) {
return "dfm/yieldPrediction";
}
}

84
ruoyi-admin/src/main/resources/templates/dfm/dataImport.html Normal file
View File

@ -0,0 +1,84 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('信息查询')" />
<th:block th:include="include :: select2-css" />
</head>
<body class="gray-bg">
<div class="container-div">
<div class="main-content">
<form id="dataAnalysisForm" class="form-horizontal">
<h4 class="form-header h4">数据导入</h4>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">风险元件导入：</label>
<div class="col-sm-8">
<input type="file" class="form-control" />
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">维修不良导入：</label>
<div class="col-sm-8">
<input type="file" class="form-control" />
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">DPPM数据导入：</label>
<div class="col-sm-8">
<input type="file" class="form-control" />
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">DFM数据导入：</label>
<div class="col-sm-8">
<input type="file" class="form-control" />
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-offset-5 col-sm-10">
<button type="button" class="btn btn-sm btn-primary" onclick="submitAnalysis()"><i class="fa fa-check"></i>导 入</button>&nbsp;
<button type="button" class="btn btn-sm btn-danger" onclick="closeItem()"><i class="fa fa-reply-all"></i>关 闭 </button>
</div>
</div>
</form>
</div>
<!--<div class="row" style="height: 100px;">-->
<!--<div class="col-sm-12 select-table table-striped" >-->
<!--<table id="infoQueryResultTable"></table>-->
<!--</div>-->
<!--</div>-->
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
</script>
</body>
</html>

236
ruoyi-admin/src/main/resources/templates/dfm/infoQuery.html Normal file
View File

@ -0,0 +1,236 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('信息查询')" />
<th:block th:include="include :: select2-css" />
</head>
<body class="gray-bg">
<div class="container-div">
<div class="main-content">
<form id="dataAnalysisForm" class="form-horizontal">
<h4 class="form-header h4">单板信息</h4>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">单板名：</label>
<div class="col-sm-8">
<input placeholder="请输入单板名" class="form-control" type="text" maxlength="30">
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">版本：</label>
<div class="col-sm-8">
<input placeholder="请输入版本" class="form-control" type="text" maxlength="30">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">料单号：</label>
<div class="col-sm-8">
<input placeholder="请输入料单号" class="form-control" type="text" maxlength="30">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">板材：</label>
<div class="col-sm-8">
<input placeholder="请输入单板名" class="form-control" type="text" maxlength="30">
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">表面处理：</label>
<div class="col-sm-8">
<input placeholder="请输入版本" class="form-control" type="text" maxlength="30">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">单板长：</label>
<div class="col-sm-8">
<input class="form-control" style="width: 150px;display: inline" type="text" maxlength="30">
~
<input class="form-control" style="width: 150px;display: inline" type="text" maxlength="30">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">单板宽：</label>
<div class="col-sm-8">
<input class="form-control" style="width: 150px;display: inline" type="text" maxlength="30">
~
<input class="form-control" style="width: 150px;display: inline" type="text" maxlength="30">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">单板层数：</label>
<div class="col-sm-8">
<input class="form-control" style="width: 150px;display: inline" type="text" maxlength="30">
~
<input class="form-control" style="width: 150px;display: inline" type="text" maxlength="30">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">单板厚度：</label>
<div class="col-sm-8">
<input class="form-control" style="width: 150px;display: inline" type="text" maxlength="30">
~
<input class="form-control" style="width: 150px;display: inline" type="text" maxlength="30">
</div>
</div>
</div>
</div>
<h4 class="form-header h4">拼板信息</h4>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">拼板长：</label>
<div class="col-sm-8">
<input class="form-control" style="width: 150px;display: inline" type="text" maxlength="30">
~
<input class="form-control" style="width: 150px;display: inline" type="text" maxlength="30">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">拼板宽：</label>
<div class="col-sm-8">
<input class="form-control" style="width: 150px;display: inline" type="text" maxlength="30">
~
<input class="form-control" style="width: 150px;display: inline" type="text" maxlength="30">
</div>
</div>
</div>
</div>
<h4 class="form-header h4">关键参数</h4>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">规则名：</label>
<div class="col-sm-8">
<select name="primarySide" class="form-control m-b" required>
<option>--请选择--</option>
</select>
</div>
</div>
</div>
</div>
<h4 class="form-header h4">风险参数</h4>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">风险代码：</label>
<div class="col-sm-8">
<select name="primarySide" class="form-control m-b" required>
<option>--请选择--</option>
</select>
</div>
</div>
</div>
</div>
<h4 class="form-header h4">器件</h4>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">物料代码：</label>
<div class="col-sm-8">
<input placeholder="请输入单板名" class="form-control" type="text" maxlength="30">
</div>
</div>
</div>
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">封装名：</label>
<div class="col-sm-8">
<input placeholder="请输入版本" class="form-control" type="text" maxlength="30">
</div>
</div>
</div>
</div>
<h4 class="form-header h4">DPPM值</h4>
<div class="row">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label is-required">DPPM值：</label>
<div class="col-sm-8">
<select name="primarySide" style="width: 150px;display: inline"class="form-control m-b" required>
<option>大于</option>
<option>小于</option>
</select>
&nbsp;
<input class="form-control" style="width: 150px;display: inline" type="text" maxlength="30">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-offset-5 col-sm-10">
<button type="button" class="btn btn-sm btn-primary" onclick="submitAnalysis()"><i class="fa fa-check"></i>查 询</button>&nbsp;
<button type="button" class="btn btn-sm btn-danger" onclick="closeItem()"><i class="fa fa-reply-all"></i>关 闭 </button>
</div>
</div>
</form>
</div>
<!--<div class="row" style="height: 100px;">-->
<!--<div class="col-sm-12 select-table table-striped" >-->
<!--<table id="infoQueryResultTable"></table>-->
<!--</div>-->
<!--</div>-->
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
</script>
</body>
</html>

68
ruoyi-admin/src/main/resources/templates/dfm/yieldPrediction.html Normal file
View File

@ -0,0 +1,68 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<th:block th:include="include :: header('良率预测')" />
<th:block th:include="include :: select2-css" />
</head>
<body class="gray-bg">
<div class="container-div">
<div class="row" style="height: 200px;">
<div class="col-sm-12 search-collapse">
<form id="role-form">
<div class="select-list">
<ul>
<li>
板命：<input type="text" name="name"/>
</li>
<li>
版本：<input type="text" name="username"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;预测</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;导出</a>
</li>
</ul>
</div>
</form>
</div>
</div>
<h4 class="form-header h4">良率预测结果</h4>
<div class="row" style="height: 200px;">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">预估良率约为</label>
</div>
</div>
</div>
<h4 class="form-header h4">物料DPPM</h4>
<div class="row" style="height: 200px;">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">物料DPPM影响因素占</label>
</div>
</div>
</div>
<h4 class="form-header h4">关键工艺参数的影响</h4>
<div class="row" style="height: 200px;">
<div class="col-sm-6">
<div class="form-group">
<label class="col-sm-4 control-label">关键工艺参数的影响因素占</label>
</div>
</div>
</div>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
</script>
</body>
</html>