提交 7c3db377 authored 作者: 王腾飞's avatar 王腾飞

1025

上级 a95778f3
......@@ -23,20 +23,21 @@
margin:0 auto;
}
&:nth-of-type(6) div {
width:55px;
height:23px;
text-align:center;
line-height:23px;
background:#409EFF;
border-radius:3px;
color:#FFFFFF;
font-size:12px;
margin:0 auto;
background-image:url(../../../assets/img/look.png);
background-repeat:no-repeat;
background-size:14px 9px;
background-position:5px 6px;
padding-left:21px;
// width:55px;
// height:23px;
// text-align:center;
// line-height:23px;
// background:#409EFF;
// border-radius:3px;
// color:#FFFFFF;
// font-size:12px;
// margin:0 auto;
// background-image:url(../../../assets/img/look.png);
// background-repeat:no-repeat;
// background-size:14px 9px;
// background-position:5px 6px;
// padding-left:21px;
// cursor:pointer;
}
}
td:nth-of-type(3) div,td:nth-of-type(4) div,td:nth-of-type(5) div,td:nth-of-type(6) div {
......
......@@ -237,7 +237,8 @@
:data="tableData"
height="250"
border
style="width: 100%">
style="width: 100%"
@row-click="goResourceDetail">
<el-table-column
prop="name"
label="标题"
......@@ -261,8 +262,12 @@
label="状态">
</el-table-column>
<el-table-column
prop="action"
label="操作">
prop=""
label="操作"
>
<template slot-scope="scope">
<el-button type="primary" size="mini" icon="el-icon-view">查看</el-button>
</template>
</el-table-column>
</el-table>
</div>
......@@ -442,7 +447,7 @@ export default {
chartLink:[],
current: 0,
characterDetailData: {},
peopleName: '',
peopleName: null,
relatePeopleData: [],
relateOrganData: [],
relateAreaData: [],
......@@ -525,7 +530,7 @@ export default {
.then(res => {
if (res.data.code === 0) {
_this.characterDetailData = res.data.data;
_this.peopleName = res.data.data.name;
_this.peopleName = res.data.data.keyword;
}
})
} else if (this.$route.query.entityType === '2') {
......@@ -533,7 +538,7 @@ export default {
.then(res => {
if (res.data.code === 0) {
_this.characterDetailData = res.data.data;
_this.peopleName = res.data.data.name;
_this.peopleName = res.data.data.keyword;
}
})
} else if (this.$route.query.entityType === '3') {
......@@ -542,7 +547,7 @@ export default {
if (res.data.code === 0) {
_this.characterDetailData = res.data.data;
console.log(_this.characterDetailData,"IIIIIII")
_this.peopleName = res.data.data.name;
_this.peopleName = res.data.data.keyword;
}
})
}
......@@ -598,14 +603,14 @@ export default {
getRelateResourceListAPI() {//关联资源列表
var _this = this;
setTimeout(() => {
console.log(this.peopleName)
relateResourceListAPI('string')
relateResourceListAPI(this.peopleName)
.then(res => {
console.log(res, "11818188")
if (res.data.code === 0) {
_this.tableData = res.data.data;
console.log(_this.tableData,"IOIOI((")
_this.tableData.forEach((item, index) => {
this.$set(item, 'action', '操作')
this.$set(item, 'action', '查看')
this.$set(item, 'statusVal', null);
this.$set(item, 'resourceTypeVal', null);
if (item.resourceType === 1) {
......@@ -635,6 +640,16 @@ export default {
})
},500)
},
goResourceDetail(row, column, event) {
console.log(row,"((((((((()))")
this.$router.push({
path: '/draw/msgPacket',
query: {
id: row.id,
resourceType:row.resourceType
}
})
},
initEchart() {
this.relationChart = echarts.init(document.getElementById("relationChart"));
},
......@@ -730,46 +745,53 @@ export default {
data:[],
}]
}
keyWordsAPI({name:"李大钊"}).then(res=>{
if(res.data.code===0){
let dataRes=res.data.data;
let data=[];
dataRes.forEach(list=>{
data.push({
name: list.keyword,
value: list.count
setTimeout(() => {
keyWordsAPI({name: this.peopleName}).then(res=>{
if(res.data.code===0){
let dataRes=res.data.data;
let data=[];
dataRes.forEach(list=>{
data.push({
name: list.keyword,
value: list.count
})
})
})
// 为echarts对象加载数据
option.series[0].data=data;
this.keywordChart.setOption(option)
}else{
this.$message.error('获取人物关系失败')
}
})
// 为echarts对象加载数据
option.series[0].data=data;
this.keywordChart.setOption(option)
}else{
this.$message.error('获取人物关系失败')
}
})
},200)
},
getKeyWordsRelation() {//获取人物关系的
keyWordsRelationAPI('水果')//先写死
.then(res => {
// this.characterRelationData = res.data.data;
//{name: "工程建设情况", showName: "工程建设情况", symbolSize: 50, category: 0},
if(res.data.code===0){
let resData=res.data.data;
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{
this.$message.error('获取人物关系失败')
}
})
setTimeout(() => {
console.log(this.peopleName,"*(*(*(")
keyWordsRelationAPI(this.peopleName)//先写死
.then(res => {
console.log(this.peopleName,"*(*(*(111111111")
// this.characterRelationData = res.data.data;
//{name: "工程建设情况", showName: "工程建设情况", symbolSize: 50, category: 0},
if(res.data.code===0){
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)
}else{
this.$message.error('获取人物关系失败')
}
})
},200)
}
}
......@@ -862,17 +884,21 @@ export default {
border-bottom:none;
border-right:none;
tr {
width:100%;
td {
border-bottom:1px solid #E3EBF3;
border-right:1px solid #E3EBF3;
font-size:14px;
color:#293C6C;
padding:0 20px;
text-align:left;
height:44px;
text-indent:1em;
&:nth-of-type(2n) {
width:40%;
}
&:nth-of-type(2n+1) {
width:10%;
color:#404E67;
padding-left:30px;
}
}
}
......@@ -905,6 +931,7 @@ export default {
padding:11px 11px;
width:calc(50% - 10px);
height:112px;
margin-bottom:20px;
&:nth-of-type(2n) {
margin-left:20px;
}
......
......@@ -28,7 +28,8 @@
<li>
<dl>
<dt>
<img :src="item.img" alt="">
<img :src="item.img" alt="" v-if="item.img">
<img src="../../../assets/img/pic_user.png" alt="" v-else>
</dt>
<dd>
<ul>
......
......@@ -28,7 +28,8 @@
<li>
<dl>
<dt>
<img :src="item.img" alt="">
<img :src="item.img" alt="" v-if="item.img">
<img src="../../../assets/img/pic_ops.png" alt="" v-else>
</dt>
<dd>
<ul>
......
......@@ -28,7 +28,8 @@
<li>
<dl>
<dt>
<img :src="item.img" alt="">
<img :src="item.img" alt="" v-if="item.img">
<img src="../../../assets/img/pic_user.png" alt="" v-else>
</dt>
<dd>
<ul>
......
......@@ -57,9 +57,10 @@
</p> -->
</div>
<el-button type="warning" size="mini" style="margin-right: 40px;">{{ item.statusVal }}</el-button>
<img class="tag" :src="`${domain}${requestPath.file}?fileName=${item.userImg}&isOnLine=true`" v-if="item.userImg" alt="头像">
<!-- <img class="tag_img" :src="item.userImg" v-if="item.userImg" alt="头像"> -->
<img class="tag" src="../../../assets/img/default.png" v-else alt="默认头像">
<img class="tag" :src="`${domain}${requestPath.file}?fileName=${item.userImg}&isOnLine=true`" alt="用户头像" v-if="item.userImg" :title="'提交者:' + item.createrName">
<img class="tag" src="~@/assets/img/default.png" alt="用户头像" v-else :title="'提交者:' + item.createrName">
<img class="tag" :src="`${domain}${requestPath.file}?fileName=${item.modifierImg}&isOnLine=true`" alt="最后修改者头像" v-if="item.modifierImg" :title="'最后编辑:'+ item.modifierName">
<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>
......@@ -135,10 +136,10 @@ export default {
formation: null,
size: null,
status: null,
resourceType: null,
resourceType: '',
status: '',
orderBy: null,
createTime: null,
createrId: 11,
pageNum: 1,
pageSize: 30
},
......@@ -170,7 +171,7 @@ export default {
},
getList(){
myCommitResListAPI(this.searchForm).then(res=>{
console.log(res, '111111111111')
console.log(res, '3333')
if (res.data.code === 0) {
this.list=res.data.data.list||[];
this.totalCount=res.data.data.total||0;
......@@ -419,8 +420,8 @@ export default {
.tag{
margin-right: 40px;
color:#F56C6C;
width:40px;
border-radius:40px;
width:28px;
border-radius:4px;
}
.opt_wrap{
width: 100px;
......
......@@ -16,7 +16,7 @@
<dl>
<dt @click="lookphotoDetail(item)">
<img v-if="item.firstImg" :src="`${uploadUrl}?fileName=${item.firstImg}`" alt="">
<img v-else src="../../../assets/img/bookDefault.png" alt="">
<img v-else src="../../../assets/img/defaultPhoto.png" alt="">
</dt>
<dd>
<span>{{ item.name }}</span>
......
......@@ -76,8 +76,8 @@
<p class="text">{{item.description}}</p>
</div>
<span class="tag">{{ item.statusVal }}</span>
<img class="tag userPhoto" :src="`${uploadUrl}?fileName=${item.userImg}`" alt="用户头像" v-if="item.userImg">
<img class="tag userPhoto" src="../../../assets/img/default.png" alt="头像" v-else>
<img class="tag userPhoto" :src="`${uploadUrl}?fileName=${item.userImg}`" alt="用户头像" v-if="item.userImg" :title="item.createrName">
<img class="tag userPhoto" src="../../../assets/img/default.png" alt="头像" v-else :title="item.createrName">
<!-- <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">
......@@ -429,9 +429,9 @@ export default {
<style lang="less" scoped>
.userPhoto {
width:40px;
height:40px;
border-radius:50%;
width:28px;
height:28px;
border-radius:4px;
}
</style>
......
......@@ -57,8 +57,10 @@
</p> -->
</div>
<el-button type="warning" size="mini" style="margin-right: 40px;">{{ item.statusVal }}</el-button>
<img class="tag" :src="`${domain}${requestPath.file}?fileName=${item.userImg}&isOnLine=true`" alt="用户头像" v-if="item.userImg">
<img class="tag" src="~@/assets/img/default.png" alt="用户头像" v-else>
<img class="tag" :src="`${domain}${requestPath.file}?fileName=${item.userImg}&isOnLine=true`" alt="用户头像" v-if="item.userImg" :title="'提交者:' + item.createrName">
<img class="tag" src="~@/assets/img/default.png" alt="用户头像" v-else :title="'提交者:' + item.createrName">
<img class="tag" :src="`${domain}${requestPath.file}?fileName=${item.modifierImg}&isOnLine=true`" alt="最后修改者头像" v-if="item.modifierImg" :title="'最后编辑'+ item.modifierName">
<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)" v-if="item.status != 3 && item.status != 5">编辑/挂接</el-button>
<el-button type="success" size="mini" icon="el-icon-search" @click="goResourceDetail(item)">查看</el-button>
......@@ -140,13 +142,14 @@ export default {
formation: null,
size: null,
status: null,
resourceType: null,
resourceType: '',
orderBy: null,
createTime: null,
createrId: Cookies.get('userId'),
pageNum: 1,
pageSize: 30,
content:''
content:'',
status: ''
},
searchUserForm:{},
dateTime:'',
......@@ -175,7 +178,7 @@ export default {
},
getList(){
myCommitResListAPI(this.searchForm).then(res=>{
console.log(res, '111111111111')
console.log(res, '222222222222')
if (res.data.code === 0) {
this.list=res.data.data.list||[];
this.totalCount=res.data.data.total||0;
......@@ -439,8 +442,9 @@ export default {
.tag{
margin-right: 40px;
color:#F56C6C;
width:40px;
border-radius:40px;
width:28px;
border-radius:4px;
cursor:pointer;
}
.opt_wrap{
width: 100px;
......
......@@ -58,8 +58,10 @@
</p> -->
</div>
<el-button type="warning" size="mini" style="margin-right: 40px;">{{ item.statusVal }}</el-button>
<img class="tag" :src="`${domain}${requestPath.file}?fileName=${item.userImg}&isOnLine=true`" alt="用户头像" v-if="item.userImg">
<img class="tag" src="~@/assets/img/default.png" alt="用户头像" v-else>
<img class="tag" :src="`${domain}${requestPath.file}?fileName=${item.userImg}&isOnLine=true`" alt="用户头像" v-if="item.userImg" :title="'提交者:' + item.createrName">
<img class="tag" src="~@/assets/img/default.png" alt="用户头像" v-else :title="'提交者:' + item.createrName">
<img class="tag" :src="`${domain}${requestPath.file}?fileName=${item.modifierImg}&isOnLine=true`" alt="最后修改者头像" v-if="item.modifierImg" :title="'最后编辑'+ item.modifierName">
<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)" v-if="item.status != 3 && item.status != 5">编辑/挂接</el-button>
<el-button type="success" size="mini" icon="el-icon-search" @click="goResourceDetail(item)">查看</el-button>
......@@ -139,7 +141,8 @@ export default {
formation: null,
size: null,
status: null,
resourceType: null,
resourceType: '',
status: '',
orderBy: null,
createTime: null,
modifierId: Cookies.get('userId'),
......@@ -173,7 +176,7 @@ export default {
},
getList(){
myCommitResListAPI(this.searchForm).then(res=>{
console.log(res, '111111111111')
console.log(res, '222222')
if (res.data.code === 0) {
this.list=res.data.data.list||[];
this.totalCount=res.data.data.total||0;
......@@ -437,8 +440,9 @@ export default {
.tag{
margin-right: 40px;
color:#F56C6C;
width:40px;
border-radius:50%;
width:28px;
border-radius:4px;
cursor:pointer;
}
.opt_wrap{
width: 100px;
......
......@@ -55,6 +55,24 @@
<img :src="`${uploadUrl}?fileName=${item.fileName}`" alt="">
</el-carousel-item>
</el-carousel> -->
<div class="swiper-box" style="height: 500px">
<!-- swiper1 -->
<swiper :options="swiperOptionTop" class="gallery-top" ref="swiperTop">
<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%'}">
<!-- <img :src="`${uploadUrl}?fileName=${item.fileName}`" alt=""> -->
</swiper-slide>
<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>
<!-- swiper2 Thumbs -->
<swiper :options="swiperOptionThumbs" class="gallery-thumbs" ref="swiperThumbs">
<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%'}">
<!-- <img :src="`${uploadUrl}?fileName=${item.fileName}`" alt=""> -->
</swiper-slide>
<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>
</div>
</div>
<div class="atlasBasicInfo">
<section>
......@@ -63,7 +81,7 @@
</h2>
<el-button type="primary" icon="el-icon-edit" size="mini">编辑信息</el-button>
</section>
<table v-for="(item, key) in photoInfo" :key="key">
<table v-for="(item, key) in photoInfo" :key="key" v-if="key === activeIndex">
<tr>
<th>照片题名</th>
<td>{{ item.name }}</td>
......@@ -136,17 +154,59 @@
<script>
import { getItemDetailByIdAPI } from '@/api/resourcecommit'
import { uploadUrl } from "@/utils/global";
import 'swiper/dist/css/swiper.css'
import { swiper, swiperSlide } from 'vue-awesome-swiper'
export default {
name: 'photolook',
components: {
swiper,
swiperSlide
},
data() {
return {
uploadUrl: uploadUrl,
atlasInfo: {},
photoInfo: [],
activeIndex: 0,
swiperOptionTop: {
spaceBetween: 10,
navigation: {
nextEl: '.swiper-button-next',
prevEl: '.swiper-button-prev'
},
on:{
// 要使用es6的箭头函数,使this指向vue对象
click: ()=>{
const swiperTop = this.$refs.swiperTop.swiper
this.activeIndex = swiperTop.activeIndex;
console.log(this.activeIndex,"当前索引");
}
}
},
swiperOptionThumbs: {
spaceBetween: 10,
centeredSlides: true,
slidesPerView: 'auto',
touchRatio: 0.2,
slideToClickedSlide: true,
navigation: {
nextEl: '.swiper-button-next',
prevEl: '.swiper-button-prev'
},
on:{
// 要使用es6的箭头函数,使this指向vue对象
click: ()=>{
const swiperThumbs = this.$refs.swiperThumbs.swiper
this.activeIndex = swiperThumbs.activeIndex;
console.log(this.activeIndex,"当前索引");
}
}
}
}
},
mounted(){
this.getItemDetailById()
this.getItemDetailById();
this.lunbo();
},
methods: {
editPhotoBasicInfo() {
......@@ -173,6 +233,16 @@ export default {
this.$message.error('获取详情错误')
}
})
},
lunbo() {
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
})
}
}
}
......@@ -281,4 +351,32 @@ export default {
height:60px;
}
}
.swiper-slide {
display:flex;
align-items:center;
justify-content:center;
overflow:hidden;
}
.gallery-top {
height: 80%!important;
width: 100%;
.swiper-slide {
width:100%;
}
}
.gallery-thumbs {
height: 20%!important;
box-sizing: border-box;
padding: 10px 0;
}
.gallery-thumbs .swiper-slide {
width: 25%;
height: 100%;
opacity: 0.4;
}
.gallery-thumbs .swiper-slide-active {
opacity: 1;
}
</style>
......@@ -51,30 +51,30 @@ export default {
},
data () {
return {
swiperOptionTop: {
spaceBetween: 10,
navigation: {
nextEl: '.swiper-button-next',
prevEl: '.swiper-button-prev'
}
},
swiperOptionThumbs: {
spaceBetween: 10,
centeredSlides: true,
slidesPerView: 'auto',
touchRatio: 0.2,
slideToClickedSlide: true
swiperOptionTop: {
spaceBetween: 10,
navigation: {
nextEl: '.swiper-button-next',
prevEl: '.swiper-button-prev'
}
},
swiperOptionThumbs: {
spaceBetween: 10,
centeredSlides: true,
slidesPerView: 'auto',
touchRatio: 0.2,
slideToClickedSlide: true
}
}
},
mounted() {
this.$nextTick(() => {
const swiperTop = this.$refs.swiperTop.swiper
const swiperThumbs = this.$refs.swiperThumbs.swiper
swiperTop.controller.control = swiperThumbs
swiperThumbs.controller.control = swiperTop
})
}
this.$nextTick(() => {
const swiperTop = this.$refs.swiperTop.swiper
const swiperThumbs = this.$refs.swiperThumbs.swiper
swiperTop.controller.control = swiperThumbs
swiperThumbs.controller.control = swiperTop
})
}
}
</script>
......
......@@ -63,7 +63,7 @@
placeholder="选择日期"
style="width:100%;">
</el-date-picker>
<em>文档形成时间,具体时间不确定的输入0000-00-00</em>
<em>文档形成时间。</em>
</el-form-item>
<el-form-item label="地理位置:">
<el-input autocomplete="off" :disabled="true" v-model="location">
......@@ -293,6 +293,7 @@ export default {
this.getresourceDiyTypeList();
this.resourceLabelListAPI();
this.getLookContent();
this.getNowTime()
},
methods: {
showMark() {
......@@ -457,7 +458,9 @@ export default {
console.log(res, 'OPOPOPO');
if (res.data.code === 0) {
this.formData = res.data.data;
this.location = '经度:' + res.data.data.longitude + ',' + '维度:' + res.data.data.latitude + ',' + res.data.data.address;
if (res.data.data.longitude) {
this.location = '经度:' + res.data.data.longitude + ',' + '维度:' + res.data.data.latitude + ',' + res.data.data.address;
}
res.data.data.label.map((item, index) => {
this.$set(item, 'value', item.labelId);
this.resourceLabel.push(item.value)
......@@ -480,7 +483,21 @@ export default {
this.$message.success('保存变更成功')
}
})
}
},
getNowTime() {
var now = new Date();
var year = now.getFullYear(); //得到年份
var month = now.getMonth(); //得到月份
var date = now.getDate(); //得到日期
month = month + 1;
month = month.toString().padStart(2, "0");
date = date.toString().padStart(2, "0");
var defaultDate = `${year}-${month}-${date}`;
// this.$set(this.searchFormField, "date", defaultDate);
console.log(defaultDate,"()***")
this.formData.formationTime = defaultDate;
console.log(this.formData.formationTime,"()***")
},
}
}
</script>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论