张延森 пре 2 година
родитељ
комит
3a840d93b9

+ 6
- 6
resources/static/css/public.css Прегледај датотеку

1
 @charset "utf-8";
1
 @charset "utf-8";
2
 /* CSS Document */
2
 /* CSS Document */
3
 
3
 
4
-*{padding:0;margin:0;font-family:"微软雅黑";font-size: 16px;font-weight:400;color:#555;}
4
+*{padding:0;margin:0;font-family:"微软雅黑";font-size: 16px;font-weight:400;}
5
 html,body{ width:100%; height:100%;}
5
 html,body{ width:100%; height:100%;}
6
 body{background:#edf1fa;}
6
 body{background:#edf1fa;}
7
 
7
 
226
 
226
 
227
 .editBar{clear:both;display:block;margin-top:10px;margin-bottom:-15px;}
227
 .editBar{clear:both;display:block;margin-top:10px;margin-bottom:-15px;}
228
 .editBar .btn-group{margin:0 10px 15px 0;}
228
 .editBar .btn-group{margin:0 10px 15px 0;}
229
-.editBar .btn-group a.btn,
229
+/* .editBar .btn-group a.btn,
230
 .editBar .input-group .input-group-addon,
230
 .editBar .input-group .input-group-addon,
231
 .editBar .form-control,
231
 .editBar .form-control,
232
-.editBar .input-group-btn .btn{height: 36px;font-size:16px;line-height: 26px;color:#555;padding: 4px 20px;border-radius: 0;}
232
+.editBar .input-group-btn .btn{height: 36px;font-size:16px;line-height: 26px;color:#555;padding: 4px 20px;border-radius: 0;} */
233
 
233
 
234
-.editBar .btn-group a.btn{background:#f8f8f8;}
234
+/* .editBar .btn-group a.btn{background:#f8f8f8;} */
235
 .editBar .btn .icon{margin-right:8px;}
235
 .editBar .btn .icon{margin-right:8px;}
236
 .editBar .input-group{min-width:190px;vertical-align:middle;display: inline-flex;margin-bottom: 15px;}
236
 .editBar .input-group{min-width:190px;vertical-align:middle;display: inline-flex;margin-bottom: 15px;}
237
 .editBar .input-group .input-group-addon{width:auto;background:#f8f8f8;}
237
 .editBar .input-group .input-group-addon{width:auto;background:#f8f8f8;}
258
 .table td{border-color: transparent;text-align: center;}
258
 .table td{border-color: transparent;text-align: center;}
259
 .table > tbody > tr:nth-of-type(even){background: #f8f8f8;}
259
 .table > tbody > tr:nth-of-type(even){background: #f8f8f8;}
260
 .table > tbody > tr:hover{background: #f0f2f7;cursor: pointer;}
260
 .table > tbody > tr:hover{background: #f0f2f7;cursor: pointer;}
261
-.table > tbody > tr td .btn{margin-right: 10px;}
262
-.table > tbody > tr td .btn:last-child{margin-right: 0;}
261
+/* .table > tbody > tr td .btn{margin-right: 10px;} */
262
+/* .table > tbody > tr td .btn:last-child{margin-right: 0;} */
263
 
263
 
264
 /*表格折叠*/
264
 /*表格折叠*/
265
 .conForm button .icon-double-angle-down,
265
 .conForm button .icon-double-angle-down,

+ 1
- 1
resources/static/js/commentItem/list.js Прегледај датотеку

109
 						title : "操作",
109
 						title : "操作",
110
 						width : 280,
110
 						width : 280,
111
 						formatter : function(data, row, index) {
111
 						formatter : function(data, row, index) {
112
-							var rtnData = '<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini" title="查看">查看</a>';			
112
+							var rtnData = '<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini btn-link" title="查看">查看</a>';			
113
 							return rtnData;
113
 							return rtnData;
114
 						}
114
 						}
115
 					} ]
115
 					} ]

+ 1
- 1
resources/static/js/commentRecord/list.js Прегледај датотеку

108
 						width : 280,
108
 						width : 280,
109
 						formatter : function(data, row, index) {
109
 						formatter : function(data, row, index) {
110
 							let hrefUrl = urlPre + getClassName() +'/toDetails?taskId='+taskId+'&recordUuid='+row.recordUuid+"&itemCodes="+itemCodes
110
 							let hrefUrl = urlPre + getClassName() +'/toDetails?taskId='+taskId+'&recordUuid='+row.recordUuid+"&itemCodes="+itemCodes
111
-							var rtnData = '<a href="'+ hrefUrl +'" class="btn btn-mini" title="查看">查看</a>';							
111
+							var rtnData = '<a href="'+ hrefUrl +'" class="btn btn-mini btn-link" title="查看">查看</a>';							
112
 								return rtnData;
112
 								return rtnData;
113
 						}
113
 						}
114
 					})
114
 					})

+ 14
- 9
resources/static/js/common.js Прегледај датотеку

234
 /**
234
 /**
235
  * 删除的公用方法
235
  * 删除的公用方法
236
  */
236
  */
237
-function deleteObj() {
238
-	var boxes = $("input[name='dataId']:checked");
239
-	if (boxes.length == 0) {
240
-		bootbox.alert('请选择要删除的数据');
241
-		return false;
242
-	}
243
-	var className = getClassName();
237
+function deleteObj(inx, clsName) {
244
 	var datas = JSON.parse($("#datas").val());
238
 	var datas = JSON.parse($("#datas").val());
239
+	var className = clsName;
245
 	let idArr = [];
240
 	let idArr = [];
246
-	for(let t=0;t<boxes.length;t++){
247
-		idArr[idArr.length] = datas[boxes[t].value].oldId
241
+	if (inx === undefined) {
242
+		var boxes = $("input[name='dataId']:checked");
243
+		if (boxes.length == 0) {
244
+			bootbox.alert('请选择要删除的数据');
245
+			return false;
246
+		}
247
+		className = getClassName();
248
+		for(let t=0;t<boxes.length;t++){
249
+			idArr[idArr.length] = datas[boxes[t].value].oldId
250
+		}
251
+	} else {
252
+		idArr.push(datas[inx].oldId)
248
 	}
253
 	}
249
 	var delUrl = urlPre + className + "/" + idArr.toString();
254
 	var delUrl = urlPre + className + "/" + idArr.toString();
250
 	top.bootbox.confirm("确认删除当前选中的记录吗?", function(result) {
255
 	top.bootbox.confirm("确认删除当前选中的记录吗?", function(result) {

+ 1
- 1
resources/static/js/dataManager/list.js Прегледај датотеку

32
 						title : "操作",
32
 						title : "操作",
33
 						width : 280,
33
 						width : 280,
34
 						formatter : function(data, row, index) {
34
 						formatter : function(data, row, index) {
35
-							var rtnData = '<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini" title="查看">查看</a>';							
35
+							var rtnData = '<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini btn-link" title="查看">查看</a>';							
36
 							return rtnData;
36
 							return rtnData;
37
 						}
37
 						}
38
 					} ]
38
 					} ]

+ 1
- 1
resources/static/js/dict/list.js Прегледај датотеку

43
 						title : "操作",
43
 						title : "操作",
44
 						width : 280,
44
 						width : 280,
45
 						formatter : function(data, row, index) {
45
 						formatter : function(data, row, index) {
46
-							var rtnData = '<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini" title="查看">查看</a>';							
46
+							var rtnData = '<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini btn-link" title="查看">查看</a>';							
47
 							return rtnData;
47
 							return rtnData;
48
 						}
48
 						}
49
 					} ]
49
 					} ]

