瀏覽代碼

修改南岸

ljh 2 年之前
父節點
當前提交
9db5a8b072

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

@@ -234,7 +234,7 @@ a {
 
 .el-timeline-item__tail {
     border-left: 5px solid #47413B;
-    height: 112%;
+    height: 116%;
 }
 
 .el-timeline-item__node--normal {
@@ -762,7 +762,7 @@ a {
     position: fixed;
     top: 50%;
     left: 50%;
-    margin: -20% 0 0 -25%;
+    margin: -21% 0 0 -25%;
     z-index: 10;
 }
 .contribute_content>.contribute_content_title{

+ 37 - 28
nngkxxdp/src/main/resources/static/impression/impression.html

@@ -66,7 +66,7 @@
                 <li><a href="">印象南岸</a></li>
             </ul>
         </div>
-        <div class="zj">
+        <div class="zj" v-loading="loading">
             <div class="pontoon">
                 <p @click="contribute">我要投稿</p>
             </div>
@@ -79,34 +79,43 @@
                         <img src="img/cha.png" alt="" style="cursor: pointer;position: relative;left: 8%;top: -47%;"
                             @click="closeContribute">
                     </div>
-                        <div class="contribute_content_updata">
-                            <p>+<span>我的电话:</span></p>
-                            <el-input v-model.number="form.tel" placeholder="请输入电话"></el-input>
-                        </div>
-                        <div class="contribute_content_updata">
-                            <p>+<span>作品名称:</span></p>
-                            <el-input v-model.number="form.title" placeholder="请输入作品名称"></el-input>
-                        </div>
-                        <div class="contribute_content_updata">
-                            <p>+<span>作者:</span></p>
-                            <el-input v-model.number="form.author" placeholder="请输入作者名称"></el-input>
-                        </div>
-                        <div class="contribute_content_updata">
-                            <p>+<span>我的作品</span></p>
-                            <div>
-                                <el-upload class="upload-demo" drag action="http://192.168.0.26:7777/yxnn/uploadDocumet"
-                                :http-request="upRequest" >
-                                    <div class="upPhotograph">上传图片</div>
-                                    <div class="el-upload__text">点击 / 拖拽一个文件到这里上传</div>
-                                    <div class="el-upload__text astrict">支持jpg、png体积在5M以下</div>
-                                </el-upload>
+                    <div class="contribute_content_updata">
+                        <p>+<span>我的电话:</span></p>
+                        <el-input v-model.number="form.tel" placeholder="请输入电话"></el-input>
+                    </div>
+                    <div class="contribute_content_updata">
+                        <p>+<span>作品名称:</span></p>
+                        <el-input v-model.number="form.title" placeholder="请输入作品名称"></el-input>
+                    </div>
+                    <div class="contribute_content_updata">
+                        <p>+<span>作者:</span></p>
+                        <el-input v-model.number="form.author" placeholder="请输入作者名称"></el-input>
+                    </div>
+                    <div class="contribute_content_updata">
+                        <p>+<span>归属日期:</span></p>
+                        <template>
+                            <div style="border: 0;">
+                                <el-date-picker v-model="form.time" type="date" placeholder="选择日期">
+                                </el-date-picker>
                             </div>
+                        </template>
+                    </div>
+                    <div class="contribute_content_updata">
+                        <p>+<span>我的作品</span></p>
+                        <div>
+                            <el-upload class="upload-demo" drag action="http://192.168.0.26:7777/yxnn/uploadDocumet"
+                                :http-request="upRequest">
+                                <div class="upPhotograph">上传图片</div>
+                                <div class="el-upload__text">点击 / 拖拽一个文件到这里上传</div>
+                                <div class="el-upload__text astrict">支持jpg、png格式,体积大小在5M以下</div>
+                            </el-upload>
                         </div>
-                        <div class="contribute_content_updata">
-                            <p>+<span>作品描述</span></p>
-                            <textarea name="" id="" v-model="form.content"  placeholder="请再次输入您的作品描述..."></textarea>
-                        </div>
-                        <div class="notarize" @click="notarizeUp" >确认提交</div>
+                    </div>
+                    <div class="contribute_content_updata">
+                        <p>+<span>作品描述</span></p>
+                        <textarea name="" id="" v-model="form.content" placeholder="请再次输入您的作品描述..."></textarea>
+                    </div>
+                    <div class="notarize" @click="notarizeUp">确认提交</div>
                 </div>
                 <div class="contribute_content" v-if="isshows">
                     <div class="contribute_content_title">
@@ -221,7 +230,7 @@
                         <el-timeline>
                             <el-timeline-item v-for="(activity, index) in activities" :key="index"
                                 :timestamp="activity.timestamp">
-                                <div  >
+                                <div>
                                     <div class="branch">
                                         <div class="transverse"></div>
                                         <div class="contents">

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

@@ -17,13 +17,15 @@ new Vue({
             content: '',
             title: '',
             author: '',
+            time:'',
         },
         parent: {
             page: 1,
             limit: 10,
             pictureType: 0,
             examineState: 2,
-        }
+        },
+        loading:false
     },
     methods: {
         beforeLiberation() {
@@ -102,6 +104,7 @@ new Vue({
             FormDatas.append('pictureDescription', _this.form.content)
             FormDatas.append('pictureTitle', _this.form.title)
             FormDatas.append('pictureAuthor', _this.form.author)
+            FormDatas.append('vestingDate', _this.form.time)
             $.ajax({
                 type: 'post',
                 url: PATH + '/yxnn/uploadDocumet',
@@ -109,7 +112,6 @@ new Vue({
                 contentType: false,
                 processData: false,
                 success: function (json) {
-                    console.log(json)
                     if (json.result) {
                         _this.getajax()
                         _this.isshow = false
@@ -118,10 +120,7 @@ new Vue({
                             message: '发布成功',
                             type: 'success'
                         });
-                        _this.form.tel = '';
                         _this.form.content = '';
-                        _this.form.title = '';
-                        _this.form.author = '';
                     } else {
                         _this.$message(json.data);
                     }
@@ -148,8 +147,7 @@ new Vue({
                 data: _this.parent,
                 success: function (json) {
                     var content = json.data.data;
-
-                    if (content.length > 0) {
+                    if (content && content.length>0) {
                         var arr = [];
                         var obj = []
                         obj.unshift([]);
@@ -159,7 +157,7 @@ new Vue({
                             obj.push({
                                 content: arr[i][0],
                                 time: arr[i][1] + '/' + arr[i][2].slice(0, 2),
-                                author: '《' + content[i].pictureTitle + '》作者:' + content[i].pictureAuthor,
+                                author: '《' + (content[i].pictureTitle || '无') + '》作者:' + (content[i].pictureAuthor || '无'),
                                 img: PATH + '/' + content[i].urlAddress,
                                 synopsis: content[i].pictureDescription
                             })
@@ -167,9 +165,9 @@ new Vue({
                         _this.activities = obj
                         obj.push([]);
                     } else {
-                        _this.activities = []
+                        _this.activities = [];
                     }
-
+                    _this.loading=false;
                 },
                 error: function (err) {
                 }
@@ -177,7 +175,7 @@ new Vue({
         }
     },
     created: function () {
-        this.getajax()
-
+        this.loading=true
+        this.getajax();
     },
 })

+ 6 - 1
nngkxxdp/src/main/resources/static/page/css/lr_index.css

@@ -153,11 +153,16 @@
 }
 #details>ul>li{
 	margin-bottom: 10px;
-	font-size: 18px;
+	font-size: 14px;
+	color: #666;
 }
 #details>ul>li>div{
 	margin-top: 10px;
 }
 .layui-layer-content{
 	text-align: center;
+}
+.layui-input-block {
+    text-align: initial;
+    line-height: 36px;
 }

+ 83 - 30
nngkxxdp/src/main/resources/static/page/js/base/lr_index.js

@@ -20,13 +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)
 		}
 	});
 });
@@ -218,26 +220,35 @@ function initTables(datas) {
 		url: PATH + '/yxnn/getDocumentPage',
 		type: 'get',
 		data: datas,
-		async:false,
+		async: false,
 		success: function (data) {
 			if (data.data) {
-				count=data.data.count
+				var obj = data.data.data;
+				count = data.data.count
+				var limitValue = 10;
+				if (obj) {
+					if (obj.length > 10) {
+						limitValue = obj.length
+					}
+				}
 				layui.table.render({
 					elem: '#yxnnTable'
 					, cellMinWidth: 80 //全局定义常规单元格的最小宽度,
-					,limit:data.data.data.length
+					, limit: limitValue
 					, cols: [[
-						{ field: 'id', width: 80, title: 'ID', }
-						, { field: 'uploaderPhone', title: '电话', width: 150, }
-						, { field: 'pictureTitle', title: '作品题目',  }
-						, { field: 'pictureAuthor', title: '作品作者',  }
-						, { field: 'uploadTime', title: '上传时间', sort: true, width: 200, }
-						, { field: 'pictureDescription', title: '描述内容', width: '30%' }
-						, { field: 'pictureType', title: '图片', templet: pictureTypetemplet }
-						, { field: 'examineState', title: '状态', templet: examineStatetemplet }
-						, { title: '操作', width: 300, toolbar: '#barDemo' }
+						// { 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: 'pictureDescription', title: '描述内容', width: '20%' }
+						, { field: 'vestingData', title: '归属日期', }
+						, { field: 'pictureType', title: '图片类型', sort: true, templet: pictureTypetemplet }
+						, { field: 'examineState', title: '状态',sort: true, templet: examineStatetemplet }
+						, { title: '操作',  width:250, toolbar: '#barDemo' }
 					]]
-					, data: data.data.data
+					, data: obj
 				})
 			}
 		}
@@ -261,7 +272,7 @@ function detailHtml(data) {
 	html += '<li>上传照片: <div><img src="' + PATH +'../'+ data.urlAddress + '" alt=""></div></li>'
 	html += '<li></li>'
 	html += '</ul>'
-	html += '<div class="getBack">返回</div>'
+	html += '<button type="button" class="layui-btn layui-btn-normal getBack">返回</button>'
 	$('#details').empty().append(html);
 	$('.getBack').click(function () {
 		$('#details').hide();
@@ -273,16 +284,53 @@ function detailHtml(data) {
 var layerHtml = '';
 
 function editHtml(data) {
-	var selectHtml = `<div style="margin:10px">选择内容类型:</div> <select name="pictureTypeSelect" lay-verify="">
-  						<option value="0">解放前</option>
-  						<option value="1">解放后-80年代</option>
-						<option value="2">80年代-新世纪</option>
-  						<option value="3">千禧年-新世纪</option>
-					</select> `;
+	var selectHtml = `<form class="layui-form" action="">
+	<div class="layui-form-item">
+	  <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>
+	  <div class="layui-input-block">
+	   ${data.pictureTitle}
+	   </div>
+	</div>
+	<div class="layui-form-item">
+		<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>
+		<div class="layui-input-block">
+		${data.uploadTime}
+		</div>
+	  </div>
+	<div class="layui-form-item">
+	  <label class="layui-form-label">选择框</label>
+	  <div class="layui-input-block">
+		<select name="pictureTypeSelect" lay-verify="required">
+			<option value="0">解放前</option>
+			<option value="1">解放后-80年代</option>
+			<option value="2">80年代-新世纪</option>
+			<option value="3">千禧年-新世纪</option>
+		</select>
+	  </div>
+	</div>
+	<div class="layui-form-item">
+		<label class="layui-form-label">图片</label>
+		<div class="layui-input-block">
+		<img style="with:500px" src="`+PATH+`../${data.urlAddress}" alt=""> 
+		</div>
+	  </div>
+  </form>`;
 	layerHtml = layer.open({
 		type: 1 //此处以iframe举例
 		, title: '审核'
-		, area: ['390px', '260px']
+		, area: ['1000px', '800px']
 		, shade: 0
 		, maxmin: true
 		, content: selectHtml
@@ -297,10 +345,12 @@ function editHtml(data) {
 		, btn3: function (index, layero) {
 			layer.close()
 		}
-		, cancel: function () {
-			layer.close()
+		, success: function () {
+		
+			layui.form.render('select');
 		}
 	});
+	
 }
 function updateYxnn(obj, data) {
 	data.examineState = obj
@@ -358,7 +408,7 @@ layui.use('laypage', function () {
 	//执行一个laypage实例
 	laypage.render({
 		elem: 'yxpage'
-		, count: 12
+		, count: count
 		, layout: ['limit', 'prev', 'page', 'next']
 		, jump: function (obj, first) {
 			datas.page = obj.curr;
@@ -446,12 +496,15 @@ function initDetails(id) {
 				$('#d-remark').text(data.describe);
 				let imgs = data.imgUrls;
 				var html = '';
-				for (var i = 0; i < imgs.length; i++) {
-					html += '<div class="lr-img-div">'
-						+ '<img class="lr-img" alt="" src="' + (PATH + '/' + imgs[i].imageurl) + '" onclick="seeImg(\'#detail-img-list\')" '
-						+ 'layer-src="' + (PATH + '/' + imgs[i].imageurl) + '">'
-						+ '</div>';
+				if (imgs) {
+					for (var i = 0; i < imgs.length; i++) {
+						html += '<div class="lr-img-div">'
+							+ '<img class="lr-img" alt="" src="' + (PATH + '/' + imgs[i].imageurl) + '" onclick="seeImg(\'#detail-img-list\')" '
+							+ 'layer-src="' + (PATH + '/' + imgs[i].imageurl) + '">'
+							+ '</div>';
+					}
 				}
+
 				$('#detail-img-list').empty().append(html);
 				switchPage('.lr-table', '.lr-table-detail');
 			}

+ 4 - 2
nngkxxdp/src/main/resources/static/page/lr_index.html

@@ -177,7 +177,7 @@
 						</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>
@@ -188,14 +188,15 @@
 					<div id="details">
 
 					</div>
+					
 				</div>
 			</div>
 		</div>
 		<script type="text/html" id="historyTableTpl">
   			<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>
@@ -210,6 +211,7 @@
 			{{#  } }}
 			<!-- <a class="layui-btn layui-btn-xs" lay-event="edit">审核</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>
 </body>