提交 6a1ae472 authored 作者: 王腾飞's avatar 王腾飞

1101

上级 62297cda
......@@ -43,4 +43,11 @@
td:nth-of-type(3) div,td:nth-of-type(4) div,td:nth-of-type(5) div,td:nth-of-type(6) div {
text-align:center;
}
}
\ No newline at end of file
}
.searchBox {
.el-input-group__append {
background:#409EFF;
color:#fff;
border:none;
}
}
<template>
<div class="box">
<div class="metaDataTop">
<em v-if="this.$route.query.entityType === '1'">人物实体</em>
<em v-if="this.$route.query.entityType === '2'">地理位置实体</em>
<em v-if="this.$route.query.entityType === '3'">组织机构实体</em>
<em v-if="this.$route.query.entityType == 1">人物实体</em>
<em v-if="this.$route.query.entityType == 3">地理位置实体</em>
<em v-if="this.$route.query.entityType == 2">组织机构实体</em>
<span>刷新</span>
</div>
<div class="contentBox">
<div class="contentBoxLeft">
<h2 id="moduleId0">>人物信息</h2>
<h2 id="moduleId0">>实体信息</h2>
<dl>
<dt>
<img :src="characterDetailData.img" alt="">
......@@ -16,7 +16,9 @@
<dd>
<ul>
<li>{{ characterDetailData.name }}</li>
<li>{{ characterDetailData.occupation }} | {{ characterDetailData.dateofbirth }}-{{ characterDetailData.elapsedtime }} | {{ characterDetailData.nationality }}</li>
<li v-if="this.$route.query.entityType == 1">{{ characterDetailData.occupation }} | {{ characterDetailData.dateofbirth }}-{{ characterDetailData.elapsedtime }} | {{ characterDetailData.nationality }}</li>
<li v-else-if="this.$route.query.entityType == 3">{{ characterDetailData.detailedaddress }}</li>
<li v-else>{{ characterDetailData.type }} | {{ characterDetailData.foundertime }} | {{ characterDetailData.abbreviation }}</li>
<li>{{ characterDetailData.description }}</li>
</ul>
</dd>
......@@ -54,7 +56,7 @@
<td></td>
</tr>
</table>
<table class="basicInfo" v-if="this.$route.query.entityType == 2">
<table class="basicInfo" v-if="this.$route.query.entityType == 3">
<tr>
<td>名称:</td>
<td>{{ characterDetailData.name }}</td>
......@@ -74,7 +76,7 @@
<td></td>
</tr>
</table>
<table class="basicInfo" v-if="this.$route.query.entityType == 3">
<table class="basicInfo" v-if="this.$route.query.entityType == 2">
<tr>
<td>名称:</td>
<td>{{ characterDetailData.name }}</td>
......@@ -168,16 +170,16 @@
</table>
<div class="echartsBox" id="moduleId4 moduleId5">
<section class="left">
<h2 v-if="this.$route.query.entityType === '1'">>人物关系</h2>
<h2 v-else-if="this.$route.query.entityType === '2'">>地点实体关系</h2>
<h2 v-if="this.$route.query.entityType == 1">>人物关系</h2>
<h2 v-else-if="this.$route.query.entityType == 3">>地点实体关系</h2>
<h2 v-else>>组织机构实体关系</h2>
<div>
<div id="relationChart" style="width:100%; height:100%;"></div>
</div>
</section>
<section class="right">
<h2 v-if="this.$route.query.entityType === '1'">>人物关键词</h2>
<h2 v-else-if="this.$route.query.entityType === '2'">>地点关键词</h2>
<h2 v-if="this.$route.query.entityType == 1">>人物关键词</h2>
<h2 v-else-if="this.$route.query.entityType == 3">>地点关键词</h2>
<h2 v-else>>组织机构关键词</h2>
<div>
<div id="myChart"></div>
......@@ -462,7 +464,7 @@ export default {
contentBoxRightData: [
{
id: 1,
name: '人物信息'
name: '实体信息'
},
{
id: 2,
......@@ -478,11 +480,11 @@ export default {
},
{
id: 5,
name: '人物关系'
name: '实体关系'
},
{
id: 6,
name: '人物关键词'
name: '实体关键词'
},
{
id: 7,
......@@ -539,7 +541,7 @@ export default {
_this.peopleName = res.data.data.keyword;
}
})
} else if (this.$route.query.entityType == 2) {
} else if (this.$route.query.entityType == 3) {
localtionDetailAPI(this.$route.query.id)
.then(res => {
if (res.data.code === 0) {
......@@ -547,7 +549,7 @@ export default {
_this.peopleName = res.data.data.keyword;
}
})
} else if (this.$route.query.entityType == 3) {
} else if (this.$route.query.entityType == 2) {
organDetailAPI(this.$route.query.id)
.then(res => {
if (res.data.code === 0) {
......
......@@ -2,16 +2,11 @@
<div class="box">
<div class="metaDataTop">
<em>人物</em>
<span @click="refPage">刷新 <i class="el-icon-refresh " ></i></span>
<span @click="refPage">刷新 <i class="el-icon-refresh"></i></span>
</div>
<div class="searchBox">
<el-input placeholder="搜索数字记忆资源库" v-model="inputVal" class="input-with-select">
<el-select v-model="selectVal" slot="prepend" placeholder="关键字">
<el-option label="餐厅名" value="1"></el-option>
<el-option label="订单号" value="2"></el-option>
<el-option label="用户电话" value="3"></el-option>
</el-select>
<el-button slot="append" icon="el-icon-search" style="background:#409EFF; color:#fff; border-top-left-radius:0; border-bottom-left-radius:0;">检索</el-button>
<el-button slot="append" icon="el-icon-search" style="border-top-left-radius:0; border-bottom-left-radius:0;">检索</el-button>
</el-input>
</div>
<div class="screeningConditionsLeft">
......@@ -572,3 +567,7 @@ export default {
}
}
</style>
<style lang="scss">
@import 'character.scss'
</style>
......@@ -228,7 +228,7 @@ export default {
path: 'character',
query: {
id: item.id,
entityType: 2,
entityType: 3,
}
})
},
......
......@@ -254,7 +254,7 @@ export default {
path: 'character',
query: {
id: item.id,
entityType: 3,
entityType: 2,
}
})
},
......
......@@ -49,7 +49,6 @@
<el-upload
:action="`${uploadUrl}/${uploadPath}/info`"
:show-file-list="false"
:limit="1"
:on-success="handleSuccess"
:before-upload="beforeUpload"
class="upload-demo"
......@@ -233,12 +232,14 @@ export default {
}, 1000)
},
editThisItem(item, key) {
// console.log(item, "*****(((((")
// store.dispatch('set_photo_id', item.id)
// this.$router.push({
// path: 'editphotoresource',
// activeIndexOne: key
// })
store.dispatch('set_photo_id', item.id);
this.$router.push({
path: 'editphotoresource',
query: {
oid: this.$route.query.oid,//图册id
activeIndexOne: key
}
})
}
}
}
......
......@@ -298,7 +298,8 @@ export default {
this.$router.push({
path: '/submission/resourcecommit',
query: {
oid: item.id
oid: item.id,
flag: 'look'
}
})
},
......
<template>
<div class="editPhotoResourceBox app-container">
<div class="resourceCommitTop">
<em>提交文本资源</em>
<em>编辑照片资源</em>
</div>
<div class="formBox">
<div class="formLeft">
......
......@@ -292,7 +292,7 @@ export default {
this.$router.push({
path: '/submission/resourcecommit',
query: {
oid: item.id
oid: item.id,
}
})
},
......@@ -300,7 +300,8 @@ export default {
this.$router.push({
path: '/submission/resourcecommit',
query: {
oid: item.id
oid: item.id,
flag: 'look'
}
})
}
......
......@@ -300,7 +300,8 @@ export default {
this.$router.push({
path: '/submission/resourcecommit',
query: {
oid: item.id
oid: item.id,
flag: 'look'
}
})
}
......
......@@ -190,10 +190,18 @@ export default {
console.log(this.uploadUrl, "LL")
this.photoItemId = flag.id
this.exifImgPath = this.uploadUrl + '?fileName=' + flag.fileName;
console.log(this.exifImgPath)
var _this = this;
var res = _this.EXIF.getAllTags(this.exifImgPath);
console.log(res,"22222222222222");
const imageObj = new Image();
if (this.exifImgPath) {
imageObj.src = this.exifImgPath;
console.log(imageObj, 'ILIL')
console.log(this.exifImgPath)
var _this = this;
this.EXIF.getData([imageObj], function () {
console.log(_this.EXIF.getAllTags(this), "::::") // 此处打印的为选中图片的数据
})
// var res = _this.EXIF.getAllTags(imageObj);
// console.log(res,"22222222222222");
}
}
}
},
......@@ -218,10 +226,18 @@ export default {
console.log(this.uploadUrl, "LL")
this.photoItemId = flag.id
this.exifImgPath = this.uploadUrl + '?fileName=' + flag.fileName;
console.log(this.exifImgPath)
var _this = this;
var res = _this.EXIF.getAllTags(this.exifImgPath);
console.log(res,"22222222222222");
const imageObj = new Image();
if (this.exifImgPath) {
imageObj.src = this.exifImgPath;
console.log(imageObj, 'ILIL')
console.log(this.exifImgPath)
var _this = this;
this.EXIF.getData(imageObj, function () {
console.log(_this.EXIF.getAllTags(this)) // 此处打印的为选中图片的数据
})
// var res = _this.EXIF.getAllTags(imageObj);
// console.log(res,"22222222222222");
}
}
}
}
......
......@@ -24,7 +24,7 @@
color:#409EFF;
background:#e6f1fe;
}
.el-form-item__error {
top:80%;
}
// .el-form-item__error {
// top:80%;
// }
}
......@@ -13,12 +13,10 @@
<h2>>资源内容描述类</h2>
<el-form label-width="86px" :model="formData" ref="formOne" :rules="rulesOne">
<el-form-item label="题名:" prop="name">
<el-input autocomplete="off" placeholder="文档题名" v-model="formData.name"></el-input>
<em>文档有原始题名的,使用原始题名。</em>
<el-input autocomplete="off" placeholder="文档有原始题名的,使用原始题名。" v-model="formData.name"></el-input>
</el-form-item>
<el-form-item label="主题:">
<el-input autocomplete="off" placeholder="文档主题" v-model="formData.theme"></el-input>
<em>描述、识别或诠释资源的术语或片语。</em>
<el-input autocomplete="off" placeholder="描述、识别或诠释资源的术语或片语。" v-model="formData.theme"></el-input>
</el-form-item>
<el-form-item label="文件上传:">
<el-upload
......@@ -44,20 +42,16 @@
</el-upload>
</el-form-item>
<el-form-item label="描述/摘要:">
<el-input type="textarea" v-model="formData.description" @input="changeType($event)"></el-input>
<em>对文档的简要摘要性描述。</em>
<el-input type="textarea" v-model="formData.description" @input="changeType($event)" placeholder="对文档的简要摘要性描述。"></el-input>
</el-form-item>
<el-form-item label="来源:">
<el-input autocomplete="off" placeholder="文档来源" v-model="formData.source"></el-input>
<em>文档的出处。</em>
<el-input autocomplete="off" placeholder="文档的出处。" v-model="formData.source"></el-input>
</el-form-item>
<el-form-item label="关键词:" prop="keyword">
<el-input autocomplete="off" placeholder="关键词" v-model="formData.keyword"></el-input>
<em>一般选择3-5个关键词。</em>
<el-input autocomplete="off" placeholder="一般选择3-5个关键词。" v-model="formData.keyword"></el-input>
</el-form-item>
<el-form-item label="语种:">
<el-input autocomplete="off" v-model="formData.languages"></el-input>
<em>指所著录文档资源所主要使用的语言,一般为中文。</em>
<el-input autocomplete="off" v-model="formData.languages" placeholder="指所著录文档资源所主要使用的语言,一般为中文。"></el-input>
</el-form-item>
</el-form>
</div>
......@@ -69,20 +63,19 @@
value-format="yyyy-MM-dd"
v-model="formData.formationTime"
type="date"
placeholder="选择日期"
placeholder="文档形成时间。"
style="width:100%;">
</el-date-picker>
<em>文档形成时间。</em>
</el-form-item>
<el-form-item label="地理位置:">
<el-input autocomplete="off" :disabled="true" v-model="location">
<el-input autocomplete="off" :disabled="true" v-model="location" placeholder="资源内容所指或者所相关的地理位置。">
<i slot="append" class="el-icon-location" @click="showMark">选择位置</i>
</el-input>
<em>资源内容所指或者所相关的地理位置。</em>
</el-form-item>
<el-form-item label="资源分类:">
<div class="block">
<el-cascader
placeholder="指定资源所属类别,类目体系在资源库系统中设置。"
change-on-select
v-model="optionResourceDiyTypeShow"
style="width:100%;"
......@@ -92,10 +85,9 @@
@change="handleChange">
</el-cascader>
</div>
<em>指定资源所属类别,类目体系在资源库系统中设置。</em>
</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"
......@@ -103,18 +95,15 @@
:value="item.id">
</el-option>
</el-select>
<em>指定资源所属专题与内容特征,相关标签需提前在“资源标签”功能中设置。</em>
</el-form-item>
</el-form>
<h2>>版权信息描述类</h2>
<el-form label-width="86px" :model="formData" ref="formThree" :rules="rulesOne">
<el-form-item label="责任者:" prop="responsibility">
<el-input autocomplete="off" placeholder="责任者" v-model="formData.responsibility"></el-input>
<em>文档责任者,创建者。</em>
<el-input autocomplete="off" placeholder="文档责任者,创建者。" v-model="formData.responsibility"></el-input>
</el-form-item>
<el-form-item label="版权信息:">
<el-input autocomplete="off" placeholder="版权信息" v-model="formData.copyright"></el-input>
<em>文档出版版权信息等。</em>
<el-input autocomplete="off" placeholder="文档出版版权信息等。" v-model="formData.copyright"></el-input>
</el-form-item>
</el-form>
<h2>>关联信息描述类</h2>
......@@ -126,7 +115,7 @@
</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>
<em>点击按钮勾选实体。</em>
<em></em>
</el-form-item>
</el-form>
<div v-if="this.$route.query.resourceType === '2'">
......@@ -140,16 +129,13 @@
<h2>>自定义元数据项目</h2>
<el-form label-width="110px">
<el-form-item label="论文发表卷期:">
<el-input autocomplete="off" placeholder="论文发表卷期"></el-input>
<em>论文发表卷期,例如2013年第10期。</em>
<el-input autocomplete="off" placeholder="论文发表卷期,例如2013年第10期。"></el-input>
</el-form-item>
<el-form-item label="类名:">
<el-input autocomplete="off" placeholder="类名"></el-input>
<em>所属的22个大类。</em>
<el-input autocomplete="off" placeholder="所属的22个大类。"></el-input>
</el-form-item>
<el-form-item label="子类名:">
<el-input autocomplete="off" placeholder="子类名"></el-input>
<em>类名的二级类目名。</em>
<el-input autocomplete="off" placeholder="类名的二级类目名。"></el-input>
</el-form-item>
</el-form>
</div>
......@@ -164,17 +150,16 @@
</el-select>
<el-form label-width="86px">
<el-form-item label="描述/摘要:">
<el-input type="textarea"></el-input>
<em>著录者为论文新写的摘要。</em>
<el-input type="textarea" placeholder="著录者为论文新写的摘要。"></el-input>
</el-form-item>
</el-form>
</div>
</div>
<div class="threeBtn">
<button @click="$router.back(-1)">取消</button>
<button v-if="!isShowSavaBtn">提交并转录目录</button>
<button @click="commitResource" v-if="!isShowSavaBtn">提交入库</button>
<button @click="saveEdit" v-if="isShowSavaBtn">保存变更</button>
<button v-if="isShowSavaBtn">提交并转录目录</button>
<button @click="commitResource" v-if="isShowSavaBtn">提交入库</button>
<button @click="saveEdit" v-if="isShowSavaBtn1">保存变更</button>
</div>
</div>
<mapmark :isShowMark="isShowMark" @changeIsShowMark="changeVal" @locationChange="locationChange"></mapmark>
......@@ -210,6 +195,7 @@ export default {
lat: '',
addressDetail: '',
isShowSavaBtn: false,
isShowSavaBtn1: false,
// timeVal: '',
formData: {
resourceType: this.$route.query.resourceType,
......@@ -306,7 +292,8 @@ export default {
this.getresourceDiyTypeList();
this.resourceLabelListAPI();
this.getLookContent();
this.getNowTime()
this.getNowTime();
this.formSixBtn();
},
methods: {
showMark() {
......@@ -389,7 +376,7 @@ export default {
this.formData.suffix = response.suffixName;
this.formData.fileName = response.fileName;
this.formData.name = response.originalFileName;
this.formData.pdfName = response.pdfName;
this.formData.pdfName = response.pdfPath;
},
getresourceDiyTypeList() { //获取资源分类的数据
resourceDiyTypeAPI(1)
......@@ -465,9 +452,20 @@ export default {
})
})
},
formSixBtn() {
if (this.$route.query.resourceType) {
this.isShowSavaBtn = true;
this.isShowSavaBtn1 = false;
}
},
getLookContent() {//查看
if(this.$route.query.oid && this.$route.query.flag) {
this.isShowSavaBtn = false;
} else {
this.isShowSavaBtn1 = true;
}
if (this.$route.query.oid) {
this.isShowSavaBtn = true;
//this.isShowSavaBtn = true;
editItemAPI(this.$route.query.oid)
.then(res => {
console.log(res, 'OPOPOPO');
......@@ -492,11 +490,28 @@ export default {
}
},
saveEdit() {//保存编辑
saveEditAPI(this.formData)
.then(res => {
if (res.data.code === 0) {
this.$message.success('保存变更成功')
}
const formOne = new Promise((resolve,reject) => {
this.$refs['formOne'].validate(valid=>{
if(valid) resolve()
})
});
const formTwo = new Promise((resolve,reject) => {
this.$refs['formTwo'].validate(valid => {
if(valid) resolve()
})
});
const formThree = new Promise((resolve,reject) => {
this.$refs['formThree'].validate(valid => {
if(valid) resolve()
})
});
Promise.all([formOne, formTwo, formThree]).then(() => {
saveEditAPI(this.formData)
.then(res => {
if (res.data.code === 0) {
this.$message.success('保存变更成功')
}
})
})
},
getNowTime() {
......@@ -538,9 +553,9 @@ export default {
font-size:18px;
margin:40px 0 46px 0;
}
.el-form-item {
margin-bottom:12px;
}
// .el-form-item {
// margin-bottom:12px;
// }
em {
font-style:normal;
color:#FBA57F;
......@@ -559,6 +574,7 @@ export default {
}
.formRight, .formLeft {
padding-bottom:26px;
height:758px;
}
.formBottom {
width:100%;
......@@ -581,7 +597,7 @@ export default {
height:80px;
background:#fff;
clear:both;
padding-left:35.73%;
text-align:center;
button {
border-radius:4px;
font-size:14px;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论