Merge branch 'wtf' into dev

src/api/resourcecommit.js

@@ -181,6 +181,14 @@ export function deleteLableItemAPI(data) { //根据id查询标签
   })
 }
 
+export function searchPageLableAPI(params) { //分页查询标签
+  return request({
+    url: `${requestPath.common}/label/page`,
+    method: 'get',
+    params
+  })
+}
+
 
 
 

src/views/submission/infoview/allresource.vue

@@ -330,7 +330,8 @@ export default {
 				.then(res => {
 					if (res.data.code === 0) {
 						this.list.splice(item.id, 1)
-						this.$message.success('删除成功')
+						this.$message.success('删除成功');
+						this.getList();
 					} else {
 						this.$message.warn(res.data.msg)
 					}

src/views/submission/infoview/mycommit.vue

@@ -292,7 +292,8 @@ export default {
 				.then(res => {
 					if (res.data.code === 0) {
 						this.list.splice(item.id, 1)
-						this.$message.success('删除成功')
+						this.$message.success('删除成功');
+						this.getList();
 					} else {
 						this.$message.warn(res.data.msg)
 					}

src/views/submission/infoview/myedit.vue

@@ -292,6 +292,7 @@ export default {
 					if (res.data.code === 0) {
 						this.list.splice(item.id, 1)
 						this.$message.success('删除成功')
+						this.getList();
 					} else {
 						this.$message.warn(res.data.msg)
 					}

src/views/submission/resourcecommit/index.scss

@@ -35,3 +35,13 @@
     }
 }
 
+.lableDia {
+    .el-dialog {
+        width: 1000px;
+        table {
+            th,td {
+                text-align:center;
+            }
+        }
+    }
+}

src/views/submission/resourcecommit/index.vue

@@ -91,14 +91,21 @@
 						</div>
 					</el-form-item>
 					<el-form-item label="资源标签：" prop="label">
-						<el-select v-model="resourceLabel" multiple placeholder="指定资源所属专题与内容特征，相关标签需提前在“资源标签”功能中设置。" style="width:100%;" @change="selectOpt">
+						<!-- <el-select v-model="resourceLabel" multiple placeholder="指定资源所属专题与内容特征，相关标签需提前在“资源标签”功能中设置。" style="width:100%;" @change="selectOpt">
 							<el-option
 								v-for="item in resourceLabelList"
 								:key="item.id"
 								:label="item.name"
 								:value="item.id">
 							</el-option>
-						</el-select>
+						</el-select> -->
+						<!-- <el-input v-model="resourceLabel" multiple placeholder="指定资源所属专题与内容特征，相关标签需提前在“资源标签”功能中设置。" @focus="showLableDia"></el-input> -->
+						<div style="display:flex;">
+							<div class="entityDataCon">
+								<span v-for="(item, key) in resourceLabel" :key="key" class="entitySpan" @click="deleteLableItem(key)">{{ item }}<i class="el-icon-error" style="padding-left:5px;"></i></span>
+							</div>
+							<i class="el-icon-star-off" @click="showLableDia" style="width:140px; text-align:center; line-height:36px; color:#fff; background:#409EFF; border-top-right-radius:4px; border-bottom-right-radius:4px; cursor:pointer;">请选择资源标签</i>
+						</div>
 					</el-form-item>
 				</el-form>
 				<h2>>版权信息描述类</h2>
@@ -170,6 +177,22 @@
 				<button @click="saveEdit" v-if="isShowSavaBtn1">再次提交</button>
 			</div>
 		</div>
+		<el-dialog title="标签资源" :visible.sync="dialogTableVisible" class="lableDia">
+			<el-table :data="gridData" @selection-change="handleSelectionChange">
+				<el-table-column
+					type="selection"
+					width="55">
+				</el-table-column>
+				<el-table-column property="name" label="标签名称"></el-table-column>
+				<el-table-column property="description" label="标签说明"></el-table-column>
+				<el-table-column property="createrName" label="创建者"></el-table-column>
+				<el-table-column property="createTime" label="创建时间"></el-table-column>
+			</el-table>
+			<div slot="footer" class="dialog-footer">
+				<el-button @click="dialogTableVisible = false">取 消</el-button>
+				<el-button type="primary" @click="sureLable">确 定</el-button>
+			</div>
+		</el-dialog>
 		<mapmark :isShowMark="isShowMark" @changeIsShowMark="changeVal" @locationChange="locationChange"></mapmark>
 		<linkentity :isShowLineEntityMark="isShowLineEntityMark" @changeStateVal="changeStateVal" @getEntity="getEntity"></linkentity>	
 	</div>
@@ -187,7 +210,8 @@ import {
 	resourceLabelListAPI, 
 	editItemAPI, 
 	saveEditAPI,
-	getMetaDataPlanListAPI
+	getMetaDataPlanListAPI,
+	searchPageLableAPI
 } from "@/api/resourcecommit";
 import { detailsAPI } from '@/api/metadataPlan/index'
 import { convertTree } from '@/utils/format'
@@ -199,6 +223,15 @@ export default {
 	},
 	data() {
 		return {
+			gridData: [],
+			multipleSelection: [],
+			dialogTableVisible: false,
+			searchPageLableForm: {
+				search: null,
+				pageNum: 1,
+				pageSize: 10,
+				orderBy: null
+			},
 			domain: process.env.BASE_API,
       requestPath: requestPath,
 			vals: [],
@@ -703,6 +736,40 @@ export default {
 			//} 
 			console.log(this.processLength, '22211aa')
 		},
+		showLableDia() {
+			this.dialogTableVisible = true;
+			searchPageLableAPI(this.searchPageLableForm)
+			.then(res => {
+				console.log(res, '21312')
+				if ( res.data.code === 0 ) {
+					this.gridData = res.data.data.list
+				}
+			}) 
+		},
+		handleSelectionChange(val) {
+			// multipleSelection
+			console.log(val, '123val')
+			this.multipleSelection = val;	
+			let optIdArr = [];
+			this.multipleSelection.map((item, index) => {
+				var obj = {
+					labelId: item.id
+				}
+				optIdArr.push(obj)
+			})
+			this.formData.label = optIdArr;
+		},
+		sureLable() {
+			this.multipleSelection.map((item, index) => {
+				if (!this.resourceLabel.includes(item.name)) {
+					this.resourceLabel.push(item.name)
+				}
+			})
+			this.dialogTableVisible = false
+		},
+		deleteLableItem(key) {
+			this.resourceLabel.splice(key, 1)
+		}
 	},
 	beforeRouteLeave(to, from, next) {
 		from.meta.keepAlive = false;