修改后台

nngkxxdp/src/main/resources/static/impression/impression.html

@@ -98,10 +98,10 @@
                     </div>
                     <div class="contribute_content_updata">
                         <p>＋<span>归属日期:</span></p>
-                            <div style="border: 0;">
-                                <el-date-picker v-model="form.time" value-format="yyyy-MM-dd"  placeholder="选择日期">
-                                </el-date-picker>
-                            </div>
+                        <div style="border: 0;">
+                            <el-date-picker v-model="form.time" value-format="yyyy-MM-dd"  placeholder="选择日期">
+                            </el-date-picker>
+                        </div>
                     </div>
                     <div class="contribute_content_updata">
                         <p>＋<span>我的作品</span></p>

nngkxxdp/src/main/resources/static/page/css/lr_index.css

@@ -153,11 +153,12 @@
 }
 #details>ul>li{
 	margin-bottom: 10px;
-	font-size: 14px;
-	color: #666;
+    font-size: 14px;
+    color: #666;
+    margin-top: 17px;
 }
-#details>ul>li>div{
-	margin-top: 10px;
+#details>ul>li>span{
+	font-weight: bold;
 }
 .layui-layer-content{
 	text-align: center;

nngkxxdp/src/main/resources/static/page/js/base/lr_index.js

@@ -20,15 +20,15 @@ layui.use(['element', 'table', 'form', 'upload',], function () {
 			detailHtml(data);
 		} else if (layEvent === 'del') { //删除
 			deleteHtml(data)
-		} else if (layEvent === 'edit') { 
+		} else if (layEvent === 'edit') {
 			if (data.examineState != 0) {
 				return;
 			}
 			editHtml(data)
 		} else if (layEvent === 'LAYTABLE_TIPS') {
 			layer.alert('Hi，头部工具栏扩展的右侧图标。');
-		} else if(layEvent === 'amend'){
-			editHtml(data)
+		} else if (layEvent === 'amend') {
+			editHtml(data, 1)
 		}
 	});
 });
@@ -238,15 +238,15 @@ function initTables(datas) {
 					, cols: [[
 						// { field: 'id', width: 80, title: 'ID', }
 						{ type: 'numbers', width: 80, title: '序号', }
-						, { field: 'uploaderPhone', title: '电话', width:120}
-						, { field: 'pictureTitle', title: '作品题目', width:120 }
-						, { field: 'pictureAuthor', title: '作品作者', width:120}
-						, { field: 'uploadTime', title: '上传时间', sort: true,  }
+						, { field: 'uploaderPhone', title: '电话', width: 120 }
+						, { field: 'pictureTitle', title: '作品题目', width: 120 }
+						, { field: 'pictureAuthor', title: '作品作者', width: 120 }
+						, { field: 'uploadTime', title: '上传时间', sort: true, }
 						, { field: 'pictureDescription', title: '描述内容', width: '20%' }
 						, { field: 'vestingDate', title: '归属日期', }
 						, { field: 'pictureType', title: '图片类型', sort: true, templet: pictureTypetemplet }
-						, { field: 'examineState', title: '状态',sort: true, templet: examineStatetemplet }
-						, { title: '操作',  width:250, toolbar: '#barDemo' }
+						, { field: 'examineState', title: '状态', sort: true, templet: examineStatetemplet }
+						, { title: '操作', width: 250, toolbar: '#barDemo' }
 					]]
 					, data: obj
 				})
