пре 1 година · e3c64f2e63
--- a/suishenbang-admin/src/main/resources/templates/system/alertConfiguration/configuration.html
+++ b/suishenbang-admin/src/main/resources/templates/system/alertConfiguration/configuration.html
@@ -18,10 +18,31 @@
 
				             width: 73px;
			
 
				             height: 32px;
			
 
				         }
			
 
				+        .preview-item{
			
 
				+            width: 100%;
			
 
				+            height: 100%;
			
 
				+            flex-direction: row;
			
 
				+            display: flex;
			
 
				+            justify-content: center;
			
 
				+            align-items: center;
			
 
				+            position: fixed;
			
 
				+            z-index: 100;
			
 
				+            background-color: rgba(0,0,0,0.7);
			
 
				+        }
			
 
				+        .preview-img{
			
 
				+            width: 300px;
			
 
				+            max-height: 400px;
			
 
				+            overflow-y: scroll;
			
 
				+        }
			
 
				     </style>
			
 
				 </head>
			
 
				 <body class="gray-bg">
			
 
				      <div class="container-div">
			
 
				+         <div id="previewImg" class="preview-item" onclick="closePreview()">
			
 
				+             <div class="preview-img">
			
 
				+                 <img id="previewImage" src="" style="width: 100%;">
			
 
				+             </div>
			
 
				+         </div>
			
 
				         <div class="row">
			
 
				             <div class="col-sm-12 search-collapse">
			
 
				                 <form id="formId">
			
@@ -90,6 +111,7 @@
 
				         var prefix = ctx + "system/configuration";
			
 
				 
			
 
				         $(function() {
			
 
				+            $("#previewImg").hide();
			
 
				             var options = {
			
 
				                 url: prefix + "/list",
			
 
				                 createUrl: prefix + "/add",
			
@@ -117,7 +139,11 @@
 
				                         width : '100px',
			
 
				                         formatter: function(value, row, index) {
			
 
				                             if (value != null){
			
 
				-                                return $.table.imageView(value,218,237,"tableImage_s img-view");
			
 
				+                                // return $.table.imageView(value,600,300,"tableImage_s img-view");
			
 
				+                                var valueStr = value + '';
			
 
				+                                console.log('url1',value);
			
 
				+                                console.log('url2',valueStr);
			
 
				+                                return '<img width="24" height="22" src="' + value + '" onclick="imgPreview(\'' + valueStr + '\')"/>'
			
 
				                             }
			
 
				                         }
			
 
				                     },
			
@@ -203,6 +229,19 @@
 
				                 $.operate.post(prefix + "/release", { "alertId": arrayQiyong[0], "alertStatus": 1, "userType": arrayQiyong[1], "salesLevel": arrayQiyong[2], "orgCode": arrayQiyong[3] });
			
 
				             })
			
 
				         }
			
 
				+
			
 
				+        $("#previewImage").on('click',function (event) {
			
 
				+            event.stopPropagation();
			
 
				+        })
			
 
				+
			
 
				+        function closePreview() {
			
 
				+            $("#previewImg").hide();
			
 
				+        }
			
 
				+
			
 
				+        function imgPreview(url) {
			
 
				+            $("#previewImage").attr('src',url);
			
 
				+            $("#previewImg").show();
			
 
				+        }
			
 
				     </script>
			
 
				 </body>
			
 
				 </html>
			
--- a/suishenbang-admin/src/main/resources/templates/system/alertConfiguration/edit.html
+++ b/suishenbang-admin/src/main/resources/templates/system/alertConfiguration/edit.html
@@ -39,7 +39,7 @@
 
				             <div class="form-group">    
			
 
				                 <label class="col-sm-3 control-label">弹框开始时间：</label>
			
 
				                 <div class="col-sm-8">
			
 
				-                    <input id="alertStartTime" name="alertStartTime" th:value="${#dates.format(alertConfiguration.alertStartTime, 'yyyy-MM-dd hh:mm')}" class="form-control" type="datetime-local">
			
 
				+                    <input id="alertStartTime" name="alertStartTime" th:value="${#dates.format(alertConfiguration.alertStartTime, 'yyyy-MM-dd HH:mm')}" class="form-control" type="datetime-local">
			
 
				                     <!--<div class="input-group date">-->
			
 
				                         <!--<span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
			
 
				                         <!--<input id="alertStartTime" name="alertStartTime" th:value="${#dates.format(alertConfiguration.alertStartTime, 'yyyy-MM-dd hh:mm')}" class="form-control" placeholder="yyyy-MM-dd hh:mm" type="text">-->
			
@@ -49,7 +49,7 @@
 
				             <div class="form-group">    
			
 
				                 <label class="col-sm-3 control-label">弹框结束时间：</label>
			
 
				                 <div class="col-sm-8">
			
 
				-                    <input id="alertEndTime" name="alertEndTime" th:value="${#dates.format(alertConfiguration.alertEndTime, 'yyyy-MM-dd hh:mm')}" class="form-control" type="datetime-local">
			
 
				+                    <input id="alertEndTime" name="alertEndTime" th:value="${#dates.format(alertConfiguration.alertEndTime, 'yyyy-MM-dd HH:mm')}" class="form-control" type="datetime-local">
			
 
				                     <!--<div class="input-group date">-->
			
 
				                         <!--<span class="input-group-addon"><i class="fa fa-calendar"></i></span>-->
			
 
				                         <!--<input id="alertEndTime" name="alertEndTime" th:value="${#dates.format(alertConfiguration.alertEndTime, 'yyyy-MM-dd hh:mm')}" class="form-control" placeholder="yyyy-MM-dd hh:mm" type="text">-->