Skip to content

K
knowledgeServiceAdmin
提交 bd115842 authored 作者: 王腾飞's avatar 王腾飞
浏览文件
操作

Merge branch 'wtf' into dev

上级 45e5945f fed3c66b
隐藏空白字符变更
内嵌 并排
正在显示 包含 156 行增加 和 68 行删除
src/styles/element-ui.scss
浏览文件 @ bd115842
......@@ -203,12 +203,13 @@
.user_list_dialog{
display: flex;
.header_pic{
width: 75px;
height: 75px;
img{
width: 100%;
height: 100%;
}
width: 74px;
height: 74px;
img{
width: 60px;
height: 60px;
margin-top:7px;
}
}
.content_right{
flex: 1;
......
src/views/dataManagement/index.scss
浏览文件 @ bd115842
......@@ -195,11 +195,12 @@
.user_list_dialog{
display: flex;
.header_pic{
width: 75px;
height: 75px;
width: 74px;
height: 74px;
img{
width: 100%;
height: 100%;
width: 60px;
height: 60px;
margin-top:7px;
}
}
.content_right{
......
src/views/dataManagement/search.vue
浏览文件 @ bd115842
......@@ -123,7 +123,10 @@
:label="item.name"
:value="item.userId">
<div class="user_list_dialog">
<dt class="header_pic"><img :src="item.img" alt="头像" ></dt>
<dt class="header_pic">
<img :src="`${uploadUrl}?fileName=${item.img}`" alt="头像" v-if="item.img">
<img src="~@/assets/img/default.png" alt="默认头像" v-else>
</dt>
<dd class="content_right">
<div style="font-size: 16px;font-weight:600">{{ item.name }}</div>
<div>{{ item.email }}</div>
......@@ -248,7 +251,7 @@ export default {
dateTime:'',
formation:'',//形成时间的筛选的
size:'',
createTime:'',
createTime:'desc',
list:[],
totalCount:0,
}
......@@ -302,7 +305,7 @@ export default {
pageSize:this.searchForm.pageSize
};
this.formation='';
this.createTime='';
this.createTime='desc';
this.size ='';
this.getList()
},
......
src/views/draw/atlas/index.vue
浏览文件 @ bd115842
......@@ -83,7 +83,10 @@
:label="item.name"
:value="item.userId">
<div class="user_list_dialog">
<dt class="header_pic"><img :src="item.img" alt="头像" ></dt>
<dt class="header_pic">
<img :src="`${uploadUrl}?fileName=${item.img}`" alt="头像" v-if="item.img">
<img src="~@/assets/img/default.png" alt="默认头像" v-else>
</dt>
<dd class="content_right">
<div style="font-size: 16px;font-weight:600">{{ item.name }}</div>
<div>{{ item.email }}</div>
......@@ -163,7 +166,8 @@ export default {
data () {
return {
domain: process.env.BASE_API,
requestPath: requestPath,
requestPath: requestPath,
uploadUrl:uploadUrl,
loading:false,
checkAll: false,
searchUserVisible:false,
......
src/views/draw/atlas_rich/index.vue
浏览文件 @ bd115842
......@@ -74,7 +74,10 @@
:label="item.name"
:value="item.userId">
<div class="user_list_dialog">
<dt class="header_pic"><img :src="item.img" alt="头像" ></dt>
<dt class="header_pic">
<img :src="`${uploadUrl}?fileName=${item.img}`" alt="头像" v-if="item.img">
<img src="~@/assets/img/default.png" alt="默认头像" v-else>
</dt>
<dd class="content_right">
<div style="font-size: 16px;font-weight:600">{{ item.name }}</div>
<div>{{ item.email }}</div>
......
src/views/draw/metadata/index.vue
浏览文件 @ bd115842
......@@ -72,7 +72,10 @@
:label="item.name"
:value="item.userId">
<div class="user_list_dialog">
<dt class="header_pic"><img :src="item.img" alt="头像" ></dt>
<dt class="header_pic">
<img :src="`${uploadUrl}?fileName=${item.img}`" alt="头像" v-if="item.img">
<img src="~@/assets/img/default.png" alt="默认头像" v-else>
</dt>
<dd class="content_right">
<div style="font-size: 16px;font-weight:600">{{ item.name }}</div>
<div>{{ item.email }}</div>
......@@ -121,7 +124,8 @@ export default {
data () {
return {
domain: process.env.BASE_API,
requestPath: requestPath,
requestPath: requestPath,
uploadUrl:uploadUrl,
searchUserVisible:false,
searchTimerVisible:false,
loading:false,
......
src/views/draw/sip/index.vue
浏览文件 @ bd115842
......@@ -85,7 +85,10 @@
:label="item.name"
:value="item.userId">
<div class="user_list_dialog">
<dt class="header_pic"><img :src="item.img" alt="头像" ></dt>
<dt class="header_pic">
<img :src="`${uploadUrl}?fileName=${item.img}`" alt="头像" v-if="item.img">
<img src="~@/assets/img/default.png" alt="默认头像" v-else>
</dt>
<dd class="content_right">
<div style="font-size: 16px;font-weight:600">{{ item.name }}</div>
<div>{{ item.email }}</div>
......@@ -167,7 +170,8 @@ export default {
data () {
return {
domain: process.env.BASE_API,
requestPath: requestPath,
requestPath: requestPath,
uploadUrl:uploadUrl,
loading:false,
checkAll: false,
searchUserVisible:false,
......
src/views/storagemodule/namedentity/character.vue
浏览文件 @ bd115842
......@@ -168,13 +168,17 @@
</table>
<div class="echartsBox" id="moduleId4 moduleId5">
<section class="left">
<h2>>人物关系</h2>
<h2 v-if="this.$route.query.entityType === '1'">>人物关系</h2>
<h2 v-else-if="this.$route.query.entityType === '2'">>地点实体关系</h2>
<h2 v-else>>组织机构实体关系</h2>
<div>
<div id="relationChart" style="width:100%; height:100%;"></div>
</div>
</section>
<section class="right">
<h2>>人物关键词</h2>
<h2 v-if="this.$route.query.entityType === '1'">>人物关键词</h2>
<h2 v-else-if="this.$route.query.entityType === '2'">>地点关键词</h2>
<h2 v-else>>组织机构关键词</h2>
<div>
<div id="myChart"></div>
</div>
......@@ -363,6 +367,7 @@ let relateOptaion={
},
symbolSize: 50,
data: [
//{name: "工程建设情况", showName: "工程建设情况", symbolSize: 50, category: 0},
// {name: "工程建设情况", showName: "工程建设情况", symbolSize: 50, category: 0},
// {name: "工程规模", showName: "工程规模", symbolSize: 50, category: 0},
// {name: "建成时间", showName: "建成时间", symbolSize: 50, category: 0},
......@@ -774,19 +779,25 @@ export default {
// this.characterRelationData = res.data.data;
//{name: "工程建设情况", showName: "工程建设情况", symbolSize: 50, category: 0},
if(res.data.code===0){
let resData=res.data.data || [];
let resData=res.data.data;
console.log(resData,"565656566")
let data=[{name:resData[0]['relationword'] , showName: resData[0]['relationword'], category: 0}];
let links=[];
resData.forEach(list=>{
let state=Number(list.state)
data.push({name: list.brelationword, showName:list.brelationword , category: state})
links.push({source:list.brelationword, target: resData[0]['relationword'], value: list.relation})
})
relateOptaion.series[0]['data']=data;
relateOptaion.series[0]['links']=links;
relateOptaion.series[0].categories[0]['name']=resData[0]['relationword'];
this.relationChart.setOption(relateOptaion)
if (resData.length != 0) {
let data=[{name:resData[0]['relationword'] , showName: resData[0]['relationword'], category: 0}];
let links=[];
resData.forEach(list=>{
let state=Number(list.state)
data.push({name: list.brelationword, showName:list.brelationword , category: state})
links.push({source:list.brelationword, target: resData[0]['relationword'], value: list.relation})
})
relateOptaion.series[0]['data']=data;
relateOptaion.series[0]['links']=links;
relateOptaion.series[0].categories[0]['name']=resData[0]['relationword'];
this.relationChart.setOption(relateOptaion)
} else {
let data=[{name:this.peopleName, showName: this.peopleName, category: 0}];
relateOptaion.series[0]['data']=data;
this.relationChart.setOption(relateOptaion)
}
}else{
this.$message.error('获取人物关系失败')
}
......
src/views/submission/infoview/addnewphoto.vue
浏览文件 @ bd115842
......@@ -54,8 +54,11 @@
:before-upload="beforeUpload"
class="upload-demo"
drag>
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<img :src="`${this.domain}${this.requestPath.file}?fileName=${this.formData.fileName}&isOnLine=true`" alt="" v-if="formData.fileName" style="width:auto; height:100%;">
<div v-else>
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
</div>
<div class="el-upload__tip" slot="tip" style="color:rgb(98, 110, 130); font-size:16px; margin-top:-10px;">支持JPEG、PNG、GIF、TIFF等多种格式照片。</div>
</el-upload>
</el-form-item>
......@@ -97,6 +100,8 @@ export default {
name: 'photolook',
data() {
return {
domain: process.env.BASE_API,
requestPath: requestPath,
uploadUrl: uploadUrl,
uploadPath: uploadPath,
atlasInfo: {},
......
src/views/submission/infoview/allresource.vue
浏览文件 @ bd115842
......@@ -63,7 +63,7 @@
<img class="tag" src="~@/assets/img/default.png" alt="最后修改者头像" v-else :title="'最后编辑：' + item.modifierName">
<div class="opt_wrap">
<el-button type="primary" size="mini" @click="editItem(item)">编辑/挂接</el-button>
<el-button type="success" size="mini" icon="el-icon-search">查看</el-button>
<el-button type="success" size="mini" icon="el-icon-search" @click="goResourceDetail(item)">查看</el-button>
<el-button type="danger" icon="el-icon-delete" size="mini" @click="deleteItem(item)">删除</el-button>
</div>
</div>
......@@ -147,7 +147,7 @@ export default {
dateTime:'',
formation:'',//形成时间的筛选的
size:'',
createTime:'',
createTime:'desc',
list:[],
totalCount:0,
}
......@@ -256,7 +256,20 @@ export default {
})
},
editItem(item) {
this.$router.push({
path: '/submission/resourcecommit',
query: {
oid: item.id
}
})
},
goResourceDetail(item) {
this.$router.push({
path: '/submission/resourcecommit',
query: {
oid: item.id
}
})
},
},
beforeDestroy() {
......
src/views/submission/infoview/browsebycategory.vue
浏览文件 @ bd115842
......@@ -81,7 +81,7 @@
<!-- <img class="tag userPhoto" :src="`${uploadUrl}?fileName=${item.modifierImg}`" alt="最后修改者头像" v-if="item.modifierImg">
<img class="tag userPhoto" src="../../../assets/img/default.png" alt="头像" v-else> -->
<div class="opt_wrap">
<el-button type="primary" size="mini" plain icon="el-icon-view" class="look_btn" @click="richTo(item.id)">查看</el-button>
<el-button type="primary" size="mini" plain icon="el-icon-view" class="look_btn" @click="goItemDetail(item)">查看</el-button>
</div>
</div>
</div>
......@@ -217,7 +217,7 @@ export default {
},
formation:'',//形成时间的筛选的
size:'',
createTime:'',
createTime:'desc',
list:[],
totalCount:0,
diytypeList:[],
......@@ -423,6 +423,15 @@ export default {
this.loading=false;
},1000)
},
goItemDetail(item) {
this.$router.push({
path: '/draw/msgPacket',
query: {
id: item.id,
resourceType: item.resourceType
}
})
}
},
}
</script>
......
src/views/submission/infoview/mycommit.vue
浏览文件 @ bd115842
......@@ -155,7 +155,7 @@ export default {
dateTime:'',
formation:'',//形成时间的筛选的
size:'',
createTime:'',
createTime:'desc',
list:[],
totalCount:0,
}
......@@ -205,7 +205,7 @@ export default {
},
refPage(){
this.loading=true;
this.resetSearch();
//this.resetSearch();
setTimeout(()=>{
this.loading=false;
},1000)
......
src/views/submission/infoview/myedit.vue
浏览文件 @ bd115842
......@@ -153,7 +153,7 @@ export default {
dateTime:'',
formation:'',//形成时间的筛选的
size:'',
createTime:'',
createTime:'desc',
list:[],
totalCount:0,
}
......
src/views/submission/infoview/photolook.vue
浏览文件 @ bd115842
......@@ -57,7 +57,7 @@
</el-carousel> -->
<div class="swiper-box" style="height: 500px; padding-top:20px;">
<!-- swiper1 -->
<swiper :options="swiperOptionTop" class="gallery-top" ref="swiperTop">
<swiper :options="swiperOptionTop" class="gallery-top" ref="swiperTop" @click="callback($event)">
<swiper-slide class="slide-1" v-for="(item, key) in photoInfo" :key="key" :style="{backgroundImage: 'url('+`${uploadUrl}?fileName=${item.fileName}`+')', backgroundRepeat: 'no-repeat', backgroundPosition: '50%', backgroundSize: 'contain'}">
<!-- <img :src="`${uploadUrl}?fileName=${item.fileName}`" alt=""> -->
</swiper-slide>
......@@ -72,8 +72,7 @@
<div class="swiper-button-next swiper-button-black" slot="button-next"></div>
<div class="swiper-button-prev swiper-button-black" slot="button-prev"></div>
</swiper>
<input type="file" id="" value="" accept="image/*" multiple="multiple" name="files" @change="uploadFile" ref="img"/>
<!-- <img :src="`${uploadUrl}?fileName=${exifImgPath}`" alt=""> -->
<!-- <input type="file" id="" value="" accept="image/*" multiple="multiple" name="files" @change="uploadFile" ref="img"/> -->
</div>
</div>
<div class="atlasBasicInfo">
......@@ -81,7 +80,7 @@
<h2 class="titleWithIcon">
<i class="el-icon-info"></i>照片信息
</h2>
<el-button type="primary" icon="el-icon-edit" size="mini">编辑信息</el-button>
<el-button type="primary" icon="el-icon-edit" size="mini" @click="goEditPhotoResource(item)">编辑信息</el-button>
</section>
<table v-for="(item, key) in photoInfo" :key="key" v-if="key === activeIndex">
<tr>
......@@ -109,12 +108,6 @@
<td>{{ item.responsibility }}</td>
</tr>
<tr>
<th>照片标签</th>
<td></td>
<th></th>
<td></td>
</tr>
<tr>
<th>照片大小</th>
<td>{{ item.size }}</td>
<th>照片后缀名</th>
......@@ -126,6 +119,12 @@
<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 class="atlasBasicInfo photoExifInfo">
......@@ -185,7 +184,12 @@ export default {
console.log(this.activeIndex,"当前索引");
let flag = this.photoInfo[this.activeIndex];
console.log(flag,"不知道是什么")
this.exifImgPath = flag.fileName;
console.log(this.uploadUrl, "LL")
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");
}
}
},
......@@ -250,13 +254,27 @@ export default {
swiperThumbs.controller.control = swiperTop
})
},
uploadFile (event) {//exif获取照片信息
let file = event.target.files[0]
let _this = this
this.EXIF.getData(file, function () {
console.log(_this.EXIF.getAllTags(this)) // 此处打印的为选中图片的数据
})
}
goEditPhotoResource(item) {
this.$router.push({
path: 'editphotoresource'
})
}
// uploadFile (event) {//exif获取照片信息
// let file = event.target.files[0]
// let _this = this
// console.log(file,"IOIOIO**")
// this.EXIF.getData(file, function () {
// console.log(_this.EXIF.getAllTags(this)) // 此处打印的为选中图片的数据
// })
// },
// callback(e) {
// let _this = this
// console.log(e)
// this.EXIF.getData(e.target, function() {
// var res = _this.EXIF.getAllTags(this);
// console.log(res,"11111");
// });
// }
}
}
</script>
......@@ -321,6 +339,7 @@ export default {
table {
width:100%;
border-collapse:collapse;
table-layout:fixed;
td,th{
height:40px;
border-bottom:1px solid #eee;
......
src/views/submission/resourcecommit/index.vue
浏览文件 @ bd115842
......@@ -24,14 +24,23 @@
<el-upload
:action="`${uploadUrl}/${uploadPath}/info`"
:show-file-list="false"
:limit="1"
:on-success="handleSuccess"
:before-upload="beforeUpload"
class="upload-demo"
drag>
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<div class="el-upload__tip" slot="tip">支持office格式、pdf以及txt。</div>
<img :src="`${this.domain}${this.requestPath.file}?fileName=${this.formData.fileName}&isOnLine=true`" alt="" v-if="formData.fileName && this.$route.query.resourceType === '2'" style="width:auto; height:100%;">
<p v-else-if="formData.name && this.$route.query.resourceType === '1'">{{ formData.name }}</p>
<p v-else-if="formData.name && this.$route.query.resourceType === '3'">{{ formData.name }}</p>
<p v-else-if="formData.name && this.$route.query.resourceType === '4'">{{ formData.name }}</p>
<div v-else>
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
</div>
<div class="el-upload__tip" slot="tip" v-if="this.$route.query.resourceType === '1'">支持office格式、pdf以及txt。</div>
<div class="el-upload__tip" slot="tip" v-else-if="this.$route.query.resourceType === '2'">支持jpeg格式、png, gif以及jpg。</div>
<div class="el-upload__tip" slot="tip" v-else-if="this.$route.query.resourceType === '3'">支持mp3格式、mpeg以及wma。</div>
<div class="el-upload__tip" slot="tip" v-else-if="this.$route.query.resourceType === '4'">支持mp4格式、avi, flv以及mov。</div>
<div class="el-upload__tip" slot="tip" v-else>支持office格式、pdf以及txt。</div>
</el-upload>
</el-form-item>
<el-form-item label="描述/摘要：">
......@@ -186,6 +195,8 @@ export default {
},
data() {
return {
domain: process.env.BASE_API,
requestPath: requestPath,
vals: [],
val: [],
isShowMark: false,
......@@ -325,7 +336,7 @@ export default {
},
// 上传附件有关
beforeUpload(file) {
console.log(file)
console.log(file, '11!!')
let type = file.name.slice(file.name.lastIndexOf(".") + 1).toLowerCase();
console.log(type,"0000")
const isLt100M = file.size / 1024 / 1024 < 100;
......@@ -343,7 +354,7 @@ export default {
this.$message.warning("上传中");
}
} else if (this.formData.resourceType === '2') {
isType = type == "jpeg" || type == "png" || type == "gif";
isType = type == "jpeg" || type == "png" || type == "gif" || type == "jpg";
if (!isType) {
this.$message.error("上传附件格式工为jpeg, png, gif, jpg！");
return isType;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论