Home Verkennen Help
Inloggen
liujiankang
/
iamberry-common-parent
geforked van hexiugang/iamberry-common-parent
Volgen 1
Ster 0
Vork 0
Bestanden
Bladeren bron

修改了设备页面

liuzhiwei 7 jaren geleden
bovenliggende
d25aa90708
commit
21f0006902
8 gewijzigde bestanden met toevoegingen van 45 en 15 verwijderingen
Zij-aan-zij weergave Toon Diff Stats
  1. 1 1
      watero-rst-core/pom.xml
  2. 29 0
      watero-rst-core/src/main/java/com.iamberry.rst.core/pts/ProduceProcess.java
  3. 1 1
      watero-rst-service/pom.xml
  4. 1 1
      watero-rst-web/pom.xml
  5. 3 3
      watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/add_device.ftl
  6. 5 5
      watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/device_list.ftl
  7. 3 3
      watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/update_device.ftl
  8. 2 1
      watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/update_process.ftl

+ 1 - 1
watero-rst-core/pom.xml
Bestand weergeven 

@@ -27,7 +27,7 @@
 
     </dependencies>
 
 
     <build>
 
-        <finalName>watero-rent-web</finalName>
 
+        <finalName>watero-rst-core</finalName>
 
         <plugins>
 
             <plugin>
 
                 <groupId>org.apache.maven.plugins</groupId>

+ 29 - 0
watero-rst-core/src/main/java/com.iamberry.rst.core/pts/ProduceProcess.java
Bestand weergeven 

