Skip to content

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

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

上级 039b5169 5000bae5
隐藏空白字符变更
内嵌 并排
正在显示 包含 42 行增加 和 31 行删除
src/views/authorizationmanage/user_management.vue
浏览文件 @ ca5cb50d
......@@ -437,19 +437,19 @@ export default {
operationMsg.apply(this,[res.data.code,'用户信息修改'])
res.data.code === 0 ? this.dialogFormVisible = false : true
this.$refs.tree.setCheckedKeys([]);
if(tempData.password&&tempData.userId==this.userId){
if(tempData.password&&tempData.userId==this.userId){//修改了登录者本人的密码时
this.$store.dispatch("FedLogOut").then(res => {
if (res) {
location.reload();
}
});
}
if(tempData.userId==this.userId){
if(tempData.userId==this.userId){//修改了本人的信息，重新更新cookies
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 => {
this.$store.dispatch("ChangeNavImg").then(res => {//这里其实不需要异步
if (res) {
//location.reload();
}
......
src/views/dataManagement/chart.vue
浏览文件 @ ca5cb50d
......@@ -139,10 +139,10 @@ var surveyOption = {
0
],
bottom: 30,
"start": 10,
"end": 80,
"start": 0,
"end": 100,
handleIcon: 'path://M306.1,413c0,2.2-1.8,4-4,4h-59.8c-2.2,0-4-1.8-4-4V200.8c0-2.2,1.8-4,4-4h59.8c2.2,0,4,1.8,4,4V413z',
handleSize: '110%',
handleSize: '120%',
handleStyle:{
color:"#d3dee5",
},
......@@ -503,19 +503,19 @@ var mapOption = {
}
}
},
visualMap: {
min: 0,
max: 11,
left: 'left',
top: 'bottom',
text: ['高', '低'],
calculable: true,
seriesIndex:'0',
show:false,
inRange: {
color:["#01689C",'#01689C']
}
},
// visualMap: {
// min: 0,
// max: 11,
// left: 'left',
// top: 'bottom',
// text: ['高', '低'],
// calculable: true,
// seriesIndex:'0',
// show:false,
// inRange: {
// color:["#01689C",'#01689C']
// }
// },
series: [{
name: '散点',
type: 'scatter',
......@@ -526,10 +526,8 @@ var mapOption = {
},
label: {
normal: {
//color: 'yellow',
formatter: '{b}',
position: 'center',
align:"center",
position: 'right',
show: true
},
emphasis: {
......@@ -584,7 +582,7 @@ export default {
statusChart:null,
typeChart:null,
mapOption:null,
province:'北京市',
province:'广东省',
cityOptions:[],
//proName:'北京',
};
......@@ -681,7 +679,7 @@ export default {
}
})
},
getMap(proName='北京市'){
getMap(proName='广东省'){
mapOption.geo.map=proName;
echarts.registerMap(proName, cityMap[proName]);
mapOption.title.text= proName+"资源分布情况";
......
src/views/dataManagement/index.scss
浏览文件 @ ca5cb50d
......@@ -220,7 +220,7 @@
.dataChart_wrap{
.metaDataTop {
width:100%;
border-bottom:1px solid #EBEEF1;
// border-bottom:1px solid #EBEEF1;
padding-bottom:23px;
em {
color:#3F4560;
......
src/views/draw/sip/msg_packet.vue
浏览文件 @ ca5cb50d
......@@ -15,11 +15,11 @@
<span>资源题名：{{pdf.name}} 由 {{pdf.createrName}} 在 {{pdf.createTime}} 提交</span>
<span v-if="pdf.resourceType==2||pdf.resourceType==6">
<el-button type="primary" icon="el-icon-download" size="mini" @click="down">下载源文件</el-button>
<el-button type="primary" icon="" size="mini" @click="linkPic" v-if="pdf.albumId">进入图册</el-button>
<el-button v-if="pdf.albumId" type="primary" icon="" size="mini" @click="linkPic">进入图册</el-button>
</span>
<span v-else>
<img src="~@/assets/img/pdf.png" alt="pdf" class="pdf_icon">
<el-button type="primary" icon="el-icon-download" size="mini" @click="down">下载源文件</el-button>
<el-button v-if="pdf.pdfName" type="primary" icon="el-icon-download" size="mini" @click="down">下载源文件</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>
......@@ -112,15 +112,21 @@
<el-button type="warning" icon="el-icon-edit" @click="linkToEdit">编辑</el-button>
</div>
<div class="step_wrap">
<!-- //0待录入，2待挂接，1待交接，3通过交接（待丰富化），4拒绝交接 ,5已入库 -->
<!-- //0待录入，2待挂接，1待交接（审核交接中），3通过交接（已交接），4拒绝交接 ,5已入库 -->
<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="待挂接" v-if="pdf.status==2"></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>
</el-steps>
<!-- <el-steps :active="activeStatus" finish-status="success">
<el-step title="步骤 1"></el-step>
<el-step title="步骤 2"></el-step>
<el-step title="步骤 3"></el-step>
<el-step title="步骤 4"></el-step>
</el-steps> -->
</div>
</div>
</div>
......@@ -196,9 +202,15 @@ export default {
watch: {
status(newV,oldV){
this.activeStatus=newV;
if(newV==3){
if(newV==0){
this.activeStatus=1;
}
if(newV==1){
this.activeStatus=2;
}
if(newV==2){
this.activeStatus=1;
}
}
},
methods: {
......@@ -207,8 +219,9 @@ export default {
if(res.data.code===0){
let {fileName}=res.data.data;
this.pdf=res.data.data;
//this.pdf.status=2;
//浏览器不记录iframe的路径
this.iframeHtml= `"<iframe src='${this.domain}${this.pdf.pdfName}' frameborder='0' width='100%' height='100%'></iframe>"`
this.iframeHtml= `<iframe src='${this.domain}${this.pdf.pdfName}' frameborder='0' width='100%' height='100%'></iframe>`
//回显，置空备注
this.pdf.remark='';
this.activeStatus=this.pdf.status;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论