From 3c5dd09bfab51666ae3a345ee6cad3d7069717d3 Mon Sep 17 00:00:00 2001
From: wangh <123456>
Date: Fri, 29 Jul 2022 11:39:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=9C=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/templates/login.html   |  2 +-
 .../mapper/system/BaseDtNengMapper.xml        |  3 +
 .../templates/system/base_dt_neng/add.html    | 76 +++++++++----------
 .../system/base_dt_neng/base_dt_neng.html     |  4 +
 .../templates/system/base_dt_neng/edit.html   | 75 +++++++++---------
 5 files changed, 82 insertions(+), 78 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/login.html b/ruoyi-admin/src/main/resources/templates/login.html
index 95ab5e1..f7dc008 100644
--- a/ruoyi-admin/src/main/resources/templates/login.html
+++ b/ruoyi-admin/src/main/resources/templates/login.html
@@ -43,7 +43,7 @@
             <div >
                 <form id="signupForm" autocomplete="off">
                     <h4 class="no-margins">登录：</h4>
-                    <p class="m-t-md">后台管理系统</p>
+                    <p class="m-t-md">MES可视化管理系统</p>
                     <input type="text"     name="username" class="form-control uname"     placeholder="用户名" value="admin"    />
                     <input type="password" name="password" class="form-control pword"     placeholder="密码"   value="admin123" />
 					<div class="row m-t" th:if="${captchaEnabled==true}">
diff --git a/ruoyi-system/src/main/resources/mapper/system/BaseDtNengMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BaseDtNengMapper.xml
index eb523f7..a99e694 100644
--- a/ruoyi-system/src/main/resources/mapper/system/BaseDtNengMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/BaseDtNengMapper.xml
@@ -52,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="yearName != null">year_name,</if>
+            <if test="target != null">target,</if>
             <if test="month1 != null">month1,</if>
             <if test="month2 != null">month2,</if>
             <if test="month3 != null">month3,</if>
@@ -68,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="yearName != null">#{yearName},</if>
+            <if test="target != null">#{target},</if>
             <if test="month1 != null">#{month1},</if>
             <if test="month2 != null">#{month2},</if>
             <if test="month3 != null">#{month3},</if>
@@ -88,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="yearName != null">year_name = #{yearName},</if>
             <if test="month1 != null">month1 = #{month1},</if>
+            <if test="target != null">target = #{target},</if>
             <if test="month2 != null">month2 = #{month2},</if>
             <if test="month3 != null">month3 = #{month3},</if>
             <if test="month4 != null">month4 = #{month4},</if>
diff --git a/ruoyi-system/src/main/resources/templates/system/base_dt_neng/add.html b/ruoyi-system/src/main/resources/templates/system/base_dt_neng/add.html
index c69c936..42867a3 100644
--- a/ruoyi-system/src/main/resources/templates/system/base_dt_neng/add.html
+++ b/ruoyi-system/src/main/resources/templates/system/base_dt_neng/add.html
@@ -7,80 +7,78 @@
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-base_dt_neng-add">
             <div class="form-group">    
-                <label class="col-sm-3 control-label">年份：</label>
-                <div class="col-sm-8">
+                <label class="col-sm-2 control-label">年份：</label>
+                <div class="col-sm-4">
                     <input name="yearName" class="form-control" type="text">
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">1月：</label>
-                <div class="col-sm-8">
-                    <input name="month1" class="form-control" type="text">
+                <label class="col-sm-2 control-label">本年目标：</label>
+                <div class="col-sm-4">
+                    <input name="target" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">2月：</label>
-                <div class="col-sm-8">
+                <label class="col-sm-2 control-label">1月：</label>
+                <div class="col-sm-4">
+                    <input name="month1" class="form-control" type="text">
+                </div>
+                <label class="col-sm-2 control-label">2月：</label>
+                <div class="col-sm-4">
                     <input name="month2" class="form-control" type="text">
                 </div>
             </div>
+
             <div class="form-group">    
-                <label class="col-sm-3 control-label">3月：</label>
-                <div class="col-sm-8">
+                <label class="col-sm-2 control-label">3月：</label>
+                <div class="col-sm-4">
                     <input name="month3" class="form-control" type="text">
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">4月：</label>
-                <div class="col-sm-8">
+
+                <label class="col-sm-2 control-label">4月：</label>
+                <div class="col-sm-4">
                     <input name="month4" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">5月：</label>
-                <div class="col-sm-8">
+                <label class="col-sm-2 control-label">5月：</label>
+                <div class="col-sm-4">
                     <input name="month5" class="form-control" type="text">
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">6月：</label>
-                <div class="col-sm-8">
+
+                <label class="col-sm-2 control-label">6月：</label>
+                <div class="col-sm-4">
                     <input name="month6" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">7月：</label>
-                <div class="col-sm-8">
+                <label class="col-sm-2 control-label">7月：</label>
+                <div class="col-sm-4">
                     <input name="month7" class="form-control" type="text">
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">8月：</label>
-                <div class="col-sm-8">
+
+                <label class="col-sm-2 control-label">8月：</label>
+                <div class="col-sm-4">
                     <input name="month8" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">9月：</label>
