Merge branch 'dev' of http://192.168.2.120/quanlili/knowledgeServiceAdmin into qll

config/dev.env.js

@@ -3,4 +3,5 @@ module.exports = {
     ENV_CONFIG: '"dev"',
     //BASE_API: '"http://192.168.2.175:8808"'
     BASE_API: '"http://test16.zhongdianyun.com:8808"'
+    //BASE_API: '"http://localhost:8808"'
 }
\ No newline at end of file

config/prod.env.js

@@ -3,4 +3,5 @@ module.exports = {
     ENV_CONFIG: '"prod"',
     //BASE_API: '"http://192.168.2.175:8808"'
     BASE_API: '"http://test16.zhongdianyun.com:8808"'
+    //BASE_API: '"http://localhost:8808"'
 }
\ No newline at end of file

config/sit.env.js

@@ -3,5 +3,5 @@ module.exports = {
     ENV_CONFIG: '"sit"',
     //BASE_API: '"http://192.168.2.175:8808"'
     BASE_API: '"http://test16.zhongdianyun.com:8808"'
-
+    //BASE_API: '"http://localhost:8808"'
 }
\ No newline at end of file

src/api/resourcecommit.js

@@ -101,6 +101,22 @@ export function updataAtlasInfoByIdAPI(data) { //更新图册信息
   })
 }
 
+export function getEntityListAPI(params) { //关联实体选择
+  return request({
+    url: `${requestPath.common}/participle/relation/all`,
+    method: 'get',
+    params
+  })
+}
+
+export function getlinkedResAPI(params) { //关联实体弹窗的已链接资源
+  return request({
+    url: `${requestPath.common}/people/get/resource`,
+    method: 'get',
+    params
+  })
+}
+
 
 
 

src/components/pagination/pagination.vue

@@ -4,7 +4,7 @@
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
       :current-page="listQuery.pageNum"
-      :page-sizes="[30,50,100,200,500]"
+      :page-sizes="listQuery.pageSizes"
       :page-size="listQuery.pageSize"
       layout="total, sizes, prev, pager, next, jumper"
       :total="total"
@@ -16,15 +16,19 @@
 //<pagination @pagesize="pagesizeFun" :total="total" @currentPage="currentPageFun"></pagination>
 export default {
   name: "pagination",
-  props: ["total","pageNum","pageSize"],
+  props: ["total","pageNum","pageSize", 'pageSizes'],
   data() {
     return {
       listQuery: {
         pageNum: 1,
-        pageSize: 30
+        pageSize: 30,
+        pageSizes: [30,50,100,200,500]
       }
     };
   },
+  mounted() {
+    this.getNewData();
+  },
   methods: {
     handleSizeChange(val) {
       this.$emit("pagesize", val);
@@ -32,6 +36,19 @@ export default {
     handleCurrentChange(val) {
       this.$emit("currentPage", val);
       // console.log(`当前页: ${val}`);
+    },
+    getNewData() {
+      if (this.pageSize) {
+        this.listQuery.pageSize = this.pageSize;
+      } else {
+        return;
+      }
+      if (this.pageSizes) {
+        this.listQuery.pageSizes = this.pageSizes;
+      } else {
+        return;
+      }
+      
     }
   }
 };

src/utils/global.js

@@ -17,6 +17,7 @@ export const requestPath = {
 
 //export const uploadUrl = `http://192.168.2.175:8808/file/file/`
 export const uploadUrl = `http://test16.zhongdianyun.com:8808/file/file/`
+//export const uploadUrl = `http://localhost:8808/file/file/`
     // BASE_API: '"http://rsks.class.com.cn"'
 export const downloadPath = 'download'
 export const uploadPath = 'upload'
\ No newline at end of file

src/views/submission/infoview/atlas.vue

@@ -116,8 +116,9 @@ export default {
 					if (res.data.code === 0) {
 						this.myAtlasListData.splice(key, 1)
 						this.$message.success('删除成功');
+						this.getMyAtlasInfo();
 					} else {
-						this.$message.error('删除失败')
+						this.$message.error('删除失败');
 					}
 				})
 			})

