ljh 2 年之前
父節點
當前提交
7b50350c35

+ 23 - 12
nngkxxdp/src/main/resources/static/impression/css/imperssion.css

@@ -6,7 +6,7 @@
 }
 
 body {
-    min-width: 1240px;
+    min-width: 1280px;
 }
 
 a {
@@ -306,7 +306,7 @@ a {
     width: 500px;
     cursor: pointer;
     border: 10px solid #fff;
-    max-height: 500px;
+    max-height: 350px;
 }
 .contents>p {
     text-decoration: overline;
@@ -328,6 +328,7 @@ a {
     position: relative;
     top: 34px;
     font-size: 20px;
+    line-height: 10px;
 }
 .popup{
     width: 1000px;
@@ -737,7 +738,9 @@ a {
     background-size: 100% 100%;
     background-repeat: no-repeat;
 }
-
+.eightyYears .middle_title>img{
+    padding-bottom: 38px;
+}
 .middle_nav4 {
     width: 100%;
 }
@@ -825,10 +828,15 @@ a {
 .block3 .synopsis {
     color: #FFFFFF;
 }
+.block3 .synopsis{
+    width: 100%;
+    padding: 0;
+    height: 202px;
+}
 
 .block3 .contents {
     color: #FFFFFF;
-    width: 500px;
+    width: 520px;
 }
 
 .block3 .contents>p {
@@ -838,10 +846,6 @@ a {
 .block3 .el-timeline-item:nth-child(odd) .el-timeline-item__wrapper {
     left: -55%;
 }
-.block3 .el-timeline-item:nth-child(odd) img{
-    position: relative;
-    left: -2vh;
-}
 .block3 .transverse {
     color: #FF7D13;
     background-color: #FF7D13;
@@ -960,12 +964,12 @@ a {
     padding-bottom: 30px;
 }
 .contribute_content_updata>textarea{ 
-    width: 100%;
-    height: 10vh;
     outline: none;
     padding-left: 10px;
     padding-top: 5px;
     color: #000;
+    width: 468px;
+    height: 88px;
 }
 .notarize{
     width: 219px;
@@ -1054,15 +1058,22 @@ a {
 }
 .el-date-editor .el-input__inner{
     height: 3vh;
+    border: 1px solid #000;
+    border-radius: 0;
+}
+.el-select{
+    width: 100%;
 }
 .el-date-editor .el-input__icon{
-    line-height: 29px;
+    line-height: 1vh;
 }
 .el-select .el-input--suffix input{
     height: 3vh;
+    border: 1px solid #000;
+    border-radius: 0;
 } 
 .el-select  .el-input__icon{
-    line-height: 28px;
+    line-height: 1vh;
 }
 
 /* .el-message-box__header{

+ 12 - 10
nngkxxdp/src/main/resources/static/impression/impression.html

@@ -81,7 +81,7 @@
                         <p>我要投稿
                             <img src="img/tiao.png" alt="">
                         </p>
-                        <img src="img/cha.png" alt="" style="cursor: pointer;position: relative;left: 8%;top: -47%;"
+                        <img src="img/cha.png" alt="" style="cursor: pointer;position: relative;left: 8%;top: -47%;width: 19px;"
                             @click="closeContribute">
                     </div>
                     <div class="contribute_content_updata">
@@ -98,21 +98,23 @@
                     </div>
                     <div class="contribute_content_updata">
                         <p>+<span>归属日期:</span></p>
-                        <div>
+                        <div style="border: 0;">
                             <el-date-picker limit=1 v-model="form.time" value-format="yyyy-MM-dd"  placeholder="选择日期" >
                             </el-date-picker>
                         </div>
                     </div>
                     <div class="contribute_content_updata">
                         <p>+<span>选择年代:</span></p>
-                        <el-select v-model="form.years" placeholder="请选择">
-                            <el-option
-                              v-for="item in options"
-                              :key="item.value"
-                              :label="item.label"
-                              :value="item.value">
-                            </el-option>
-                        </el-select>
+                        <div style="border: 0;">
+                            <el-select v-model="form.years" placeholder="请选择">
+                                <el-option
+                                  v-for="item in options"
+                                  :key="item.value"
+                                  :label="item.label"
+                                  :value="item.value">
+                                </el-option>
+                            </el-select>
+                        </div>
                     </div>
                     <div class="contribute_content_updata">
                         <p>+<span>我的作品:</span></p>

+ 41 - 11
nngkxxdp/src/main/resources/static/impression/js/inperssion.js

@@ -97,43 +97,73 @@ new Vue({
             var _this = this
             var reg = /1[3-9]\d{9}/
             if (!reg.test(_this.form.tel)) {
-                _this.$message('请输入正确格式的电话!');
+                _this.$message({
+                    message: '请输入正确格式的电话!',
+                    offset:150,
+                });
                 return;
             }
             if (!_this.form.title) {
-                _this.$message('请输入正确的作品名称!');
+                _this.$message({
+                    message:'请输入正确的作品名称!',
+                    offset:150
+                });
                 return;
             }
             if (_this.form.title.length > 20) {
-                _this.$message('作品名称不能大于10个字!');
+                _this.$message({
+                    message:'作品名称不能大于10个字!',
+                    offset:150
+                });
                 return;
             }
             if (!_this.form.author) {
-                _this.$message('请输入作者名称!');
+                _this.$message({
+                    message:'请输入作者名称!',
+                    offset:150 
+                });
                 return;
             }
             if (_this.form.author.length > 10) {
-                _this.$message('作者名称不能大于10个字!');
+                _this.$message({
+                    message:'作者名称不能大于10个字!',
+                    offset:150 
+                });
                 return;
             }
             if (!_this.form.time) {
-                _this.$message('请选择归属日期!');
+                _this.$message({
+                    message:'请选择归属日期!',
+                    offset:150 
+                });
                 return;
             }
             if (!_this.form.years) {
-                _this.$message('请选择年代!');
+                _this.$message({
+                    message:'请选择年代!',
+                    offset:150 
+                });
                 return;
             }
             if (!_this.form.file) {
-                _this.$message('请添加文件!');
+                _this.$message({
+                    message:'请添加文件!',
+                    offset:150 
+                });
                 return;
             }
             if (_this.form.file.size > 5242880) {
-                _this.$message('文件过大!');
+                _this.$message({
+                    message: '文件过大!',
+                    offset:150 
+                });
                 return;
             }
             if (!_this.form.content) {
-                _this.$message('请添加内容!');
+                _this.$message({
+                    message:'请添加内容!',
+                    offset:150 
+                });
                 return;
             }
             let FormDatas = new FormData()
@@ -269,7 +299,7 @@ new Vue({
                         </div>
                         <div class="content_introduce">
                             <div style="height: 32px;display:flex;margin-bottom: 10px;">
-                            <img src="./img/xiao.png" alt="">
+                            <img style="width:54px" src="./img/xiao.png" alt="">
                             <p style="font-size: 17px;margin-left: 14px;">${json.data.pictureTitle}</p>
                             
                             </div>

+ 16 - 0
nngkxxdp/src/main/resources/static/page/css/lr_index.css

@@ -172,4 +172,20 @@
 }
 .layui-input{
 	width: 100%;
+}
+#yxpage{
+	margin-left: 16px;
+}
+#details{
+	width: 1000px;
+}
+#details tr td:nth-child(1){
+	background-color: #e5e8ed;
+}
+#details tr td:nth-child(3){
+	background-color: #e5e8ed;
+	width: 150px;
+}
+#details .layui-table td{
+	border: 1px solid  rgb(183,212,175);
 }

+ 62 - 23
nngkxxdp/src/main/resources/static/page/js/base/lr_index.js

@@ -258,36 +258,72 @@ function detailHtml(data) {
 	$('#details').show();
 	$('#yxnnTable~div').hide();
 	$('#yxpage').hide();
+	$('.detailsimg').show();
+	var arr = []
+	// arr.push(data)
+	// layui.table.render({
+	// 	elem: '#examine'
+	// 	, cellMinWidth: 80 //全局定义常规单元格的最小宽度,
+	// 	, cols: [[
+	// 		// { field: 'id', width: 80, title: 'ID', }
+	// 		, { field: 'uploaderPhone', title: '电话',  width: 120}
+	// 		, { field: 'pictureTitle', title: '作品题目', width: 120}
+	// 		, { field: 'pictureAuthor', title: '作品作者',  width: 120}
+	// 		, { field: 'uploadTime', title: '上传时间',  width: 200}
+	// 		, { field: 'pictureType', title: '图片类型',  templet: pictureTypetemplet, width: 200}
+	// 		, { field: 'pictureDescription', title: '描述内容',}
+	// 	]]
+	// 	, data: arr
+	// })
 	var html = ''
 	html += '<button type="button" class="layui-btn layui-btn-normal getBack">返回</button>'
-	html += '<ul>'
-	html += '<li style="margin-left: 43px;"><span>作者:</span>' + (data.pictureAuthor || '暂无作者') + '</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 += '<table class="layui-table">'
+	html += '<colgroup>'
+	html += '<col width="150">'
+	html += '<col width="200">'
+	html += '<col>'
+	html += '</colgroup>'
+	html += '<tbody>'
+	html += '<tr>'
+	html += '<td>电话</td>'
+	html += '<td>' + data.uploaderPhone + '</td>'
+	html += '<td>作品题目</td>'
+	html += '<td>' + data.pictureTitle + '</td>'
+	html += '</tr>'
+	html += '<tr>'
+	html += '<td>作品作者</td>'
+	html += '<td>' + data.pictureAuthor + '</td>'
+	html += '<td>上传时间</td>'
+	html += '<td>' + data.uploadTime + '</td>'
+	html += '</tr>'
+	html += '<tr>'
+	html += '<td>图片类型</td>'
+	if(' + data.pictureType == 0 + '){
+	   html += '<td>1949</td>'
+	}else if (' + data.pictureType == 1 + ') {
+		html += '<td>1949-80年代</td>'
+	} else if (' + data.pictureType == 2 + ') {
+		html += '<td>80年代-2000年</td>'
+	} else if ('+ data.pictureType == 3 + ') {
+		html += '<td>2000年-至今</td>'
 	}
-	if (data.pictureType == 0) {
-		html += '<li style="margin-left: 43px;"><span>年代:</span>1949</li>'
-	} else if (data.pictureType == 1) {
-		html += '<li style="margin-left: 43px;"><span>年代:</span>1949-80年代</li>'
-	} else if (data.pictureType == 2) {
-		html += '<li style="margin-left: 43px;"><span>年代:</span>80年代-2000年</li>'
-	} else if (data.pictureType == 3) {
-		html += '<li style="margin-left: 43px;"><span>年代:</span>2000年-至今</li>'
-	}
-	html += '<li style="margin-left: 15px;"><span>图片题目:</span>' + (data.pictureTitle || '暂无题目') + '</li>'
-	html += '<li style="margin-left: 15px;display: flex;"><span>内容描述:</span><div style="width: 500px;text-align: justify;">' + data.pictureDescription + '</div></li>'
-	html += '<li style="margin-left: 15px;display: flex;"><span>上传照片:</span> <div><img style="max-width: 500px;margin-bottom:15px;max-height: 500px;" src="' + PATH + '/' + data.urlAddress + '" alt=""></div></li>'
-	html += '<li></li>'
-	html += '</ul>'
-
+	html += '<td>描述内容</td>'
+	html += '<td style="layui-table-cell laytable-cell-3-0-5">'+data.pictureDescription +'</td>'
+	html += '</tr>'
+	html+'<tr>'
+	html += '<td>照片</td>'
+	html += '<td colspan="3"><img style="max-width: 500px;margin-bottom:15px;max-height: 500px;" src="' + PATH + '/' + data.urlAddress + '" alt=""></div></td>'
+	html+'</tr>'
+	html += '</tbody>'
+	html += '</table>'
+	// html += '<li style="margin-left: 15px;display: flex;"><span>照片:</span> <div></li>'
 	$('#details').empty().append(html);
 	$('.getBack').click(function () {
 		$('#details').hide();
 		$('#yxnnTable~div').show();
 		$('#yxpage').show();
+		$("#examine~.layui-form").hide();
+		$('.detailsimg').hide();
 	})
 }
 
@@ -437,7 +473,7 @@ function pictureTypetemplet(d) {
 		return '2000年-至今'
 	}
 }
-function laypage(){
+function laypage() {
 	layui.use('laypage', function () {
 		var laypage = layui.laypage;
 		//执行一个laypage实例
@@ -487,6 +523,9 @@ function resetPage(table) {
 	$("#details").hide();
 	$("#yxpage").show();
 	laypage();
+	$("#examine~.layui-form").hide();
+	$('.detailsimg').hide();
+	$(".layui-layer").remove()
 }
 // 初始化表单
 function initForm(form) {

+ 24 - 16
nngkxxdp/src/main/resources/static/page/lr_index.html

@@ -39,7 +39,7 @@
 						<i class="iconfont icon-lishi lr-nav-icon"></i>历史记录
 					</div>
 				</li>
-				<li class="layui-nav-item lr-nav-items refresh">
+				<li class="layui-nav-item lr-nav-items ">
 					<div class="lr-item">
 						<i class="iconfont icon-yinx lr-nav-icon"></i>印象南岸
 					</div>
@@ -176,18 +176,26 @@
 						</div>
 					</div>
 				</div>
-				<div class="layui-tab-item" >
+				<div class="layui-tab-item">
 					<div class="layui-tab layui-tab-brief">
 						<ul class="layui-tab-title">
 							<li class="layui-this" style="color: #2a98fb; margin-left: 15px;">印象南岸</li>
 						</ul>
-						<table class="layui-hide" id="yxnnTable" lay-filter="yxnnfilter"></table>
+						<div class="lr-table">
+							<table class="layui-hide" id="yxnnTable" lay-filter="yxnnfilter"></table>
+						</div>
 					</div>
 					<div id="yxpage"></div>
-					<div id="details">
+					<div>
+						<div id="details">
 
+						</div>
+						<!-- <div class="lr-table">
+							<table class="layui-hide" id="examine" lay-filter="yxnnfilter"></table>
+						</div> -->
 					</div>
-					
+
+
 				</div>
 			</div>
 		</div>
@@ -195,23 +203,23 @@
   			<p class="lr-tpl-detail" lay-event="datail">详情</p>
 		</script>
 	</div>
-	
+
 	<script type="text/javascript" src="js/jquery.min.js" charset="utf-8"></script>
 	<script type="text/javascript" src="layui/layui.js" charset="utf-8"></script>
 	<script type="text/javascript" src="js/constans.js" charset="utf-8"></script>
 	<script type="text/javascript" src="js/base/lr_index.js" charset="utf-8"></script>
 	<script type="text/html" id="barDemo">
 		<!-- console.log(d.examineState) -->
-			<a class="layui-btn layui-btn-xs" lay-event="detail">查看</a>
-			{{#  if(d.examineState !=0){ }}
-			<a class="layui-btn layui-btn-xs layui-btn-disabled" lay-event="edit">审核</a>
-			<a class="layui-btn  layui-btn-xs "  lay-event="amend">修改</a>
-			{{#  } else { }}
-			<a class="layui-btn layui-btn-xs" lay-event="edit">审核</a>
-			<a class="layui-btn  layui-btn-xs layui-btn-disabled" lay-event="amend">修改</a> 
-			{{#  } }}
-			
-			<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a> 
+	<a class="layui-btn layui-btn-xs" lay-event="detail">查看</a>
+	{{# if(d.examineState !=0){ }}
+	<a class="layui-btn layui-btn-xs layui-btn-disabled" lay-event="edit">审核</a>
+	<a class="layui-btn  layui-btn-xs " lay-event="amend">修改</a>
+	{{# } else { }}
+	<a class="layui-btn layui-btn-xs" lay-event="edit">审核</a>
+	<a class="layui-btn  layui-btn-xs layui-btn-disabled" lay-event="amend">修改</a>
+	{{# } }}
+
+	<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
 	</script>
 </body>