+ 1
- 1
resources/static/js/equipment/list.js Прегледај датотеку

103
 						title : "操作",
103
 						title : "操作",
104
 						width : 280,
104
 						width : 280,
105
 						formatter : function(data, row, index) {
105
 						formatter : function(data, row, index) {
106
-							var rtnData = '<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini" title="查看">查看</a>';							
106
+							var rtnData = '<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini btn-link" title="查看">查看</a>';							
107
 							return rtnData;
107
 							return rtnData;
108
 						}
108
 						}
109
 					} ]
109
 					} ]

+ 1
- 1
resources/static/js/guaranteeAbility/list.js Прегледај датотеку

33
 						title : "操作",
33
 						title : "操作",
34
 						width : 280,
34
 						width : 280,
35
 						formatter : function(data, row, index) {
35
 						formatter : function(data, row, index) {
36
-							var rtnData = '<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini" title="查看">查看</a>';							
36
+							var rtnData = '<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini btn-link" title="查看">查看</a>';							
37
 							return rtnData;
37
 							return rtnData;
38
 						}
38
 						}
39
 					} ]
39
 					} ]

+ 1
- 1
resources/static/js/guaranteeOrg/list.js Прегледај датотеку

126
 						title : "操作",
126
 						title : "操作",
127
 						width : 280,
127
 						width : 280,
