Skip to content

9
912project
提交 2b8622dd authored 作者: thy's avatar thy
浏览文件
操作

选项修改

上级 4e6cf3b4
隐藏空白字符变更
内嵌 并排
正在显示 包含 429 行增加 和 452 行删除
config.js
浏览文件 @ 2b8622dd
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
// 服务地址 // 服务地址
const IP = 'http://120.55.57.35'; // 刘杰 const IP = 'http://120.55.57.35'; // 刘杰
// const IP = 'http://localhost'; // 刘杰 // const IP = 'http://192.168.0.114'; // 刘杰
// 请求目标服务器域名配置 // 请求目标服务器域名配置
const DOMAIN_NAME = { const DOMAIN_NAME = {
......
package-lock.json
浏览文件 @ 2b8622dd
...@@ -5261,7 +5261,8 @@ ...@@ -5261,7 +5261,8 @@
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
...@@ -5282,12 +5283,14 @@ ...@@ -5282,12 +5283,14 @@
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
...@@ -5302,17 +5305,20 @@ ...@@ -5302,17 +5305,20 @@
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
...@@ -5429,7 +5435,8 @@ ...@@ -5429,7 +5435,8 @@
"inherits": { "inherits": {
"version": "2.0.4", "version": "2.0.4",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
...@@ -5441,6 +5448,7 @@ ...@@ -5441,6 +5448,7 @@
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
...@@ -5455,6 +5463,7 @@ ...@@ -5455,6 +5463,7 @@
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
...@@ -5462,12 +5471,14 @@ ...@@ -5462,12 +5471,14 @@
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.9.0", "version": "2.9.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
...@@ -5486,6 +5497,7 @@ ...@@ -5486,6 +5497,7 @@
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
...@@ -5575,7 +5587,8 @@ ...@@ -5575,7 +5587,8 @@
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
...@@ -5587,6 +5600,7 @@ ...@@ -5587,6 +5600,7 @@
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
...@@ -5672,7 +5686,8 @@ ...@@ -5672,7 +5686,8 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
...@@ -5708,6 +5723,7 @@ ...@@ -5708,6 +5723,7 @@
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
...@@ -5727,6 +5743,7 @@ ...@@ -5727,6 +5743,7 @@
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
...@@ -5770,12 +5787,14 @@ ...@@ -5770,12 +5787,14 @@
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.1.1", "version": "3.1.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
} }
} }
}, },
......
src/components/UnDependenceDispose/UnDependence.vue
浏览文件 @ 2b8622dd
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="content"> <div class="content">
<p class="title">未知依赖配置</p>
<p class="search"> <p class="search">
<span class="searchVal"> <span class="searchVal">
<span>查询：</span> <span>查询：</span>
...@@ -71,7 +70,7 @@ export default { ...@@ -71,7 +70,7 @@ export default {
tableData: [], tableData: [],
tablePageSize: 0, tablePageSize: 0,
myPage: 1, // 分页第一页 myPage: 1, // 分页第一页
pageSize: 8, // 每页个数 pageSize: 9, // 每页个数
openModel: false, openModel: false,
components: '', components: '',
technologyId:'内部依赖(未知)', technologyId:'内部依赖(未知)',
...@@ -89,7 +88,7 @@ export default { ...@@ -89,7 +88,7 @@ export default {
technologyName: this.technologyId, technologyName: this.technologyId,
target: this.input2 target: this.input2
} }
this.$server.getConfigPageList(this.myPage, 8, obj).then(res => { this.$server.getConfigPageList(this.myPage, this.pageSize, obj).then(res => {
console.log(res); console.log(res);
this.tableData = res.data.objects; this.tableData = res.data.objects;
this.tablePageSize = res.data.totalElement; this.tablePageSize = res.data.totalElement;
...@@ -100,7 +99,7 @@ export default { ...@@ -100,7 +99,7 @@ export default {
let obj = { let obj = {
technologyName:this.technologyId technologyName:this.technologyId
} }
this.$server.getConfigPageList(this.myPage,8,obj).then(res => { this.$server.getConfigPageList(this.myPage,this.pageSize,obj).then(res => {
this.tableData = res.data.objects; this.tableData = res.data.objects;
this.tablePageSize = res.data.totalElement; this.tablePageSize = res.data.totalElement;
}); });
...@@ -245,4 +244,4 @@ export default { ...@@ -245,4 +244,4 @@ export default {
background-color: #ffffff; background-color: #ffffff;
color: #4877e6; color: #4877e6;
} }
</style> </style>
\ No newline at end of file
src/components/XCalliance/XCalliance/imgs.vue
浏览文件 @ 2b8622dd
...@@ -28,7 +28,6 @@ export default { ...@@ -28,7 +28,6 @@ export default {
created() { created() {
}, },
mounted(){ mounted(){
this.imgload();
window.addEventListener('resize',()=>{ window.addEventListener('resize',()=>{
this.height = this.$refs.height[0].height; this.height = this.$refs.height[0].height;
this.imgload(); this.imgload();
...@@ -38,7 +37,6 @@ export default { ...@@ -38,7 +37,6 @@ export default {
imgload() { imgload() {
this.$nextTick(()=>{ this.$nextTick(()=>{
this.height = this.$refs.height[0].height; this.height = this.$refs.height[0].height;
console.log(this.$refs.height[0].height);
}) })
} }
}, },
......
src/components/XCalliance/dynamicList/dynamicList.vue
浏览文件 @ 2b8622dd
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="content"> <div class="content">
<p class="title">最新动态</p>
<p class="search"> <p class="search">
<span class="searchVal"> <span class="searchVal">
<span>查询：</span> <span>查询：</span>
...@@ -76,7 +75,7 @@ export default { ...@@ -76,7 +75,7 @@ export default {
return { return {
searchVal: '', searchVal: '',
currentPage: 1, // 分页第一页 currentPage: 1, // 分页第一页
pagesize: 8, // 每页个数 pagesize: 9, // 每页个数
totleLength: 8, // 获取后台传的所有数据的长度 totleLength: 8, // 获取后台传的所有数据的长度
allData:[ allData:[
{ {
......
src/components/admittance/company/company.vue
浏览文件 @ 2b8622dd
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="content"> <div class="content">
<p class="title">单位管理</p>
<p class="search"> <p class="search">
<span class="searchVal"> <span class="searchVal">
<span>单位名称：</span> <span>单位名称：</span>
...@@ -78,7 +77,7 @@ export default { ...@@ -78,7 +77,7 @@ export default {
return { return {
totalLength: 0, totalLength: 0,
currentPage: 1, // 分页第一页 currentPage: 1, // 分页第一页
pageSize: 8, // 每页个数 pageSize: 9, // 每页个数
searchName: '', searchName: '',
openModel: false, // 弹框开关 openModel: false, // 弹框开关
components: '', // 当前弹框内容 components: '', // 当前弹框内容
......
src/components/admittance/product/product.vue
浏览文件 @ 2b8622dd
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="content"> <div class="content">
<p class="title">产品管理</p>
<p class="search"> <p class="search">
<span class="searchVal"> <span class="searchVal">
<span>产品名称：</span> <span>产品名称：</span>
...@@ -95,7 +94,7 @@ export default { ...@@ -95,7 +94,7 @@ export default {
return { return {
totalLength: 0, totalLength: 0,
currentPage: 1, // 分页第一页 currentPage: 1, // 分页第一页
pageSize: 8, // 每页个数 pageSize: 9, // 每页个数
formValue: '', formValue: '',
name: '', name: '',
formList: [{form: 1},{form: 2},{form: 3},{form: 4},{form: 5},{form: 6}], formList: [{form: 1},{form: 2},{form: 3},{form: 4},{form: 5},{form: 6}],
......
src/components/admittance/technical/technical.vue
浏览文件 @ 2b8622dd
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="content"> <div class="content">
<p class="title">技术路线管理</p>
<p class="search"> <p class="search">
<span class="searchVal"> <span class="searchVal">
<span>技术路线名称：</span> <span>技术路线名称：</span>
...@@ -88,7 +87,7 @@ export default { ...@@ -88,7 +87,7 @@ export default {
data () { data () {
return { return {
currentPage: 1, // 分页第一页 currentPage: 1, // 分页第一页
pagesize: 8, // 每页个数 pagesize: 9, // 每页个数
totleLength: 0, // 获取后台传的所有数据的长度 totleLength: 0, // 获取后台传的所有数据的长度
openModel: false, // 弹框开关 openModel: false, // 弹框开关
components: '', // 当前弹框内容 components: '', // 当前弹框内容
......
src/components/assessment/homeDetailcopy.vue
浏览文件 @ 2b8622dd
...@@ -1645,6 +1645,9 @@ export default { ...@@ -1645,6 +1645,9 @@ export default {
e === this[objKey][objName] e === this[objKey][objName]
? (this[objKey][objName] = "") ? (this[objKey][objName] = "")
: (this[objKey][objName] = e); : (this[objKey][objName] = e);
if(objKey === 'browser' && objName !== 'plugInUnit'){
this.browser.plugInUnit = 1
}
}, },
addZip(name, file, git) { addZip(name, file, git) {
this.loading = false; this.loading = false;
......
src/components/basicInformation/company/company.vue
浏览文件 @ 2b8622dd
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="content"> <div class="content">
<p class="title">单位管理</p>
<p class="search"> <p class="search">
<span class="searchVal"> <span class="searchVal">
<span>单位名称：</span> <span>单位名称：</span>
...@@ -94,7 +93,7 @@ export default { ...@@ -94,7 +93,7 @@ export default {
return { return {
totalLength: 0, totalLength: 0,
currentPage: 1, // 分页第一页 currentPage: 1, // 分页第一页
pageSize: 8, // 每页个数 pageSize: 9, // 每页个数
searchName: '', searchName: '',
openModel: false, // 弹框开关 openModel: false, // 弹框开关
components: '', // 当前弹框内容 components: '', // 当前弹框内容
......
src/components/basicInformation/person/person.vue
浏览文件 @ 2b8622dd
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="content"> <div class="content">
<p class="title">人员管理</p>
<p class="search"> <p class="search">
<span class="searchVal"> <span class="searchVal">
<span>姓名：</span> <span>姓名：</span>
...@@ -94,7 +93,7 @@ export default { ...@@ -94,7 +93,7 @@ export default {
data () { data () {
return { return {
currentPage: 1, // 分页第一页 currentPage: 1, // 分页第一页
pagesize: 8, // 每页个数 pagesize: 9, // 每页个数
totleLength: 0, // 获取后台传的所有数据的长度 totleLength: 0, // 获取后台传的所有数据的长度
openModel: false, // 弹框开关 openModel: false, // 弹框开关
components: '', // 当前弹框内容 components: '', // 当前弹框内容
...@@ -133,9 +132,8 @@ export default { ...@@ -133,9 +132,8 @@ export default {
} }
let val = { let val = {
name: '基础资料管理', name: '基础资料管理',
index: 11,
childPath: 'person', childPath: 'person',
childIndex: 2 childName: '人员管理'
} }
this.$store.commit('changeJumpOther', val); this.$store.commit('changeJumpOther', val);
this.init() this.init()
......
src/components/basicInformation/product/product.vue
浏览文件 @ 2b8622dd
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="content"> <div class="content">
<p class="title">产品管理</p>
<p class="search"> <p class="search">
<span class="searchVal"> <span class="searchVal">
<span>产品名称：</span> <span>产品名称：</span>
...@@ -111,7 +110,7 @@ export default { ...@@ -111,7 +110,7 @@ export default {
return { return {
totalLength: 0, totalLength: 0,
currentPage: 1, // 分页第一页 currentPage: 1, // 分页第一页
pageSize: 8, // 每页个数 pageSize: 9, // 每页个数
formValue: '', formValue: '',
name: '', name: '',
formList: [{form: 1},{form: 2},{form: 3},{form: 4},{form: 5},{form: 6}], formList: [{form: 1},{form: 2},{form: 3},{form: 4},{form: 5},{form: 6}],
......
src/components/basicInformation/role/authority.vue
浏览文件 @ 2b8622dd
...@@ -14,14 +14,19 @@ ...@@ -14,14 +14,19 @@
<span>角色权限：</span> <span>角色权限：</span>
<span style="margin-left: 180px;"> <span style="margin-left: 180px;">
<span class="selected" @click="selected"> <span class="selected" @click="selected">
<span class="img"></span>
<span class="val">全选</span> <span class="val">全选</span>
</span> </span>
</span> </span>
</p> </p>
<p class="authorityList"> <div class="authorityAll">
<span v-for="(item,index) of authority" @click="clickList(index,item)"><span class="author"></span>{{item.name}}</span> <el-scrollbar style="height: 100%">
</p> <p class="authorityList">
<span v-for="(item,index) of authority" @click="clickList(index,item)">
<span class="author"></span>{{item.name}}
</span>
</p>
</el-scrollbar>
</div>
</div> </div>
<p class="line"></p> <p class="line"></p>
<p class="buttonClick"> <p class="buttonClick">
...@@ -66,8 +71,16 @@ export default { ...@@ -66,8 +71,16 @@ export default {
} }
setTimeout(()=>{ setTimeout(()=>{
for (let item of this.allAuthority) { for (let item of this.allAuthority) {
let val = '.authorityList>span:nth(' + (item - 1) + ')'; for (let arr of this.authority) {
$(val).addClass('authorityListClick') if (item === arr.id) {
for (let i = 0; i < $('.authorityList>span').length; i++) {
if ($('.authorityList>span')[i].innerText === arr.name) {
let val = '.authorityList>span:nth(' + i + ')';
$(val).addClass('authorityListClick')
}
}
}
}
} }
},300) },300)
...@@ -120,7 +133,6 @@ export default { ...@@ -120,7 +133,6 @@ export default {
if (this.clickAll === false) { if (this.clickAll === false) {
$('.selected').addClass('selectedClick'); $('.selected').addClass('selectedClick');
$('.authorityList>span').addClass('authorityListClick'); $('.authorityList>span').addClass('authorityListClick');
$('.selected .img').addClass('noClick')
$('.val').html('全不选') $('.val').html('全不选')
this.allAuthority = []; this.allAuthority = [];
for (let item of this.authority) { for (let item of this.authority) {
...@@ -128,7 +140,6 @@ export default { ...@@ -128,7 +140,6 @@ export default {
} }
this.clickAll = true; this.clickAll = true;
} else { } else {
$('.selected .img').removeClass('noClick')
$('.selected').removeClass('selectedClick'); $('.selected').removeClass('selectedClick');
$('.val').html('全选') $('.val').html('全选')
this.allAuthority = []; this.allAuthority = [];
...@@ -199,27 +210,23 @@ export default { ...@@ -199,27 +210,23 @@ export default {
cursor: pointer; cursor: pointer;
color: #4877e6; color: #4877e6;
} }
.authority .img{ .authority .authorityAll{
display: inline-block; width: 340px;
width: 19px; height: 160px;
height: 19px; margin: 10px 0 0 305px;
background: url("./img/selected.png"); text-align: center;
}
.authority .noClick{
background: url("./img/selectedN.png");
} }
.authority .authorityList{ .authority .authorityList{
width: 280px;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
margin: 10px 0 0 305px;
} }
.authority .authorityList>span{ .authority .authorityList>span{
margin-left: 25px; margin-left: 25px;
margin-top: 10px; margin-top: 10px;
display: inline-block; display: inline-block;
width: 100px; width: 140px;
cursor: pointer; cursor: pointer;
text-align: left;
} }
.authority .author{ .authority .author{
margin-right: 5px; margin-right: 5px;
...@@ -232,4 +239,7 @@ export default { ...@@ -232,4 +239,7 @@ export default {
.authority .authorityListClick>span{ .authority .authorityListClick>span{
background: url("./img/click.png"); background: url("./img/click.png");
} }
.authority .authorityAll>>>.el-scrollbar__wrap {
overflow-x: hidden;
}
</style> </style>
src/components/basicInformation/role/role.vue
浏览文件 @ 2b8622dd
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="content"> <div class="content">
<p class="title">角色管理</p>
<p class="search"> <p class="search">
<span class="searchVal"> <span class="searchVal">
<span>查询：</span> <span>查询：</span>
...@@ -74,7 +73,7 @@ export default { ...@@ -74,7 +73,7 @@ export default {
return { return {
searchVal: '', searchVal: '',
currentPage: 1, // 分页第一页 currentPage: 1, // 分页第一页
pagesize: 8, // 每页个数 pagesize: 9, // 每页个数
totleLength: 0, // 获取后台传的所有数据的长度 totleLength: 0, // 获取后台传的所有数据的长度
openModel: false, // 弹框开关 openModel: false, // 弹框开关
components: '', // 当前弹框内容 components: '', // 当前弹框内容
......
src/components/complaint/complaint/complaint.vue
浏览文件 @ 2b8622dd
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="content"> <div class="content">
<p class="title">意见建议</p>
<p class="search"> <p class="search">
<span class="searchVal"> <span class="searchVal">
<span>查询：</span> <span>查询：</span>
...@@ -88,7 +87,7 @@ export default { ...@@ -88,7 +87,7 @@ export default {
return { return {
searchVal: '', searchVal: '',
currentPage: 1, // 分页第一页 currentPage: 1, // 分页第一页
pagesize: 8, // 每页个数 pagesize: 9, // 每页个数
totleLength: 0, // 获取后台传的所有数据的长度 totleLength: 0, // 获取后台传的所有数据的长度
allData:[] // 列表内容 allData:[] // 列表内容
} }
......
src/components/complaint/complaintManagement/complaintManagement.vue
浏览文件 @ 2b8622dd
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="content"> <div class="content">
<p class="title">投诉管理</p>
<p class="search"> <p class="search">
<span class="searchVal"> <span class="searchVal">
<span>查询：</span> <span>查询：</span>
...@@ -89,7 +88,7 @@ export default { ...@@ -89,7 +88,7 @@ export default {
return { return {
searchVal: '', searchVal: '',
currentPage: 1, // 分页第一页 currentPage: 1, // 分页第一页
pagesize: 8, // 每页个数 pagesize: 9, // 每页个数
totleLength: 0, // 获取后台传的所有数据的长度 totleLength: 0, // 获取后台传的所有数据的长度
allData:[] // 列表内容 allData:[] // 列表内容
} }
......
src/components/evaluationReport/evaluationReport.vue
浏览文件 @ 2b8622dd
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="content"> <div class="content">
<p class="title">评估报告管理</p>
<p class="search"> <p class="search">
<span class="searchVal"> <span class="searchVal">
<span>查询：</span> <span>查询：</span>
...@@ -67,13 +66,13 @@ ...@@ -67,13 +66,13 @@
<script> <script>
import $ from 'jquery'; import $ from 'jquery';
import moment from "moment"; import moment from "moment";
export default { export default {
data () { data () {
return { return {
searchVal: '', searchVal: '',
currentPage: 1, // 分页第一页 currentPage: 1, // 分页第一页
pagesize: 8, // 每页个数 pagesize: 9, // 每页个数
totleLength: 0, // 获取后台传的所有数据的长度 totleLength: 0, // 获取后台传的所有数据的长度
allData:[] // 列表内容 allData:[] // 列表内容
} }
...@@ -86,7 +85,14 @@ export default { ...@@ -86,7 +85,14 @@ export default {
methods: { methods: {
add(){ add(){
console.log(this.$store.state.userData.userName) console.log(this.$store.state.userData.userName)
this.$router.push({
name: 'assessmentReport',
query: {
username:this.$store.state.userData.userName,
authority: this.$store.state.userData.type,
id: null,
}
});
// let Logistics= this.$router.resolve({ // let Logistics= this.$router.resolve({
// path:'/assessmentReport', // path:'/assessmentReport',
// query:{ // query:{
...@@ -96,23 +102,15 @@ export default { ...@@ -96,23 +102,15 @@ export default {
// } // }
// }) // })
// window.open(Logistics.href) // window.open(Logistics.href)
this.$router.push({
name: "assessmentReport",
query: {
username:this.$store.state.userData.userName,
authority: this.$store.state.userData.type,
id: null,
}
});
}, },
// 初始请求 // 初始请求
init() { init() {
var username = '' let username = ''
if(this.$store.state.userData.userName != 'admin'){ if (this.$store.state.userData.userName !== 'admin'){
username =this.$store.state.userData.userName username =this.$store.state.userData.userName
} }
let val = { let val = {
'username':username, 'username':username,
'projectName': this.searchVal, 'projectName': this.searchVal,
} }
this.$server.getEvaluationList(this.currentPage,this.pagesize,val).then(res=>{ this.$server.getEvaluationList(this.currentPage,this.pagesize,val).then(res=>{
...@@ -145,6 +143,11 @@ export default { ...@@ -145,6 +143,11 @@ export default {
evaluation(row) { evaluation(row) {
console.log(row) console.log(row)
console.log(this.$store.state.userData) console.log(this.$store.state.userData)
this.$router.push({name:'assessmentReport', query: {
username: row.username,
id: row.id,
authority: this.$store.state.userData.type
}})
// // return // // return
// let Logistics= this.$router.resolve({ // let Logistics= this.$router.resolve({
// path:'/assessmentReport', // path:'/assessmentReport',
...@@ -155,15 +158,11 @@ export default { ...@@ -155,15 +158,11 @@ export default {
// } // }
// }) // })
// window.open(Logistics.href) // window.open(Logistics.href)
this.$router.push({name:'assessmentReport', query: {
username: row.username,
id: row.id,
authority: this.$store.state.userData.type
}})
// this.$router.push({name: 'complaintManagementDetail',params:{'value': row}}); // this.$router.push({name: 'complaintManagementDetail',params:{'value': row}});
}, },
// 报告 // 报告
report(row) { report(row) {
console.log(row)
// console.log(row) // console.log(row)
// let Logistics= this.$router.resolve({ // let Logistics= this.$router.resolve({
// path:'/reportAssess', // path:'/reportAssess',
...@@ -174,11 +173,11 @@ export default { ...@@ -174,11 +173,11 @@ export default {
// } // }
// }) // })
// window.open(Logistics.href) // window.open(Logistics.href)
this.$router.push({name:'reportAssess',query: { this.$router.push({name:'reportAssess',query: {
username: row.username, username: row.username,
id:row.id, id:row.id,
authority:this.$store.state.userData.type, authority:this.$store.state.userData.type,
}}) }})
}, },
// 删除 // 删除
del(row) { del(row) {
...@@ -207,33 +206,29 @@ export default { ...@@ -207,33 +206,29 @@ export default {
}, },
// 时间换算 // 时间换算
time(value) { time(value) {
// console.log(timestamp) value = value.replace(/-/g, '/').replace('T', ' ').replace('.000+0000', '')
// value = value.replace(/-/g, '/').replace('T', ' ').replace('.000+0000', '') if (value !== undefined && value !== null) {
if (value !== undefined && value !== null) { let date = new Date(value); // 时间戳为10位需*1000，时间戳为13位的话不需乘1000
let date = new Date(value); // 时间戳为10位需*1000，时间戳为13位的话不需乘1000 let day = moment(value).format('YYYY-MM-DD HH:mm:ss');
var day = moment(value).format('YYYY-MM-DD HH:mm:ss'); let day2 = moment(day).utc().format()
var day2 = moment(day).utc().format() return day
// console.log(day) } else {
// console.log(timestamp.length) return ''
return day }
} else {
return ''
}
} }
}, },
components: { components: {
}, },
computed: { computed: {
listData() { listData() {
return this.$store.state.routeClick; return this.$store.state.routeClick;
} }
}, },
watch: { watch: {
'$store.state.routeClick':function(newFlag, oldFlag){ '$store.state.routeClick':function(newFlag, oldFlag){
// 需要执行的代码 // 需要执行的代码
console.log('vuex==========',newFlag,oldFlag) console.log('vuex==========',newFlag,oldFlag)
} }
} }
} }
</script> </script>
......
src/components/header/header.vue
浏览文件 @ 2b8622dd
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<div style="height: 40px;background: #fff;" v-if=" $route.name == 'assessmentReport'?false:$route.name == 'reportAssess'?false:$route.path == '/firstHome'?false:true"> <div style="height: 40px;background: #fff;" v-if=" $route.name == 'assessmentReport'?false:$route.name == 'reportAssess'?false:$route.path == '/firstHome'?false:true">
<p class="list"> <p class="list">
<span class="menuTitle goTitle" @click="go">{{sidebar.name}}</span> <span class="menuTitle goTitle" @click="go">{{sidebar.name}}</span>
<span v-for="(item,index) of sidebar.menu" :key="index" class="listVal" @click="jump(item.path, index)"> <span v-for="(item,index) of sidebar.menu" :key="index" class="listVal" @click="jump(item.path, index)" v-if="getUserData.authorityCode.indexOf(item.code) !== -1">
<span>{{item.name}}</span> <span>{{item.name}}</span>
<img src="./img/line.png" v-show="index !== sidebar.menu.length - 1"> <img src="./img/line.png" v-show="index !== sidebar.menu.length - 1">
</span> </span>
...@@ -105,7 +105,7 @@ export default { ...@@ -105,7 +105,7 @@ export default {
} }
}, },
computed: { computed: {
...mapGetters(['getSidebar','getJumpOther']) ...mapGetters(['getSidebar','getJumpOther', 'getUserData'])
}, },
components: { components: {
}, },
...@@ -113,8 +113,8 @@ export default { ...@@ -113,8 +113,8 @@ export default {
'getSidebar': { // 监听侧边栏点击 'getSidebar': { // 监听侧边栏点击
handler: function (val) { handler: function (val) {
this.sidebar = val; this.sidebar = val;
if (val.path !== this.$store.getters.getNowPath && val.menu !== undefined) { // 判断是否显示首页 if (val.menu !== undefined) {
for (let i = 0; i < val.menu.length; i++) { // 没有显示首页，轮询子菜单对比名称 for (let i = 0; i < val.menu.length; i++) { // 当前页与子菜单进行对比
if (val.menu[i].path === this.$store.getters.getNowPath) { // 判断子菜单path与当前path if (val.menu[i].path === this.$store.getters.getNowPath) { // 判断子菜单path与当前path
$('.listVal>span').removeClass('menuClick') // 修改样式 $('.listVal>span').removeClass('menuClick') // 修改样式
$('.menuTitle').removeClass('goTitle') $('.menuTitle').removeClass('goTitle')
...@@ -131,12 +131,18 @@ export default { ...@@ -131,12 +131,18 @@ export default {
getJumpOther: { getJumpOther: {
handler: function (val) { handler: function (val) {
if (val !== '') { if (val !== '') {
let index;
for (let i = 0; i < $('.sidebar div').length; i++) {
if (val.name === $('.sidebar div')[i].innerText) {
index = i + 1;
}
}
$('.sidebar .menu').removeClass('click'); // 样式修改 $('.sidebar .menu').removeClass('click'); // 样式修改
$('.sidebar .font').removeClass('fontClick'); $('.sidebar .font').removeClass('fontClick');
$('.sidebar .line').removeClass('lineClick'); $('.sidebar .line').removeClass('lineClick');
let menu = '.sidebar>div:nth-child(' + val.index + ') .menu'; let menu = '.sidebar>div:nth-child(' + index + ') .menu';
let font = '.sidebar>div:nth-child(' + val.index + ') .font'; let font = '.sidebar>div:nth-child(' + index + ') .font';
let line = '.sidebar>div:nth-child(' + val.index + ') .line'; let line = '.sidebar>div:nth-child(' + index + ') .line';
$(menu).addClass('click'); $(menu).addClass('click');
$(font).addClass('fontClick'); $(font).addClass('fontClick');
$(line).addClass('lineClick'); $(line).addClass('lineClick');
...@@ -148,7 +154,13 @@ export default { ...@@ -148,7 +154,13 @@ export default {
$('.listVal>span').removeClass('menuClick') // 修改样式 $('.listVal>span').removeClass('menuClick') // 修改样式
$('.menuTitle').removeClass('goTitle') $('.menuTitle').removeClass('goTitle')
setTimeout(()=>{ // 新增样式，vux更新延迟，需要加延时 setTimeout(()=>{ // 新增样式，vux更新延迟，需要加延时
let va = '.list>span:nth-child(' + (val.childIndex + 2) + ')>span'; let childIndex;
for (let i = 0; i < $('.listVal').length; i++) {
if (val.childName === $('.listVal')[i].innerText) {
childIndex = i;
}
}
let va = '.list>span:nth-child(' + (childIndex + 2) + ')>span';
$(va).addClass('menuClick') $(va).addClass('menuClick')
this.$store.commit('changeJumpOther', ''); this.$store.commit('changeJumpOther', '');
},50) },50)
......
src/components/home/home.vue
浏览文件 @ 2b8622dd
...@@ -4,91 +4,82 @@ ...@@ -4,91 +4,82 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="menu"> <div class="menu">
<p class="bg"> <p class="bg" v-if="this.$store.getters.getUserData.authorityCode.indexOf('000200') !== -1">
<img src="./img/JD.png"> <img src="./img/JD.png">
<span>基地建设</span> <span>基地建设</span>
</p> </p>
<p class="bg" @click="jump('XCalliance',9,'XX联盟')" v-if="this.$store.getters.getUserData.type === 1"> <p class="bg" @click="jump('XCalliance','XX联盟')" v-if="this.$store.getters.getUserData.authorityCode.indexOf('000300') !== -1">
<img src="./img/XC.png"> <img src="./img/XC.png">
<span>XX联盟</span> <span>XX联盟</span>
</p> </p>
<p class="bg" @click="jump('integration',10,'XXX一体化')" v-if="this.$store.getters.getUserData.type === 1"> <p class="bg" @click="jump('integration','XXX一体化')" v-if="this.$store.getters.getUserData.authorityCode.indexOf('000400') !== -1">
<img src="./img/ZQ.png"> <img src="./img/ZQ.png">
<span>XXX一体化</span> <span>XXX一体化</span>
</p> </p>
<p class="bg" @click="jump('XCalliance',5,'XX联盟')" v-if="this.$store.getters.getUserData.type !== 1"> <p class="bg" @click="jump('company','国家名录')" v-if="this.$store.getters.getUserData.authorityCode.indexOf('0001500') !== -1">
<img src="./img/XC.png">
<span>XX联盟</span>
</p>
<p class="bg" @click="jump('integration',6,'XXX一体化')" v-if="this.$store.getters.getUserData.type !== 1">
<img src="./img/ZQ.png">
<span>XXX一体化</span>
</p>
<p class="bg" v-if="this.$store.getters.getUserData.type !== 1" @click="jump('company',7,'国家名录')">
<img src="./img/GJ.png"> <img src="./img/GJ.png">
<span>国家名录</span> <span>国家名录</span>
</p> </p>
<p class="bg" v-if="this.$store.getters.getUserData.type !== 1" @click="jump('product',8,'市级名录')"> <p class="bg" @click="jump('product','市级名录')" v-if="this.$store.getters.getUserData.authorityCode.indexOf('0001600') !== -1">
<img src="./img/SJ.png"> <img src="./img/SJ.png">
<span>市级名录</span> <span>市级名录</span>
</p> </p>
<p class="bg" v-if="this.$store.getters.getUserData.type === 1" @click="jump('company',11,'基础资料管理')"> <p class="bg" @click="jump('company','基础资料管理')" v-if="this.$store.getters.getUserData.authorityCode.indexOf('000500') !== -1">
<img src="./img/GJ.png"> <img src="./img/GJ.png">
<span>基础资料管理</span> <span>基础资料管理</span>
</p> </p>
<p class="bg" v-if="this.$store.getters.getUserData.type === 1" @click="jump('product',12,'市级准入管理')"> <p class="bg" @click="jump('product','市级准入管理')" v-if="this.$store.getters.getUserData.authorityCode.indexOf('000600') !== -1">
<img src="./img/SJ.png"> <img src="./img/SJ.png">
<span>市级准入管理</span> <span>市级准入管理</span>
</p> </p>
<p class="bg"> <p class="bg" v-if="this.$store.getters.getUserData.authorityCode.indexOf('000700') !== -1">
<img src="./img/KT.png"> <img src="./img/KT.png">
<span>课题攻关</span> <span>课题攻关</span>
</p> </p>
</div> </div>
<div class="menu"> <div class="menu">
<p class="bg" @click="jump('evaluationReport',1,'评估报告管理')"> <p class="bg" @click="jump('evaluationReport','评估报告管理')" v-if="this.$store.getters.getUserData.authorityCode.indexOf('000800') !== -1">
<img src="./img/PG.png"> <img src="./img/PG.png">
<span>评估报告管理</span> <span>评估报告管理</span>
</p> </p>
<p class="bg" v-if="this.$store.getters.getUserData.type !== 1" @click="jump('projectManagement',2,'我的项目')"> <p class="bg" @click="otherJump">
<img src="./img/PC.png">
<span>评测报告管理</span>
</p>
<p class="bg" @click="jump('projectManagement','我的项目')" v-if="this.$store.getters.getUserData.authorityCode.indexOf('0001800') !== -1">
<img src="./img/WD.png"> <img src="./img/WD.png">
<span>我的项目</span> <span>我的项目</span>
</p> </p>
<p class="bg" v-if="this.$store.getters.getUserData.type === 1" @click="jump('projectManagement',2,'项目管理')"> <p class="bg" @click="jump('projectManagement','项目管理')" v-if="this.$store.getters.getUserData.authorityCode.indexOf('000900') !== -1">
<img src="./img/WD.png"> <img src="./img/WD.png">
<span>项目管理</span> <span>项目管理</span>
</p> </p>
<p class="bg" v-if="this.$store.getters.getUserData.type !== 1" @click="jump('complaint',3,'意见建议')"> <p class="bg" @click="jump('complaint','意见建议')" v-if="this.$store.getters.getUserData.authorityCode.indexOf('0001900') !== -1">
<img src="./img/TS.png"> <img src="./img/TS.png">
<span>意见建议</span> <span>意见建议</span>
</p> </p>
<p class="bg" v-if="this.$store.getters.getUserData.type === 1" @click="jump('complaintManagement',3,'投诉管理')"> <p class="bg" @click="jump('complaintManagement','投诉管理')" v-if="this.$store.getters.getUserData.authorityCode.indexOf('0001000') !== -1">
<img src="./img/TS.png"> <img src="./img/TS.png">
<span>投诉管理</span> <span>投诉管理</span>
</p> </p>
<p class="blank"></p>
<p class="blank"></p>
<p class="blank"></p>
</div> </div>
<div class="menu" v-if="this.$store.getters.getUserData.type === 1"> <div class="menu">
<p class="bg" v-if="this.$store.getters.getUserData.type === 1" @click="jump('keyTechnology',4,'关键技术管理')"> <p class="bg" @click="jump('keyTechnology','关键技术管理')" v-if="this.$store.getters.getUserData.authorityCode.indexOf('0001100') !== -1">
<img src="./img/GJJS.png"> <img src="./img/GJJS.png">
<span>关键技术管理</span> <span>关键技术管理</span>
</p> </p>
<p class="bg" v-if="this.$store.getters.getUserData.type === 1" @click="jump('roleDispose',5,'规则配置')"> <p class="bg" @click="jump('roleDispose','规则配置')" v-if="this.$store.getters.getUserData.authorityCode.indexOf('0001200') !== -1">
<img src="./img/GZ.png"> <img src="./img/GZ.png">
<span>规则配置</span> <span>规则配置</span>
</p> </p>
<p class="bg" v-if="this.$store.getters.getUserData.type === 1" @click="jump('parameterConfiguration',6,'参数配置')"> <p class="bg" @click="jump('parameterConfiguration','参数配置')" v-if="this.$store.getters.getUserData.authorityCode.indexOf('0001300') !== -1">
<img src="./img/CS.png"> <img src="./img/CS.png">
<span>参数配置</span> <span>参数配置</span>
</p> </p>
<p class="bg" v-if="this.$store.getters.getUserData.type === 1" @click="jump('UnDependence',7,'未知依赖配置')"> <p class="bg" @click="jump('UnDependence','未知依赖配置')" v-if="this.$store.getters.getUserData.authorityCode.indexOf('0001400') !== -1">
<img src="./img/WZ.png"> <img src="./img/WZ.png">
<span>未知依赖配置</span> <span>未知依赖配置</span>
</p> </p>
<p class="blank"></p>
<p class="blank"></p>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
...@@ -96,36 +87,48 @@ ...@@ -96,36 +87,48 @@
</template> </template>
<script> <script>
import $ from 'jquery';
export default { export default {
data () { data () {
return { return {
} }
}, },
created() { created() {
}, },
mounted(){ mounted(){
this.init(1);
this.init(2);
this.init(3);
}, },
methods: { methods: {
// 页面布局
init(val) {
let one = '.menu:nth-child(' + val + ')>p';
if ($(one).length < 6) {
let i = 6 - $(one).length;
for (let a = 0; a < i; a++) {
let html = $('<p class="blank"></p>');
let other = '.menu:nth-child(' + val + ')';
$(other).append(html)
$('.blank').css('width', '180px');
$('.blank').css('height', '180px');
}
}
},
// 跳转 // 跳转
jump(path,index,title) { jump(path,title) {
let val = { let val = {
name: path, name: path,
index: index,
title: title title: title
} }
this.$store.commit('changeHomeClick', val); // 传给导航进行样式定位和点击事件 this.$store.commit('changeHomeClick', val); // 传给导航进行样式定位和点击事件
this.$store.commit('changeNowPath', path); // 当前path传给header作比对 this.$store.commit('changeNowPath', path); // 当前path传给header作比对
this.$router.push({name: path}); this.$router.push({name: path});
}, },
// 跳转到其他页面 // 链接到其他页面
goOther(path) { otherJump() {
if (this.$store.getters.getUserData.type !== 1) { window.open('http://120.55.57.35:8080/auto-test/#/AssessmentUser')
let val = path + '?username=' + this.$store.getters.getUserData.userName + '&authority=0';
window.open(val);
} else if (this.$store.getters.getUserData.type === 1) {
let val = path + '?username=' + this.$store.getters.getUserData.userName + '&authority=1';
window.open(val);
}
} }
}, },
components: { components: {
...@@ -154,10 +157,6 @@ export default { ...@@ -154,10 +157,6 @@ export default {
.firstHome .bg:hover{ .firstHome .bg:hover{
box-shadow: rgba(72,119,230,0.2) 7px 7px 5px; box-shadow: rgba(72,119,230,0.2) 7px 7px 5px;
} }
.firstHome .blank{
width: 170px;
height: 170px;
}
.firstHome .bg>img{ .firstHome .bg>img{
margin-top: 35px; margin-top: 35px;
height: 67px; height: 67px;
...@@ -173,39 +172,4 @@ export default { ...@@ -173,39 +172,4 @@ export default {
justify-content: space-between; justify-content: space-between;
margin-bottom: 88px; margin-bottom: 88px;
} }
.firstHome .XC{
margin: 48px 0 32px 0;
}
.firstHome .XCmenu{
display: flex;
}
.firstHome .XCmenu>p{
width: 328px;
height: 160px;
line-height: 160px;
display: inline-block;
background: #fff;
text-align: center;
font-size: 18px;
color: #333;
position: relative;
cursor: pointer;
transition: all 0.5s;
}
.firstHome .XCmenu>p:hover{
background: rgba(228,231,237,0.7);
border-radius: 10px;
}
.firstHome .XCmenu img{
margin-right: 15px;
}
.firstHome .XCmenu .line{
display: inline-block;
position: absolute;
top: 15px;
right: 0px;
height: 130px;
width: 1px;
background: #4877e6;
}
</style> </style>
src/components/integration/dynamicList/dynamicList.vue
浏览文件 @ 2b8622dd
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="content"> <div class="content">
<p class="title">最新动态</p>
<p class="search"> <p class="search">
<span class="searchVal"> <span class="searchVal">
<span>查询：</span> <span>查询：</span>
...@@ -76,7 +75,7 @@ export default { ...@@ -76,7 +75,7 @@ export default {
return { return {
searchVal: '', searchVal: '',
currentPage: 1, // 分页第一页 currentPage: 1, // 分页第一页
pagesize: 8, // 每页个数 pagesize: 9, // 每页个数
totleLength: 8, // 获取后台传的所有数据的长度 totleLength: 8, // 获取后台传的所有数据的长度
allData:[ allData:[
{ {
......
src/components/keyTechnology/keyTechnology.vue
浏览文件 @ 2b8622dd
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="content"> <div class="content">
<p class="title">关键技术管理</p>
<p class="search"> <p class="search">
<span class="searchVal"> <span class="searchVal">
<span>查询：</span> <span>查询：</span>
...@@ -93,7 +92,7 @@ export default { ...@@ -93,7 +92,7 @@ export default {
return { return {
searchVal: '', searchVal: '',
currentPage: 1, // 分页第一页 currentPage: 1, // 分页第一页
pagesize: 8, // 每页个数 pagesize: 9, // 每页个数
totleLength: 0, // 获取后台传的所有数据的长度 totleLength: 0, // 获取后台传的所有数据的长度
allData:[], // 列表内容 allData:[], // 列表内容
openModel: false, // 弹框开关 openModel: false, // 弹框开关
......
src/components/parameterConfiguration/parameterConfiguration.vue
浏览文件 @ 2b8622dd
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="content"> <div class="content">
<p class="title">人员信息</p>
<p class="buttonP" @click="change"> <p class="buttonP" @click="change">
<span class="button" title="编辑"><span></span></span> <span class="button" title="编辑"><span></span></span>
</p> </p>
...@@ -159,14 +158,8 @@ export default { ...@@ -159,14 +158,8 @@ export default {
background: #fff; background: #fff;
overflow: hidden; overflow: hidden;
} }
.parameter .content .title{
padding: 30px 0 0 60px;
font-size: 20px;
color: #233b6e;
position: relative;
}
.parameter .content .buttonP{ .parameter .content .buttonP{
padding: 10px 70px 40px 0px; padding: 30px 70px 40px 0px;
text-align: right; text-align: right;
} }
.parameter .content .button{ .parameter .content .button{
......
src/components/projectManagement/document/document.vue
浏览文件 @ 2b8622dd
...@@ -84,7 +84,7 @@ export default { ...@@ -84,7 +84,7 @@ export default {
data () { data () {
return { return {
searchVal: '', searchVal: '',
allData: [{name:'1',roleName: '123',unitName: '1',number: '1'}], allData: [],
currentPage: 1, // 分页第一页 currentPage: 1, // 分页第一页
pageSize: 8, // 每页个数 pageSize: 8, // 每页个数
totalLength: 0, // 获取后台传的所有数据的长度 totalLength: 0, // 获取后台传的所有数据的长度
......
src/components/projectManagement/project/projectManagement.vue
浏览文件 @ 2b8622dd
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="content"> <div class="content">
<p class="title">{{pageName}}</p>
<p class="search"> <p class="search">
<span class="searchVal"> <span class="searchVal">
<span>查询：</span> <span>查询：</span>
...@@ -92,7 +91,7 @@ export default { ...@@ -92,7 +91,7 @@ export default {
allData: [], allData: [],
pageName: '', pageName: '',
currentPage: 1, // 分页第一页 currentPage: 1, // 分页第一页
pagesize: 8, // 每页个数 pagesize: 9, // 每页个数
totleLength: 0 // 获取后台传的所有数据的长度 totleLength: 0 // 获取后台传的所有数据的长度
} }
}, },
......
src/components/projectManagement/projectDetails/projectDetails.vue
浏览文件 @ 2b8622dd
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="contentAll"> <div class="contentAll">
<p class="title">项目管理 <p class="title">
<span class="back" @click="back" title="返回"></span> <span class="back" @click="back" title="返回"></span>
</p> </p>
<p class="titleList"> <p class="titleList">
......
src/components/projectManagement/projectInformation/projectInformation.vue
浏览文件 @ 2b8622dd
...@@ -150,8 +150,8 @@ export default { ...@@ -150,8 +150,8 @@ export default {
time: '2020-03-02' time: '2020-03-02'
} }
], ],
now: 3, // 当前进度 now: 0, // 当前进度
forecase: 2 // 预计进度 forecase: 0 // 预计进度
} }
}, },
created() { created() {
...@@ -204,12 +204,20 @@ export default { ...@@ -204,12 +204,20 @@ export default {
$('.trasLine').css('opacity', '0') $('.trasLine').css('opacity', '0')
} }
if (this.now === 4) { // 终验 if (this.now === 4) { // 终验
$('.blueLine').css('width', ''); if (this.now === 4 && this.forecase === 4) { // 判断当前进度和期望进度都是终验
$('.trasLine').css('opacity', '0') $('.blueLine').css('width', '');
$('.processAll>p:nth-child(1) .processList').addClass('blue'); $('.trasLine').css('opacity', '0')
$('.processAll>p:nth-child(2) .processList').addClass('blue'); $('.processAll>p:nth-child(1) .processList').addClass('blue');
$('.processAll>p:nth-child(3) .processList').addClass('blue'); $('.processAll>p:nth-child(2) .processList').addClass('blue');
$('.processAll>p:nth-child(4) .processList').addClass('blue') $('.processAll>p:nth-child(3) .processList').addClass('blue');
$('.processAll>p:nth-child(4) .processList').addClass('blue')
} else { // 判断期望进度不是终验
$('.blueLine').css('width', '');
$('.processAll>p:nth-child(1) .processList').addClass('blue');
$('.processAll>p:nth-child(2) .processList').addClass('blue');
$('.processAll>p:nth-child(3) .processList').addClass('blue');
$('.processAll>p:nth-child(4) .processList').addClass('blue')
}
} else if (this.now === 3) { // 试运行阶段 } else if (this.now === 3) { // 试运行阶段
$('.blueLine').css('width', '80%'); $('.blueLine').css('width', '80%');
$('.processAll>p:nth-child(1) .processList').addClass('blue'); $('.processAll>p:nth-child(1) .processList').addClass('blue');
......
src/components/reportAssess/reportAssess.vue
浏览文件 @ 2b8622dd
...@@ -13,11 +13,11 @@ ...@@ -13,11 +13,11 @@
<!-- <p v-if="picture" style="color:red">本评估报告不适用于C/S架构的应用系统,不适用于非Java体系下开发的应用系统。</p> --> <!-- <p v-if="picture" style="color:red">本评估报告不适用于C/S架构的应用系统,不适用于非Java体系下开发的应用系统。</p> -->
<p v-if="picture">不支持此类系统的评估 </p> <p v-if="picture">不支持此类系统的评估 </p>
<div v-if="picture" class="firstBtn" @click="reback"><span>改造替换</span></div> <div v-if="picture" class="firstBtn" @click="reback"><span>改造替换</span></div>
</div> </div>
</div> </div>
<!-- 声明 --> <!-- 声明 -->
<!-- 概要 --> <!-- 概要 -->
<div class="my-box" v-if="!picture"> <div class="my-box" v-if="!picture">
<div class="one"> <div class="one">
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<div style="padding-left:35px;"> 建议：<span > <div style="padding-left:35px;"> 建议：<span >
{{ this.type === 1 ? {{ this.type === 1 ?
'修改' : (this.type === 2 && this.language ===1 &&this.framework ===1) ? '修改': '重构' }} '修改' : (this.type === 2 && this.language ===1 &&this.framework ===1) ? '修改': '重构' }}
</span> </span>
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
</div> </div>
</div> </div>
<div class="six"> <div class="six" v-if="this.$route.query.authority === 1">
<div class="oneTitle"> <div class="oneTitle">
<!--<div @click="openMenuFour">--> <!--<div @click="openMenuFour">-->
<!--&lt;!&ndash;<img src="../assets/img/tab.png" alt="">&ndash;&gt;--> <!--&lt;!&ndash;<img src="../assets/img/tab.png" alt="">&ndash;&gt;-->
...@@ -195,7 +195,7 @@ ...@@ -195,7 +195,7 @@
<div style="height: 20px"></div> <div style="height: 20px"></div>
</div> </div>
<div class="seven"> <div class="seven" v-if="this.$route.query.authority !== 1">
<div class="oneTitle"> <i></i>评估建议</div> <div class="oneTitle"> <i></i>评估建议</div>
<!-- 评估建议各项 --> <!-- 评估建议各项 -->
<div class="seven-title"> <div class="seven-title">
...@@ -676,7 +676,7 @@ ...@@ -676,7 +676,7 @@
<el-col :span="6" > <el-col :span="6" >
<p v-if="this.newDifficuty.databaseDifficulty"> <p v-if="this.newDifficuty.databaseDifficulty">
<p style="margin-top:8px;float:left;">其他内容：</p> <p style="margin-top:8px;float:left;">其他内容：</p>
<span > <span >
{{this.newDifficuty.databaseDifficulty.otherContent}} {{this.newDifficuty.databaseDifficulty.otherContent}}
</span> </span>
...@@ -748,6 +748,17 @@ ...@@ -748,6 +748,17 @@
</div> </div>
<div class="seven" v-if="this.$route.query.authority === 1">
<div class="oneTitle"> <i></i>评估建议</div>
<p class="otherTitle">1、关键技术及替换策略建议</p>
<p class="bird">{{this.firstDetial.des}}</p>
<p class="otherTitle">2、工作量评估</p>
<p class="bird">{{this.newWork.des}}</p>
<p class="otherTitle">3、额外依赖服务申请</p>
<p class="bird">额外依赖服务申请费用 <span></span> {{this.newApply.cost === -1 ? '无' : this.newApply.cost}}</p>
<p class="otherTitle">4、适配难度评估</p>
<p class="bird">{{this.newDifficuty.des}}</p>
</div>
...@@ -762,20 +773,20 @@ ...@@ -762,20 +773,20 @@
</el-scrollbar> </el-scrollbar>
</div> </div>
</template> </template>
<script> <script>
//这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等） // 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）
//例如：import 《组件名称》 from '《组件路径》'; // 例如：import 《组件名称》 from '《组件路径》';
export default { export default {
name: 'reportAssess', name: 'reportAssess',
//import引入的组件需要注入到对象中才能使用 // import引入的组件需要注入到对象中才能使用
components: { components: {
}, },
data() { data() {
//这里存放数据 // 这里存放数据
return { return {
orgName: '', orgName: '',
sysName: '', sysName: '',
...@@ -831,34 +842,34 @@ export default { ...@@ -831,34 +842,34 @@ export default {
}; };
}, },
//监听属性 类似于data概念 // 监听属性 类似于data概念
// computed: {}, // computed: {},
computed: { computed: {
sumAmount(){ sumAmount(){
if(this.newCost == ''){ if (this.newCost === ''){
return 0 return 0
}else{ } else {
return Number(this.newCost.artificial.calculation) + Number(this.popp.basic ) return Number(this.newCost.artificial.calculation) + Number(this.popp.basic )
} }
}, },
sumAmount1(){ sumAmount1(){
if(this.newCost == ''){ if (this.newCost === ''){
return 0 return 0
}else if(this.isAgree){ } else if (this.isAgree){
return ( ( (Number(this.newCost.artificial.calculation) + Number(this.popp.basic )) * Number(this.newCost.workLoad.calculation) ) + Number(this.newCost.apply.calculation) ).toFixed(3) return ( ( (Number(this.newCost.artificial.calculation) + Number(this.popp.basic )) * Number(this.newCost.workLoad.calculation) ) + Number(this.newCost.apply.calculation) ).toFixed(3)
} else { } else {
return ( (Number(this.newCost.artificial.calculation) + Number(this.popp.basic )) * Number(this.newCost.workLoad.calculation) ).toFixed(3) return ( (Number(this.newCost.artificial.calculation) + Number(this.popp.basic )) * Number(this.newCost.workLoad.calculation) ).toFixed(3)
} }
}, },
}, },
//监控data中的数据变化 // 监控data中的数据变化
watch: { watch: {
// popp: { // popp: {
// handler (val, oldVal) { // handler (val, oldVal) {
...@@ -870,33 +881,32 @@ export default { ...@@ -870,33 +881,32 @@ export default {
// deep: true // deep: true
// } // }
}, },
//方法集合 // 方法集合
methods: { methods: {
goBackprev(){ goBackprev(){
this.$router.push({name:'evaluationReport', query:{
this.$router.push({name:'evaluationReport', query:{ username: this.$route.query.username,
username: this.$route.query.username, id: this.$route.query.id,
id: this.$route.query.id, authority: this.$route.query.authority,
authority: this.$route.query.authority, }})
}}) // if(this.$route.query.authority == 0){
// if(this.$route.query.authority == 0){ // console.log("执行")
// console.log("执行") // this.$router.push({name:'AssessmentUser', query: {
// this.$router.push({name:'AssessmentUser', query: { // username: this.$route.query.username,
// username: this.$route.query.username, // id: this.$route.query.id,
// id: this.$route.query.id, // authority: this.$route.query.authority,
// authority: this.$route.query.authority, // }})
// }}) // }else if (this.$route.query.authority == 1){
// }else if (this.$route.query.authority == 1){ // console.log("执行")
// console.log("执行") // this.$router.push({name:'Assessment', query: {
// this.$router.push({name:'Assessment', query: { // username: this.$route.query.username,
// username: this.$route.query.username, // id: this.$route.query.id,
// id: this.$route.query.id, // authority: this.$route.query.authority,
// authority: this.$route.query.authority, // }})
// }}) // }
// }
}, },
openMenu() { //展开 openMenu() { // 展开
this.isShow = !this.isShow; this.isShow = !this.isShow;
}, },
// tear() { // tear() {
...@@ -914,16 +924,16 @@ export default { ...@@ -914,16 +924,16 @@ export default {
tableShow() { tableShow() {
this.isTableShow = !this.isTableShow; this.isTableShow = !this.isTableShow;
}, },
openMenuOne() { //展开 openMenuOne() { // 展开
this.isShowOne = !this.isShowOne; this.isShowOne = !this.isShowOne;
}, },
openMenuTwo() { //展开 openMenuTwo() { // 展开
this.isShowTwo = !this.isShowTwo; this.isShowTwo = !this.isShowTwo;
}, },
openMenuThree() { //展开 openMenuThree() { // 展开
this.isShowThree = !this.isShowThree; this.isShowThree = !this.isShowThree;
}, },
openMenuFour() { //展开 openMenuFour() { // 展开
this.isShowFour = !this.isShowFour; this.isShowFour = !this.isShowFour;
}, },
...@@ -960,7 +970,7 @@ export default { ...@@ -960,7 +970,7 @@ export default {
this.$server.getTechnology(name).then(res=>{ this.$server.getTechnology(name).then(res=>{
console.log('数据请求结果',res.data) console.log('数据请求结果',res.data)
if(res.data == 500) { if (res.data === 500) {
this.picture = true this.picture = true
// this.orgName = res.data.orgName // this.orgName = res.data.orgName
...@@ -969,7 +979,7 @@ export default { ...@@ -969,7 +979,7 @@ export default {
// this.difficulty = res.data.difficulty // this.difficulty = res.data.difficulty
// this.type = res.data.type // this.type = res.data.type
}else { } else {
this.orgName = res.data.orgName this.orgName = res.data.orgName
this.sysName = res.data.sysName this.sysName = res.data.sysName
...@@ -987,7 +997,7 @@ export default { ...@@ -987,7 +997,7 @@ export default {
console.log( '3333',this.tableData) console.log( '3333',this.tableData)
console.log( 'type',this.type) console.log( 'type',this.type)
//technologyReports 技术和替换策略建议 // technologyReports 技术和替换策略建议
// 循环表格 // 循环表格
this.table1Data = res.data.technologyList.technologyReports this.table1Data = res.data.technologyList.technologyReports
...@@ -1017,76 +1027,76 @@ export default { ...@@ -1017,76 +1027,76 @@ export default {
// 中间件 // 中间件
//系统部署架构难度 // 系统部署架构难度
this.newDifficuty.frameDifficulty.details === 1 ? this.newDifficuty.frameDifficulty.details === 1 ?
this.newDifficuty.frameDifficulty.details = '混合' : this.newDifficuty.frameDifficulty.details ===2 ? this.newDifficuty.frameDifficulty.details = '混合' : this.newDifficuty.frameDifficulty.details ===2 ?
this.newDifficuty.frameDifficulty.details = '前后端分离' : this.newDifficuty.frameDifficulty.details == -1 ? this.newDifficuty.frameDifficulty.details = '前后端分离' : this.newDifficuty.frameDifficulty.details === -1 ?
this.newDifficuty.frameDifficulty.details = '-':'' this.newDifficuty.frameDifficulty.details = '-':''
this.newDifficuty.frameDifficulty.distributed === 1 ? this.newDifficuty.frameDifficulty.distributed === 1 ?
this.newDifficuty.frameDifficulty.distributed = '是' : this.newDifficuty.frameDifficulty.distributed === 2 ? this.newDifficuty.frameDifficulty.distributed = '是' : this.newDifficuty.frameDifficulty.distributed === 2 ?
this.newDifficuty.frameDifficulty.distributed = '否' : this.newDifficuty.frameDifficulty.distributed == -1 ? this.newDifficuty.frameDifficulty.distributed = '否' : this.newDifficuty.frameDifficulty.distributed === -1 ?
this.newDifficuty.frameDifficulty.distributed = '-' :'' this.newDifficuty.frameDifficulty.distributed = '-' :''
this.newDifficuty.frameDifficulty.loadBalance === 1 ? this.newDifficuty.frameDifficulty.loadBalance === 1 ?
this.newDifficuty.frameDifficulty.loadBalance = '是' : this.newDifficuty.frameDifficulty.loadBalance === 2 ? this.newDifficuty.frameDifficulty.loadBalance = '是' : this.newDifficuty.frameDifficulty.loadBalance === 2 ?
this.newDifficuty.frameDifficulty.loadBalance = '否' :this.newDifficuty.frameDifficulty.loadBalance == -1 ? this.newDifficuty.frameDifficulty.loadBalance = '否' :this.newDifficuty.frameDifficulty.loadBalance === -1 ?
this.newDifficuty.frameDifficulty.loadBalance = '-' : '' this.newDifficuty.frameDifficulty.loadBalance = '-' : ''
this.newDifficuty.frameDifficulty.disaster === 1 ? this.newDifficuty.frameDifficulty.disaster === 1 ?
this.newDifficuty.frameDifficulty.disaster = '分布式' : this.newDifficuty.frameDifficulty.disaster === 2 ? this.newDifficuty.frameDifficulty.disaster = '分布式' : this.newDifficuty.frameDifficulty.disaster === 2 ?
this.newDifficuty.frameDifficulty.disaster = '否' : this.newDifficuty.frameDifficulty.disaster == -1 ? this.newDifficuty.frameDifficulty.disaster = '否' : this.newDifficuty.frameDifficulty.disaster === -1 ?
this.newDifficuty.frameDifficulty.disaster = '-' : '' this.newDifficuty.frameDifficulty.disaster = '-' : ''
//系统部署架构难度 // 系统部署架构难度
//中间件难度 // 中间件难度
this.newDifficuty.middlewareDifficulty.web === 1 ? this.newDifficuty.middlewareDifficulty.web === 1 ?
this.newDifficuty.middlewareDifficulty.web = '是' : this.newDifficuty.middlewareDifficulty.web === 2 ? this.newDifficuty.middlewareDifficulty.web = '是' : this.newDifficuty.middlewareDifficulty.web === 2 ?
this.newDifficuty.middlewareDifficulty.web = '否' : this.newDifficuty.middlewareDifficulty.web == -1 ? this.newDifficuty.middlewareDifficulty.web = '否' : this.newDifficuty.middlewareDifficulty.web === -1 ?
this.newDifficuty.middlewareDifficulty.web = '-' : '' this.newDifficuty.middlewareDifficulty.web = '-' : ''
this.newDifficuty.middlewareDifficulty.jndi === 1 ? this.newDifficuty.middlewareDifficulty.jndi === 1 ?
this.newDifficuty.middlewareDifficulty.jndi = '是' : this.newDifficuty.middlewareDifficulty.jndi === 2 ? this.newDifficuty.middlewareDifficulty.jndi = '是' : this.newDifficuty.middlewareDifficulty.jndi === 2 ?
this.newDifficuty.middlewareDifficulty.jndi = '否' : this.newDifficuty.middlewareDifficulty.jndi == -1 ? this.newDifficuty.middlewareDifficulty.jndi = '否' : this.newDifficuty.middlewareDifficulty.jndi === -1 ?
this.newDifficuty.middlewareDifficulty.jndi = '-' : '' this.newDifficuty.middlewareDifficulty.jndi = '-' : ''
this.newDifficuty.middlewareDifficulty.jms === 1 ? this.newDifficuty.middlewareDifficulty.jms === 1 ?
this.newDifficuty.middlewareDifficulty.jms = '是' : this.newDifficuty.middlewareDifficulty.jms === 2 ? this.newDifficuty.middlewareDifficulty.jms = '是' : this.newDifficuty.middlewareDifficulty.jms === 2 ?
this.newDifficuty.middlewareDifficulty.jms = '否' : this.newDifficuty.middlewareDifficulty.jms == -1 ? this.newDifficuty.middlewareDifficulty.jms = '否' : this.newDifficuty.middlewareDifficulty.jms === -1 ?
this.newDifficuty.middlewareDifficulty.jms = '-' : '' this.newDifficuty.middlewareDifficulty.jms = '-' : ''
this.newDifficuty.middlewareDifficulty.route === 1 ? this.newDifficuty.middlewareDifficulty.route === 1 ?
this.newDifficuty.middlewareDifficulty.route = '是' : this.newDifficuty.middlewareDifficulty.route === 2 ? this.newDifficuty.middlewareDifficulty.route = '是' : this.newDifficuty.middlewareDifficulty.route === 2 ?
this.newDifficuty.middlewareDifficulty.route = '否' : this.newDifficuty.middlewareDifficulty.route == -1 ? this.newDifficuty.middlewareDifficulty.route = '否' : this.newDifficuty.middlewareDifficulty.route === -1 ?
this.newDifficuty.middlewareDifficulty.route = '-' : '' this.newDifficuty.middlewareDifficulty.route = '-' : ''
//中间件难度 // 中间件难度
this.newDifficuty.databaseDifficulty.disasterTolerance === 1 ? this.newDifficuty.databaseDifficulty.disasterTolerance === 1 ?
this.newDifficuty.databaseDifficulty.disasterTolerance = '否' : this.newDifficuty.databaseDifficulty.disasterTolerance === 2 ? this.newDifficuty.databaseDifficulty.disasterTolerance = '否' : this.newDifficuty.databaseDifficulty.disasterTolerance === 2 ?
this.newDifficuty.databaseDifficulty.disasterTolerance = '主备' : this.newDifficuty.databaseDifficulty.disasterTolerance === 3 ? this.newDifficuty.databaseDifficulty.disasterTolerance = '主备' : this.newDifficuty.databaseDifficulty.disasterTolerance === 3 ?
this.newDifficuty.databaseDifficulty.disasterTolerance = '分布式' : this.newDifficuty.databaseDifficulty.disasterTolerance === -1 ? this.newDifficuty.databaseDifficulty.disasterTolerance = '分布式' : this.newDifficuty.databaseDifficulty.disasterTolerance === -1 ?
this.newDifficuty.databaseDifficulty.disasterTolerance = '-' : '' this.newDifficuty.databaseDifficulty.disasterTolerance = '-' : ''
//数据库难度 // 数据库难度
this.newDifficuty.databaseDifficulty.safe ===1 ? this.newDifficuty.databaseDifficulty.safe ===1 ?
this.newDifficuty.databaseDifficulty.safe = '是' : this.newDifficuty.databaseDifficulty.safe === 2 ? this.newDifficuty.databaseDifficulty.safe = '是' : this.newDifficuty.databaseDifficulty.safe === 2 ?
this.newDifficuty.databaseDifficulty.safe = '否' : this.newDifficuty.databaseDifficulty.safe == -1 ? this.newDifficuty.databaseDifficulty.safe = '否' : this.newDifficuty.databaseDifficulty.safe === -1 ?
this.newDifficuty.databaseDifficulty.safe = '-' : '' this.newDifficuty.databaseDifficulty.safe = '-' : ''
this.newDifficuty.databaseDifficulty.separate ===1 ? this.newDifficuty.databaseDifficulty.separate ===1 ?
this.newDifficuty.databaseDifficulty.separate = '是' : this.newDifficuty.databaseDifficulty.separate === 2 ? this.newDifficuty.databaseDifficulty.separate = '是' : this.newDifficuty.databaseDifficulty.separate === 2 ?
this.newDifficuty.databaseDifficulty.separate = '否' : this.newDifficuty.databaseDifficulty.separate == -1 ? this.newDifficuty.databaseDifficulty.separate = '否' : this.newDifficuty.databaseDifficulty.separate === -1 ?
this.newDifficuty.databaseDifficulty.separate = '-' : '' this.newDifficuty.databaseDifficulty.separate = '-' : ''
this.newDifficuty.databaseDifficulty.performance ===1 ? this.newDifficuty.databaseDifficulty.performance ===1 ?
this.newDifficuty.databaseDifficulty.performance = '是' : this.newDifficuty.databaseDifficulty.performance === 2 ? this.newDifficuty.databaseDifficulty.performance = '是' : this.newDifficuty.databaseDifficulty.performance === 2 ?
this.newDifficuty.databaseDifficulty.performance = '不' : this.newDifficuty.databaseDifficulty.performance == -1 ? this.newDifficuty.databaseDifficulty.performance = '不' : this.newDifficuty.databaseDifficulty.performance === -1 ?
this.newDifficuty.databaseDifficulty.performance = '-' : '' this.newDifficuty.databaseDifficulty.performance = '-' : ''
//数据库难度 // 数据库难度
// console.log('适配难度评估',this.newDifficuty) // console.log('适配难度评估',this.newDifficuty)
// 系统部署架构难度 // 系统部署架构难度
...@@ -1114,10 +1124,10 @@ export default { ...@@ -1114,10 +1124,10 @@ export default {
reback() { // 改造替换 reback() { // 改造替换
this.$router.push({name:'assessmentReport', query: { this.$router.push({name:'assessmentReport', query: {
username: this.$route.query.username, username: this.$route.query.username,
id: this.$route.query.id, id: this.$route.query.id,
authority: this.$route.query.authority, authority: this.$route.query.authority,
}}) }})
}, },
// close() { // 关闭 // close() { // 关闭
...@@ -1133,9 +1143,9 @@ export default { ...@@ -1133,9 +1143,9 @@ export default {
// //
backTop() { backTop() {
console.log(11) console.log(11)
document.getElementById("isFlag").scrollIntoView({ document.getElementById('isFlag').scrollIntoView({
behavior: "smooth", // 平滑过渡 behavior: 'smooth', // 平滑过渡
block: "start" // 上边框与视窗顶部平齐。默认值 block: 'start' // 上边框与视窗顶部平齐。默认值
}); });
}, },
...@@ -1144,7 +1154,7 @@ export default { ...@@ -1144,7 +1154,7 @@ export default {
timeFilter(timestamp) { // 时间戳转为yyyy-mm-dd hh:mm:ss timeFilter(timestamp) { // 时间戳转为yyyy-mm-dd hh:mm:ss
// console.log(timestamp) // console.log(timestamp)
if (timestamp !== undefined && timestamp !== null) { if (timestamp !== undefined && timestamp !== null) {
let date = new Date(timestamp); // 时间戳为10位需*1000，时间戳为13位的话不需乘1000 let date = new Date(timestamp); // 时间戳为10位需*1000，时间戳为13位的话不需乘1000
let Y = date.getFullYear() + '-'; let Y = date.getFullYear() + '-';
let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-'; let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-';
...@@ -1159,16 +1169,16 @@ export default { ...@@ -1159,16 +1169,16 @@ export default {
}, },
}, },
//生命周期 - 创建完成（可以访问当前this实例） // 生命周期 - 创建完成（可以访问当前this实例）
created() { created() {
// this.getTechnology() // this.getTechnology()
}, },
//生命周期 - 挂载完成（可以访问DOM元素） // 生命周期 - 挂载完成（可以访问DOM元素）
mounted() { mounted() {
console.log('传参的name',this.$route.query.username) console.log('传参的name',this.$route.query.username)
console.log('传参的id',this.$route.query.id) console.log('传参的id',this.$route.query.id)
var obj = { let obj = {
name:this.$route.query.username, name:this.$route.query.username,
id:this.$route.query.id id:this.$route.query.id
} }
...@@ -1187,13 +1197,13 @@ export default { ...@@ -1187,13 +1197,13 @@ export default {
destroyed () { // 销毁监听事件,当我们离开这个页面的时候，便会调用这个函数 destroyed () { // 销毁监听事件,当我们离开这个页面的时候，便会调用这个函数
window.removeEventListener('scroll', this.showBtn) window.removeEventListener('scroll', this.showBtn)
}, },
beforeCreate() {}, //生命周期 - 创建之前 beforeCreate() {}, // 生命周期 - 创建之前
beforeMount() {}, //生命周期 - 挂载之前 beforeMount() {}, // 生命周期 - 挂载之前
beforeUpdate() {}, //生命周期 - 更新之前 beforeUpdate() {}, // 生命周期 - 更新之前
updated() {}, //生命周期 - 更新之后 updated() {}, // 生命周期 - 更新之后
beforeDestroy() {}, //生命周期 - 销毁之前 beforeDestroy() {}, // 生命周期 - 销毁之前
destroyed() {}, //生命周期 - 销毁完成 destroyed() {}, // 生命周期 - 销毁完成
activated() {} //如果页面有keep-alive缓存功能，这个函数会触发 activated() {} // 如果页面有keep-alive缓存功能，这个函数会触发
} }
</script> </script>
...@@ -1206,11 +1216,11 @@ export default { ...@@ -1206,11 +1216,11 @@ export default {
padding: 0 45px 0 45px; padding: 0 45px 0 45px;
color: black; color: black;
/* padding-top: 30px; */ /* padding-top: 30px; */
} }
.scrollbar { .scrollbar {
height: 97vh; height: 97vh;
} }
.bigTitle { .bigTitle {
text-align: center; text-align: center;
...@@ -1409,7 +1419,7 @@ export default { ...@@ -1409,7 +1419,7 @@ export default {
} }
.snack div span { .snack div span {
color: #333; color: #333;
display: inline-block; display: inline-block;
width: 200px; width: 200px;
height: 36px; height: 36px;
...@@ -1418,7 +1428,7 @@ export default { ...@@ -1418,7 +1428,7 @@ export default {
border-radius: 2px; border-radius: 2px;
line-height: 36px; line-height: 36px;
padding: 0 12px padding: 0 12px
} }
.snack div span i { .snack div span i {
color: #41ba87; color: #41ba87;
...@@ -1740,4 +1750,9 @@ export default { ...@@ -1740,4 +1750,9 @@ export default {
} }
/*20200308*/ /*20200308*/
</style> .otherTitle{
\ No newline at end of file color: #000;
font-size: 18px;
margin-top: 30px;
}
</style>
src/components/roleDispose/addRole.vue
浏览文件 @ 2b8622dd
...@@ -141,7 +141,7 @@ export default { ...@@ -141,7 +141,7 @@ export default {
font-size: 18px; font-size: 18px;
color: #666; color: #666;
text-align: center; text-align: center;
margin-top: 40px; margin-top: 25px;
} }
.add-role .addVal>span{ .add-role .addVal>span{
width: 160px; width: 160px;
...@@ -157,7 +157,7 @@ export default { ...@@ -157,7 +157,7 @@ export default {
.add-role .buttonClick{ .add-role .buttonClick{
display: flex; display: flex;
justify-content: space-evenly; justify-content: space-evenly;
margin-top: 30px; margin-top: 36px;
} }
.add-role .company-content>>>.el-radio{ .add-role .company-content>>>.el-radio{
margin-right: 30px; margin-right: 30px;
......
src/components/roleDispose/roleDispose.vue
浏览文件 @ 2b8622dd
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<div class="content"> <div class="content">
<p class="title">规则配置</p>
<p class="search"> <p class="search">
<span class="searchVal"> <span class="searchVal">
<span>查询：</span> <span>查询：</span>
...@@ -78,7 +77,7 @@ export default { ...@@ -78,7 +77,7 @@ export default {
input2: '', input2: '',
tableData: [], tableData: [],
tablePageSize: 0, tablePageSize: 0,
pageSize: 8, // 每页个数 pageSize: 9, // 每页个数
openModel: false, openModel: false,
components: '', components: '',
myPage: 1, myPage: 1,
...@@ -96,7 +95,7 @@ export default { ...@@ -96,7 +95,7 @@ export default {
let obj = { let obj = {
technologyName:this.input2 technologyName:this.input2
} }
this.$server.getConfigPageList(this.myPage,8,obj).then(res => { this.$server.getConfigPageList(this.myPage,this.pageSize,obj).then(res => {
this.tableData = res.data.objects; this.tableData = res.data.objects;
this.tablePageSize = res.data.totalElement; this.tablePageSize = res.data.totalElement;
}) })
......
src/components/sidebar/sidebar.vue
浏览文件 @ 2b8622dd
<template> <template>
<div class="sidebarAll"> <div class="sidebarAll">
<div class="sidebar" v-if="this.$store.getters.getUserData.type !== 1"> <div class="sidebar">
<div @click="clickMenu('evaluationReport',1,'评估报告管理')"> <div @click="clickMenu('evaluationReport','评估报告管理')" v-if="this.$store.getters.getUserData.authorityCode.indexOf('000800') !== -1">
<p class="menu"> <p class="menu">
<span class="font">评估报告管理</span> <span class="font">评估报告管理</span>
<span class="line"></span> <span class="line"></span>
</p> </p>
</div> </div>
<div @click="clickMenu('projectManagement',2,'我的项目')" v-if="this.$store.getters.getUserData.type !== 1"> <div @click="clickMenu('projectManagement','项目管理')" v-if="this.$store.getters.getUserData.authorityCode.indexOf('000900') !== -1">
<p class="menu"> <p class="menu">
<span class="font">我的项目</span> <span class="font">项目管理</span>
<span class="line"></span>
</p>
</div>
<div @click="clickMenu('complaint',3,'意见建议')" v-if="this.$store.getters.getUserData.type !== 1">
<p class="menu">
<span class="font">意见建议</span>
<span class="line"></span>
</p>
</div>
<div>
<p class="menu">
<span class="font">基地建设</span>
<span class="line"></span>
</p>
</div>
<div @click="clickMenu('XCalliance',5,'XX联盟')">
<p class="menu">
<span class="font">XX联盟</span>
<span class="line"></span>
</p>
</div>
<div @click="clickMenu('integration',6,'XXX一体化')">
<p class="menu">
<span class="font">XXX一体化</span>
<span class="line"></span> <span class="line"></span>
</p> </p>
</div> </div>
<div @click="clickMenu('',7,'国家名录')" v-if="this.$store.getters.getUserData.type !== 1"> <div @click="clickMenu('projectManagement','我的项目')" v-if="this.$store.getters.getUserData.authorityCode.indexOf('0001800') !== -1">
<p class="menu"> <p class="menu">
<span class="font">国家名录</span> <span class="font">我的项目</span>
<span class="line"></span> <span class="line"></span>
</p> </p>
</div> </div>
<div @click="clickMenu('',8,'市级名录')" v-if="this.$store.getters.getUserData.type !== 1"> <div @click="clickMenu('complaintManagement','投诉管理')" v-if="this.$store.getters.getUserData.authorityCode.indexOf('0001000') !== -1">
<p class="menu"> <p class="menu">
<span class="font">市级名录</span> <span class="font">投诉管理</span>
<span class="line"></span> <span class="line"></span>
</p> </p>
</div> </div>
<div> <div @click="clickMenu('complaint','意见建议')" v-if="this.$store.getters.getUserData.authorityCode.indexOf('0001900') !== -1">
<p class="menu"> <p class="menu">
<span class="font">课题攻关</span> <span class="font">意见建议</span>
<span class="line"></span>
</p>
</div>
</div>
<div class="sidebar" v-if="this.$store.getters.getUserData.type === 1">
<div @click="clickMenu('evaluationReport',1,'评估报告管理')">
<p class="menu">
<span class="font">评估报告管理</span>
<span class="line"></span> <span class="line"></span>
</p> </p>
</div> </div>
<div @click="clickMenu('projectManagement',2,'项目管理')" v-if="this.$store.getters.getUserData.type === 1"> <div @click="clickMenu('keyTechnology','关键技术管理')" v-if="this.$store.getters.getUserData.authorityCode.indexOf('0001100') !== -1">
<p class="menu"> <p class="menu">
<span class="font">项目管理</span> <span class="font">关键技术管理</span>
<span class="line"></span> <span class="line"></span>
</p> </p>
</div> </div>
<div @click="clickMenu('complaintManagement',3,'投诉管理')" v-if="this.$store.getters.getUserData.type === 1"> <div @click="clickMenu('roleDispose','规则配置')" v-if="this.$store.getters.getUserData.authorityCode.indexOf('0001200') !== -1">
<p class="menu"> <p class="menu">
<span class="font">投诉管理</span> <span class="font">规则配置</span>
<span class="line"></span> <span class="line"></span>
</p> </p>
</div> </div>
<div @click="clickMenu('keyTechnology',4,'关键技术管理')" v-if="this.$store.getters.getUserData.type === 1"> <div @click="clickMenu('parameterConfiguration','参数配置')" v-if="this.$store.getters.getUserData.authorityCode.indexOf('0001300') !== -1">
<p class="menu"> <p class="menu">
<span class="font">关键技术管理</span> <span class="font">参数配置</span>
<span class="line"></span> <span class="line"></span>
</p> </p>
</div> </div>
<div @click="clickMenu('roleDispose',5,'规则配置')" v-if="this.$store.getters.getUserData.type === 1"> <div @click="clickMenu('UnDependence','未知依赖配置')" v-if="this.$store.getters.getUserData.authorityCode.indexOf('0001400') !== -1">
<p class="menu"> <p class="menu">
<span class="font">规则配置</span> <span class="font">未知依赖配置</span>
<span class="line"></span> <span class="line"></span>
</p> </p>
</div> </div>
<div @click="clickMenu('parameterConfiguration',6,'参数配置')" v-if="this.$store.getters.getUserData.type === 1"> <div v-if="this.$store.getters.getUserData.authorityCode.indexOf('000200') !== -1">
<p class="menu"> <p class="menu">
<span class="font">参数配置</span> <span class="font">基地建设</span>
<span class="line"></span> <span class="line"></span>
</p> </p>
</div> </div>
<div @click="clickMenu('UnDependence',7,'未知依赖配置')" v-if="this.$store.getters.getUserData.type === 1"> <div @click="clickMenu('XCalliance','XX联盟')" v-if="this.$store.getters.getUserData.authorityCode.indexOf('000300') !== -1">
<p class="menu"> <p class="menu">
<span class="font">未知依赖配置</span> <span class="font">XX联盟</span>
<span class="line"></span> <span class="line"></span>
</p> </p>
</div> </div>
<div> <div @click="clickMenu('integration','XXX一体化')" v-if="this.$store.getters.getUserData.authorityCode.indexOf('000400') !== -1">
<p class="menu"> <p class="menu">
<span class="font">基地建设</span> <span class="font">XXX一体化</span>
<span class="line"></span> <span class="line"></span>
</p> </p>
</div> </div>
<div @click="clickMenu('XCalliance',9,'XX联盟')"> <div @click="clickMenu('','基础资料管理')" v-if="this.$store.getters.getUserData.authorityCode.indexOf('000500') !== -1">
<p class="menu"> <p class="menu">
<span class="font">XX联盟</span> <span class="font">基础资料管理</span>
<span class="line"></span> <span class="line"></span>
</p> </p>
</div> </div>
<div @click="clickMenu('integration',10,'XXX一体化')"> <div @click="clickMenu('','市级准入管理')" v-if="this.$store.getters.getUserData.authorityCode.indexOf('000600') !== -1">
<p class="menu"> <p class="menu">
<span class="font">XXX一体化</span> <span class="font">市级准入管理</span>
<span class="line"></span> <span class="line"></span>
</p> </p>
</div> </div>
<div @click="clickMenu('',11,'基础资料管理')" v-if="this.$store.getters.getUserData.type === 1"> <div @click="clickMenu('','国家名录')" v-if="this.$store.getters.getUserData.authorityCode.indexOf('0001500') !== -1">
<p class="menu"> <p class="menu">
<span class="font">基础资料管理</span> <span class="font">国家名录</span>
<span class="line"></span> <span class="line"></span>
</p> </p>
</div> </div>
<div @click="clickMenu('',12,'市级准入管理')" v-if="this.$store.getters.getUserData.type === 1"> <div @click="clickMenu('','市级名录')" v-if="this.$store.getters.getUserData.authorityCode.indexOf('0001600') !== -1">
<p class="menu"> <p class="menu">
<span class="font">市级准入管理</span> <span class="font">市级名录</span>
<span class="line"></span> <span class="line"></span>
</p> </p>
</div> </div>
<div> <div v-if="this.$store.getters.getUserData.authorityCode.indexOf('000700') !== -1">
<p class="menu"> <p class="menu">
<span class="font">课题攻关</span> <span class="font">课题攻关</span>
<span class="line"></span> <span class="line"></span>
</p> </p>
</div> </div>
</div> </div>
</div> </div>
</template> </template>
...@@ -189,19 +152,23 @@ export default { ...@@ -189,19 +152,23 @@ export default {
menuList: [ menuList: [
{ {
name: '单位管理', name: '单位管理',
path: 'company' path: 'company',
code: '000501'
}, },
{ {
name: '产品管理', name: '产品管理',
path: 'basisProduct' path: 'basisProduct',
code: '000502'
}, },
{ {
name: '人员管理', name: '人员管理',
path: 'person' path: 'person',
code: '000503'
}, },
{ {
name: '角色管理', name: '角色管理',
path: 'role' path: 'role',
code: '000504'
} }
] ]
}, },
...@@ -210,15 +177,18 @@ export default { ...@@ -210,15 +177,18 @@ export default {
menuList: [ menuList: [
{ {
name: '产品管理', name: '产品管理',
path: 'product' path: 'product',
code: '000601'
}, },
{ {
name: '单位管理', name: '单位管理',
path: 'admittanceCompany' path: 'admittanceCompany',
code: '000602'
}, },
{ {
name: '技术路线', name: '技术路线',
path: 'technical' path: 'technical',
code: '000603'
} }
] ]
}, },
...@@ -227,11 +197,13 @@ export default { ...@@ -227,11 +197,13 @@ export default {
menuList: [ menuList: [
{ {
name: '单位名录', name: '单位名录',
path: 'company' path: 'company',
code: '0001502'
}, },
{ {
name: '产品名录', name: '产品名录',
path: 'basisProduct' path: 'basisProduct',
code: '0001501'
} }
] ]
}, },
...@@ -241,15 +213,18 @@ export default { ...@@ -241,15 +213,18 @@ export default {
{ {
name: '产品管理', name: '产品管理',
path: 'product' path: 'product',
code: '0001601'
}, },
{ {
name: '单位管理', name: '单位管理',
path: 'admittanceCompany' path: 'admittanceCompany',
code: '0001602'
}, },
{ {
name: '技术路线', name: '技术路线',
path: 'technical' path: 'technical',
code: '0001603'
} }
] ]
}, },
...@@ -290,11 +265,17 @@ export default { ...@@ -290,11 +265,17 @@ export default {
}, },
mounted(){ mounted(){
// home点击过来，定位到对应导航 // home点击过来，定位到对应导航
this.clickMenu(this.$store.getters.getHomeClick.name,this.$store.getters.getHomeClick.index,this.$store.getters.getHomeClick.title) this.clickMenu(this.$store.getters.getHomeClick.name,this.$store.getters.getHomeClick.title)
}, },
methods: { methods: {
// 点击切换样式并且跳转 // 点击切换样式并且跳转
clickMenu(name, num,title) { clickMenu(name,title) {
let num;
for (let i = 0; i < $('.sidebar div').length; i++) {
if (title === $('.sidebar div')[i].innerText) {
num = i + 1;
}
}
$('.sidebar .menu').removeClass('click'); // 样式修改 $('.sidebar .menu').removeClass('click'); // 样式修改
$('.sidebar .font').removeClass('fontClick'); $('.sidebar .font').removeClass('fontClick');
$('.sidebar .line').removeClass('lineClick'); $('.sidebar .line').removeClass('lineClick');
......
src/services/server.js
浏览文件 @ 2b8622dd
...@@ -10,6 +10,7 @@ import axios from '@/services/axios'; ...@@ -10,6 +10,7 @@ import axios from '@/services/axios';
* dataType * dataType
*/ */
import qs from 'qs'; import qs from 'qs';
const assess = 'http://120.55.57.35:8079'
const server = { const server = {
getfindAll() { // 获取权限列表 getfindAll() { // 获取权限列表
return axios('/authority/findAll', { return axios('/authority/findAll', {
...@@ -279,113 +280,109 @@ const server = { ...@@ -279,113 +280,109 @@ const server = {
}) })
}, },
getEvaluationList(page,size,data) { // 评估报告管理 getEvaluationList(page,size,data) { // 评估报告管理
return axios( '/evaluation/search/' + page + '/' + size,{ return axios( assess + '/evaluation/search/' + page + '/' + size,{
method: 'post', method: 'post',
data: data data: data
}) })
}, },
delEvaluationList(id) { // 删除评估报告管理 delEvaluationList(id) { // 删除评估报告管理
return axios('/evaluation/' + id,{ return axios( assess + '/evaluation/' + id,{
method: 'delete' method: 'delete'
}) })
}, },
getAllPageList(page,size,data){ // 关键技术管理列表 getAllPageList(page,size,data){ // 关键技术管理列表
return axios( '/technology/search/' + page + '/' + size,{ return axios( assess + '/technology/search/' + page + '/' + size,{
method: 'post', method: 'post',
data: data data: data
}) })
}, },
getAllKeySelect(){ // 获取关键技术类型 getAllKeySelect(){ // 获取关键技术类型
return axios('/category',{ return axios( assess + '/category',{
method: 'get' method: 'get'
}) })
}, },
addTec(data){ // 新增关键技术管理 addTec(data){ // 新增关键技术管理
return axios('/technology/add',{ return axios( assess + '/technology/add',{
method: 'post', method: 'post',
data: data data: data
}) })
}, },
editKey(id,data){ // 修改关键技术管理 editKey(id,data){ // 修改关键技术管理
return axios('/technology/' + id,{ return axios( assess + '/technology/' + id,{
method: 'post', method: 'post',
data: data data: data
}) })
}, },
getConfigValue(){ // 获取参数配置 getConfigValue(){ // 获取参数配置
return axios( '/config',{ return axios( assess + '/config',{
method: 'get', method: 'get',
}) })
}, },
editConfigValue(data){ // 修改参数配置 editConfigValue(data){ // 修改参数配置
return axios( '/config/updates',{ return axios( assess + '/config/updates',{
method: 'post', method: 'post',
data: data data: data
}) })
}, },
getAllList(){ // 关键技术 getAllList(){ // 关键技术
return axios('/technology',{ return axios( assess + '/technology',{
method: 'get' method: 'get'
}) })
}, },
editConfigUpdate(data){ // 修改规则配置 editConfigUpdate(data){ // 修改规则配置
return axios('/rule/update',{ return axios( assess + '/rule/update',{
method: 'post', method: 'post',
data:data data:data
}) })
}, },
addConfig(data){ // 规则 addConfig(data){ // 规则
return axios('/rule',{ return axios( assess + '/rule',{
method: 'post', method: 'post',
data: data data: data
}) })
}, },
delConfig(data){ // 规则配置删除 delConfig(data){ // 规则配置删除
return axios('/rule/',{ return axios( assess + '/rule/',{
method: 'delete', method: 'delete',
data: data data: data
}) })
}, },
getConfigPageList(page,size,data){ // 未知规则配置搜索 getConfigPageList(page,size,data){ // 未知规则配置搜索
return axios( '/rule/search/' + page + '/' + size,{ return axios( assess + '/rule/search/' + page + '/' + size,{
method: 'post', method: 'post',
data: data data: data
}) })
}, },
goPg(data){ goPg(data){
return axios("/inspect/rapidAssessment",{ return axios( assess + '/inspect/rapidAssessment',{
method:"post", method:'post',
data:data data:data
}) })
}, },
pgName(name){ pgName(name){
return axios( "/evaluation/in/"+ name,{ return axios( assess + '/evaluation/in/'+ name,{
method:"get", method:'get',
})
})
}, },
getTechnology(data){ getTechnology(data){
return axios( assess + '/evaluation/eva?id='+data.id+'&name='+data.name,{
return axios( "/evaluation/eva?id="+data.id+'&name='+data.name,{ method:'get',
method:"get",
}) })
}, },
upZip(data){ upZip(data){
return axios( "/inspect/uploads",{ return axios( assess + '/inspect/uploads',{
method:"post", method:'post',
data:data data:data
}) })
}, },
upGit(data){ upGit(data){
return axios("/inspect/gitdownload",{ return axios( assess + '/inspect/gitdownload',{
headers: { headers: {
'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8' 'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
}, },
// application/x-www-form-urlencode method:'post',
method:"post", data:qs.stringify(data)
data:qs.stringify(data) })
}) }
},
} }
export default server; export default server;
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论