Skip to content

9
912project
提交 414bab06 authored 作者: CRS's avatar CRS
浏览文件
操作

合并分支 'crs' 到 'master'

new 查看合并请求 !25
上级 a2b4d9d1 f2f43251
隐藏空白字符变更
内嵌 并排
正在显示 包含 204 行增加 和 12 行删除
src/assets/changeElementStyle.css
浏览文件 @ 414bab06
......@@ -51,7 +51,7 @@
text-align: center;
background: #4877e6;
cursor: pointer;
border-radius: 2px;
border-radius: 4px;
color: #fff;
font-size: 18px;
}
......@@ -64,7 +64,7 @@
line-height: 34px;
text-align: center;
cursor: pointer;
border-radius: 2px;
border-radius: 4px;
color: #fff;
font-size: 18px;
background: #889cdd;
......@@ -140,3 +140,10 @@
/*.content .search>>>.el-input--prefix .el-input__inner{*/
/* padding-left: 15px;*/
/*}*/
/*统一修改input、select字体样式颜色*/
.el-input__inner{
color: #333;
font-size: 18px;
font-family: 'Regular';
}
src/components/admittance/technical/addTechnical.vue
浏览文件 @ 414bab06
......@@ -102,10 +102,18 @@ export default {
mounted(){
if (this.row !== '') { // 当页面传值过来时
this.addVal = this.row.name; // 修改名称
console.log(this.row)
for (let i = 0; i < this.row.producies.length; i++) {
if (i === 1) { // 修改第一个产品类型
if (i === 0) { // 修改第一个产品类型
this.product1 = this.row.producies[i].form;
this.product2 = this.row.producies[i].id;
this.$server.getFindByForm(this.row.producies[i].form).then((res) => { // 数据请求
if (res.data.code === 200) {
this.product2List = res.data.data;
this.product2 = this.row.producies[i].id;
}
}).catch(err => {
this.$message.error('数据请求失败！');
})
} else { // 修改后面自动生成的产品类型
let product2List;
this.$server.getFindByForm(this.row.producies[i].form).then((res) => { // 数据请求
......@@ -246,10 +254,11 @@ export default {
cursor: pointer;
}
.addTechnical .select{
margin-top: 10px;
margin-top: 24px;
}
.addTechnical .select img{
margin-left: 10px;
margin-right: 10px;
}
.addTechnical .select>div{
display: inline-block;
......
src/components/admittance/technical/technical.vue
浏览文件 @ 414bab06
......@@ -29,7 +29,7 @@
max-height="840"
:data="allData"
stripe
style="width: 100%;margin-bottom: 10px;">
style="width: 100%;">
<el-table-column
prop="name"
label="技术路线名称"
......
src/components/basicInformation/person/person.vue
浏览文件 @ 414bab06
......@@ -40,7 +40,7 @@
max-height="840"
:data="allData"
stripe
style="width: 100%;margin-bottom: 10px;">
style="width: 100%;">
<el-table-column
prop="name"
label="人员名称"
......@@ -129,6 +129,13 @@ export default {
}
}
}
let val = {
name: '基础资料管理',
index: 4,
childPath: 'person',
childIndex: 2
}
this.$store.commit('changeJumpOther', val);
this.init()
}
}).catch(err => {
......
src/components/header/header.vue
浏览文件 @ 414bab06
......@@ -104,7 +104,7 @@ export default {
}
},
computed: {
...mapGetters(['getSidebar'])
...mapGetters(['getSidebar','getJumpOther'])
},
components: {
},
......@@ -126,6 +126,31 @@ export default {
}
},
deep: true
},
getJumpOther: {
handler: function (val) {
console.log(val);
if (val !== '') {
$('.sidebar .menu').removeClass('click'); // 样式修改
$('.sidebar .font').removeClass('fontClick');
let menu = '.sidebar>div:nth-child(' + val.index + ') .menu';
let font = '.sidebar>div:nth-child(' + val.index + ') .font';
$(menu).addClass('click');
$(font).addClass('fontClick');
if (val.childPath === '') {
$('.listVal>span').removeClass('menuClick') // 修改样式
$('.menuTitle').addClass('goTitle')
} else {
$('.listVal>span').removeClass('menuClick') // 修改样式
$('.menuTitle').removeClass('goTitle')
setTimeout(()=>{ // 新增样式，vux更新延迟，需要加延时
let va = '.list>span:nth-child(' + (val.childIndex + 2) + ')>span';
$(va).addClass('menuClick')
},50)
}
}
},
deep: true
}
}
}
......
src/components/home/home.vue
浏览文件 @ 414bab06
......@@ -43,7 +43,7 @@
<img src="./img/WD.png">
<span>我的项目</span>
</p>
<p class="bg" v-if="this.$store.getters.getUserData.type === 1">
<p class="bg" v-if="this.$store.getters.getUserData.type === 1" @click="jump('document',7,'项目管理')">
<img src="./img/WD.png">
<span>项目管理</span>
</p>
......@@ -67,10 +67,15 @@
<span>评估报告管理</span>
<span class="line"></span>
</p>
<p v-if="this.$store.getters.getUserData.type !== 1" @click="goOther('http://120.55.57.35:8080/assessment/#/home')">
<p @click="goOther('http://120.55.57.35:8080/assessment/#/home')"v-if="this.$store.getters.getUserData.type !== 1">
<img src="./img/XT.png">
<span>系统改造评估</span>
</p>
<p @click="goOther('http://120.55.57.35:8080/assessment/#/home')" v-if="this.$store.getters.getUserData.type === 1">
<img src="./img/XT.png">
<span>系统改造评估</span>
<span class="line"></span>
</p>
<p v-if="this.$store.getters.getUserData.type === 1" @click="goOther('http://120.55.57.35:8080/assessment/#/technology')">
<img src="./img/JS.png">
<span>关键技术管理</span>
......@@ -116,7 +121,7 @@ export default {
},
// 跳转到其他页面
goOther(path) {
if (path === 'http://120.55.57.35:8080/assessment/#/home') {
if (path === 'http://120.55.57.35:8080/assessment/#/home' && this.$store.getters.getUserData.type !== 1) {
let val = 'http://120.55.57.35:8080/assessment/#/home' + '?userName=' + this.$store.getters.getUserData.userName;
window.open(val);
} else {
......
src/components/projectManagement/technicalRoute/technicalRoute.vue 0 → 100644
浏览文件 @ 414bab06
<template>
<div class="technicalRoute">
<el-row>
<el-col :span="24">
<div class="content">
<el-row>
<el-col :span="24">
<p class="title">技术路线</p>
<p class="search">
<span class="value">
<span>中间件：</span>
<el-input v-model="allVal.middleware" size="medium" :disabled="true"></el-input>
</span>
<span class="value">
<span>操作系统：</span>
<el-input v-model="allVal.system" size="medium" :disabled="true"></el-input>
</span>
</p>
<p class="search">
<span class="value">
<span>CPU型号：</span>
<el-input v-model="allVal.cpu" size="medium" :disabled="true"></el-input>
</span>
<span class="value">
<span>数据库：</span>
<el-input v-model="allVal.database" size="medium" :disabled="true"></el-input>
</span>
</p>
<p class="search">
<span class="value">
<span>服务器：</span>
<el-input v-model="allVal.server" size="medium" :disabled="true"></el-input>
</span>
<span class="value">
<span>笔记本：</span>
<el-input v-model="allVal.computer" size="medium" :disabled="true"></el-input>
</span>
</p>
</el-col>
</el-row>
</div>
</el-col>
</el-row>
</div>
</template>
<script>
export default {
data () {
return {
allVal: {
middleware: '金蝶',
system: 'centos',
cpu: '龙芯cpu',
database: '瀚高数据库',
server: 'XXX服务器',
computer: 'XXX笔记本'
}
}
},
created() {
},
mounted(){
},
methods: {
},
components: {
},
watch: {
}
}
</script>
<style scoped>
.technicalRoute{
background: #ebf0f8;
width: 100%;
}
.technicalRoute .content{
margin: 40px;
height: 841px;
background: #fff;
overflow: hidden;
}
.technicalRoute .content .title{
padding: 30px 0 0 60px;
font-size: 20px;
color: #233b6e;
position: relative;
}
.technicalRoute .content .search{
margin-top: 36px;
display: flex;
padding: 0px 70px 30px 70px;
justify-content: space-evenly;
}
.technicalRoute .content .value{
width: 410px;
display: flex;
font-size: 18px;
color: #666;
}
.technicalRoute .content .value>span{
width: 150px;
display: inline-block;
line-height: 34px;
text-align: right;
}
.technicalRoute>>>.el-input--medium .el-input__inner{
font-size: 18px;
color: #333;
font-family: 'Regular';
}
</style>
src/components/sidebar/sidebar.vue
浏览文件 @ 414bab06
......@@ -195,6 +195,9 @@ export default {
}, {
name: '操作日志',
path: 'journal'
},{
name: '技术路线',
path: 'technicalRoute'
}
]
},
......
src/router/index.js
浏览文件 @ 414bab06
......@@ -175,6 +175,12 @@ export default new Router({
name: 'journal',
component: resolve => require(['../components/projectManagement/journal/journal.vue'], resolve)
},
// 项目管理-技术路线
{
path: '/technicalRoute',
name: 'technicalRoute',
component: resolve => require(['../components/projectManagement/technicalRoute/technicalRoute.vue'], resolve)
},
]
}
......
src/store/action.js
浏览文件 @ 414bab06
......@@ -24,6 +24,12 @@ const actions = {
nowPath: payload
})
},
changeJumpOther(store, payload) {
store.commit({
type: 'changeJumpOther',
jumpOther: payload
})
},
};
export default actions;
src/store/getter.js
浏览文件 @ 414bab06
......@@ -11,6 +11,9 @@ const getters = {
},
getNowPath(state) {
return state.nowPath
},
getJumpOther(state) {
return state.jumpOther
}
};
......
src/store/mutation.js
浏览文件 @ 414bab06
......@@ -12,6 +12,9 @@ const mutations = {
changeNowPath(state, payload) {
state.nowPath = payload;
},
changeJumpOther(state, payload) {
state.jumpOther = payload;
},
};
export default mutations;
src/store/state.js
浏览文件 @ 414bab06
......@@ -3,7 +3,8 @@ const state = {
sidebar: [], // 子菜单
userData: {}, // 登录用户信息
homeClick: {}, // 首页点击的模块
nowPath: '' // 当前页面路径
nowPath: '', // 当前页面路径
jumpOther: '', // 跳转到其他页面，修改顶部子菜单样式
};
export default state;
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论