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 @@
<p class="search">
<span class="searchVal">
<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 class="button searchBtn" @change="search('search')">搜索</span>
<span class="button searchBtn" @click="search()">搜索</span>
</p>
<div class="common-table">
<el-table
highlight-current-row
max-height="840"
:data="allData"
@row-click="details"
:data="tableData"
stripe
style="width: 100%;">
<el-table-column
......@@ -33,9 +32,9 @@
prop="number"
label="操作"
align="center">
<template>
<span class="change revise"><span class="img support-img"></span>支持国产化</span>
<span class="change delete"><span class="img Unsupport-img"></span>不支持国产化</span>
<template slot-scope="scope">
<span class="change revise" @click="yesEdit(scope.row)"><span class="img support-img"></span>支持国产化</span>
<span class="change delete" @click="noEdit(scope.row)"><span class="img Unsupport-img"></span>不支持国产化</span>
</template>
</el-table-column>
</el-table>
......@@ -45,11 +44,11 @@
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
:current-page.sync="myPage"
:page-size="pageSize"
background
layout="prev, pager, next, jumper"
:total="totalLength">
:total="tablePageSize">
</el-pagination>
</div>
<!-- 分页 -->
......@@ -69,16 +68,43 @@ export default {
name: 'roleDispose',
data () {
return {
searchVal: '',
allData: [{technologyName: '1'}],
totalLength: 0,
currentPage: 1, // 分页第一页
tableData: [],
tablePageSize: 0,
myPage: 1, // 分页第一页
pageSize: 8, // 每页个数
openModel: false,
components: ''
components: '',
technologyId:'未知依赖(未知)',
input2: '',
}
},
mounted() {
this.getConfigList();
},
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) {
console.log(`每页 ${val} 条`);
......@@ -86,12 +112,60 @@ export default {
// 当前页数
handleCurrentChange(val) {
console.log(val)
this.myPage = val;
this.getConfigList();
},
// 关闭弹框
reset() {
this.openModel = false;
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>
......@@ -145,11 +219,15 @@ export default {
.UnDependence .content .button:hover{
background: rgba(72,119,230,.6);
}
.UnDependence .content .revise{
margin-right: 10px;
}
.UnDependence .content .img{
width: 17px;
height: 17px;
display: inline-block;
vertical-align: middle;
margin-right: 5px;
}
.UnDependence .support-img{
background-image: url("./img/select.png");
......
src/components/roleDispose/addRole.vue
浏览文件 @ 4b1b39c5
<template>
<div class="add-role">
<p class="dialog-header">
<span>新增规则</span>
<span>{{modalName}}</span>
</p>
<div class="company-content" style="text-align: center; margin-top: 14px;">
<p class="new">
<span class="addVal">
<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>
<el-select v-model="form.technologyId" @change="search('search')" placeholder="请选择" clearable>
<el-select v-model="oldRule.technologyId" placeholder="请选择" clearable>
<el-option
v-for="item in tableDataAdd"
:key="item.id"
......@@ -20,7 +20,7 @@
</span>
<span class="addVal" style="width: 350px">
<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="js" value="js"></el-option>
<el-option label="xml" value="xml"></el-option>
......@@ -32,7 +32,7 @@
</span>
<span class="addVal">
<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>
</p>
</div>
......@@ -47,18 +47,70 @@
<script>
export default {
name: 'addRole',
props: ['detailData', 'modalName'],
data () {
return {
form: {},
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: {
getAll() {
this.$server.getAllList().then(res => {
console.log(res);
this.tableDataAdd = res.data;
});
},
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>
......
src/components/roleDispose/roleDispose.vue
浏览文件 @ 4b1b39c5
......@@ -7,16 +7,16 @@
<p class="search">
<span class="searchVal">
<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 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>
</p>
<div class="common-table">
<el-table
highlight-current-row
max-height="840"
:data="allData"
:data="tableData"
stripe
style="width: 100%;">
<el-table-column
......@@ -38,9 +38,9 @@
prop="technologyName"
label="操作"
align="center">
<template>
<span class="change revise"><span class="img-revise"></span>修改</span>
<span class="change delete"><span class="img"><img src="./img/role-delete.png"/></span>删除</span>
<template slot-scope="scope">
<span class="change revise" @click="edit(scope.row)"><span class="img-revise"></span>修改</span>
<span class="change delete" @click="deleteRule(scope.row)"><span class="img"><img src="./img/role-delete.png"/></span>删除</span>
</template>
</el-table-column>
</el-table>
......@@ -50,11 +50,11 @@
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
:current-page.sync="myPage"
:page-size="pageSize"
background
layout="prev, pager, next, jumper"
:total="totalLength">
:total="tablePageSize">
</el-pagination>
</div>
<!-- 分页 -->
......@@ -64,7 +64,7 @@
<!-- 新增 / 编辑 公用弹窗 -->
<el-dialog :visible.sync="openModel" class="model">
<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>
</div>
</template>
......@@ -75,20 +75,68 @@ export default {
name: 'roleDispose',
data () {
return {
searchVal: '',
allData: [{technologyName: '1'}],
totalLength: 0,
currentPage: 1, // 分页第一页
input2: '',
tableData: [],
tablePageSize: 0,
pageSize: 8, // 每页个数
openModel: false,
components: ''
components: '',
myPage: 1,
detailData: {},
modalName: ''
}
},
mounted() {
this.search();
},
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() {
this.openModel = true;
this.components = 'addRole';
this.modalName = '新增规则'
},
// 点击分页
handleSizeChange(val) {
......@@ -96,12 +144,18 @@ export default {
},
// 当前页数
handleCurrentChange(val) {
console.log(val)
console.log(val);
this.myPage = val
this.search();
},
// 关闭弹框
reset() {
reset(val) {
console.log(val)
this.openModel = false;
this.components = '';
if (val) {
this.search()
}
},
},
components: {
......
src/components/sidebar/sidebar.vue
浏览文件 @ 4b1b39c5
......@@ -43,7 +43,7 @@
</p>
</div>
<div>
<div @click="clickMenu('roleDispose',5,'规则配置')">
<p class="menu">
<span class="font">规则配置</span>
<span class="line"></span>
......@@ -57,7 +57,7 @@
</p>
</div>
<div>
<div @click="clickMenu('UnDependence',7,'未知依赖配置')">
<p class="menu">
<span class="font">未知依赖配置</span>
<span class="line"></span>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论