@@ -259,20 +259,21 @@ function detailHtml(data) {
 	$('#yxnnTable~div').hide();
 	$('#yxpage').hide();
 	var html = ''
+	html += '<button type="button" class="layui-btn layui-btn-normal getBack">返回</button>'
 	html += '<ul>'
-	html += '<li>上传人电话：' + data.uploaderPhone + '</li>'
-	if(data.uploadTime){
-		html += '<li>上传时间：' + data.uploadTime + '</li>'
-	}else if(data.updateTime){
-		html += '<li>处理时间：' + data.updateTime + '</li>'
+	html += '<li><span>上传人电话：</span>' + data.uploaderPhone + '</li>'
+	if (data.uploadTime) {
+		html += '<li style="margin-left: 14px;"><span>上传时间：</span>' + data.uploadTime + '</li>'
+	} else if (data.updateTime) {
+		html += '<li  style="margin-left: 42px;"><span>处理时间：</span>' + data.updateTime + '</li>'
 	}
-	html += '<li>作者：' + (data.pictureAuthor  || '暂无作者') + '</li>'
-	html += '<li>图片题目：' + (data.pictureTitle  || '暂无题目') + '</li>'
-	html += '<li>内容描述：' + data.pictureDescription + '</li>'
-	html += '<li>上传照片： <div><img src="' + PATH +'../'+ data.urlAddress + '" alt=""></div></li>'
+	html += '<li style="margin-left: 43px;"><span>作者：</span>' + (data.pictureAuthor || '暂无作者') + '</li>'
+	html += '<li style="margin-left: 15px;"><span>图片题目：</span>' + (data.pictureTitle || '暂无题目') + '</li>'
+	html += '<li style="margin-left: 15px;"><span>内容描述：</span>' + data.pictureDescription + '</li>'
+	html += '<li style="margin-left: 15px;display: flex;"><span>上传照片：</span> <div><img src="' + PATH + '../' + data.urlAddress + '" alt=""></div></li>'
 	html += '<li></li>'
 	html += '</ul>'
-	html += '<button type="button" class="layui-btn layui-btn-normal getBack">返回</button>'
+	
 	$('#details').empty().append(html);
 	$('.getBack').click(function () {
 		$('#details').hide();
@@ -283,28 +284,28 @@ function detailHtml(data) {
 
 var layerHtml = '';
 
-function editHtml(data) {
+function editHtml(data, index) {
 	var selectHtml = `<form class="layui-form" action="">
 	<div class="layui-form-item">
-	  <label class="layui-form-label">电话:</label>
+	  <label class="layui-form-label">电话：</label>
 	  <div class="layui-input-block">
 		${data.uploaderPhone}
 	  </div>
 	</div>
 	<div class="layui-form-item">
-	  <label class="layui-form-label">作品名称</label>
+	  <label class="layui-form-label">作品名称：</label>
 	  <div class="layui-input-block">
 	   ${data.pictureTitle}
 	   </div>
 	</div>
 	<div class="layui-form-item">
-		<label class="layui-form-label">作品作者</label>
+		<label class="layui-form-label">作品作者：</label>
 		<div class="layui-input-block">
 		${data.pictureAuthor}
 		</div>
 	  </div>
 	  <div class="layui-form-item">
-		<label class="layui-form-label">上传时间</label>
+		<label class="layui-form-label">上传时间：</label>
 		<div class="layui-input-block">
 		${data.uploadTime}
 		</div>
@@ -323,34 +324,57 @@ function editHtml(data) {
 	<div class="layui-form-item">
 		<label class="layui-form-label">图片</label>
 		<div class="layui-input-block">
-		<img style="max-width:500px" src="`+PATH+`../${data.urlAddress}" alt=""> 
+		<img style="max-width:500px" src="`+ PATH + `../${data.urlAddress}" alt=""> 
 		</div>
 	  </div>
   </form>`;
-	layerHtml = layer.open({
-		type: 1 //此处以iframe举例
-		, title: '审核'
-		, area: ['1000px', '800px']
-		, shade: 0
-		, maxmin: true
-		, content: selectHtml
-		, btn: ['通过', '不通过', '返回']
-		, yes: function (index, layero) {
-			data.pictureType = $("[name='pictureTypeSelect']").val()
-			updateYxnn(2, data)
-		}
-		, btn2: function (index, layero) {
-			updateYxnn(1, data)
-		}
-		, btn3: function (index, layero) {
-			layer.close()
-		}
-		, success: function () {
-		
-			layui.form.render('select');
-		}
-	});
-	
+	if (index) {
+		layerHtml = layer.open({
+			type: 1 //此处以iframe举例
+			, title: '审核'
+			, area: ['1000px', '800px']
+			, shade: 0
+			, maxmin: true
+			, content: selectHtml
+			, btn: ['修改',  '返回']
+			, yes: function (index, layero) {
+				data.pictureType = $("[name='pictureTypeSelect']").val()
+				updateYxnn(2, data)
+			}
+			, btn3: function (index, layero) {
+				layer.close()
+			}
+			, success: function () {
+				layui.form.render('select');
+			}
+		});
+	} else {
+		layerHtml = layer.open({
+			type: 1 //此处以iframe举例
+			, title: '审核'
+			, area: ['1000px', '800px']
+			, shade: 0
+			, maxmin: true
+			, content: selectHtml
+			, btn: ['通过', '不通过', '返回']
+			, yes: function (index, layero) {
+				data.pictureType = $("[name='pictureTypeSelect']").val()
+				updateYxnn(2, data)
+			}
+			, btn2: function (index, layero) {
+				updateYxnn(1, data)
+			}
+			, btn3: function (index, layero) {
+				layer.close()
+			}
+			, success: function () {
+
+				layui.form.render('select');
+			}
+		});
+	}
+
+
 }
 function updateYxnn(obj, data) {
 	data.examineState = obj

nngkxxdp/src/main/resources/static/page/lr_index.html

@@ -209,10 +209,9 @@
 			{{#  } else { }}
 			<a class="layui-btn layui-btn-xs" lay-event="edit">审核</a>
 			{{#  } }}
-			<!-- <a class="layui-btn layui-btn-xs" lay-event="edit">审核</a> -->
+			<a class="layui-btn  layui-btn-xs" lay-event="amend">修改</a> 
 			<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a> 
-			<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="amend">修改</a> 
-		  </script>
+	</script>
 </body>
 
 </html>