-                <div class="col-sm-8">
+                <label class="col-sm-2 control-label">9月：</label>
+                <div class="col-sm-4">
                     <input name="month9" class="form-control" type="text">
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">10月：</label>
-                <div class="col-sm-8">
+
+                <label class="col-sm-2 control-label">10月：</label>
+                <div class="col-sm-4">
                     <input name="month10" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">11月：</label>
-                <div class="col-sm-8">
+                <label class="col-sm-2 control-label">11月：</label>
+                <div class="col-sm-4">
                     <input name="month11" class="form-control" type="text">
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">12月：</label>
-                <div class="col-sm-8">
+
+                <label class="col-sm-2 control-label">12月：</label>
+                <div class="col-sm-4">
                     <input name="month12" class="form-control" type="text">
                 </div>
             </div>
diff --git a/ruoyi-system/src/main/resources/templates/system/base_dt_neng/base_dt_neng.html b/ruoyi-system/src/main/resources/templates/system/base_dt_neng/base_dt_neng.html
index 435c84f..5adb420 100644
--- a/ruoyi-system/src/main/resources/templates/system/base_dt_neng/base_dt_neng.html
+++ b/ruoyi-system/src/main/resources/templates/system/base_dt_neng/base_dt_neng.html
@@ -67,6 +67,10 @@
                 {
                     field: 'yearName',
                     title: '年份'
+                },
+                    {
+                    field: 'target',
+                    title: '目标'
                 },
                 {
                     field: 'month1',
diff --git a/ruoyi-system/src/main/resources/templates/system/base_dt_neng/edit.html b/ruoyi-system/src/main/resources/templates/system/base_dt_neng/edit.html
index 52478f0..6543c94 100644
--- a/ruoyi-system/src/main/resources/templates/system/base_dt_neng/edit.html
+++ b/ruoyi-system/src/main/resources/templates/system/base_dt_neng/edit.html
@@ -8,80 +8,79 @@
         <form class="form-horizontal m" id="form-base_dt_neng-edit" th:object="${baseDtNeng}">
             <input name="id" th:field="*{id}" type="hidden">
             <div class="form-group">    
-                <label class="col-sm-3 control-label">年份：</label>
-                <div class="col-sm-8">
+                <label class="col-sm-2 control-label">年份：</label>
+                <div class="col-sm-4">
                     <input name="yearName" th:field="*{yearName}" class="form-control" type="text">
                 </div>
+                 <label class="col-sm-2 control-label">目标：</label>
+                <div class="col-sm-4">
+                    <input name="target" th:field="*{target}" class="form-control" type="text">
+                </div>
+                
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">1月：</label>
-                <div class="col-sm-8">
+                <label class="col-sm-2 control-label">1月：</label>
+                <div class="col-sm-4">
                     <input name="month1" th:field="*{month1}" class="form-control" type="text">
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">2月：</label>
-                <div class="col-sm-8">
+            
+                <label class="col-sm-2 control-label">2月：</label>
+                <div class="col-sm-4">
                     <input name="month2" th:field="*{month2}" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">3月：</label>
-                <div class="col-sm-8">
+                <label class="col-sm-2 control-label">3月：</label>
+                <div class="col-sm-4">
                     <input name="month3" th:field="*{month3}" class="form-control" type="text">
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">4月：</label>
-                <div class="col-sm-8">
+
+                <label class="col-sm-2 control-label">4月：</label>
+                <div class="col-sm-4">
                     <input name="month4" th:field="*{month4}" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">5月：</label>
-                <div class="col-sm-8">
+                <label class="col-sm-2 control-label">5月：</label>
+                <div class="col-sm-4">
                     <input name="month5" th:field="*{month5}" class="form-control" type="text">
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">6月：</label>
-                <div class="col-sm-8">
+
+                <label class="col-sm-2 control-label">6月：</label>
+                <div class="col-sm-4">
                     <input name="month6" th:field="*{month6}" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">7月：</label>
-                <div class="col-sm-8">
+                <label class="col-sm-2 control-label">7月：</label>
+                <div class="col-sm-4">
                     <input name="month7" th:field="*{month7}" class="form-control" type="text">
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">8月：</label>
-                <div class="col-sm-8">
+
+                <label class="col-sm-2 control-label">8月：</label>
+                <div class="col-sm-4">
                     <input name="month8" th:field="*{month8}" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">9月：</label>
-                <div class="col-sm-8">
+                <label class="col-sm-2 control-label">9月：</label>
+                <div class="col-sm-4">
                     <input name="month9" th:field="*{month9}" class="form-control" type="text">
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">10月：</label>
-                <div class="col-sm-8">
+
+                <label class="col-sm-2 control-label">10月：</label>
+                <div class="col-sm-4">
                     <input name="month10" th:field="*{month10}" class="form-control" type="text">
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label">11月：</label>
-                <div class="col-sm-8">
+                <label class="col-sm-2 control-label">11月：</label>
+                <div class="col-sm-4">
                     <input name="month11" th:field="*{month11}" class="form-control" type="text">
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">12月：</label>
-                <div class="col-sm-8">
+
+                <label class="col-sm-2 control-label">12月：</label>
+                <div class="col-sm-4">
                     <input name="month12" th:field="*{month12}" class="form-control" type="text">
                 </div>
             </div>