src/views/submission/infoview/browsebycategory.vue

@@ -497,7 +497,7 @@ export default {
 				query: {
 					id: item.id,
 					resourceType: item.resourceType
-				}
+				},
 			})
 		}
 	},
@@ -530,3 +530,4 @@ export default {
 
 
 
+

src/views/submission/infoview/mycommit.vue

@@ -217,7 +217,7 @@ export default {
 				status: '',
 				orderBy: null,
 				createTime: null,
-				modifierId: Cookies.get('userId'),
+				createrId: Cookies.get('userId'),
 				pageNum: 1,
 				pageSize: 30
 			};

src/views/submission/infoview/photolook.vue

@@ -82,50 +82,52 @@
 					</h2>
 					<el-button type="primary" icon="el-icon-edit" size="mini" @click="goEditPhotoResource">编辑信息</el-button>
 				</section>
-				<table v-for="(item, key) in photoInfo" :key="key" v-if="key === activeIndex">
-					<tr>
-						<th>照片题名</th>
-						<td>{{ item.name }}</td>
-						<th>照片主题</th>
-						<td>{{ item.theme }}</td>
-					</tr>
-					<tr>
-						<th>照片描述</th>
-						<td>{{ item.description }}</td>
-						<th>照片来源</th>
-						<td>{{ item.source }}</td>
-					</tr>
-					<tr>
-						<th>照片语种</th>
-						<td>{{ item.languages }}</td>
-						<th>照片形成时间</th>
-						<td>{{ item.formationTime }}</td>
-					</tr>
-					<tr>
-						<th>照片地理位置</th>
-						<td>{{ item.address }}<span v-if="item.address">，</span>{{ item.longitude }}<span v-if="item.longitude">，</span>{{ item.latitude }}</td>
-						<th>照片责任者</th>
-						<td>{{ item.responsibility }}</td>
-					</tr>
-					<tr>
-						<th>照片大小</th>
-						<td>{{ item.size }}</td>
-						<th>照片后缀名</th>
-						<td>{{ item.suffix }}</td>
-					</tr>
-					<tr>
-						<th>创建者</th>
-						<td>{{ item.createrName }}</td>
-						<th>创建时间</th>
-						<td>{{ item.createTime }}</td>
-					</tr>
-					<tr>
-						<th>照片标签</th>
-						<td v-for="(item1, key) in item.label" :key="key" style="width:90%;">{{ item1.name }}</td>
-						<th></th>
-						<td></td>
-					</tr>
-				</table>
+				<div v-for="(item, key) in photoInfo" :key="key">
+					<table v-if="key === activeIndex">
+						<tr>
+							<th>照片题名</th>
+							<td>{{ item.name }}</td>
+							<th>照片主题</th>
+							<td>{{ item.theme }}</td>
+						</tr>
+						<tr>
+							<th>照片描述</th>
+							<td>{{ item.description }}</td>
+							<th>照片来源</th>
+							<td>{{ item.source }}</td>
+						</tr>
+						<tr>
+							<th>照片语种</th>
+							<td>{{ item.languages }}</td>
+							<th>照片形成时间</th>
+							<td>{{ item.formationTime }}</td>
+						</tr>
+						<tr>
+							<th>照片地理位置</th>
+							<td>{{ item.address }}<span v-if="item.address">，</span>{{ item.longitude }}<span v-if="item.longitude">，</span>{{ item.latitude }}</td>
+							<th>照片责任者</th>
+							<td>{{ item.responsibility }}</td>
+						</tr>
+						<tr>
+							<th>照片大小</th>
+							<td>{{ item.size }}</td>
+							<th>照片后缀名</th>
+							<td>{{ item.suffix }}</td>
+						</tr>
+						<tr>
+							<th>创建者</th>
+							<td>{{ item.createrName }}</td>
+							<th>创建时间</th>
+							<td>{{ item.createTime }}</td>
+						</tr>
+						<tr>
+							<th>照片标签</th>
+							<td v-for="(item1, key) in item.label" :key="key" style="width:90%;">{{ item1.name }}</td>
+							<th></th>
+							<td></td>
+						</tr>
+					</table>
+				</div>
 			</div>
 			<div class="atlasBasicInfo photoExifInfo">
 				<section>
@@ -284,8 +286,6 @@ export default {
 			this.$nextTick(() => {
 				const swiperTop = this.$refs.swiperTop.swiper
 				const swiperThumbs = this.$refs.swiperThumbs.swiper
-				console.log(swiperTop, "YYYY")
-				console.log(swiperThumbs, "UUUU")
 				swiperTop.controller.control = swiperThumbs
 				swiperThumbs.controller.control = swiperTop
 			})

src/views/submission/resourcecommit/index.scss

@@ -28,3 +28,10 @@
     //     top:80%;
     // }
 }
+
+.contentBoxLeft {
+    .el-form-item__content {
+		display:flex;
+    }
+}
+

src/views/submission/resourcecommit/index.vue

@@ -110,8 +110,8 @@
 				<el-form label-width="110px">
 					<el-form-item label="关联实体选择：">
 						<div style="display:flex;">	
-							<div autocomplete="off" :disabled="true" style="height:36px; border:1px solid #DCDFE6; border-top-left-radius:4px; border-bottom-left-radius:4px; flex:1;">
-								<span v-for="(item, key) in entityData" :key="key" class="entitySpan" @click="deleteEntity(key, item)">{{ item.name }}<i class="el-icon-error" style="padding-left:5px;"></i></span>
+							<div class="entityDataCon" autocomplete="off" :disabled="true">
+								<span v-for="(item, key) in entityData" :key="key" class="entitySpan" @click="deleteEntity(key, item)">{{ item.keyword }}<i class="el-icon-error" style="padding-left:5px;"></i></span>
 							</div>
 							<i class="el-icon-star-off" @click="showEntityMark" style="width:111px; text-align:center; line-height:36px; color:#fff; background:#409EFF; border-top-right-radius:4px; border-bottom-right-radius:4px; cursor:pointer;">请选择实体</i>
 						</div>
@@ -227,6 +227,13 @@ export default {
 					// 	resourceId: ''//新增不传
 					// }
 				],
+				relationParticiple:[
+					{
+						// keyword:
+						// participleId:
+						// participleType:
+					}
+				],
 				responsibility: '',
 				copyright: '',
 				score: null
@@ -321,7 +328,18 @@ export default {
 			this.isShowLineEntityMark = val;
 		},
 		getEntity(val) {
+			console.log(val, '121212121');
 			this.entityData = val;
+			let entityArr = [];
+			val.map((item, index) => {
+				let entityObj = {
+					keyword: item.keyword,
+					participleId: item.id,
+					participleType: item.state
+				};
+				entityArr.push(entityObj)
+			});
+			this.formData.relationParticiple = entityArr;
 		},
 		deleteEntity(key,item) {
 			this.entityData.splice(key, 1);
@@ -494,6 +512,9 @@ export default {
 							this.$set(item, 'label', item.typeName);
 							this.optionResourceDiyTypeShow.push(item.value);
 						})
+						if (res.data.data.participleList) {
+							this.entityData = res.data.data.participleList
+						}
 					}
 				})
 			} else {
@@ -653,6 +674,19 @@ export default {
 	margin:0 10px 10px 0;
 	cursor:pointer;
 }
+.entityDataCon {
+	height:36px; 
+	border:1px solid #DCDFE6; 
+	border-top-left-radius:4px; 
+	border-bottom-left-radius:4px; 
+	flex:1;
+	overflow-y:auto;
+	padding:0 9px;
+	&::-webkit-scrollbar {
+		width:5px;
+		height:5px;
+	}
+}
 </style>
 
 <style lang="scss">