Merge branch 'master' of gitlab.gavelinfo.com:gavelinfo/kwell-mes

gavel/src/main/java/com/gavel/kwell/dao/impl/UpointDaoImpl.java

@@ -82,7 +82,7 @@ public class UpointDaoImpl extends BaseDaoImpl implements UpointDao {
         sqlMap.append("from U_PLCPOINT ");
         sqlMap.append("where U_PLCPOINT_TYPE = :U_PLCPOINT_TYPE ");
         sqlMap.setParamValue("U_PLCPOINT_TYPE", type);
-        sqlMap.append("order by U_PLCPOINT_CODE ");
+        sqlMap.append("order by U_PLCPOINT_NAME ");
         return sqlMap.query(Upoint.class);
     }
 }

gavel/src/main/resources/static/css/dashboard/index.css

@@ -438,12 +438,12 @@
 }
 .allnav-left{
     float: left;
-    width: 50%;
+    width: 40%;
     margin-top: 0.1rem;
 }
 .allnav-right{
     float: right;
-    width: 50%;
+    width: 60%;
     height: 100%;
 }
 .allnav-circle li{
@@ -464,7 +464,7 @@
 .allnav-right ul li{
     height: 25%;
     float: left;
-    width: 25%;
+    width: 20%;
     text-align: center;
 }
 .allnav-right ul li>div{

gavel/src/main/resources/templates/views/gygl/gylx/edit.html

@@ -153,7 +153,11 @@
         var $edtJghs = $div.find('input[name="jghs"]');
         var $edtZyhs = $div.find('input[name="zyhs"]');
         var $bInit = true;
-		var apigzzxid=""
+		
+		var $dialog=$('#gyglGylxEdit');
+		var params=$dialog.closest(".panel-body").iDialog("options").queryParams.pid;//取参
+		var apigzzxid=params.gzzxid
+		var apigxlx=""
 
         function pageInit(ops){
             //$cbxGcid.iCombobox({valueField:'id', textField:'name', onSelect: doSelectGcid});
@@ -176,13 +180,6 @@
                 }
             }, ops);
 
-            gas.post('gygl/bzgx/queryNotTybzBzgx', {}, function(res){
-                if (res.success && res.data.records){
-                    $cbxBzgxid.iCombobox('loadData', res.data.records);
-                }
-            }, ops);
-
-
             gas.post('gygl/gylx/init/gxlx', {}, function(res){
                 if (res.success && res.data.records){
                     $cbxGxlx.iCombobox('loadData', res.data.records);
@@ -194,6 +191,23 @@
                     $cbxGxbz.iCombobox('loadData', res.data.records);
                 }
             }, ops);
+			setTimeout(function(){
+				gas.post('gygl/bzgx/queryNotTybzBzgx', {gxlx:apigxlx,gzzxid:apigzzxid}, function(res){
+				    if (res.success && res.data.records){
+						// let value=""
+						// res.data.records.forEach(function(e){
+						// 	if(e.name==params.bzgxName){
+						// 		value=e.code
+						// 	}
+						// })
+						console.log( params.bzgxName)
+						 $cbxBzgxid.iCombobox('loadData', res.data.records);
+						$cbxBzgxid.iCombobox('setValue', params.bzgxName);
+						$edtName.val(params.bzgxNam)
+				    }
+				}, ops);
+			},200)
+			
         }
 
         function run(ops){
@@ -215,10 +229,12 @@
         function doSelectGzzxid(a){
 			apigzzxid=a.id
             if( $div.closest("form").attr("tag")!="add" && $bInit) return false;
-            gas.post('gygl/bzgx/queryNotTybzBzgx', {gzzxid: a.id}, function(res){
+            gas.post('gygl/bzgx/queryNotTybzBzgx', {gxlx:apigxlx,gzzxid:apigzzxid}, function(res){
                 if (res.success && res.data.records){
                     $cbxBzgxid.iCombobox('setValue', '');
                     $cbxBzgxid.iCombobox('loadData', res.data.records);
+					$cbxBzgxid.iCombobox('setValue', params.bzgxName);
+					$edtName.val(params.bzgxNam)
                 }
             });
         }
@@ -239,10 +255,13 @@
             });
         }
 		function doldbzgx(e){
-			gas.post('gygl/bzgx/queryNotTybzBzgx', {gxlx:e.id,gzzxid:apigzzxid}, function(res){
+			apigxlx=e.id
+			gas.post('gygl/bzgx/queryNotTybzBzgx', {gxlx:apigxlx,gzzxid:apigzzxid}, function(res){
 			    if (res.success && res.data.records){
 					$cbxBzgxid.iCombobox('setValue', '');
 			        $cbxBzgxid.iCombobox('loadData', res.data.records);
+					$cbxBzgxid.iCombobox('setValue', params.bzgxName);
+					$edtName.val(params.bzgxNam)
 			    }
 			});
 		}

gavel/src/main/resources/templates/views/gygl/gylx/index.html

@@ -66,7 +66,6 @@ $(function () {
 	var $cbxGzzxid = $div.find('input[name="gzzxid"]');
 	var $gxlxArray = [];
 	var $gxbzArray = [];
-
     function paramInit(ops){
 		gas.post('gygl/gylx/init/gxlx', {}, function(res){
 			$gxlxArray = res.data.records;
@@ -109,7 +108,13 @@ $(function () {
 			]],
 			dialog: {
 				footerIn: true,
-				href: 'gygl/gylx/edit'
+				href: 'gygl/gylx/edit',
+					onBeforeLoad:function () {//传参
+					let pid=$("#gyglGylxTable").datagrid('getSelected')
+					$(this).dialog("options").queryParams={
+					pid:pid
+					}
+				}
 			}
 		};
 		$div.Holder(options);

gavel/src/main/resources/templates/views/kmes/dashboard/first.html

@@ -91,6 +91,8 @@
 								<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
 								<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
 								<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
+								<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
+								<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
                             </ul>
                         </div>
                     </div>

gavel/src/main/resources/templates/views/kmes/dashboard/fourth.html

@@ -108,6 +108,8 @@
 								<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
 								<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
 								<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
+								<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
+								<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
                             </ul>
                         </div>
                     </div>

gavel/src/main/resources/templates/views/kmes/dashboard/third.html

@@ -227,6 +227,8 @@
 								<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
 								<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
 								<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
+								<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
+								<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
                             </ul>
                         </div>
                     </div>

gavel/src/main/resources/win32/plugin/GavelPluginVersion.ini

 [Application]
-version=1.0.0.9
+version=1.0.0.11
\ No newline at end of file