Merge remote-tracking branch 'origin/master'

master
chaiyapeng 2024-09-01 20:06:42 +08:00
commit ddce1c8599
2 changed files with 108 additions and 208 deletions

View File

@ -39,7 +39,7 @@ export function del(id){
//开启 //开启
export function onEngine(id){ export function onEngine(id){
return request({ return request({
url: "/engine/engine/onEngine/" + id, url: "/engine/engine/activateEngine/" + id,
method: "post", method: "post",
data:id data:id
}) })
@ -48,7 +48,7 @@ export function onEngine(id){
//禁用 //禁用
export function forbiddenEngine(id){ export function forbiddenEngine(id){
return request({ return request({
url: "/engine/engine/forbiddenEngine/" + id, url: "/engine/engine/closeEngine/" + id,
method: "post", method: "post",
data:id data:id
}) })
@ -73,8 +73,8 @@ export function getRuleEngineInfo(id) {
// 通过id查询 // 通过id查询
export function findById(id) { export function findById(id) {
return request({ return request({
url: '/engine/engine/selectEngineById/' + id, url: '/engine/engine/findByIdsfindByIds/' + id,
method: 'post' method:'get'
}) })
} }
@ -92,7 +92,7 @@ export function dels(id) {
//天机规则数据 //天机规则数据
export function add(data){ export function add(data){
return request({ return request({
url: "/engine/version/insert", url: "/engine/version/insertVersion",
method: "post", method: "post",
data:data data:data
}) })
@ -101,3 +101,13 @@ export function add(data){
export function selectEngineById(id){
return request({
url: "/engine/engine/selectEngineById/" + id,
method: "post",
data:id
})
}

View File

@ -1,238 +1,117 @@
<template> <template>
<div> <div>
<div style="height: 30px">
{{ maintenance.name }}<br>
</div>
<div style="height: 50px">
规则名称:{{ maintenance.name }}<br>
规则类型:<span v-if="maintenance.type==1"></span>
<span v-if="maintenance.type==2"></span>
<span v-if="maintenance.type==3"></span>
<span v-if="maintenance.type==4"></span>
<span v-if="maintenance.type==5"></span><br>
作用域:<span v-if="maintenance.scope==1"></span>
<span v-if="maintenance.scope==2"></span>
<span v-if="maintenance.scope==3"></span>
<span v-if="maintenance.scope==4"></span>
<span v-if="maintenance.scope==5"></span><br>
引擎编码:{{ maintenance.engineCode }}<br>
是否激活:<span v-if="maintenance.isActivate==1"></span>
<span v-if="maintenance.isActivate==2"></span><br>
状态:<span v-if="maintenance.isActivate==1"></span>
<span v-if="maintenance.isActivate==2"></span>
<span v-if="maintenance.isActivate==3"></span>
<span v-if="maintenance.isActivate==4"></span>
<br>
<button @click="onEngine(maintenance.id)"></button>
</div>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<br>
<el-button type="text" @click="dialogFormVisible = true">新增</el-button> <el-button type="text" @click="dialogFormVisible = true">新增</el-button>
<el-dialog title="收货地址" :visible.sync="dialogFormVisible"> <el-dialog title="添加版本信息" :visible.sync="dialogFormVisible">
<el-form :model="versions">
<el-form :model="maintenance">
<el-form-item label="名称" :label-width="formLabelWidth">
<el-input v-model="maintenance.name" autocomplete="off"></el-input>
<el-form-item label="版本类名" :label-width="formLabelWidth">
<el-input v-model="versions.versionClass" autocomplete="off"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="类型" :label-width="formLabelWidth"> <el-form-item label="版本名称" :label-width="formLabelWidth">
<el-input v-model="versions.name" autocomplete="off"></el-input>
<el-input v-model="maintenance.type" autocomplete="off"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="作用域" :label-width="formLabelWidth"> <el-form-item label="版本编码" :label-width="formLabelWidth">
<el-input v-model="versions.versionCode" autocomplete="off"></el-input>
<el-input v-model="maintenance.scope" autocomplete="off"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="是否激活" :label-width="formLabelWidth"> <el-form-item label="是否激活" :label-width="formLabelWidth">
<el-input v-model="versions.isActivate" autocomplete="off"></el-input>
<el-input v-model="maintenance.isActivate" autocomplete="off"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="状态" :label-width="formLabelWidth"> <el-form-item label="版本状态" :label-width="formLabelWidth">
<el-input v-model="versions.status" autocomplete="off"></el-input>
</el-form-item>
<el-input v-model="maintenance.status" autocomplete="off"></el-input> <el-form-item label="版本测试状态" :label-width="formLabelWidth">
<el-input v-model="versions.testStatus" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="规则内容" :label-width="formLabelWidth">
<el-input v-model="versions.ruleContent" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="引擎维护编号" :label-width="formLabelWidth">
<el-input v-model="versions.engineMaintenanceId" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="描述" :label-width="formLabelWidth">
<el-input v-model="versions.description" autocomplete="off"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false"> </el-button> <el-button @click="dialogFormVisible = false"> </el-button>
<el-button type="primary" @click=handleInsert()> </el-button> <el-button type="primary" @click=handleInsert()> </el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-table :data="maintenance.engineMaintenanceList" style="width: 100%"> <el-table :data="maintenance.engineMaintenanceList" style="width: 100%">
<el-table-column label="编号" width="180"> <el-table-column prop="id" label="编号"></el-table-column>
<el-table-column prop="versionClass" label="版本类名"></el-table-column>
<template slot-scope="scope"> <el-table-column prop="name" label="版本名称"></el-table-column>
<el-table-column prop="versionCode" label="版本编码"></el-table-column>
<i class="el-icon-time"></i> <el-table-column prop="isActivate" label="是否激活">
<template v-slot="scope">
<span style="margin-left: 10px">{{ scope.row.id }}</span> <span v-if="scope.row.isActivate==1"></span>
<span v-if="scope.row.isActivate==2"></span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="status" label="版本状态">
<el-table-column label="名称" width="180"> <template v-slot="scope">
<span v-if="scope.row.status==1"></span>
<template slot-scope="scope"> <span v-if="scope.row.status==2"></span>
<i class="el-icon-time"></i>
<span style="margin-left: 10px">{{ scope.row.name }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="testStatus" label="版本测试状态">
<el-table-column label="类型" width="180"> <template v-slot="scope">
<span v-if="scope.row.status==1"></span>
<template slot-scope="scope"> <span v-if="scope.row.status==2"></span>
<span v-if="scope.row.status==3"></span>
<i class="el-icon-time"></i>
<span style="margin-left: 10px" v-if="scope.row.type==1"></span>
<span style="margin-left: 10px" v-if="scope.row.type==2"></span>
<span style="margin-left: 10px" v-if="scope.row.type==3"></span>
<span style="margin-left: 10px" v-if="scope.row.type==4"></span>
<span style="margin-left: 10px" v-if="scope.row.type==5"></span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="ruleContent" label="规则内容"></el-table-column>
<el-table-column prop="engineMaintenanceId" label="引擎维护编号"></el-table-column>
<el-table-column prop="description" label="描述"></el-table-column>
<el-table-column label="作用域" width="180">
<el-table-column fixed="right" label="操作" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button @click.native.prevent="del(scope.row.id)" type="text" size="small">
<i class="el-icon-time"></i> 激活规则
<span style="margin-left: 10px" v-if="scope.row.scope==1"></span>
<span style="margin-left: 10px" v-if="scope.row.scope==2"></span>
<span style="margin-left: 10px" v-if="scope.row.scope==3"></span>
<span style="margin-left: 10px" v-if="scope.row.scope==4"></span>
<span style="margin-left: 10px" v-if="scope.row.scope==5"></span>
</template>
</el-table-column>
<el-table-column label="是否激活" width="180">
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span style="margin-left: 10px" v-if="scope.row.isActivate==1"></span>
<span style="margin-left: 10px" v-if="scope.row.isActivate==2"></span>
</template>
</el-table-column>
<el-table-column label="状态" width="180">
<template slot-scope="scope">
<i class="el-icon-time"></i>
<span style="margin-left: 10px" v-if="scope.row.status==1"></span>
<span style="margin-left: 10px" v-if="scope.row.status==2"></span>
<span style="margin-left: 10px" v-if="scope.row.status==3"></span>
<span style="margin-left: 10px" v-if="scope.row.status==4"></span>
</template>
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
<el-button size="mini" type="danger" @click="del(scope.row.id)">
</el-button> </el-button>
<el-button size="mini" type="danger" @click="onEngine(scope.row.id)">
</el-button>
<el-button size="mini" type="danger" @click="forbiddenEngine(scope.row.id)">
</el-button>
</template> </template>
</el-table-column>
<el-table-column fixed="right" label="操作" width="120">
<template slot-scope="scope">
<el-button @click.native.prevent="selectEngineById(scope.row.id)" type="text" size="small">
规则详情
</el-button>
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" width="120">
<template slot-scope="scope">
<el-button @click.native.prevent="forbiddenEngine(scope.row.id)" type="text" size="small">
关闭引擎
</el-button>
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" width="120">
<template slot-scope="scope">
<el-button @click.native.prevent="onEngine(scope.row.id)" type="text" size="small">
开启引擎
</el-button>
</template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -243,9 +122,8 @@
<script> <script>
import {add, dels, findById, onEngine} from "@/api/engine/engine"; import {add, dels, findById, onEngine, selectEngineById} from "@/api/engine/engine";
import {insert} from "@/api/version/version";
export default { export default {
@ -264,7 +142,6 @@ export default {
return { return {
direction: 'rtl', direction: 'rtl',
maintenance: { maintenance: {
engineMaintenanceList: [], engineMaintenanceList: [],
@ -277,7 +154,9 @@ export default {
handleClose: false, handleClose: false,
form: {}, versions: {
},
size: '', size: '',
@ -285,22 +164,25 @@ export default {
formLabelWidth: '120px', formLabelWidth: '120px',
arr:[]
} }
}, },
methods: { methods: {
selectEngineById,
handleInsert() { handleInsert() {
this.dialogFormVisible = true this.dialogFormVisible = true
add(this.maintenance).then(res => { add(this.versions).then(res => {
this.$modal.msgSuccess("新增成功") this.$modal.msgSuccess(res.msg || "新增成功")
}) })
this.dialogFormVisible=false;
this.List();
}, },
@ -308,7 +190,7 @@ export default {
onEngine(id).then(res => { onEngine(id).then(res => {
this.$modal.msgSuccess("激活成功") this.$modal.msgSuccess("开启成功")
}) })
@ -317,7 +199,7 @@ export default {
onEngine(id).then(res => { onEngine(id).then(res => {
this.$modal.msgSuccess("禁用成功") this.$modal.msgSuccess("关闭成功")
}) })
@ -327,12 +209,18 @@ export default {
findById(this.maintenance.id).then(res => { findById(this.maintenance.id).then(res => {
this.maintenance = res.data; this.maintenance.engineMaintenanceList = res.data
}) })
}, },
selectEngine(){
selectEngineById(this.maintenance.id).then(res =>{
this.arr = res.data
})
},
del(id) { del(id) {
if (confirm("你确定删除吗?")) { if (confirm("你确定删除吗?")) {
@ -357,6 +245,8 @@ export default {
this.List(); this.List();
this.selectEngine();
} }
} }