128
 						formatter : function(data, row, index) {
128
 						formatter : function(data, row, index) {
129
-							var rtnData = '<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.ID+'" class="btn btn-mini" title="查看">查看</a>';	
129
+							var rtnData = '<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.ID+'" class="btn btn-mini btn-link" title="查看">查看</a>';	
130
 							rtnData += '<a href="'+ urlPre  +'api/guaranteeOrgRecord/toList?org_id='+row.OLD_ID+'" class="btn btn-mini" title="审核记录">审核</a>';	
130
 							rtnData += '<a href="'+ urlPre  +'api/guaranteeOrgRecord/toList?org_id='+row.OLD_ID+'" class="btn btn-mini" title="审核记录">审核</a>';	
131
 							rtnData += '<a href="'+ urlPre  +'api/guaranteeOrgPerson/toList?org_id='+row.OLD_ID+'" class="btn btn-mini" title="人员管理">人员</a>';	
131
 							rtnData += '<a href="'+ urlPre  +'api/guaranteeOrgPerson/toList?org_id='+row.OLD_ID+'" class="btn btn-mini" title="人员管理">人员</a>';	
132
 													return rtnData;
132
 													return rtnData;

+ 1
- 1
resources/static/js/guaranteeOrgPerson/list.js Прегледај датотеку

54
 						title : "操作",
54
 						title : "操作",
55
 						width : 280,
55
 						width : 280,
56
 						formatter : function(data, row, index) {
56
 						formatter : function(data, row, index) {
57
-							var rtnData = '<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini" title="查看">查看</a>';							
57
+							var rtnData = '<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini btn-link" title="查看">查看</a>';							
58
 							return rtnData;
58
 							return rtnData;
59
 						}
59
 						}
60
 					} ]
60
 					} ]

+ 1
- 1
resources/static/js/guaranteeOrgRecord/list.js Прегледај датотеку

62
 						title : "操作",
62
 						title : "操作",
63
 						width : 280,
63
 						width : 280,
64
 						formatter : function(data, row, index) {
64
 						formatter : function(data, row, index) {
65
-							var rtnData = '<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini" title="查看">查看</a>';							
65
+							var rtnData = '<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini btn-link" title="查看">查看</a>';							
66
 							return rtnData;
66
 							return rtnData;
67
 						}
67
 						}
68
 					} ]
68
 					} ]

+ 1
- 1
resources/static/js/guaranteePlan/list.js Прегледај датотеку

38
 						title : "操作",
38
 						title : "操作",
39
 						width : 280,
39
 						width : 280,
40
 						formatter : function(data, row, index) {
40
 						formatter : function(data, row, index) {
41
-							var rtnData = '<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini" title="查看">查看</a>';							
41
+							var rtnData = '<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini btn-link" title="查看">查看</a>';							
42
 							return rtnData;
42
 							return rtnData;
43
 						}
43
 						}
44
 					} ]
44
 					} ]

+ 1
- 1
resources/static/js/installations/list.js Прегледај датотеку

25
 						title : "操作",
25
 						title : "操作",
26
 						width : 280,
26
 						width : 280,
27
 						formatter : function(data, row, index) {
27
 						formatter : function(data, row, index) {
28
-							var rtnData = '<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini" title="查看">查看</a>';							
28
+							var rtnData = '<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini btn-link" title="查看">查看</a>';							
29
 							return rtnData;
29
 							return rtnData;
30
 						}
30
 						}
31
 					} ]
31
 					} ]

+ 6
- 2
resources/static/js/jtaskYear/list.js Прегледај датотеку

47
 	queryParams["sorts[0].order"] = 'desc';
47
 	queryParams["sorts[0].order"] = 'desc';
48
 	var dict2 = getDictValByDictType("config_if")
48
 	var dict2 = getDictValByDictType("config_if")
49
 	var dataParams = {			
49
 	var dataParams = {			
50
-			checkable : true,
50
+			// checkable : true,
51
 			url : urlPre + getClassName() + "/page",
51
 			url : urlPre + getClassName() + "/page",
52
 			queryParams:queryParams,
52
 			queryParams:queryParams,
53
 			pagination : true,
53
 			pagination : true,
76
 						title : "操作",
76
 						title : "操作",
77
 						width : 280,
77
 						width : 280,
78
 						formatter : function(data, row, index) {
78
 						formatter : function(data, row, index) {
79
-							var rtnData = '<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini" title="查看">查看</a>';							
79
+							var rtnData = [
80
+								'<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini btn-link" title="查看">查看</a>',
81
+								'<a href="'+ urlPre + getClassName() +'/toUpdate?id='+row.id+'" class="btn btn-mini btn-link" title="编辑">编辑</a>',
82
+								'<a onclick="deleteObj('+index+', \'api/jtaskYear\');" class="btn btn-mini btn-link" title="删除">删除</a>',
83
+							].join('');							
80
 							return rtnData;
84
 							return rtnData;
81
 						}
85
 						}
82
 					} ]
86
 					} ]