@@ -28,6 +28,35 @@ public class ProduceProcess implements Serializable {
 
 
     private String json;    //传入的json字符串
 
 
+    private String produceName;             //产品名称
 
+    private String employeeName;            //员工名称
 
+    private String deviceName;              //设备名称
 
+
 
+    public String getEmployeeName() {
 
+        return employeeName;
 
+    }
 
+
 
+    public void setEmployeeName(String employeeName) {
 
+        this.employeeName = employeeName;
 
+    }
 
+
 
+    public String getDeviceName() {
 
+        return deviceName;
 
+    }
 
+
 
+    public void setDeviceName(String deviceName) {
 
+        this.deviceName = deviceName;
 
+    }
 
+
 
+    public String getProduceName() {
 
+        return produceName;
 
+    }
 
+
 
+    public void setProduceName(String produceName) {
 
+        this.produceName = produceName;
 
+    }
 
+
 
+
 
     public Integer getProcessId() {
 
         return processId;
 
     }

+ 1 - 1
watero-rst-service/pom.xml
Bestand weergeven 

@@ -35,7 +35,7 @@
 
                 <filtering>false</filtering>
 
             </resource>
 
         </resources>
 
-        <finalName>watero-rent-web</finalName>
 
+        <finalName>watero-rst-service</finalName>
 
         <plugins>
 
             <plugin>
 
                 <groupId>org.apache.maven.plugins</groupId>

+ 1 - 1
watero-rst-web/pom.xml
Bestand weergeven 

@@ -117,7 +117,7 @@
 
     </dependencies>
 
 
     <build>
 
-        <finalName>watero-rent-web</finalName>
 
+        <finalName>watero-rst-web</finalName>
 
         <plugins>
 
             <plugin>
 
                 <groupId>org.apache.maven.plugins</groupId>

+ 3 - 3
watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/add_device.ftl
Bestand weergeven 

@@ -8,7 +8,7 @@
 
         .my-title{font-weight: 500;padding-left: 15px;position: relative;}
 
         .my-title:after{content: '';position: absolute;left: 0;top:12%;width: 3px;height: 80%;background: #32a3d8;}
 
         .my-input{padding: 5px 10px;width: 60%;}
 
-        .my-input-date{padding: 5px 10px;width: 60%;background: url(images/rili-1.png) 98.5% center no-repeat; background-size:auto 80%;}
 
+        .my-input-date{padding: 5px 10px;width: 60%;background: url(http://s.iamberry.com/images/rili-1.png) 98.5% center no-repeat; background-size:auto 80%;}
 
         .input-box{margin: 18px 0;}
 
         .input-dic{float: left;margin:5px 10px 0 0;font-size: 12px;}
 
         .add-list{list-style-type: none;padding: 10px;background-color: #f5f5f5;width: 60%;float: left;margin: 0;}
 
@@ -16,7 +16,7 @@
 
         .my-textarea{padding: 5px 10px;width: 60%;}
 
         .my-btn-reset{padding: 6px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
 
         .my-btn-submit{padding: 6px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
 
-        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 60%; height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(common/images/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
 
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 60%; height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(http://s.iamberry.com/images/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
 
     </style>
 
 </head>
 
 <body>
 
@@ -25,7 +25,7 @@
 
     <span class="c-gray en">&gt;</span> 添加设备
 
     <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 
 </nav>
 
-<div style="padding: 10px;">
 
+<div style="padding: 10px; padding-left: 250px;">
 
     <form class="form-horizontal" action="${path}/admin/equipment/add_equpment" id="form-admin-add">
 
         <div class="my-title">设备信息</div>
 
         <div class="input-box">

+ 5 - 5
watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/device_list.ftl
Bestand weergeven 

@@ -49,9 +49,9 @@
 
         <tbody id="listid">
 
         <#list page.dataList as device>
 
         <tr>
 
-            <td class="text-c" width="100">${device.deviceNumber}</td>
 
-            <td class="text-c" width="100">${device.deviceName}</td>
 
-            <td class="text-c" width="100">${device.deviceRemake}</td>
 
+            <td class="text-c" width="100">${device.deviceNumber!}</td>
 
+            <td class="text-c" width="100">${device.deviceName!}</td>
 
+            <td class="text-c" width="100">${device.deviceRemake!}</td>
 
             <td class="text-c" width="100">${(device.deviceDate?string("yyyy-MM-dd"))!''}</td>
 
             <td class="text-c" width="100">
 
                 <#if device.deviceStatus == 0>
 
@@ -68,10 +68,10 @@
 
                 <#if device.processList??>
 
                     <#list device.processList as process>
 
                         <#if (process_index + 1) == device.processList?size>
 
-                            ${process.produceName}-${process.processName}
 
+                            ${process.produceName!}-${process.processName!}
 
                         </#if>
 
                         <#if (process_index + 1) != device.processList?size>
 
-                        ${process.produceName}-${process.processName},
 
+                        ${process.produceName!}-${process.processName!},
 
                         </#if>
 
                     </#list>
 
                 </#if>

+ 3 - 3
watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/update_device.ftl
Bestand weergeven 

@@ -8,7 +8,7 @@
 
         .my-title{font-weight: 500;padding-left: 15px;position: relative;}
 
         .my-title:after{content: '';position: absolute;left: 0;top:12%;width: 3px;height: 80%;background: #32a3d8;}
 
         .my-input{padding: 5px 10px;width: 60%;}
 
-        .my-input-date{padding: 5px 10px;width: 60%;background: url(images/rili-1.png) 98.5% center no-repeat; background-size:auto 80%;}
 
+        .my-input-date{padding: 5px 10px;width: 60%;background: url(http://s.iamberry.com/images/rili-1.png) 98.5% center no-repeat; background-size:auto 80%;}
 
         .input-box{margin: 18px 0;}
 
         .input-dic{float: left;margin:5px 10px 0 0;font-size: 12px;}
 
         .add-list{list-style-type: none;padding: 10px;background-color: #f5f5f5;width: 60%;float: left;margin: 0;}
 
@@ -16,7 +16,7 @@
 
         .my-textarea{padding: 5px 10px;width: 60%;}
 
         .my-btn-reset{padding: 6px 20px;width: 150px; background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
 
         .my-btn-submit{padding: 6px 20px;width: 150px; background-color: #32a3d8;color: #fff;border: 1px solid #32a3d8;cursor:pointer;margin: 10px 10px 0 10px;}
 
-        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 60%; height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(common/images/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
 
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;width: 60%; height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(http://s.iamberry.com/images/select-1.png) right center no-repeat #fff;background-size:auto 100%;}
 
     </style>
 
 </head>
 
 <body>
 
@@ -25,7 +25,7 @@
 
     <span class="c-gray en">&gt;</span> 修改设备
 
     <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 
 </nav>
 
-<div style="padding: 10px;">
 
+<div style="padding: 10px;padding-left: 250px;">
 
     <form class="form-horizontal" action="${path}/admin/equipment/update_device" id="form-admin-add">
 
         <div class="my-title">设备信息</div>
 
         <input class="my-input" type="hidden" value="${device.deviceId!}" name="deviceId" id="deviceId" placeholder="请输入设备编号"/>

+ 2 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/update_process.ftl
Bestand weergeven 

@@ -141,11 +141,12 @@
 
             border-bottom-style: none;
 
             overflow:hidden;
 
             -webkit-appearance: none;
 
+            text-align: center;
 
         }
 
 
         select option {
 
             text-align: center;
 
-            color: blue;
 
+            font-size:15px;
 
         }
 
 
         .add-title-left{position: absolute;right: 0;top: 15%;}