feats

resources/static/css/common.css

@@ -1,6 +1,6 @@
 :root {
-  --main-bg: #0D267C;
-  --primary-bg: #4276F5;
+  --main-bg: #0d267c;
+  --primary-bg: #4276f5;
 }
 .panel {
   border-radius: 12px;
@@ -51,14 +51,14 @@
 }
 .nav-menu .nav-menu-item.active div {
   position: relative;
-  border-bottom: 4px solid #3CBAF5;
+  border-bottom: 4px solid #3cbaf5;
 }
 .nav-menu .nav-menu-item.active div::after {
-  content: "";
+  content: '';
   width: 0;
   height: 0;
   border: 8px solid transparent;
-  border-bottom-color: #3CBAF5;
+  border-bottom-color: #3cbaf5;
   position: absolute;
   left: calc(50% - 8px);
   bottom: 0;
@@ -76,7 +76,7 @@
   width: 100%;
   height: 100%;
   overflow-y: auto;
-  background: #071C51;
+  background: #071c51;
 }
 .chart-page .flex-part {
   display: flex;
@@ -114,9 +114,9 @@
 }
 .chart-page .count dl::before,
 .chart-page .count dl::after {
-  content: "";
+  content: '';
   position: absolute;
-  background: #FFFFFF;
+  background: #ffffff;
   opacity: 0.1;
   border-radius: 50%;
   font-size: 0;
@@ -135,16 +135,16 @@
   top: 81px;
 }
 .chart-page .count dl:nth-child(1) {
-  background: linear-gradient(90deg, #3886D6, #003789);
+  background: linear-gradient(90deg, #3886d6, #003789);
 }
 .chart-page .count dl:nth-child(2) {
-  background: linear-gradient(90deg, #29A0B1, #3C1A63);
+  background: linear-gradient(90deg, #29a0b1, #3c1a63);
 }
 .chart-page .count dl:nth-child(3) {
-  background: linear-gradient(90deg, #1570AB, #343894);
+  background: linear-gradient(90deg, #1570ab, #343894);
 }
 .chart-page .count dl:nth-child(4) {
-  background: linear-gradient(90deg, #2788B6, #083A8C);
+  background: linear-gradient(90deg, #2788b6, #083a8c);
 }
 .chart-card {
   position: relative;
@@ -172,7 +172,7 @@
 .chart-card.panel .panel-heading .selectGroup select {
   background: transparent;
   border: 0;
-  color: #FFFFFF;
+  color: #ffffff;
 }
 .chart-card.panel .panel-heading img {
   width: 28px;
@@ -185,14 +185,14 @@
   font-size: 22px;
   font-weight: 500;
   color: transparent;
-  background-image: linear-gradient(0deg, #6F39B9 0%, #1EAED1 100%);
+  background-image: linear-gradient(0deg, #6f39b9 0%, #1eaed1 100%);
   vertical-align: middle;
   background-clip: text;
   -webkit-background-clip: text;
 }
 .chart-card.panel .panel-body {
   padding: 0;
-  background: #071C51;
+  background: #071c51;
 }
 .chart-card.panel .panel-body .info-list li {
   color: rgba(255, 255, 255, 0.6);
@@ -235,10 +235,16 @@
   top: -450%;
   width: 1000%;
   height: 1000%;
-  background-color: #1E5983;
+  background-color: #1e5983;
   background-repeat: no-repeat;
   background-position: 0 0, 100% 100%;
-  background-image: conic-gradient(from 0, transparent, #a8efff, transparent 20%), conic-gradient(from 180deg, transparent, #a8efff, transparent 20%);
+  background-image: conic-gradient(
+      from 0,
+      transparent,
+      #a8efff,
+      transparent 20%
+    ),
+    conic-gradient(from 180deg, transparent, #a8efff, transparent 20%);
   animation: chart-card-rotate 10s linear infinite;
 }
 .chart-card::after {
@@ -249,9 +255,10 @@
   top: 2px;
   width: calc(100% - 4px);
   height: calc(100% - 4px);
-  background: #071C51;
+  background: #071c51;
   border-radius: 18px;
-  box-shadow: 2px 2px 10px rgba(255, 255, 255, 0.2) inset, -2px -2px 10px rgba(255, 255, 255, 0.2) inset;
+  box-shadow: 2px 2px 10px rgba(255, 255, 255, 0.2) inset,
+    -2px -2px 10px rgba(255, 255, 255, 0.2) inset;
 }
 .ext-page .page-title {
   font-size: 20px;
@@ -314,19 +321,6 @@
   line-height: 36px;
   height: 36px;
 }
-.ext-page #wizard .export-io {
-  position: absolute;
-  top: 30px;
-  left: -45px;
-}
-.ext-page #wizard .export-io li {
-  display: flex;
-  float: none;
-}
-.ext-page #wizard div span {
-  margin-left: 6px;
-  font-weight: bold;
-}
 .editBar {
   display: flex;
   flex-direction: row-reverse;
@@ -416,7 +410,12 @@
   height: 100%;
   object-fit: contain;
 }
-.dashboard-page .act-list div[class^='col'] .act-body .act-icon img:nth-child(2) {
+.dashboard-page
+  .act-list
+  div[class^='col']
+  .act-body
+  .act-icon
+  img:nth-child(2) {
   display: none;
 }
 .dashboard-page .act-list div[class^='col'] .act-body .act-content {

resources/static/css/public.css

@@ -480,7 +480,8 @@ a.btn-warning ,a:visited.btn-warning,
 
 /*服务评价统计*/
 .serve {overflow: hidden;clear: both;}
-.serve dl{background:#f5f5f5;width: calc(33.333% - 10px);margin:0 5px;float:left;}
+.serve dl{width: calc(33.333% - 10px);float:left; min-height: 300px;}
+.serve dl:nth-of-type(n+4) { margin-top: 40px; }
 .serve dl dt{width:100%;text-align:center;height:30px;font-size: 16px;margin-top:8px;}
 .serve dl dd{background:#fff; padding:15px 0;text-align:center;margin:0 8px 8px 8px;}
 .serve dl dd a{width:32%;display:inline-block;text-align:center;text-decoration:none;color:#555;}
@@ -509,7 +510,7 @@ a.btn-warning ,a:visited.btn-warning,
 .checkboxStyle input:disabled+label {opacity: 0.6;background: #f5f5f5;}
 
 /* 下拉菜单多选 */
-.panel-body .chosen-container-multi .chosen-choices{border-radius:0;height:36px;line-height:26px;padding: 2px 10px;border-right:0;min-width: 220px;display: flex;}
+.panel-body .chosen-container-multi .chosen-choices{border-radius:4px;line-height:26px;padding: 2px 10px;border-right:0;min-width: 220px;display: flex;}
 .panel-body .chosen-container-multi .chosen-choices li.search-choice{line-height: 24px;padding-top:0;padding-bottom:0;margin:2px 3px;float: left;}
 .panel-body .chosen-container-multi .chosen-choices li.search-choice span{white-space:nowrap;}
 .panel-body .chosen-container-multi .chosen-choices li.search-choice .search-choice-close{line-height:20px;}

resources/static/js/common.js

@@ -40,9 +40,12 @@ window.onload = function() {
 		}
 	}  
 	loadPage();
+	loadPage2();
 };
 function loadPage() {
 }
+function loadPage2() {
+}
 function setSchColSpan(schColSpan){
 	$("#schCol_span").append(schColSpan);
 }

resources/static/js/equipment/list.js

@@ -12,9 +12,10 @@ function loadPage(){
 	$("#schSel").append(getDictValueByDictName("config_dev_type"));
 	$("#schSel")[0].style.display = "";
 	$('select.chosen-select').chosen({
-	    no_results_text: '没有找到',    // 当检索时没有找到匹配项时显示的提示文本
-	    disable_search_threshold: 10, // 10 个以下的选择项则不显示检索框
-	    search_contains: true         // 从任意位置开始检索
+		inherit_select_classes: true,
+		no_results_text: '没有找到',    // 当检索时没有找到匹配项时显示的提示文本
+		disable_search_threshold: 10, // 10 个以下的选择项则不显示检索框
+		search_contains: true         // 从任意位置开始检索
 	});	
 }
 function beforeQuery() {

resources/static/js/guaranteeOrg/list.js

@@ -6,9 +6,10 @@ function loadPage(){
 	$("#schSel").append(getDictValueByDictName("config_guaranteeorg_type"));
 	$("#schSel")[0].style.display = "";
 	$('select.chosen-select').chosen({
-	    no_results_text: '没有找到',    // 当检索时没有找到匹配项时显示的提示文本
-	    disable_search_threshold: 10, // 10 个以下的选择项则不显示检索框
-	    search_contains: true         // 从任意位置开始检索
+		inherit_select_classes: true,
+		no_results_text: '没有找到',    // 当检索时没有找到匹配项时显示的提示文本
+		disable_search_threshold: 10, // 10 个以下的选择项则不显示检索框
+		search_contains: true         // 从任意位置开始检索
 	});
 	datagrid();
 }

resources/static/js/task/details.js

@@ -7,7 +7,61 @@ function loadPage(){
 	 
 	 let dictArr = getDictValByDictType("config_if")
 	 $('#iflyyl').append(getDictText(dictArr,$("#iflyyl").attr("selOpt")));
-	 $('#ifjyyl').append(getDictText(dictArr,$("#ifjyyl").attr("selOpt")));	 
+	 $('#ifjyyl').append(getDictText(dictArr,$("#ifjyyl").attr("selOpt")));
+
+	 var optTpl = {
+		color: ['#3DE0A4', '#FF8940', '#CB55E9'],
+		series: [
+			{
+				type: 'gauge',
+				anchor: {
+					show: true,
+					showAbove: true,
+					size: 8,
+					itemStyle: {
+						color: '#3FC9F4'
+					}
+				},
+				pointer: {
+					icon: 'path://M2.9,0.7L2.9,0.7c1.4,0,2.6,1.2,2.6,2.6v115c0,1.4-1.2,2.6-2.6,2.6l0,0c-1.4,0-2.6-1.2-2.6-2.6V3.3C0.3,1.9,1.4,0.7,2.9,0.7z',
+					width: 4,
+					length: '80%',
+					offsetCenter: [0, '8%']
+				},
+				progress: {
+					show: true,
+					overlap: true,
+					roundCap: true,
+					width: 4
+				},
+				axisLine: {
+					roundCap: true,
+					lineStyle: {
+						width: 4
+					}
+				},
+				axisLabel: {
+					fontSize: 10
+				},
+				data: [],
+				title: {
+					fontSize: 14
+				},
+				detail: {
+					width: 40,
+					height: 14,
+					fontSize: 14,
+					color: '#fff',
+					backgroundColor: 'auto',
+					borderRadius: 3,
+					formatter: '{value}%'
+				}
+			}
+		]
+	};
+
+	var echartInsts = {};
+	var ids = [];
 	
 	 let queryParams = {};
 		queryParams.schCols = 'itemCode,itemName';
@@ -25,22 +79,44 @@ function loadPage(){
 			dataType : 'json',
 			success : function(data) {
 				var rows = data.rows;
-				let itemTxt = [];
-				for(var m = 0; m < rows.length; m++){
-					let row = rows[m]
-					let str = '<dl class="gray" id="'+row.itemCode+'_div"><dt>'+row.itemName+'评价</dt><dd>'+
-                   	    '<a href="javascript:;"><span id="'+row.itemCode+'_1">0%</span> 优</a>'+
-                    '<a href="javascript:;"><span id="'+row.itemCode+'_2">0%</span> 良</a>'+
-                    '<a href="javascript:;"><span id="'+row.itemCode+'_3">0%</span> 差</a></dd></dl>'
-                    $("#commentDiv").append(str)
-                    for(let n=0;n<itemArr.length;n++){
-                    	if(itemArr[n] == row.itemCode){
-                    		itemTxt[itemTxt.length] = row.itemName
-                    		$("#"+ row.itemCode + "_div").removeClass("gray")
-                    	}
-                    }
-				}
-				$("#config_evaluate_item").text(itemTxt.join("、"))
+
+				var dlHtml = rows.map(function(item) {
+					var domId = 'dl_'+item.itemCode;
+					ids.push(item.itemCode)
+					return '<dl id="'+domId+'"></dl>';
+				}).join('');
+				$("#commentDiv").append(dlHtml)
+
+				var evalText = rows.filter(function(item) {
+					var found = itemArr.filter(function(x) { return x == item.itemCode })[0];
+					return !!found;
+				}).map(function(x) { return x.itemName }).join("、")
+
+				ids.reduce(function(insts, id) {
+					var el = document.querySelector("#dl_"+id);
+					var echartInst = echarts.init(el);
+					var title = rows.filter(function(x){ return x.itemCode == id; })[0].itemName;
+					echartInst.setOption(Object.assign({}, optTpl, { title: { text: title + '评价', left: 'center' } }));
+					insts[id] = echartInst;
+					return insts;
+				}, echartInsts);
+
+				// let itemTxt = [];
+				// for(var m = 0; m < rows.length; m++){
+				// 	let row = rows[m]
+				// 	let str = '<dl class="gray" id="'+row.itemCode+'_div"><dt>'+row.itemName+'评价</dt><dd>'+
+        //            	    '<a href="javascript:;"><span id="'+row.itemCode+'_1">0%</span> 优</a>'+
+        //             '<a href="javascript:;"><span id="'+row.itemCode+'_2">0%</span> 良</a>'+
+        //             '<a href="javascript:;"><span id="'+row.itemCode+'_3">0%</span> 差</a></dd></dl>'
+        //             $("#commentDiv").append(str)
+        //             for(let n=0;n<itemArr.length;n++){
+        //             	if(itemArr[n] == row.itemCode){
+        //             		itemTxt[itemTxt.length] = row.itemName
+        //             		$("#"+ row.itemCode + "_div").removeClass("gray")
+        //             	}
+        //             }
+				// }
+				$("#config_evaluate_item").text(evalText)
 			}
 		});	
 		$.ajax({
@@ -48,53 +124,107 @@ function loadPage(){
 			async: false,
 			dataType:"json",
 			success:function(datas){
-				let json = {};
-				if(datas.length > 0){
-					for(let m=0;m<datas.length;m++){
-						let data = datas[m]
-						for(let key in data){
-							if(isRealNum(data[key])){
-								if(json[key] != null){
-									json[key] = data[key]+json[key] 
-								}else{
-									json[key] = data[key]
-								}
+
+				for (data of (datas || [])) {
+					var keys = Object.keys(data);
+					var id = keys.filter(function(key) { return ids.indexOf(key) > -1; })[0];
+					var totalNum = data[id];
+
+					var perfect = (data[id + "_1"] || 0) * 100 / totalNum;
+					var good = (data[id + "_2"] || 0) * 100 / totalNum;
+					var poor = (data[id + "_3"] || 0) * 100 / totalNum;
+
+					var gaugeData = [
+						{
+							value: Number(perfect).toFixed(2) - 0,
+							name: '优',
+							title: {
+								offsetCenter: ['-100%', '90%']
+							},
+							detail: {
+								offsetCenter: ['-100%', '120%']
+							}
+						},
+						{
+							value: Number(good).toFixed(2) - 0,
+							name: '良',
+							title: {
+								offsetCenter: ['0%', '90%']
+							},
+							detail: {
+								offsetCenter: ['0%', '120%']
+							}
+						},
+						{
+							value: Number(poor).toFixed(2) - 0,
+							name: '差',
+							title: {
+								offsetCenter: ['100%', '90%']
+							},
+							detail: {
+								offsetCenter: ['100%', '120%']
 							}
 						}
-					}
-					for(let key in json){					
-						if($("#"+key).length > 0){
-								let val = json[key]
-								let totalNum = json[key.substring(0,2)]
-								let tmpNum = (val/totalNum*100).toFixed()
-								$("#"+key).text(tmpNum + "%");
-								$("#"+key).attr("hidNum",tmpNum)
-						}
-					}
-					$('#commentDiv').find("dl").each(function(){
-						var val=$(this).attr("class");
-						if(val.indexOf("gray") == -1){
-							let differId = null
-							let tmpNm = 100;
-							$(this).find("span").each(function(){
-								if(typeof($(this).attr("hidnum"))!="undefined"){
-									tmpNm = tmpNm - $(this).attr("hidnum")*1;
-								}else{
-									differId = $(this).attr("id")
-								}
-							})
-							if($("#"+differId).text()!="0%"){
-								$("#"+differId).text(tmpNm +"%")
+					];
 
+					var echartInst = echartInsts[id];
+					echartInst.setOption({
+						series: [
+							{
+								data: gaugeData
 							}
-						}else{
-							$(this).find("span").each(function(){
-								$(this).text("0%");
-							})
-						}
-						
+						]
 					})
 				}
+
+				// let json = {};
+				// if(datas.length > 0){
+				// 	for(let m=0;m<datas.length;m++){
+				// 		let data = datas[m]
+				// 		for(let key in data){
+				// 			if(isRealNum(data[key])){
+				// 				if(json[key] != null){
+				// 					json[key] = data[key]+json[key] 
+				// 				}else{
+				// 					json[key] = data[key]
+				// 				}
+				// 			}
+				// 		}
+				// 	}
+
+				// 	for(let key in json){					
+				// 		if($("#"+key).length > 0){
+				// 				let val = json[key]
+				// 				let totalNum = json[key.substring(0,2)]
+				// 				let tmpNum = (val/totalNum*100).toFixed()
+				// 				$("#"+key).text(tmpNum + "%");
+				// 				$("#"+key).attr("hidNum",tmpNum)
+				// 		}
+				// 	}
+				// 	$('#commentDiv').find("dl").each(function(){
+				// 		var val=$(this).attr("class");
+				// 		if(val.indexOf("gray") == -1){
+				// 			let differId = null
+				// 			let tmpNm = 100;
+				// 			$(this).find("span").each(function(){
+				// 				if(typeof($(this).attr("hidnum"))!="undefined"){
+				// 					tmpNm = tmpNm - $(this).attr("hidnum")*1;
+				// 				}else{
+				// 					differId = $(this).attr("id")
+				// 				}
+				// 			})
+				// 			if($("#"+differId).text()!="0%"){
+				// 				$("#"+differId).text(tmpNm +"%")
+
+				// 			}
+				// 		}else{
+				// 			$(this).find("span").each(function(){
+				// 				$(this).text("0%");
+				// 			})
+				// 		}
+						
+				// 	})
+				// }
 				
 			}
 		});

resources/static/less/ext-page.less

@@ -1,279 +1,277 @@
-@ext-txt-color: #121212;
-
-.ext-page {
-  .page-title {
-    font-size: 20px;
-    color: @ext-txt-color;
-    margin: 0;
-  }
-
-  .search-bar {
-    .form-control {
-      width: 200px;
-    }
-
-    .input-group-addon {
-      background: transparent;
-      border: none;
-      font-size: 16px;
-    }
-  }
-
-  .btn-group {
-    .btn + .btn {
-      margin-left: 1em;
-    }
-  }
-
-  .wd-m {
-    width: 1000px;
-  }
-
-  .pd-m {
-    box-sizing: border-box;
-    padding: 30px;
-  }
-
-  .ext-card {
-    margin: 10px;
-    margin-bottom: 30px;
-    box-shadow: 0px 8px 20px 0px rgba(0, 0, 0, 0.08);
-    border-radius: 20px;
-    overflow: hidden;
-
-    h1 {
-      margin: 0;
-      margin-bottom: 30px;
-      background: rgba(66, 118, 245, 0.08);
-      font-size: 22px;
-      line-height: 60px;
-      height: 60px;
-      font-weight: 500;
-      color: @ext-txt-color;
-      padding: 0 20px;
-    }
-
-    .icon-info-sign {
-      color: rgba(0, 0, 0, 0.2);
-    }
-
-    .view-info {
-      margin-top: -1em;
-      padding-bottom: 30px;
-      overflow: hidden;
-
-      .info-title {
-        font-size: 16px;
-        color: #999999;
-        line-height: 36px;
-        height: 36px;
-      }
-
-      .info-text {
-        font-size: 18px;
-        color: @ext-txt-color;
-        line-height: 36px;
-        height: 36px;
-      }
-    }
-  }
-
-  #wizard {
-    .export-io {
-      // list-style: none;
-      position: absolute;
-      top: 30px;
-      left: -45px;
-      li {
-        display: flex;
-        float: none;
-      }
-    }
-    div span {
-      margin-left: 6px;
-      font-weight: bold;
-    }
-  }
-}
-
-.editBar {
-  display: flex;
-  flex-direction: row-reverse;
-  justify-content: start;
-}
-
-.table {
-  thead {
-    tr {
-      th {
-        background: rgba(66, 118, 245, 0.08);
-        padding: 16px;
-        border: none;
-      }
-    }
-  }
-  tbody {
-    tr {
-      &:nth-of-type(even) {
-        background: rgba(91, 91, 91, 0.04);
-      }
-
-      &:hover {
-        background: rgba(66, 118, 245, 0.2);
-      }
-    }
-  }
-}
-
-.dashboard-page {
-  height: 100%;
-  background-color: #081a48;
-
-  & > div {
-    height: 50%;
-    overflow: hidden;
-  }
-
-  .dash-carousel {
-    max-width: 1200px;
-    margin: 0 auto;
-    height: 100%;
-
-    .ratio-static {
-      height: 0;
-      padding-bottom: 32%; // 大约 10:3
-      position: relative;
-      overflow: hidden;
-
-      & > div {
-        position: absolute;
-        top: 0;
-        left: 0;
-        width: 100%;
-        height: 100%;
-        background: transparent;
-      }
-
-      .left {
-        width: auto;
-        background: transparent;
-        box-shadow: none;
-      }
-    }
-  }
-
-  .act-list {
-    .row {
-      height: calc(50% - 64px);
-      padding: 0 80px;
-
-      & + .row {
-        margin-top: 64px;
-      }
-    }
-
-    div[class^='col'] {
-      min-width: 280px;
-      // 每行 4 个, 间距 64
-      width: calc(25% - 48px);
-      height: 100%;
-      position: relative;
-
-      & + div {
-        margin-left: 64px;
-      }
-
-      .act-body {
-        z-index: 1;
-        width: 100%;
-        height: 100%;
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
-
-        .act-icon {
-          position: relative;
-          width: 64px;
-          height: 64px;
-          min-height: 64px;
-          flex: 0;
-
-          img {
-            position: absolute;
-            left: calc(50% - 32px);
-            top: 0;
-            display: block;
-            width: 100%;
-            height: 100%;
-            object-fit: contain;
-
-            &:nth-child(2) {
-              display: none;
-            }
-          }
-        }
-
-        .act-content {
-          flex: 0;
-          text-align: center;
-
-          span {
-            display: inline-block;
-            padding: 0 1em;
-            font-size: 24px;
-            font-weight: 500;
-            color: transparent;
-            background: linear-gradient(0deg, #2362e4 0%, #00d5fb 100%);
-            vertical-align: middle;
-            background-clip: text;
-            -webkit-background-clip: text;
-          }
-        }
-      }
-
-      .act-bg {
-        position: absolute;
-        width: 100%;
-        height: 100%;
-        z-index: 0;
-        left: 0;
-        top: 0;
-
-        img {
-          display: block;
-          width: 100%;
-          height: 100%;
-          object-fit: contain;
-
-          &:nth-child(2) {
-            display: none;
-          }
-        }
-      }
-
-      &:hover {
-        cursor: pointer;
-
-        .act-bg,
-        .act-icon {
-          img {
-            &:nth-child(1) {
-              display: none;
-            }
-            &:nth-child(2) {
-              display: block;
-            }
-          }
-        }
-
-        .act-content {
-          span {
-            color: #fff;
-            background: none;
-          }
-        }
-      }
-    }
-  }
-}
+
+@ext-txt-color: #121212;
+
+.ext-page {
+  .page-title {
+    font-size: 20px;
+    color: @ext-txt-color;
+    margin: 0;
+  }
+  
+  .search-bar {
+    .form-control {
+      width: 200px;
+    }
+
+    .input-group-addon {
+      background: transparent;
+      border: none;
+      font-size: 16px;
+    }
+  }
+
+  .btn-group {
+    .btn + .btn {
+      margin-left: 1em;
+    }
+  }
+
+  .wd-m {
+    width: 1000px;
+  }
+
+  .pd-m {
+    box-sizing: border-box;
+    padding: 30px;
+  }
+
+  .ext-card {
+    margin: 10px;
+    margin-bottom: 30px;
+    box-shadow: 0px 8px 20px 0px rgba(0,0,0,0.08);
+    border-radius: 20px;
+    overflow: hidden;
+
+    h1 {
+      margin: 0;
+      margin-bottom: 30px;
+      background: rgba(66,118,245,0.08);
+      font-size: 22px;
+      line-height: 60px;
+      height: 60px;
+      font-weight: 500;
+      color: @ext-txt-color;
+      padding: 0 20px;
+    }
+
+    .icon-info-sign {
+      color: rgba(0,0,0, .2);
+    }
+
+    .view-info {
+      margin-top: -1em;
+      padding-bottom: 30px;
+      overflow: hidden;
+
+      .info-title {
+        font-size: 16px;
+        color: #999999;
+        line-height: 36px;
+        height: 36px;
+      }
+
+      .info-text {
+        font-size: 18px;
+        color: @ext-txt-color;
+        line-height: 36px;
+        height: 36px;
+      }
+    }
+  }
+
+  .chosen-container.form-control {
+    padding: 0;
+
+    &.chosen-container-active, &.chosen-container-multi {
+      .chosen-choices {
+        border: none;
+        box-shadow: none;
+      }
+    }
+  }
+}
+
+.editBar {
+  display: flex;
+  flex-direction: row-reverse;
+  justify-content: start;
+}
+
+.table {
+  thead {
+    tr {
+      th {
+        background: rgba(66,118,245,0.08);
+        padding: 16px;
+        border: none;
+      }
+    }
+  }
+  tbody {
+    tr {
+      &:nth-of-type(even) {
+        background: rgba(91,91,91,0.04);
+      }
+
+      &:hover {
+        background: rgba(66,118,245,0.2);
+      }
+    }
+  }
+}
+
+.dashboard-page {
+  height: 100%;
+  background-color: #081A48;
+
+  & > div {
+    height: 50%;
+    overflow: hidden;
+  }
+
+  .dash-carousel {
+    max-width: 1200px;
+    margin: 0 auto;
+    height: 100%;
+
+    .ratio-static {
+      height: 0;
+      padding-bottom: 32%; // 大约 10:3
+      position: relative;
+      overflow: hidden;
+
+      & > div {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        background: transparent;
+      }
+
+      .left {
+        width: auto;
+        background: transparent;
+        box-shadow: none;
+      }
+    }
+
+  }
+  
+
+  .act-list {
+    .row {
+      height: calc(50% - 64px);
+      padding: 0 80px;
+
+      & + .row {
+        margin-top: 64px;
+      }
+    }
+
+    div[class^="col"] {
+      min-width: 280px;
+      // 每行 4 个, 间距 64
+      width: calc(25% - 48px);
+      height: 100%;
+      position: relative;
+      
+      & + div {
+        margin-left: 64px;
+      }
+
+      .act-body {
+        z-index: 1;
+        width: 100%;
+        height: 100%;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+
+        .act-icon {
+          position: relative;
+          width: 64px;
+          height: 64px;
+          min-height: 64px;
+          flex: 0;
+
+          img {
+            position: absolute;
+            left: calc(50% - 32px);
+            top: 0;
+            display: block;
+            width: 100%;
+            height: 100%;
+            object-fit: contain;
+  
+            &:nth-child(2) {
+              display: none;
+            }
+          }
+        }
+
+        .act-content {
+          flex: 0;
+          text-align: center;
+
+          span {
+            display: inline-block;
+            padding: 0 1em;
+            font-size: 24px;
+            font-weight: 500;
+            color: transparent;
+            background: linear-gradient(0deg, #2362E4 0%, #00D5FB 100%);
+            vertical-align: middle;
+            background-clip: text;
+            -webkit-background-clip: text;
+          }
+        }
+
+      }
+
+      .act-bg {
+        position: absolute;
+        width: 100%;
+        height: 100%;
+        z-index: 0;
+        left: 0;
+        top: 0;
+
+        img {
+          display: block;
+          width: 100%;
+          height: 100%;
+          object-fit: contain;
+
+          &:nth-child(2) {
+            display: none;
+          }
+        }
+      }
+
+      &:hover {
+        cursor: pointer;
+
+        .act-bg, .act-icon {
+          img {
+            &:nth-child(1) {
+              display: none;
+            }
+            &:nth-child(2) {
+              display: block;
+            }
+          }
+        }
+
+        .act-content {
+          span {
+            color: #fff;
+            background: none;
+          }
+        }
+      }
+    }
+  }
+}
+>>>>>>> 268768cf2fee2e747ce9459fa2ded365d1c962d0

resources/templates/common/common_list.html

@@ -9,7 +9,7 @@
 			<h2 class="page-title">[[${title}]]</h2>
 		</div>
 	</div>
-	<div class="panel">
+	<div class="panel" style="position: relative; z-index: 20;">
 		<div class="panel-body search-bar">
 			<!--<span id="schSpan"
 				class="input-group"> <span class="input-group-addon">
@@ -37,10 +37,11 @@
 	<div class="panel">
 		<div class="panel-body">
 			<div class="editBar" id="schBar">
-				<span class="btn-group" id="btnSpan" th:if="${haveAuth != null && haveAuth == '1'}">
+				<span class="btn-group" id="btnSpan">
+					<!-- th:if="${haveAuth != null && haveAuth == '1'}" -->
 					<a class="btn btn-primary" onclick="toAdd();" id="addBtn"><i class="icon icon-plus"></i>添加</a>
-					<!-- <a class="btn btn-info" onclick="toUpdate();" id="updateBtn"><i class="icon icon-edit"></i> 编辑</a>
-						<a class="btn btn-danger" onclick="deleteObj();" id="deleteBtn"><i class="icon icon-trash"></i>删除</a> -->
+					<a class="btn btn-info" onclick="toUpdate();" id="updateBtn"><i class="icon icon-edit"></i> 编辑</a>
+					<a class="btn btn-danger" onclick="deleteObj();" id="deleteBtn"><i class="icon icon-trash"></i>删除</a>
 				</span>
 
 			</div>

resources/templates/equipment/list.html

@@ -9,7 +9,7 @@
 <script type="text/javascript" th:src="@{/js/zui/dist/lib/chosen/chosen.min.js}"></script>
 <link th:href="@{/js/zui/dist/lib/chosen/chosen.min.css}" rel="stylesheet" type="text/css"/>
 </head>
-<body th:replace="common/common_list::common_list('军供供应设备',~{::div},'1')"> 
+<body th:replace="common/common_list::common_list('军供供应设备',~{::div},'1')" class="ext-page"> 
     <div id="uploaderExample" class="uploader" style="display:none">
 	  <div class="file-list" data-drag-placeholder="请拖拽文件到此处"></div>
 	  <button type="button" class="btn btn-primary uploader-btn-browse" id="uploadBtn"><i class="icon icon-cloud-upload"></i>导入</button>

resources/templates/main/dashboard.html

@@ -13,30 +13,10 @@
     <div class="dash-carousel">
       <div class="ratio-static">
         
-    <div id="myNiceCarousel" class="carousel slide" data-ride="carousel">
+
+    <div id="myNiceCarousel" class="carousel slide">
       <!-- 轮播项目 -->
       <div class="carousel-inner">
-        <div class="item active">
-          <img alt="First slide" src="http://openzui.com/docs/img/slide1.jpg">
-          <div class="carousel-caption">
-            <h3>我是第一张幻灯片</h3>
-            <p>:)</p>
-          </div>
-        </div>
-        <div class="item">
-          <img alt="Second slide" src="http://openzui.com/docs/img/slide2.jpg">
-          <div class="carousel-caption">
-            <h3>我是第二张幻灯片</h3>
-            <p>0.0</p>
-          </div>
-        </div>
-        <div class="item">
-          <img alt="Third slide" src="http://openzui.com/docs/img/slide3.jpg">
-          <div class="carousel-caption">
-            <h3>我是第三张幻灯片</h3>
-            <p>最后一张咯~</p>
-          </div>
-        </div>
       </div>
     
       <!-- 项目切换按钮 -->
@@ -201,4 +181,40 @@
       </div>
     </div>
   </div>
-</div>
+
+  <script>
+    function loadPage2() {
+      var TH_SERVER = 'http://192.168.89.147:8087/api'
+
+      var itemTpl = [
+        '<div class="item {active}">',
+        '  <img alt="" src="{src}">',
+        '  <div class="carousel-caption">',
+        '    <h3>{title}</h3>',
+        '  </div>',
+        '</div>',
+      ].join('');
+
+      $.ajax({
+        url: TH_SERVER+'/banner?pageNum=1&pageSize=20',
+        success: function (resp) {
+          if (resp.code != 1000) return;
+          var list = resp.data.records
+          if (list && list.length > 0) {
+            var html = list.map(function(item, index) {
+              var active = index == 0 ? 'active' : '';
+              var src = item.image;
+              var title = item.desc || '';
+
+              return itemTpl.replace('{active}', active).replace('{src}', src).replace('{title}', title);
+            }).join('')
+
+            $("#myNiceCarousel .carousel-inner").children().remove();
+            $("#myNiceCarousel .carousel-inner").append(html);
+            $('#myNiceCarousel').carousel()
+          }
+        }
+      })
+    }
+  </script>
+</div>

resources/templates/task/details.html

@@ -3,6 +3,7 @@
 	th:replace="common/common_header::common_header(~{},~{},~{::style},~{::script},'')">
 <meta charset="utf-8">
 <script th:src="@{/js/task/details.js}"></script>
+<script th:src="@{/js/chart/echarts.min.js}" type="text/javascript"></script>
 <style type="text/css">
 .view-info>div>label{min-width: 148px;}
 </style>