+ 1
- 1
resources/static/js/office/list.js Прегледај датотеку

29
 						title : "操作",
29
 						title : "操作",
30
 						width : 280,
30
 						width : 280,
31
 						formatter : function(data, row, index) {
31
 						formatter : function(data, row, index) {
32
-							var rtnData = '<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini" title="查看">查看</a>';							
32
+							var rtnData = '<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini btn-link" title="查看">查看</a>';							
33
 							rtnData += '<a href="javascript:toSelResList(\''+ row.oldId+'\')" class="btn btn-mini" title="工作人员">工作人员</a>';							
33
 							rtnData += '<a href="javascript:toSelResList(\''+ row.oldId+'\')" class="btn btn-mini" title="工作人员">工作人员</a>';							
34
 							return rtnData;
34
 							return rtnData;
35
 						}
35
 						}

+ 1
- 1
resources/static/js/operator/list.js Прегледај датотеку

36
 					title : "操作",
36
 					title : "操作",
37
 					width : 280,
37
 					width : 280,
38
 					formatter : function(data, row, index) {
38
 					formatter : function(data, row, index) {
39
-						var rtnData = '<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini" title="查看">查看</a>';							
39
+						var rtnData = '<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini btn-link" title="查看">查看</a>';							
40
 						rtnData += '<a href="javascript:resetPassword('+row.id+')" class="btn btn-mini" title="重置密码">重置密码</a>';
40
 						rtnData += '<a href="javascript:resetPassword('+row.id+')" class="btn btn-mini" title="重置密码">重置密码</a>';
41
 
41
 
42
 						return rtnData;
42
 						return rtnData;

+ 1
- 1
resources/static/js/station/list.js Прегледај датотеку

54
 						title : "操作",
54
 						title : "操作",
55
 						width : 280,
55
 						width : 280,
56
 						formatter : function(data, row, index) {
56
 						formatter : function(data, row, index) {
57
-							var rtnData = '<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini" title="查看">查看</a>';							
57
+							var rtnData = '<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini btn-link" title="查看">查看</a>';							
58
 							return rtnData;
58
 							return rtnData;
59
 						}
59
 						}
60
 					} ]
60
 					} ]

+ 1
- 1
resources/static/js/task/list.js Прегледај датотеку

74
 						title : "操作",
74
 						title : "操作",
75
 						width : 280,
75
 						width : 280,
76
 						formatter : function(data, row, index) {
76
 						formatter : function(data, row, index) {
77
-							var rtnData = '<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini" title="查看">查看</a>';							
77
+							var rtnData = '<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini btn-link" title="查看">查看</a>';							
78
 							rtnData += '<a href="javascript:toList(\''+ row.config_evaluate_item+'\',\''+ row.oldId+'\')" class="btn btn-mini" title="工作人员">评价</a>';						
78
 							rtnData += '<a href="javascript:toList(\''+ row.config_evaluate_item+'\',\''+ row.oldId+'\')" class="btn btn-mini" title="工作人员">评价</a>';						
79
 							return rtnData;
79
 							return rtnData;
80
 						}
80
 						}

+ 1
- 1
resources/static/js/worker/list.js Прегледај датотеку

75
 						title : "操作",
75
 						title : "操作",
76
 						width : 280,
76
 						width : 280,
77
 						formatter : function(data, row, index) {
77
 						formatter : function(data, row, index) {
78
-							var rtnData = '<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini" title="查看">查看</a>';							
78
+							var rtnData = '<a href="'+ urlPre + getClassName() +'/toDetails?id='+row.id+'" class="btn btn-mini btn-link" title="查看">查看</a>';							
79
 							return rtnData;
79
 							return rtnData;
80
 						}
80
 						}
81
 					} ]
81
 					} ]

+ 45
- 45
resources/static/js/zui/dist/css/zui-theme.css Прегледај датотеку

96
   }
96
   }
97
 .btn-primary {
97
 .btn-primary {
98
   color: #fff;
98
   color: #fff;
99
-  background-color: #3f51b5;
99
+  background-color: var(--primary-bg);
100
   border-color: #3e4fb1;
100
   border-color: #3e4fb1;
101
   }
101
   }
102
 .btn-primary:hover,
102
 .btn-primary:hover,
134
 .btn-primary.disabled.active,
134
 .btn-primary.disabled.active,
135
 .btn-primary[disabled].active,
135
 .btn-primary[disabled].active,
136
 fieldset[disabled] .btn-primary.active {
136
 fieldset[disabled] .btn-primary.active {
137
-  background-color: #3f51b5;
137
+  background-color: var(--primary-bg);
138
   border-color: #3e4fb1;
138
   border-color: #3e4fb1;
139
   }
139
   }
