Skip to content

9
912project
提交 4b1b39c5 authored 作者: zax's avatar zax
浏览文件
操作

合并分支 'zax' 到 'master'

规则配置 查看合并请求 !81
上级 97515e60 337fb710
显示空白字符变更
内嵌 并排
正在显示 包含 223 行增加 和 39 行删除
src/components/UnDependenceDispose/UnDependence.vue
浏览文件 @ 4b1b39c5
...@@ -7,16 +7,15 @@ ...@@ -7,16 +7,15 @@
<p class="search"> <p class="search">
<span class="searchVal"> <span class="searchVal">
<span>查询：</span> <span>查询：</span>
<el-input v-model="searchVal" size="medium" placeholder="请输入"></el-input> <el-input v-model="input2" size="medium" @change="search()" placeholder="请输入关键字"></el-input>
</span> </span>
<span class="button searchBtn" @change="search('search')">搜索</span> <span class="button searchBtn" @click="search()">搜索</span>
</p> </p>
<div class="common-table"> <div class="common-table">
<el-table <el-table
highlight-current-row highlight-current-row
max-height="840" max-height="840"
:data="allData" :data="tableData"
@row-click="details"
stripe stripe
style="width: 100%;"> style="width: 100%;">
<el-table-column <el-table-column
...@@ -33,9 +32,9 @@ ...@@ -33,9 +32,9 @@
prop="number" prop="number"
label="操作" label="操作"
align="center"> align="center">
<template> <template slot-scope="scope">
<span class="change revise"><span class="img support-img"></span>支持国产化</span> <span class="change revise" @click="yesEdit(scope.row)"><span class="img support-img"></span>支持国产化</span>
<span class="change delete"><span class="img Unsupport-img"></span>不支持国产化</span> <span class="change delete" @click="noEdit(scope.row)"><span class="img Unsupport-img"></span>不支持国产化</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -45,11 +44,11 @@ ...@@ -45,11 +44,11 @@
<el-pagination <el-pagination
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page.sync="currentPage" :current-page.sync="myPage"
:page-size="pageSize" :page-size="pageSize"
background background
layout="prev, pager, next, jumper" layout="prev, pager, next, jumper"
:total="totalLength"> :total="tablePageSize">
</el-pagination> </el-pagination>
</div> </div>
<!-- 分页 --> <!-- 分页 -->
...@@ -69,16 +68,43 @@ export default { ...@@ -69,16 +68,43 @@ export default {
name: 'roleDispose', name: 'roleDispose',
data () { data () {
return { return {
searchVal: '', tableData: [],
allData: [{technologyName: '1'}], tablePageSize: 0,
totalLength: 0, myPage: 1, // 分页第一页
currentPage: 1, // 分页第一页
pageSize: 8, // 每页个数 pageSize: 8, // 每页个数
openModel: false, openModel: false,
components: '' components: '',
technologyId:'未知依赖(未知)',
input2: '',
} }
}, },
mounted() {
this.getConfigList();
},
methods: { methods: {
// 搜索
search () {
let obj = {
technologyName: this.technologyId,
target: this.input2
}
this.$server.getConfigPageList(this.myPage, 8, obj).then(res => {
console.log(res);
this.tableData = res.data.objects;
this.tablePageSize = res.data.totalElement;
})
},
// 数据
getConfigList() {
let obj = {
technologyName:this.technologyId
}
this.$server.getConfigPageList(this.myPage,8,obj).then(res => {
console.log(res);
this.tableData = res.data.objects;
this.tablePageSize = res.data.totalElement;
});
},
// 点击分页 // 点击分页
handleSizeChange(val) { handleSizeChange(val) {
console.log(`每页 ${val} 条`); console.log(`每页 ${val} 条`);
...@@ -86,12 +112,60 @@ export default { ...@@ -86,12 +112,60 @@ export default {
// 当前页数 // 当前页数
handleCurrentChange(val) { handleCurrentChange(val) {
console.log(val) console.log(val)
this.myPage = val;
this.getConfigList();
}, },
// 关闭弹框 // 关闭弹框
reset() { reset() {
this.openModel = false; this.openModel = false;
this.components = ''; this.components = '';
}, },
// 支持国产化
yesEdit(row){
let obj = {
suffix: ['java'],
target: row.target,
technologyId: '967a8bd0-eb27-4fb6-ba1d-1bca21cea5b4',
technologyName: '国产化依赖(支持)',
id: row.id,
oldRule:{
target:row.target,
suffix:row.suffix,
technologyId:row.technologyId,
id:row.id
}
};
this.$server.editConfigUpdate(obj).then(res => {
this.$message({
message: '修改成功',
type: 'success'
});
this.getConfigList();
});
},
// 不支持国产化
noEdit(row){
let obj = {
suffix: ['java'],
target: row.target,
technologyId: '1cc9c4be-8245-49b6-bb4b-3f10c4e8b47f',
technologyName: '非国产化依赖(不支持)',
id: row.id,
oldRule:{
target:row.target,
suffix:row.suffix,
technologyId:row.technologyId,
id:row.id
}
};
this.$server.editConfigUpdate(obj).then(res => {
this.$message({
message: '修改成功',
type: 'success'
});
this.getConfigList();
});
},
} }
} }
</script> </script>
...@@ -145,11 +219,15 @@ export default { ...@@ -145,11 +219,15 @@ export default {
.UnDependence .content .button:hover{ .UnDependence .content .button:hover{
background: rgba(72,119,230,.6); background: rgba(72,119,230,.6);
} }
.UnDependence .content .revise{
margin-right: 10px;
}
.UnDependence .content .img{ .UnDependence .content .img{
width: 17px; width: 17px;
height: 17px; height: 17px;
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
margin-right: 5px;
} }
.UnDependence .support-img{ .UnDependence .support-img{
background-image: url("./img/select.png"); background-image: url("./img/select.png");
......
src/components/roleDispose/addRole.vue
浏览文件 @ 4b1b39c5
<template> <template>
<div class="add-role"> <div class="add-role">
<p class="dialog-header"> <p class="dialog-header">
<span>新增规则</span> <span>{{modalName}}</span>
</p> </p>
<div class="company-content" style="text-align: center; margin-top: 14px;"> <div class="company-content" style="text-align: center; margin-top: 14px;">
<p class="new"> <p class="new">
<span class="addVal"> <span class="addVal">
<span>设置关键字：</span> <span>设置关键字：</span>
<el-input v-model="name" size="medium" placeholder="请输入"></el-input> <el-input v-model="oldRule.target" size="medium" placeholder="请输入"></el-input>
<span style="margin-left: 10px">关键技术选择：</span> <span style="margin-left: 10px">关键技术选择：</span>
<el-select v-model="form.technologyId" @change="search('search')" placeholder="请选择" clearable> <el-select v-model="oldRule.technologyId" placeholder="请选择" clearable>
<el-option <el-option
v-for="item in tableDataAdd" v-for="item in tableDataAdd"
:key="item.id" :key="item.id"
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</span> </span>
<span class="addVal" style="width: 350px"> <span class="addVal" style="width: 350px">
<span>范围：</span> <span>范围：</span>
<el-select v-model="form.suffix" @change="search('search')" placeholder="请选择" clearable> <el-select filterable multiple allow-create v-model="oldRule.suffix" placeholder="请选择" clearable>
<el-option label="java" value="java"></el-option> <el-option label="java" value="java"></el-option>
<el-option label="js" value="js"></el-option> <el-option label="js" value="js"></el-option>
<el-option label="xml" value="xml"></el-option> <el-option label="xml" value="xml"></el-option>
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
</span> </span>
<span class="addVal"> <span class="addVal">
<span>内容：</span> <span>内容：</span>
<el-input type="textarea" :rows="2" v-model="textarea" placeholder="请输入"></el-input> <el-input type="textarea" :rows="2" v-model="content" placeholder="请输入"></el-input>
</span> </span>
</p> </p>
</div> </div>
...@@ -47,18 +47,70 @@ ...@@ -47,18 +47,70 @@
<script> <script>
export default { export default {
name: 'addRole', name: 'addRole',
props: ['detailData', 'modalName'],
data () { data () {
return { return {
form: {}, form: {},
tableDataAdd: [], tableDataAdd: [],
textarea: '' content: '',
target: '',
suffix: '',
technologyId: '',
oldRule: {}
} }
}, },
mounted() {
console.log(this.detailData)
if (this.modalName === '修改规则') {
this.oldRule = {
target: this.detailData.target,
suffix: this.detailData.suffix,
technologyId: this.detailData.technologyId
}
}
this.getAll();
},
methods: { methods: {
getAll() {
this.$server.getAllList().then(res => {
console.log(res);
this.tableDataAdd = res.data;
});
},
cancel() { cancel() {
this.$emit('on-cancel') this.$emit('on-cancel')
}, },
save() {} save() {
this.technologyName = this.tableDataAdd.find(
item => item.id === this.oldRule.technologyId
).technologyName;
let obj = {
suffix: this.oldRule.suffix,
target: this.oldRule.target,
technologyId: this.oldRule.technologyId,
technologyName: this.technologyName,
id: this.detailData.id,
oldRule: this.oldRule
};
console.log(this.detailData.id)
if (this.detailData.id !== -1) {
this.$server.editConfigUpdate(obj).then(res => {
this.$message({
message: '修改成功',
type: 'success'
});
this.$emit('on-cancel', true)
})
} else {
this.$server.addConfig(obj).then(res => {
this.$message({
message: '添加成功',
type: 'success'
});
this.$emit('on-cancel', true)
});
}
}
} }
} }
</script> </script>
......
src/components/roleDispose/roleDispose.vue
浏览文件 @ 4b1b39c5
...@@ -7,16 +7,16 @@ ...@@ -7,16 +7,16 @@
<p class="search"> <p class="search">
<span class="searchVal"> <span class="searchVal">
<span>查询：</span> <span>查询：</span>
<el-input v-model="searchVal" size="medium" placeholder="请输入"></el-input> <el-input v-model="input2" size="medium" @change="search" placeholder="请输入关键技术"></el-input>
</span> </span>
<span class="button searchBtn" @change="search('search')">搜索</span> <span class="button searchBtn" @click="search">搜索</span>
<span class="button add" @click="addRole"><img src="../../assets/img/add.png"></span> <span class="button add" @click="addRole"><img src="../../assets/img/add.png"></span>
</p> </p>
<div class="common-table"> <div class="common-table">
<el-table <el-table
highlight-current-row highlight-current-row
max-height="840" max-height="840"
:data="allData" :data="tableData"
stripe stripe
style="width: 100%;"> style="width: 100%;">
<el-table-column <el-table-column
...@@ -38,9 +38,9 @@ ...@@ -38,9 +38,9 @@
prop="technologyName" prop="technologyName"
label="操作" label="操作"
align="center"> align="center">
<template> <template slot-scope="scope">
<span class="change revise"><span class="img-revise"></span>修改</span> <span class="change revise" @click="edit(scope.row)"><span class="img-revise"></span>修改</span>
<span class="change delete"><span class="img"><img src="./img/role-delete.png"/></span>删除</span> <span class="change delete" @click="deleteRule(scope.row)"><span class="img"><img src="./img/role-delete.png"/></span>删除</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -50,11 +50,11 @@ ...@@ -50,11 +50,11 @@
<el-pagination <el-pagination
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page.sync="currentPage" :current-page.sync="myPage"
:page-size="pageSize" :page-size="pageSize"
background background
layout="prev, pager, next, jumper" layout="prev, pager, next, jumper"
:total="totalLength"> :total="tablePageSize">
</el-pagination> </el-pagination>
</div> </div>
<!-- 分页 --> <!-- 分页 -->
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
<!-- 新增 / 编辑 公用弹窗 --> <!-- 新增 / 编辑 公用弹窗 -->
<el-dialog :visible.sync="openModel" class="model"> <el-dialog :visible.sync="openModel" class="model">
<span class="closeModel" @click="reset()"></span> <span class="closeModel" @click="reset()"></span>
<component :is="components" @on-cancel="reset"></component> <component :is="components" @on-cancel="reset" :detailData="detailData" :modalName="modalName"></component>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
...@@ -75,20 +75,68 @@ export default { ...@@ -75,20 +75,68 @@ export default {
name: 'roleDispose', name: 'roleDispose',
data () { data () {
return { return {
searchVal: '', input2: '',
allData: [{technologyName: '1'}], tableData: [],
totalLength: 0, tablePageSize: 0,
currentPage: 1, // 分页第一页
pageSize: 8, // 每页个数 pageSize: 8, // 每页个数
openModel: false, openModel: false,
components: '' components: '',
myPage: 1,
detailData: {},
modalName: ''
} }
}, },
mounted() {
this.search();
},
methods: { methods: {
// 搜索
search () {
console.log(1222)
let obj = {
technologyName:this.input2
}
this.$server.getConfigPageList(this.myPage,8,obj).then(res => {
this.tableData = res.data.objects;
this.tablePageSize = res.data.totalElement;
})
},
// 修改
edit(row) {
this.openModel = true;
this.components = 'addRole';
this.detailData = row;
this.modalName = '修改规则'
},
// 删除
deleteRule(id) {
this.$confirm('此操作将永久删除该报告, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
console.log(id);
// return
this.$server.delConfig(id).then(res => {
console.log(res);
this.$message({
type: 'success',
message: '删除成功!'
});
this.search()
});
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
});
});
},
// 新建规则 // 新建规则
addRole() { addRole() {
this.openModel = true; this.openModel = true;
this.components = 'addRole'; this.components = 'addRole';
this.modalName = '新增规则'
}, },
// 点击分页 // 点击分页
handleSizeChange(val) { handleSizeChange(val) {
...@@ -96,12 +144,18 @@ export default { ...@@ -96,12 +144,18 @@ export default {
}, },
// 当前页数 // 当前页数
handleCurrentChange(val) { handleCurrentChange(val) {
console.log(val) console.log(val);
this.myPage = val
this.search();
}, },
// 关闭弹框 // 关闭弹框
reset() { reset(val) {
console.log(val)
this.openModel = false; this.openModel = false;
this.components = ''; this.components = '';
if (val) {
this.search()
}
}, },
}, },
components: { components: {
......
src/components/sidebar/sidebar.vue
浏览文件 @ 4b1b39c5
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
</p> </p>
</div> </div>
<div> <div @click="clickMenu('roleDispose',5,'规则配置')">
<p class="menu"> <p class="menu">
<span class="font">规则配置</span> <span class="font">规则配置</span>
<span class="line"></span> <span class="line"></span>
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
</p> </p>
</div> </div>
<div> <div @click="clickMenu('UnDependence',7,'未知依赖配置')">
<p class="menu"> <p class="menu">
<span class="font">未知依赖配置</span> <span class="font">未知依赖配置</span>
<span class="line"></span> <span class="line"></span>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论