Skip to content

K
knowledgeServiceAdmin
提交 4e4af36c authored 作者: quanlili's avatar quanlili
浏览文件
操作

Merge branch 'qll' into dev

上级 7071ca76 c254b833
隐藏空白字符变更
内嵌 并排
正在显示 包含 149 行增加 和 56 行删除
src/router/index.js
浏览文件 @ 4e4af36c
......@@ -359,7 +359,7 @@ export const asyncRouterMap = [{
component: _import('storagemodule/namedentity/character'),
name: 'character',
meta: {
title: '人物详情',
title: '实体详情',
routerIds: ['100101']
},
hidden:true
......
src/store/getters.js
浏览文件 @ 4e4af36c
......@@ -7,6 +7,9 @@ const getters = {
token: state => state.user.token,
avatar: state => state.user.avatar,
name: state => state.user.name,
userImg: state => state.user.userImg,
userName: state => state.user.username,
email:state => state.user.email,
pageBtn: state => state.user.pageBtn,
introduction: state => state.user.introduction,
status: state => state.user.status,
......
src/store/modules/user.js
浏览文件 @ 4e4af36c
......@@ -8,7 +8,6 @@ const user = {
status: '',
code: '',
token: getToken(),
name: '',
avatar: '',
introduction: '',
roles: [],
......@@ -16,7 +15,10 @@ const user = {
setting: {
articlePlatform: []
},
indexUserMsg:{},//首页用户的信息存储
userImg:Cookies.set('img'),//首页头部用户的头像
username:Cookies.set('username'),//首页的用户名
name:Cookies.set('name'),//首页的用户角色
email:Cookies.set('email')//首页的用户邮箱
},
mutations: {
......@@ -46,7 +48,14 @@ const user = {
},
SET_PAGE_BTN: (state, code_btns) => {
state.pageBtn[code_btns[0]] = code_btns[1]
}
},
SET_USER_INDEX: (state, data) => {
state.userImg = data.userImg;
state.username = data.username;
state.name = data.name;
state.email = data.email
},
},
actions: {
......@@ -67,8 +76,15 @@ const user = {
Cookies.set('img',data.img),
Cookies.set('lastLandingTime',data.lastLandingTime)
Cookies.set('name',data.name)//身份
Cookies.set('ip',data.ip)//身份
Cookies.set('ip',data.ip)//ip
commit('SET_TOKEN', data.token)
let indexData={
userImg:Cookies.get('img'),
username:Cookies.get('username'),
name:Cookies.get('name'),
email:Cookies.get('email')
}
commit('SET_USER_INDEX',indexData);
setToken(data.token)
resolve(0)
}).catch(err => {
......@@ -195,6 +211,20 @@ const user = {
resolve()
})
})
},
//获取cook头像的图片
ChangeNavImg({ commit }){
return new Promise(resolve => {
let data={
userImg:Cookies.get('img'),
username:Cookies.get('username'),
name:Cookies.get('name'),
email:Cookies.get('email')
}
commit('SET_USER_INDEX',data);
resolve(true)
})
}
}
}
......
src/views/authorizationmanage/user_management.vue
浏览文件 @ 4e4af36c
......@@ -186,6 +186,7 @@ import { getMultipleSelectionIDs } from '@/filters/getIds'
import { formatOptions } from '@/utils/format'
import { uploadUrl, uploadPath, requestPath } from "@/utils/global.js";
import store from '@/store'
import Cookies from 'js-cookie'
import md5 from 'blueimp-md5';
export default {
data() {
......@@ -241,6 +242,7 @@ export default {
requestPath: requestPath,
uploadPath: uploadPath,
uploading: false,
userId:Cookies.get('userId'),
authBtns: [],
tableKey: 0,
list: null,
......@@ -434,7 +436,25 @@ export default {
addAPI(tempData).then(res => {
operationMsg.apply(this,[res.data.code,'用户信息修改'])
res.data.code === 0 ? this.dialogFormVisible = false : true
this.$refs.tree.setCheckedKeys([])
this.$refs.tree.setCheckedKeys([]);
if(tempData.password&&tempData.userId==this.userId){
this.$store.dispatch("FedLogOut").then(res => {
if (res) {
location.reload();
}
});
}
if(tempData.userId==this.userId){
Cookies.set('img',tempData.img);
Cookies.set('email',tempData.email);
Cookies.set('username',tempData.userName);
Cookies.set('name',tempData.name);
this.$store.dispatch("ChangeNavImg").then(res => {
if (res) {
//location.reload();
}
});
}
})
}
})
......
src/views/draw/metadata/contrast.vue
浏览文件 @ 4e4af36c
<template>
<div class="metadata_contrast app-container">
<div class=" clearfix">
<a><span class="refBtn fr" style="margin: 17px 0px 23px;" @click="$router.go(-1)"><i class="el-icon-back" ></i> 返回</span> </a>
</div>
<el-row :gutter="20">
<el-col :span="12">
<div style="width:100%;" class="pdf_wrap" v-loading="loading">
......@@ -46,9 +49,11 @@ export default {
}
},
mounted() {
this.file=this.$route.query.file;
this.pdf=this.$route.query.pdf;
this.file=JSON.parse(this.$route.query.file);
this.pdf=JSON.parse(this.$route.query.pdf);
console.log(this.file,this.pdf,'00000000000')
this.file.fileName=`${this.domain}${requestPath.file}?fileName=${this.file.fileName}&isOnLine=true`;
this.pdf.fileName=`${this.domain}${requestPath.file}?fileName=${this.pdf.fileName}&isOnLine=true`;
},
methods: {
refPage(){
......
src/views/draw/metadata/detail.vue
浏览文件 @ 4e4af36c
......@@ -225,9 +225,10 @@
</p>
</div>
<div class="tag">相似度：{{item.relationDegree}}</div>
<img class="tag" :src="item.userImg" alt="用户头像">
<img class="tag_img" v-if="item.userImg" :src="`${uploadUrl}?fileName=${item.userImg}`" alt="头像" >
<img class="tag_img" v-else :src="`${uploadUrl}?fileName=${item.userImg}`" alt="头像">
<div class="opt_wrap">
<el-button type="primary" plain size="mini" @click="contrastTo(item.fileName,item.name)"><i class="iconfont icon-projectguanlianbijiao"></i> 关联比较</el-button>
<el-button type="primary" plain size="mini" @click="contrastTo(item.pdfName,item.name)"><i class="iconfont icon-projectguanlianbijiao"></i> 关联比较</el-button>
<el-button type="success" plain size="mini" icon="el-icon-search" @click="linkSip">查看</el-button>
</div>
</div>
......@@ -264,7 +265,7 @@
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="entityVisible = false">取 消</el-button>
<el-button type="primary" @click="entitySubmit">确 定</el-button>
<el-button type="primary" @click="entitySubmit" v-loading="submitLoad">确 定</el-button>
</span>
</el-dialog>
<!-- 命名实体确认 -->
......@@ -323,8 +324,8 @@
<!-- <div>其他义项</div> -->
<span slot="footer" class="dialog-footer">
<el-button @click="personLinkVisible = false">取 消</el-button>
<el-button type="primary" @click="personLinkVisible = false">更换义项</el-button>
<el-button type="primary" @click="importPerson">确认实体</el-button>
<!-- <el-button type="primary" @click="personLinkVisible = false">更换义项</el-button> -->
<el-button type="primary" @click="importPerson" v-loading="submitLoad">确认实体</el-button>
</span>
</el-dialog>
<!-- 地理位置实体确认 -->
......@@ -374,7 +375,7 @@
<div>其他义项</div>
<span slot="footer" class="dialog-footer">
<el-button @click="positionLinkVisible= false">取 消</el-button>
<el-button type="primary" @click="positionLinkVisible = false">更换义项</el-button>
<!-- <el-button type="primary" @click="positionLinkVisible = false">更换义项</el-button> -->
<el-button type="primary" @click="importPosition">确认实体</el-button>
</span>
</el-dialog>
......@@ -489,7 +490,7 @@ import BaiduMap from 'vue-baidu-map/components/map/Map.vue'
import Tinymce from '@/components/Tinymce'
import pagination from '@/components/pagination/pagination'
import { operationMsg, confirm, requestMsg } from '@/utils/publicFunctions'
import { requestPath } from '@/utils/global.js'
import { uploadUrl, uploadPath, requestPath } from "@/utils/global";
import {
detailsAPI ,personListAPI,
positionListAPI,organizationListAPI,
......@@ -507,6 +508,7 @@ export default {
loading:false,
domain: process.env.BASE_API,
requestPath: requestPath,
uploadUrl: uploadUrl,
packet:{lng: 116.404, lat: 39.915},
entityRules:{
state:[
......@@ -572,6 +574,7 @@ export default {
positionLinkVisible:false,
organizationLinkVisible:false,
timerLinkVisible:false,
submitLoad:false,
backForm:{
state:1,
keyword:''
......@@ -754,6 +757,7 @@ export default {
entitySubmit(){
this.$refs['entityForm'].validate((valid) => {
if (valid) {
this.submitLoad=true;
addEntityAPI(this.entityForm).then(res=>{
if(res.data.code===0){
let tab={
......@@ -763,8 +767,10 @@ export default {
this.backForm.state=this.entityForm.state;//显示哪个弹框
this.lookBack(this.entityForm.keyword);
this.entityVisible=false;
this.submitLoad=false;
}else{
this.$message.error('新增实体失败')
this.submitLoad=false;
}
})
} else {
......@@ -775,7 +781,7 @@ export default {
},
lookBack(keyword){
//1 ：为人物 2：组织机构 3： 地址 4：时间
console.log(this.backForm.state,'88888888888822222')
//console.log(this.backForm.state,'88888888888822222')
if(this.backForm.state==1){
this.personLinkVisible=true;
}else if(this.backForm.state==2){
......@@ -894,6 +900,7 @@ export default {
importPerson(){
this.$refs['personForm'].validate((valid) => {
if(valid){
this.submitLoad=true;
this.personForm.keyword=this.backForm.keyword;
importPersonAPI(this.personForm).then(res=>{
if(res.data.code == 0){
......@@ -904,8 +911,10 @@ export default {
}
this.handleInnerClick(tab,event)
this.personLinkVisible = false;
this.submitLoad=false;
}else{
this.$message.error('确认实体失败');
this.submitLoad=false;
}
})
}else{
......@@ -1008,20 +1017,22 @@ export default {
this.getTimer()
}
},
contrastTo(fileName,name){
contrastTo(pdfName,name){
let file={
fileName:pdfName,
name:name,
}
let pdf={
fileName:this.pdf.pdfName,
name:this.pdf.name
}
this.$router.push({path:"/draw/metadata_contrast",query:{
file:{
fileName:fileName,
name:name,
},pdf:{
fileName:this.pdf.fileName,
name:this.pdf.name
}
file:JSON.stringify(file),pdf:JSON.stringify(pdf)
}
})
},
linkSip(){
this.$router.push({path:"/draw/msg",query:{id:this.id,resourceType:this.resourceType}})
this.$router.push({path:"/draw/msgPacket",query:{id:this.id,resourceType:this.resourceType}})
},
remove(target){
let _this=this;
......
src/views/draw/metadata/index.scss
浏览文件 @ 4e4af36c
......@@ -158,6 +158,7 @@
.tag{
margin: 0 20px;
color:#F56C6C;
}
.tag_img{
width: 28px;
......@@ -405,6 +406,10 @@
.ref_btn{
cursor: pointer;
}
.refBtn{
font-size:14px;
color:#868BA3;
}
.pdf_wrap{
background-color: #fff;
padding: 20px;
......
src/views/draw/sip/index.vue
浏览文件 @ 4e4af36c
......@@ -312,7 +312,7 @@ export default {
},
batchUpdate(){
let data={
ids:this.allIds,
ids:this.multipleSelection,
status: 3,//通过交接
remark:this.pdf.remark
}
......@@ -338,7 +338,7 @@ export default {
},
batchRefuse(){
let data={
ids:this.allIds,
ids:this.multipleSelection,
status: 4,//通过交接
remark:this.pdf.remark
}
......
src/views/draw/sip/msg_packet.vue
浏览文件 @ 4e4af36c
......@@ -2,7 +2,7 @@
<div class="mag_packet app-container">
<div class=" clearfix">
<div class="title fl">提交信息包交接</div>
<!-- <a><span class="refBtn fr" @click="refPage"><i class="el-icon-refresh" ></i> 刷新</span> </a> -->
<a><span class="refBtn fr" style="margin: 17px 0px 23px;" @click="backTo"><i class="el-icon-back" ></i> 返回</span> </a>
</div>
<div class="content_wrap" v-loading='loading'>
<div class="wrap_left">
......@@ -90,7 +90,7 @@
<div class="list">
<p class="label">资源分类：</p>
<p class="cont">
<span v-for="tag in pdf.diyType" :key="tag.index">{{tag.name}}</span>
<span v-for="tag in pdf.diyType" :key="tag.index">{{tag.typeName}}</span>
</p>
</div>
</div>
......@@ -114,7 +114,7 @@
<el-steps :active="activeStatus" finish-status="success" align-center>
<el-step title="待录入" v-if="pdf.status==0"></el-step>
<el-step title="待挂接" v-if="pdf.status==2"></el-step>
<el-step title="审交接中"></el-step>
<el-step title="审核交接中"></el-step>
<el-step title="已交接" v-if="pdf.status!=4"></el-step>
<el-step title="已入库" v-if='pdf.status!=4'></el-step>
<el-step title="拒绝交接" v-if="pdf.status==4"></el-step>
......@@ -274,6 +274,9 @@ export default {
// })
})
},
backTo(){
this.$router.go(-1)
},
refPage(){
this.loading=true;
setTimeout(()=>{
......
src/views/index_show/index.vue
浏览文件 @ 4e4af36c
......@@ -4,12 +4,12 @@
<el-row :gutter="20" style="margin-bottom:20px;">
<el-col :span="6" class="top_block">
<el-card>
<img class="header_image" :src="`${domain}${requestPath.file}?fileName=${user.img}&isOnLine=true`" v-if="user.img!='null'" alt="头像">
<img class="header_image" :src="`${domain}${requestPath.file}?fileName=${userImg}&isOnLine=true`" v-if="userImg!='null'" alt="头像">
<img class="header_image" src="../../assets/img/default.png" v-else alt="默认头像">
<div class="msg_person clearfix">
<p class="person_name">{{user.userName}}</p>
<p class="person_email">{{user.email}}</p>
<p class="person_tag">{{user.name}}</p>
<div class="msg_person clearfix" style="height:113px">
<p class="person_name">{{userName}}</p>
<p class="person_email">{{email}}</p>
<p class="person_tag">{{name}}</p>
</div>
</el-card>
</el-col>
......@@ -20,7 +20,7 @@
<p class="tit">资源库容量</p>
<div class="bottom clearfix">
<el-progress :text-inside="false" :stroke-width="8" :percentage="resVolume.proportion"></el-progress>
<div class="percent"><span class="fl">{{resVolume.proportion.toFixed(2)}}%</span><span class="fr">总大小：{{resVolume.totalResourceSize}}</span></div>
<div class="percent"><span class="fl">{{resVolume.proportion.toFixed(2)}}%</span><span class="fr">总大小：{{resVolume.diskCapacity}}</span></div>
</div>
</div>
<div class="flex_1">
......@@ -188,6 +188,7 @@
</div>
</template>
<script>
import { mapGetters } from 'vuex'
import Cookies from 'js-cookie'
import { resVolumeAPI,uploadAPI,resUploadAPI,noticeAPI} from '@/api/index/index'
import { uploadUrl, uploadPath, requestPath } from "@/utils/global.js";
......@@ -327,11 +328,12 @@ export default {
domain: process.env.BASE_API,
requestPath: requestPath,
uploadPath: uploadPath,
//name:"",
//avatar:"",
// userImg:"",
// userName:"",
// email:"",
user:{
userName:Cookies.get('userInfo'),
email:Cookies.get('email'),
img:Cookies.get('img'),
name:Cookies.get('name'),
lastLandingTime:Cookies.get('lastLandingTime'),
ip:Cookies.get('ip')
},
......@@ -385,7 +387,20 @@ export default {
}
};
},
computed: {
...mapGetters([
'name',
'avatar',
'userImg',
'userName',
'email'
])
},
mounted() {
// this.userName=Cookies.get('username');
// this.email=Cookies.get('email');
// this.userImg=Cookies.get('img');
// this.name=Cookies.get('name');
this.initCart();//上传的图表
this.getUpload();//资源库的
this.getNotice();//公告的
......
src/views/layout/components/Navbar.vue
浏览文件 @ 4e4af36c
......@@ -29,7 +29,7 @@
<el-dropdown @command="dropdownSelect">
<div class="el-dropdown-link">
<img class="header_pic" :src="`${domain}${requestPath.file}?fileName=${user.img}&isOnLine=true`" v-if="user.img!='null'">
<img class="header_pic" :src="`${domain}${requestPath.file}?fileName=${this.$store.state.user.userImg}&isOnLine=true`" v-if="this.$store.state.user.userImg!='null'">
<!-- <img class="header_pic" :src="user.img" v-if="user.img!='null'"> -->
<img class="header_pic" src="../../../assets/img/default.png" v-else alt="头像">
<!-- <img class="header_pic" src="https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png" alt="头像"> -->
......@@ -114,16 +114,10 @@ export default {
domain: process.env.BASE_API,
requestPath: requestPath,
uploadPath: uploadPath,
user:{
userName:Cookies.get('userInfo'),
email:Cookies.get('email'),
img:Cookies.get('img'),
name:Cookies.get('name'),
lastLandingTime:Cookies.get('lastLandingTime'),
},
visible:false,
Logo: Logo,
username:'',
//username:'',
//userImg:'',
nationsType:'2',
// nationShow: null,
dialogchangePassWordVisible: false,
......@@ -172,11 +166,15 @@ export default {
...mapGetters([
'sidebar',
'name',
'avatar'
'avatar',
'userImg',
])
},
mounted() {
this.username = Cookies.get('username')
console.log(this.$store.state.user,'99999999999999')
this.username = Cookies.get('username');
//this.userImg=Cookies.get('img')
// this.getNations()
},
// watch: {
......@@ -207,8 +205,7 @@ export default {
dropdownSelect(command){
if(command="updatePass"){
this.changePassword()
}
}
},
// 保存
dataSubmit() {
......@@ -235,6 +232,8 @@ export default {
editPasswordAPI(this.passwordsubmitForm).then(res => {
if (res.data.code === 1) {
this.$message.error("旧密码输入错误，请重新输入!");
}else if (res.data.code === 3) {
this.$message.error("旧密码和新密码不能相同!");
} else if (res.data.code === 0) {
this.$message.success("修改密码成功");
this.dialogchangePassWordVisible = false;
......
src/views/storagemodule/namedentity/character.vue
浏览文件 @ 4e4af36c
......@@ -4,7 +4,7 @@
<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>
<a><span class="" @click="backTo"><i class="el-icon-back" ></i> 返回</span> </a>
</div>
<div class="contentBox">
<div class="contentBoxLeft">
......@@ -830,8 +830,10 @@ export default {
}
})
},200)
},
backTo(){
this.$router.go(-1)
}
}
}
</script>
......@@ -857,7 +859,7 @@ export default {
width:50px;
font-size:14px;
color:#868BA3;
background:url(../../../assets/img/sx.png) no-repeat;
// background:url(../../../assets/img/sx.png) no-repeat;
background-size:12px 12px;
background-position:37px 2px;
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论