140
 .btn-primary:hover,
140
 .btn-primary:hover,
172
 .btn-primary.disabled.active,
172
 .btn-primary.disabled.active,
173
 .btn-primary[disabled].active,
173
 .btn-primary[disabled].active,
174
 fieldset[disabled] .btn-primary.active {
174
 fieldset[disabled] .btn-primary.active {
175
-  background-color: #3f51b5;
175
+  background-color: var(--primary-bg);
176
   border-color: #3e4fb1;
176
   border-color: #3e4fb1;
177
   }
177
   }
178
 .btn-warning {
178
 .btn-warning {
537
   border-radius: 5px;
537
   border-radius: 5px;
538
   }
538
   }
539
 .label-primary {
539
 .label-primary {
540
-  background-color: #3f51b5;
540
+  background-color: var(--primary-bg);
541
   }
541
   }
542
 .label-primary[href]:hover,
542
 .label-primary[href]:hover,
543
 .label-primary[href]:focus {
543
 .label-primary[href]:focus {
545
   background-color: #32408f;
545
   background-color: #32408f;
546
   }
546
   }
547
 .label-primary.label-outline {
547
 .label-primary.label-outline {
548
-  color: #3f51b5;
548
+  color: var(--primary-bg);
549
   background: none;
549
   background: none;
550
-  border: 1px solid #3f51b5;
550
+  border: 1px solid var(--primary-bg);
551
   }
551
   }
552
 .label-primary[href]:hover,
552
 .label-primary[href]:hover,
553
 .label-primary[href]:focus {
553
 .label-primary[href]:focus {
626
   background-color: #8591d5;
626
   background-color: #8591d5;
627
   }
627
   }
628
 .text-primary {
628
 .text-primary {
629
-  color: #3f51b5;
629
+  color: var(--primary-bg);
630
   }
630
   }
631
 .text-primary:hover {
631
 .text-primary:hover {
632
   color: #32408f;
632
   color: #32408f;
676
   color: #3949ab;
676
   color: #3949ab;
677
   }
677
   }
678
 .bg-primary {
678
 .bg-primary {
679
-  background-color: #3f51b5;
679
+  background-color: var(--primary-bg);
680
   }
680
   }
681
 a.bg-primary:hover {
681
 a.bg-primary:hover {
682
   background-color: #32408f;
682
   background-color: #32408f;
693
   }
693
   }
694
 .progress-bar {
694
 .progress-bar {
695
   color: #fff;
695
   color: #fff;
696
-  background-color: #3f51b5;
696
+  background-color: var(--primary-bg);
697
   border-radius: 0;
697
   border-radius: 0;
698
   }
698
   }
699
 .form-control {
699
 .form-control {
716
   border-radius: 0;
716
   border-radius: 0;
717
   }
717
   }
718
 .switch > input:checked + label:before {
718
 .switch > input:checked + label:before {
719
-  background-color: #3f51b5;
720
-  border-color: #3f51b5;
719
+  background-color: var(--primary-bg);
720
+  border-color: var(--primary-bg);
721
   }
721
   }
722
 .switch input:focus + label {
722
 .switch input:focus + label {
723
-  color: #3f51b5;
723
+  color: var(--primary-bg);
724
   }
724
   }
725
 .switch input:focus + label:before {
725
 .switch input:focus + label:before {
726
-  border-color: #3f51b5;
726
+  border-color: var(--primary-bg);
727
   }
727
   }
