Skip to content

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

Merge branch 'dev' of http://192.168.2.120/quanlili/knowledgeServiceAdmin into wtf

上级 d6be6dfd 0d829270
隐藏空白字符变更
内嵌 并排
正在显示 包含 195 行增加 和 90 行删除
src/api/dataManagement/index.js
浏览文件 @ 3b52c70d
......@@ -23,6 +23,13 @@ export function getTypeAPI(params) { //查看资源类型
params
})
}
export function getMapAPI(params) { //查看资源分布，地图
return request({
url: `${requestPath.resource}/resource/geography/resource`,
method: 'get',
params
})
}
......
src/views/dataManagement/chart.vue
浏览文件 @ 3b52c70d
......@@ -41,7 +41,7 @@ anhui,beijing,fujian,xianggang,taiwan
} from "@/utils/importMap";
import { CityInfo } from '@/mock/city-data'
import { debounce } from '@/utils'
import { getSurveyAPI,getStatusAPI,getTypeAPI} from '@/api/dataManagement/index'
import { getSurveyAPI,getStatusAPI,getTypeAPI,getMapAPI} from '@/api/dataManagement/index'
var surveyOption = {
backgroundColor: "#fff",
"title": {
......@@ -510,21 +510,44 @@ var mapOption = {
top: 'bottom',
text: ['高', '低'],
calculable: true,
seriesIndex:'1',
seriesIndex:'0',
show:false,
inRange: {
//color: ['#01524c', '#02726c'] // 蓝绿
color:["#01689C",'#01689C']
}
},
series: [{
name: '',
name: '散点',
type: 'scatter',
coordinateSystem: 'geo',
data: [],
symbolSize: function(val) {
return 6;
},
label: {
normal: {
//color: 'yellow',
formatter: '{b}',
position: 'center',
align:"center",
show: true
},
emphasis: {
show: true
}
},
itemStyle: {
normal: {
color: 'yellow'
}
}
},{
name: '气泡',
type: 'scatter',
coordinateSystem: 'geo',
symbol: 'pin',
data:[
{name: "天安门",value:[116.403694,39.914271, 258]},
{name: "四惠桥",value:[116.49568,39.914271,333]}
],
symbolSize: function(val) {
// var a = (maxSize4Pin - minSize4Pin) / (max - min);
......@@ -533,47 +556,23 @@ var mapOption = {
// return a * val[2] + b;
return 35;
},
// label: {
// normal: {
// show: true,
// formatter: function(params) {
// return params.data.value[2]
// },
// textStyle: {
// color: '#fff',
// fontSize: 9,
// }
// }
// },
label: {
label:{
normal: {
color: '#04BFFC',
//formatter: '{b}',
show: true,
formatter:function(params){
return '{white|'+params.value[2]+'}\n'+'{name|'+params.name+'}'
return params.value[2]
},
rich: {
'white': {
color:"#fff",
height:18,
align:'center',
},
'name':{
color:"yellow",
height:20,
align:'right'
}
},
position: 'center',
show: true
}
textStyle: {
color: '#fff',
fontSize: 9,
}
},
},
itemStyle: {
normal: {
color: 'red', //标志颜色
color: '#F62157', //标志颜色
}
},
zlevel: 1
}]
};
......@@ -682,7 +681,21 @@ export default {
getMap(proName='北京市'){
mapOption.geo.map=proName;
echarts.registerMap(proName, cityMap[proName]);
this.mapChart.setOption(mapOption,true)
mapOption.title.text= proName+"资源分布情况";
let params={
name:proName
}
getMapAPI(params).then(res=>{
if(res.data.code==0){
let resData=res.data.data||[];
mapOption.series[0].data=resData;
mapOption.series[1].data=resData;
this.mapChart.setOption(mapOption,true)
}else{
this.$message.error('获取资源状态失败')
}
})
},
changePro(){
this.getMap(this.province)
......
src/views/draw/atlas/index.scss
浏览文件 @ 3b52c70d
.atlas_wrap{
.status_tag{
color: #fff;
font-size: 12px;
border-radius: 3px;
display: inline-block;
padding: 7px 15px;
display: inline-block;
line-height: 1;
white-space: nowrap;
background-color: rgb(255, 168, 125)
}
.check_all{
padding:20px 20px 0;
float: left;
......
src/views/draw/atlas/index.vue
浏览文件 @ 3b52c70d
......@@ -49,7 +49,7 @@
清太祖爱新觉罗·努尔哈赤（1559年2月21日—1626年9月30日），清朝的奠基者，后金开国之君，通满语和汉语，喜读《三国演义》。二十五岁时起兵统一女真各部，明神宗万历四十四年...
</p> -->
</div>
<el-button type="warning" size="mini" style="margin-right: 40px;">待交接</el-button>
<span class="status_tag" style="margin-right: 40px;">待交接</span>
<!-- <img class="tag" :src="item.userImg" alt="用户头像"> -->
<img class="tag_img" :src="`${domain}${requestPath.file}?fileName=${item.userImg}&isOnLine=true`" v-if="item.userImg" alt="头像" :title="item.createrName">
<img class="tag_img" src="../../../assets/img/default.png" v-else alt="默认头像" :title="item.createrName">
......@@ -414,6 +414,7 @@ export default {
refPage(){
this.loading=true;
this.resetSearch();
this.bus.$emit("resetSearch",'');
setTimeout(()=>{
this.loading=false;
},1000)
......
src/views/draw/atlas_rich/index.vue
浏览文件 @ 3b52c70d
......@@ -244,6 +244,7 @@ export default {
refPage(){
this.loading=true;
this.resetSearch();
this.bus.$emit("resetSearch",'');
setTimeout(()=>{
this.loading=false;
},1000)
......
src/views/draw/metadata/detail.vue
浏览文件 @ 3b52c70d
......@@ -26,7 +26,7 @@
<img :src="pdf.fileName" alt="" class="pic_show">
</div>
<!-- 图册 -->
<div style="width:80%;margin:0 auto;height:800px;text-align:center" v-if="resourceType==5">
<div style="width:80%;margin:0 auto;height:800px;text-align:center" v-else-if="resourceType==5">
</div>
<div style="width:80%;margin:0 auto;height:800px" v-else>
......@@ -56,7 +56,7 @@
</div>
<div class="opt_wrap">
<el-button type="success" plain size="mini" @click="lookBack(item.keyword)" v-if='item.state==0'><i class="iconfont icon-projectlianjie"></i> 链接</el-button>
<el-button type="success" plain size="mini" v-if='item.state==1' @click="linkTo()"><i class="el-icon-view"></i> 详情</el-button>
<el-button type="success" plain size="mini" v-if='item.state==1' @click="linkTo(item)"><i class="el-icon-view"></i> 详情</el-button>
<el-button type="danger" icon="el-icon-delete" plain size="mini" @click="removeList(item.id)">移除</el-button>
</div>
</div>
......@@ -96,7 +96,7 @@
</div>
<div class="opt_wrap">
<el-button type="success" plain size="mini" @click="lookBack(item.keyword)" v-if='item.state==0'><i class="iconfont icon-projectlianjie"></i> 链接</el-button>
<el-button type="success" plain size="mini" v-if="item.state==1"><i class="el-icon-view"></i> 详情</el-button>
<el-button type="success" plain size="mini" v-if="item.state==1" @click="linkTo(item)"><i class="el-icon-view"></i> 详情</el-button>
<el-button type="danger" icon="el-icon-edit" plain size="mini" @click="removeList(item.id)">移除</el-button>
</div>
</div>
......@@ -119,7 +119,7 @@
<el-button type="success" plain size="mini" v-if='item.state==0'
@click="lookBack(item.keyword)"
><i class="iconfont icon-projectlianjie"></i> 链接</el-button>
<el-button type="success" plain size="mini" v-if="item.state==1"><i class="el-icon-view"></i> 详情</el-button>
<el-button type="success" plain size="mini" v-if="item.state==1" @click="linkTo(item)"><i class="el-icon-view"></i> 详情</el-button>
<el-button type="danger" icon="el-icon-edit" plain size="mini" @click="removeList(item.id)">移除</el-button>
</div>
</div>
......@@ -143,7 +143,7 @@
</div>
<div class="opt_wrap">
<el-button type="success" plain size="mini" @click="lookBack(item.keyword)" v-if='item.state==0'><i class="iconfont icon-projectlianjie"></i> 链接</el-button>
<el-button type="success" plain size="mini" v-if='item.state==1' @click="linkTo()"><i class="el-icon-view"></i> 详情</el-button>
<el-button type="success" plain size="mini" v-if='item.state==1' @click="linkTo(item)"><i class="el-icon-view"></i> 详情</el-button>
<el-button type="danger" icon="el-icon-delete" plain size="mini" @click="removeList(item.id)">移除</el-button>
</div>
</div>
......@@ -957,8 +957,9 @@ export default {
},1000)
//window.location.reload()
},
linkTo(){
this.$router.push({path:'/storagemodule/namedentity/character'})
linkTo(item){
//id=0648831bf60911e996cc0050569033dc&entityType=2
this.$router.push({path:'/storagemodule/namedentity/character',query:{id:item.entityId,entityType:this.backForm.state}})
}
},
}
......
src/views/draw/metadata/index.vue
浏览文件 @ 3b52c70d
......@@ -227,6 +227,7 @@ export default {
refPage(){
this.loading=true;
this.resetSearch();
this.bus.$emit("resetSearch",'');
setTimeout(()=>{
this.loading=false;
},1000)
......
src/views/draw/sip/index.scss
浏览文件 @ 3b52c70d
.sip_wrap{
.album_tag{
font-size: 12px;
border-radius: 3px;
display: inline-block;
padding: 7px 15px;
color: #fff;
display: inline-block;
line-height: 1;
white-space: nowrap;
background-color: #21BFD2
}
.status_tag{
color: #fff;
font-size: 12px;
border-radius: 3px;
display: inline-block;
padding: 7px 15px;
display: inline-block;
line-height: 1;
white-space: nowrap;
background-color: rgb(255, 168, 125)
}
.check_all{
padding:20px 20px 0;
float: left;
......@@ -170,6 +193,10 @@
}
}
.mag_packet{
.refBtn{
font-size:14px;
color:#868BA3;
}
.title_wrap{
height: 70px;
padding: 0 28px;
......
src/views/draw/sip/index.vue
浏览文件 @ 3b52c70d
......@@ -49,8 +49,8 @@
</div>
<!-- <el-tag type="success" effect="dark" style="margin-right: 40px;" v-if="item.albumId">图册</el-tag>
<el-tag type="warning" effect="dark" style="margin-right: 40px;">待交接</el-tag> -->
<el-button type="success" size="mini" style="margin-right: 40px;" v-if="item.albumId">图册</el-button>
<el-button type="warning" size="mini" style="margin-right: 40px;">待交接</el-button>
<span class="album_tag" style="margin-right: 40px;" v-if="item.albumId">图册</span>
<span class="status_tag" style="margin-right: 40px;">待交接</span>
<img class="tag_img" :src="`${domain}${requestPath.file}?fileName=${item.userImg}&isOnLine=true`" v-if="item.userImg" alt="头像" :title="`上传者：${item.createrName}`">
<img class="tag_img" src="../../../assets/img/default.png" v-else alt="默认头像" :title="`上传者：${item.createrName}`">
<img class="tag_img" :src="`${domain}${requestPath.file}?fileName=${item.modifierImg}&isOnLine=true`" v-if="item.modifierImg" alt="头像" :title="`最后编辑：${item.modifierName}`">
......@@ -317,11 +317,12 @@ export default {
remark:this.pdf.remark
}
batchUpdateStatusAPI(data).then(res => {
operationMsg.apply(this, [
res.data.code,
`批量提交${this.multipleSelection.length}项`
]);
//this.getList();
if(res.data.code==0){
this.$message.success(`批量提交${this.multipleSelection.length}项`);
this.getList();
}else{
this.$message.error('提交失败')
}
this.passVisible=false;
});
},
......@@ -342,12 +343,13 @@ export default {
remark:this.pdf.remark
}
batchUpdateStatusAPI(data).then(res => {
operationMsg.apply(this, [
res.data.code,
`批量提交${this.multipleSelection.length}项`
]);
if(res.data.code==0){
this.$message.success(`批量提交${this.multipleSelection.length}项`);
this.getList();
}else{
this.$message.error('提交失败')
}
this.passVisible=false;
this.getList();
});
},
alertUpdate(item){
......@@ -364,12 +366,11 @@ export default {
singleUpdate(){
this.dataUpdate.remark=this.pdf.remark;
batchUpdateStatusAPI(this.dataUpdate).then(res => {
operationMsg.apply(this, [
res.data.code,
`提交`
]);
if(res.data.code==0){
this.$message.success('提交成功');
this.getList();
}else{
this.$message.error('提交失败')
}
this.passVisible=false;
});
......@@ -393,12 +394,13 @@ export default {
remark:this.pdf.remark
}
batchUpdateStatusAPI(data).then(res => {
operationMsg.apply(this, [
res.data.code,
`提交`
]);
if(res.data.code==0){
this.$message.success('提交成功');
this.getList();
}else{
this.$message.error('提交失败')
}
this.passVisible=false;
this.getList();
});
},
handleCheckAllChange(val) {
......@@ -416,6 +418,7 @@ export default {
refPage(){
this.loading=true;
this.resetSearch();
this.bus.$emit("resetSearch",'');
setTimeout(()=>{
this.loading=false;
},1000)
......
src/views/draw/sip/msg_packet.vue
浏览文件 @ 3b52c70d
......@@ -2,9 +2,9 @@
<div class="mag_packet app-container">
<div class=" clearfix">
<div class="title fl">提交信息包交接</div>
<a><span class="ref_btn fr"><i class="el-icon-refresh" @click="refPage"></i> 刷新</span> </a>
<!-- <a><span class="refBtn fr" @click="refPage"><i class="el-icon-refresh" ></i> 刷新</span> </a> -->
</div>
<div class="content_wrap">
<div class="content_wrap" v-loading='loading'>
<div class="wrap_left">
<div class="title_wrap clearfix"><span class="small_tit fl">资源详情</span></div>
<div class="pdf_wrap">
......@@ -19,8 +19,8 @@
</span>
<span v-else>
<img src="~@/assets/img/pdf.png" alt="pdf" class="pdf_icon">
<el-button type="primary" icon="el-icon-refresh" size="mini">重新转码</el-button>
<el-button type="primary" icon="el-icon-document" size="mini">目录转译</el-button>
<!-- <el-button type="primary" icon="el-icon-refresh" size="mini">重新转码</el-button>
<el-button type="primary" icon="el-icon-document" size="mini">目录转译</el-button> -->
</span>
</p>
</div>
......@@ -33,11 +33,11 @@
</div>
</div>
</div>
<div class="wrap_right" :class="[isShow ? 'upClass':''] ">
<div class="wrap_right" :class="[isShow ? 'upClass':''] " v-loading='loadRing'>
<div class="up_btn" v-if="isShow" @click="showSider"><i class="el-icon-arrow-left"></i></div>
<div class="title_wrap clearfix">
<div class="small_tit fl">元数据</div>
<div class="ref_btn fr" v-if="!isShow"><span><i class="el-icon-refresh"></i></span><span @click="hideSider"><i class="el-icon-close"></i></span></div>
<div class="ref_btn fr" v-if="!isShow"><span @click="refRight"><i class="el-icon-refresh"></i></span><span @click="hideSider"><i class="el-icon-close"></i></span></div>
</div>
<div class="width_wrap">
<div class="side_content">
......@@ -104,9 +104,9 @@
</div>
</div>
<div class="status-btn" v-if="pdf.status==1">
<el-button type="danger" icon="el-icon-close">拒绝</el-button>
<el-button type="danger" icon="el-icon-close" @click="refuse">拒绝</el-button>
<el-button type="success" icon="el-icon-check" @click="passVisible=true">通过</el-button>
<el-button type="warning" icon="el-icon-edit">编辑</el-button>
<el-button type="warning" icon="el-icon-edit" @click="linkToEdit">编辑</el-button>
</div>
<div class="step_wrap">
<!-- //0待录入，2待挂接，1待交接，3通过交接（待丰富化），4拒绝交接 ,5已入库 -->
......@@ -129,6 +129,7 @@
:visible.sync="passVisible"
width="800px"
class=""
@close="closePass"
>
<el-form ref="form" :model="pdf" label-width="80px">
<el-form-item label="题名：">
......@@ -165,6 +166,7 @@ export default {
components:{pagination},
data () {
return {
loadRing:false,
loading:false,
passVisible:false,
domain: process.env.BASE_API,
......@@ -201,6 +203,8 @@ export default {
if(res.data.code===0){
let {fileName}=res.data.data;
this.pdf=res.data.data;
//回显，置空备注
this.pdf.remark='';
this.activeStatus=this.pdf.status;
this.fileName=fileName;
this.pdf.fileName=`${this.domain}${requestPath.file}?fileName=${fileName}&isOnLine=true`;
......@@ -232,6 +236,30 @@ export default {
linkPic(){
this.$router.push({path:'/submission/infoview/photolook',query:{oid:this.pdf.albumId}})
},
refuse(){
confirm.apply(this,['确定要拒绝交接吗？']).then(() => {
let data={
ids:[this.id],
status: 4,//拒绝交接
remark:this.pdf.remark
}
batchUpdateStatusAPI(data).then(res => {
if(res.data.code==0){
this.$message.success('提交成功');
this.getDetail();
}else{
this.$message.error('提交失败')
}
});
})
},
linkToEdit(){
//console.log(this.pdf.albumId,'this.pdf.albumId')
this.$router.push({path:'/submission/resourcecommit',query:{oid:this.id}})
},
closePass(){
this.pdf.remark='';
},
handleClick(){
},
......@@ -253,6 +281,12 @@ export default {
},1000)
//window.location.reload()
},
refRight(){
this.loadRing=true;
setTimeout(()=>{
this.loadRing=false;
},1000)
},
hideSider(){
this.isShow=true;
},
......
src/views/layout/components/AppMain.vue
浏览文件 @ 3b52c70d
......@@ -50,6 +50,7 @@ export default {
}else{
this.showSearch=false;
}
this.resetInput();
},
watch: {
$route(to,from){
......@@ -74,14 +75,6 @@ export default {
}
},
methods:{
// valueChange(value) {
// console.log(value,'value')
// if (value.length < 30) {
// this.$store.dispatch("SetSearchValue", value).then(res => {});
// }else{
// return
// }
// },
search(){
let meta=this.$route.meta;
if(this.$route.name=="atlasRich"||this.$route.name=="atlas"){
......@@ -90,10 +83,16 @@ export default {
this.bus.$emit("searchList",this.value);
}
//console.log(this.$store.state.pageTemp,'11111111111')
},
resetInput(){
this.bus.$off('resetSearch').$on('resetSearch', content => {
this.value='';
console.log('清空了，哈哈哈')
});
}
},
beforeDestroy () {
this.bus.$off('resetSearch');
}
}
</script>
......
src/views/storagemodule/storageinfomanger/resourcelook.vue
浏览文件 @ 3b52c70d
......@@ -3,7 +3,7 @@
<div v-loading='loading'>
<div class="sip_Top clearfix">
<span class="fl">资源浏览</span>
<a><i class="el-icon-refresh fr" @click="refPage"></i></a>
<a class="refBtn fr" @click="refPage">刷新 <i class="el-icon-refresh" ></i></a>
</div>
<div class="resource_content">
<div class="tree_wrap" v-loading='loadTreeVisible'>
......@@ -77,7 +77,7 @@
</div>
<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>
<span class="tag">{{ item.statusVal }}</span>
<span class="tag" style="min-width:100px;text-align: center;">{{ item.statusVal }}</span>
<div class="opt_wrap">
<el-button type="primary" size="mini" plain icon="el-icon-view" class="look_btn" @click="richTo(item.id)">查看</el-button>
</div>
......@@ -404,8 +404,8 @@ export default {
this.searchForm.pageNum = val;
this.getList()
},
lookTo(){
this.$router.push({path:'/draw/msgPacket'})
richTo(id){
this.$router.push({path:'/draw/msgPacket',query:{id:id}})
},
refTree(){
this.loadTreeVisible=true;
......@@ -423,6 +423,10 @@ export default {
}
</script>
<style lang="less" scoped>
.refBtn{
font-size:14px;
color:#868BA3;
}
.userPhoto {
width:40px;
height:40px;
......
src/views/submission/infoview/allresource.vue
浏览文件 @ 3b52c70d
......@@ -224,6 +224,7 @@ export default {
refPage(){
this.loading=true;
this.resetSearch();
this.bus.$emit("resetSearch",'');
setTimeout(()=>{
this.loading=false;
},1000)
......
src/views/submission/infoview/mycommit.vue
浏览文件 @ 3b52c70d
......@@ -229,6 +229,7 @@ export default {
refPage(){
this.loading=true;
this.resetSearch();
this.bus.$emit("resetSearch",'');
setTimeout(()=>{
this.loading=false;
},1000)
......
src/views/submission/infoview/myedit.vue
浏览文件 @ 3b52c70d
......@@ -229,6 +229,7 @@ export default {
refPage(){
this.loading=true;
this.resetSearch();
this.bus.$emit("resetSearch",'');
setTimeout(()=>{
this.loading=false;
},1000)
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论