728
 .form-control:focus + .input-control-label-left {
728
 .form-control:focus + .input-control-label-left {
729
   color: #3949ab;
729
   color: #3949ab;
816
 .list-group-item.active:hover,
816
 .list-group-item.active:hover,
817
 .list-group-item.active:focus {
817
 .list-group-item.active:focus {
818
   color: #fff;
818
   color: #fff;
819
-  background-color: #3f51b5;
820
-  border-color: #3f51b5;
819
+  background-color: var(--primary-bg);
820
+  border-color: var(--primary-bg);
821
   }
821
   }
822
 .list-group-item.active .list-group-item-heading,
822
 .list-group-item.active .list-group-item-heading,
823
 .list-group-item.active:hover .list-group-item-heading,
823
 .list-group-item.active:hover .list-group-item-heading,
908
 .nav-pills > li.active > a,
908
 .nav-pills > li.active > a,
909
 .nav-pills > li.active > a:hover,
909
 .nav-pills > li.active > a:hover,
910
 .nav-pills > li.active > a:focus {
910
 .nav-pills > li.active > a:focus {
911
-  background-color: #3f51b5;
911
+  background-color: var(--primary-bg);
912
   }
912
   }
913
 .nav-primary > li:first-child > a {
913
 .nav-primary > li:first-child > a {
914
   border-top-left-radius: 0;
914
   border-top-left-radius: 0;
925
 .nav-primary > li.active > a:hover,
925
 .nav-primary > li.active > a:hover,
926
 .nav-primary > li.active > a:focus {
926
 .nav-primary > li.active > a:focus {
927
   color: #fff;
927
   color: #fff;
928
-  background-color: #3f51b5;
929
-  border-color: #3f51b5;
928
+  background-color: var(--primary-bg);
929
+  border-color: var(--primary-bg);
930
   }
930
   }
931
 .nav-secondary > li.active > a,
931
 .nav-secondary > li.active > a,
932
 .nav-secondary > li.active > a:hover,
932
 .nav-secondary > li.active > a:hover,
933
 .nav-secondary > li.active > a:focus {
933
 .nav-secondary > li.active > a:focus {
934
-  color: #3f51b5;
935
-  border-bottom-color: #3f51b5;
934
+  color: var(--primary-bg);
935
+  border-bottom-color: var(--primary-bg);
936
   }
936
   }
937
 .nav-stacked.nav-primary > li,
937
 .nav-stacked.nav-primary > li,
938
 .nav-stacked.nav-primary > li > a {
938
 .nav-stacked.nav-primary > li > a {
968
 .nav-stacked.nav-secondary > li.active > a:hover,
968
 .nav-stacked.nav-secondary > li.active > a:hover,
969
 .nav-stacked.nav-secondary > li.active > a:focus {
969
 .nav-stacked.nav-secondary > li.active > a:focus {
970
   background-color: #f5f5f5;
970
   background-color: #f5f5f5;
971
-  -webkit-box-shadow: inset 2px 0 0 #3f51b5;
972
-          box-shadow: inset 2px 0 0 #3f51b5;
971
+  -webkit-box-shadow: inset 2px 0 0 var(--primary-bg);
972
+          box-shadow: inset 2px 0 0 var(--primary-bg);
973
   }
973
   }
974
 .nav-stacked.nav-secondary > li.nav-heading {
974
 .nav-stacked.nav-secondary > li.nav-heading {
975
   border-bottom: 1px solid #ddd;
975
   border-bottom: 1px solid #ddd;
1006
 .pager > li.active > a:hover,
1006
 .pager > li.active > a:hover,
1007
 .pager > li.active > span:hover {
1007
 .pager > li.active > span:hover {
1008
   color: #fff;
1008
   color: #fff;
1009
-  background-color: #3f51b5;
1010
-  border-color: #3f51b5;
1009
+  background-color: var(--primary-bg);
1010
+  border-color: var(--primary-bg);
1011
   }
1011
   }
1012
 .pager > li.disabled > span,
1012
 .pager > li.disabled > span,
1013
 .pager > li.disabled > span:hover,
1013
 .pager > li.disabled > span:hover,
1035
           box-shadow: none;
1035
           box-shadow: none;
1036
   }
1036
   }
1037
 .panel-primary {
1037
 .panel-primary {
1038
-  border-color: #3f51b5;
1038
+  border-color: var(--primary-bg);
1039
   }
1039
   }
1040
 .panel-primary > .panel-heading {
1040
 .panel-primary > .panel-heading {
1041
   color: #fff;
1041
   color: #fff;
1042
-  background-color: #3f51b5;
1043
-  border-color: #3f51b5;
1042
+  background-color: var(--primary-bg);
1043
+  border-color: var(--primary-bg);
1044
   }
1044
   }
1045
 .panel-primary > .panel-heading + .panel-collapse .panel-body {
1045
 .panel-primary > .panel-heading + .panel-collapse .panel-body {
1046
-  border-top-color: #3f51b5;
1046
+  border-top-color: var(--primary-bg);
1047
   }
1047
   }
1048
 .panel-primary > .panel-footer + .panel-collapse .panel-body {
1048
 .panel-primary > .panel-footer + .panel-collapse .panel-body {
1049
-  border-bottom-color: #3f51b5;
1049
+  border-bottom-color: var(--primary-bg);
1050
   }
1050
   }
1051
 .panel-success > .panel-body,
1051
 .panel-success > .panel-body,
1052
 .panel-warning > .panel-body,
1052
 .panel-warning > .panel-body,
1088
   border-bottom-left-radius: #3949ab !important;
1088
   border-bottom-left-radius: #3949ab !important;
1089
   }
1089
   }
1090
 .chosen-container .chosen-results li.highlighted {
1090
 .chosen-container .chosen-results li.highlighted {
1091
-  background-color: #3f51b5 !important;
1091
+  background-color: var(--primary-bg) !important;
1092
   }
1092
   }
1093
 .chosen-container-active .chosen-single {
1093
 .chosen-container-active .chosen-single {
1094
   border-color: #3949ab !important;
1094
   border-color: #3949ab !important;
1114
   border-bottom-left-radius: #3949ab !important;
1114
   border-bottom-left-radius: #3949ab !important;
1115
   }
1115
   }
1116
 .chosen-container.chosen-highlight-selected .result-selected {
1116
 .chosen-container.chosen-highlight-selected .result-selected {
1117
-  color: #3f51b5;
1117
+  color: var(--primary-bg);
1118
   background: #eceff1;
1118
   background: #eceff1;
1119
   }
1119
   }
1120
 .menu > .nav > li > .nav {
1120
 .menu > .nav > li > .nav {
1131
 .menu > .nav > li > .nav > li.active > a:hover,
1131
 .menu > .nav > li > .nav > li.active > a:hover,
1132
 .menu > .nav > li > .nav > li.active > a:focus {
1132
 .menu > .nav > li > .nav > li.active > a:focus {
1133
   color: #fff;
1133
   color: #fff;
1134
-  background-color: #3f51b5;
1135
-  border-color: #3f51b5;
1134
+  background-color: var(--primary-bg);
1135
+  border-color: var(--primary-bg);
1136
   }
1136
   }
1137
 .menu > .nav > li:first-child > a,
1137
 .menu > .nav > li:first-child > a,
1138
 .menu > .nav > li:first-child.nav-heading {
1138
 .menu > .nav > li:first-child.nav-heading {
1184
   }
1184
   }
1185
 .dropdown-menu > li > a:hover,
1185
 .dropdown-menu > li > a:hover,
1186
 .dropdown-menu > li > a:focus {
1186
 .dropdown-menu > li > a:focus {
1187
-  background-color: #3f51b5;
1187
+  background-color: var(--primary-bg);
1188
   }
1188
   }
1189
 .dropdown-menu > .active > a,
1189
 .dropdown-menu > .active > a,
1190
 .dropdown-menu > .active > a:hover,
1190
 .dropdown-menu > .active > a:hover,
1191
 .dropdown-menu > .active > a:focus {
1191
 .dropdown-menu > .active > a:focus {
1192
-  background-color: #3f51b5;
1192
+  background-color: var(--primary-bg);
1193
   }
1193
   }
1194
 .dropdown-submenu:hover > a,
1194
 .dropdown-submenu:hover > a,
1195
 .dropdown-submenu:focus > a {
1195
 .dropdown-submenu:focus > a {
1196
-  background-color: #3f51b5;
1196
+  background-color: var(--primary-bg);
1197
   }
1197
   }
1198
 .dropdown-submenu:hover > a:after {
1198
 .dropdown-submenu:hover > a:after {
1199
   border-left-color: #fff;
1199
   border-left-color: #fff;
1203
   border-color: #f0ad4e !important;
1203
   border-color: #f0ad4e !important;
1204
   }
1204
   }
1205
 .datetimepicker td.day.active {
1205
 .datetimepicker td.day.active {
1206
-  background-color: #3f51b5 !important;
1206
+  background-color: var(--primary-bg) !important;
1207
   border-color: #32408f !important;
1207
   border-color: #32408f !important;
1208
   }
1208
   }
1209
 .datetimepicker td.day.active:hover {
1209
 .datetimepicker td.day.active:hover {
1222
           box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(57, 73, 171, .6) !important;
1222
           box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(57, 73, 171, .6) !important;
1223
   }
1223
   }
1224
 .ke-menu-item-on {
1224
 .ke-menu-item-on {
1225
-  background-color: #3f51b5 !important;
1225
+  background-color: var(--primary-bg) !important;
1226
   }
1226
   }
1227
 .ke-colorpicker-cell-on {
1227
 .ke-colorpicker-cell-on {
1228
-  background-color: #3f51b5 !important;
1228
+  background-color: var(--primary-bg) !important;
1229
   }
1229
   }
1230
 .ke-input-text:focus {
1230
 .ke-input-text:focus {
1231
   border-color: #3949ab !important;
1231
   border-color: #3949ab !important;
1236
   border-radius: 0;
1236
   border-radius: 0;
1237
   }
1237
   }
1238
 .messager-primary {
1238
 .messager-primary {
1239
-  background-color: #3f51b5;
1239
+  background-color: var(--primary-bg);
1240
   }
1240
   }
1241
 .messager-success {
1241
 .messager-success {
1242
   background-color: #4caf50;
1242
   background-color: #4caf50;
1314
   }
1314
   }
1315
 .alert-primary-inverse {
1315
 .alert-primary-inverse {
1316
   color: #fff;
1316
   color: #fff;
1317
-  background-color: #3f51b5;
1318
-  border-color: #3f51b5;
1317
+  background-color: var(--primary-bg);
1318
+  border-color: var(--primary-bg);
1319
   }
1319
   }
1320
 .alert-primary-inverse hr {
1320
 .alert-primary-inverse hr {
1321
   border-top-color: #ddd;
1321
   border-top-color: #ddd;
1343
 .datagrid .datagrid-loading > .content > .icon,
1343
 .datagrid .datagrid-loading > .content > .icon,
1344
 .datagrid .datagrid-sort-up > .icon-sort:before,
1344
 .datagrid .datagrid-sort-up > .icon-sort:before,
1345
 .datagrid .datagrid-sort-down > .icon-sort:before {
1345
 .datagrid .datagrid-sort-down > .icon-sort:before {
1346
-  color: #3f51b5;
1346
+  color: var(--primary-bg);
1347
   }
1347
   }
1348
 .tree-drag-holder {
1348
 .tree-drag-holder {
1349
   background-color: #eceff1;
1349
   background-color: #eceff1;
1350
   }
1350
   }
1351
 .tree-menu li.active > a {
1351
 .tree-menu li.active > a {
1352
   color: #fff;
1352
   color: #fff;
1353
-  background-color: #3f51b5;
1354
-  border-color: #3f51b5;
1353
+  background-color: var(--primary-bg);
1354
+  border-color: var(--primary-bg);
1355
   }
1355
   }
1356
 .tree-menu li.active > .list-toggle {
1356
 .tree-menu li.active > .list-toggle {
1357
   color: #fff;
1357
   color: #fff;

+ 1
- 1
resources/templates/common/common_header.html Прегледај датотеку

12
 	<script th:src="@{/js/jquery-3.5.1.min.js}"></script>
12
 	<script th:src="@{/js/jquery-3.5.1.min.js}"></script>
13
 	<script th:src="@{/js/zui/dist/js/zui.js}"></script>	
13
 	<script th:src="@{/js/zui/dist/js/zui.js}"></script>	
14
 	<link th:href="@{/js/zui/dist/css/zui.css}" rel="stylesheet" type="text/css"/>
14
 	<link th:href="@{/js/zui/dist/css/zui.css}" rel="stylesheet" type="text/css"/>
15
-	<!-- <link th:href="@{/js/zui/dist/css/zui-theme.css}" rel="stylesheet" type="text/css"/> -->
15
+	<link th:href="@{/js/zui/dist/css/zui-theme.css}" rel="stylesheet" type="text/css"/>
16
 	<link th:href="@{/css/iconfont.css}" rel="stylesheet" type="text/css"/>	
16
 	<link th:href="@{/css/iconfont.css}" rel="stylesheet" type="text/css"/>	
17
 	<link th:href="@{/css/public.css}" rel="stylesheet" type="text/css"/>	
17
 	<link th:href="@{/css/public.css}" rel="stylesheet" type="text/css"/>	
18
 	<script th:src="@{/js/jquery-validation/jquery.validate.min.js}" th:if="${methodName=='edit'}"></script>
18
 	<script th:src="@{/js/jquery-validation/jquery.validate.min.js}" th:if="${methodName=='edit'}"></script>

+ 3
- 3
resources/templates/common/common_list.html Прегледај датотеку

36
 		<div class="panel-body">
36
 		<div class="panel-body">
37
 			<div class="editBar" id="schBar">
37
 			<div class="editBar" id="schBar">
38
 				<span class="btn-group"  id="btnSpan" th:if="${haveAuth != null && haveAuth == '1'}">
38
 				<span class="btn-group"  id="btnSpan" th:if="${haveAuth != null && haveAuth == '1'}">
39
-		        <a class="btn" onclick="toAdd();" id="addBtn"><i class="icon icon-plus"></i>添加</a>
40
-						<a class="btn" onclick="toUpdate();" id="updateBtn"><i class="icon icon-edit"></i> 编辑</a>
41
-						<a class="btn" onclick="deleteObj();" id="deleteBtn"><i class="icon icon-trash"></i>删除</a>
39
+		        <a class="btn btn-primary" onclick="toAdd();" id="addBtn"><i class="icon icon-plus"></i>添加</a>
40
+						<!-- <a class="btn btn-info" onclick="toUpdate();" id="updateBtn"><i class="icon icon-edit"></i> 编辑</a> -->
41
+						<!-- <a class="btn btn-danger" onclick="deleteObj();" id="deleteBtn"><i class="icon icon-trash"></i>删除</a> -->
42
 				</span>
42
 				</span>
43
 				
43
 				
44
 			</div>
44
 			</div>