|
|
@@ -2,11 +2,7 @@
|
|
|
<div class="app-container">
|
|
|
<el-header style="height:auto;!improtant">
|
|
|
<div class="filter-container" style="padding-bottom: 20px;!improtant">
|
|
|
-<<<<<<< HEAD
|
|
|
- <el-input v-model="listQuery.ruleDesc" placeholder="规则描述" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter" />
|
|
|
-=======
|
|
|
<el-input v-model="listQuery.ruleDesc" placeholder="描述" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter" />
|
|
|
->>>>>>> 35077813b17465e1ad88ec639629e669deba7849
|
|
|
<el-input v-model="listQuery.execSort" placeholder="优先级" style="width: 200px;" class="filter-item" @keyup.enter.native="handleFilter" />
|
|
|
<el-select v-model="listQuery.status" class="filter-item" filterable clearable placeholder="状态">
|
|
|
<el-option v-for="item in ruleStatus" :key="item.key" :label="item.display_name" :value="item.key" />
|
|
|
@@ -19,23 +15,9 @@
|
|
|
<el-button style="float: right;" type="primary" @click="prev"> 返回 </el-button>
|
|
|
</div>
|
|
|
</el-header>
|
|
|
-<<<<<<< HEAD
|
|
|
- <el-table
|
|
|
- :key="tableKey"
|
|
|
- v-loading="listLoading"
|
|
|
- :data="list"
|
|
|
- fit
|
|
|
- highlight-current-row
|
|
|
- style="width: 100%;"
|
|
|
- :header-cell-style="styleObj"
|
|
|
- @sort-change="sortChange"
|
|
|
- >
|
|
|
- <el-table-column label="规则ID" prop="id" sortable="custom" align="center" min-width="80px">
|
|
|
-=======
|
|
|
<el-table :key="tableKey" v-loading="listLoading" :data="list" fit highlight-current-row style="width: 100%;">
|
|
|
|
|
|
<el-table-column label="结果ID" prop="id" sortable="custom" align="center" min-width="80px">
|
|
|
->>>>>>> 35077813b17465e1ad88ec639629e669deba7849
|
|
|
<template slot-scope="scope">
|
|
|
<el-popover trigger="hover" placement="top">
|
|
|
<p>创建人: {{ scope.row.creator }}</p>
|
|
|
@@ -61,13 +43,7 @@
|
|
|
</el-table-column>
|
|
|
|
|
|
<el-table-column label="接口ID" min-width="80px" align="center">
|
|
|
-<<<<<<< HEAD
|
|
|
- <!-- <template slot-scope="scope"> -->
|
|
|
- <span>{{ this.$route.path.split('/')[3] }}</span>
|
|
|
- <!-- </template> -->
|
|
|
-=======
|
|
|
{{ this.$route.path.split('/')[3] }}
|
|
|
->>>>>>> 35077813b17465e1ad88ec639629e669deba7849
|
|
|
</el-table-column>
|
|
|
|
|
|
<!--<el-table-column label="方法协议" min-width="150px" align="center">-->
|
|
|
@@ -81,10 +57,6 @@
|
|
|
<!--<!– <el-tag>{{ row.type | typeFilter }}</el-tag> –>-->
|
|
|
<!--</template>-->
|
|
|
<!--</el-table-column>-->
|
|
|
-<<<<<<< HEAD
|
|
|
-=======
|
|
|
-
|
|
|
->>>>>>> 35077813b17465e1ad88ec639629e669deba7849
|
|
|
<el-table-column label="优先级" min-width="110px" align="center">
|
|
|
<template slot-scope="scope">{{ scope.row.execSort }}</template>
|
|
|
</el-table-column>
|
|
|
@@ -127,15 +99,6 @@
|
|
|
</el-table>
|
|
|
|
|
|
<pagination v-show="total>0" :total="total" :page.sync="listQuery.curIndex" :limit.sync="listQuery.pageSize" @pagination="getList" />
|
|
|
-<<<<<<< HEAD
|
|
|
- <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" width="65%" @open="returnMessageData">
|
|
|
- <el-form ref="ruleDataForm" :rules="roleDataRules" :model="ruleData" label-position="left" label-width="120px" style="width: 500px; margin-left:80px;">
|
|
|
- <el-form-item label="规则" prop="whenScript">
|
|
|
- <el-input v-model="ruleData.whenScript" placeholder="any" disabled />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="规则描述" prop="ruleDesc">
|
|
|
- <el-input v-model="ruleData.ruleDesc" placeholder="请输入规则描述" />
|
|
|
-=======
|
|
|
|
|
|
<el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" width="65%" @open="isNotAnyRequest">
|
|
|
|
|
|
@@ -174,7 +137,6 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item label="描述" prop="ruleDesc" style="width:52vw; white-space:nowrap;">
|
|
|
<el-input v-model="ruleForm.ruleDesc" placeholder="请输入描述" />
|
|
|
->>>>>>> 35077813b17465e1ad88ec639629e669deba7849
|
|
|
</el-form-item>
|
|
|
<el-form-item label="优先级" prop="execSort">
|
|
|
<el-tooltip class="item" effect="light" content="值越大，优先级越高" placement="right">
|
|
|
@@ -187,17 +149,8 @@
|
|
|
</el-form>
|
|
|
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
-<<<<<<< HEAD
|
|
|
- <el-button @click="clear(), dialogFormVisible = false">
|
|
|
- 取消
|
|
|
- </el-button>
|
|
|
- <el-button v-if="showSubmit" type="primary" @click="dialogStatus==='create'?createData():updateData()">
|
|
|
- 确定
|
|
|
- </el-button>
|
|
|
-=======
|
|
|
<el-button @click="dialogFormVisible = false"> 取消 </el-button>
|
|
|
<el-button v-if="showSubmit" type="primary" @click=" dialogStatus === 'create'?createData(ruleForm):updateData(ruleForm)"> 确定 </el-button>
|
|
|
->>>>>>> 35077813b17465e1ad88ec639629e669deba7849
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
</div>
|
|
|
@@ -217,15 +170,7 @@ export default {
|
|
|
directives: { waves },
|
|
|
filters: {
|
|
|
statusFilter(status) {
|
|
|
-<<<<<<< HEAD
|
|
|
- const statusMap = {
|
|
|
- 1: 'success',
|
|
|
- draft: 'info',
|
|
|
- 0: 'danger'
|
|
|
- }
|
|
|
-=======
|
|
|
const statusMap = { 1: 'success', draft: 'info', 0: 'danger' }
|
|
|
->>>>>>> 35077813b17465e1ad88ec639629e669deba7849
|
|
|
return statusMap[status]
|
|
|
},
|
|
|
lengthFilter(value) {
|
|
|
@@ -281,13 +226,9 @@ export default {
|
|
|
methodName: '',
|
|
|
methodProtocol: 'http',
|
|
|
ruleDesc: '',
|
|
|
-<<<<<<< HEAD
|
|
|
- ruleDescSeen: false
|
|
|
-=======
|
|
|
ruleDescSeen: false,
|
|
|
formLabelWidths: '7px',
|
|
|
paramtions: {}
|
|
|
->>>>>>> 35077813b17465e1ad88ec639629e669deba7849
|
|
|
},
|
|
|
showSubmit: true,
|
|
|
jsonTit: `{ 'code': 200, 'data': { 'crowdComposition': 'U_866', 'campaignId': 789, 'id': 4606, 'class': 'com.didi.prado.config.api.dto.CampaignCrowdDTO'}}`,
|
|
|
@@ -297,54 +238,17 @@ export default {
|
|
|
expressOptionWithutAny: [],
|
|
|
// statusOptions: ['published', 'draft', 'deleted'],
|
|
|
showReviewer: false,
|
|
|
-<<<<<<< HEAD
|
|
|
- ruleData: {
|
|
|
- methodId: 0,
|
|
|
- updator: '',
|
|
|
- methodName: '',
|
|
|
- execSort: 1,
|
|
|
- whenScript: '',
|
|
|
- ruleDesc: '',
|
|
|
- returnMessage: '',
|
|
|
- curIndex: 1,
|
|
|
- pageSize: 20,
|
|
|
- methodProtocol: 'http'
|
|
|
- },
|
|
|
-=======
|
|
|
metaRule: [],
|
|
|
showRules: false,
|
|
|
->>>>>>> 35077813b17465e1ad88ec639629e669deba7849
|
|
|
dialogFormVisible: false,
|
|
|
showguiz: true,
|
|
|
dialogStatus: '',
|
|
|
textMap: {
|
|
|
update: '编辑',
|
|
|
-<<<<<<< HEAD
|
|
|
- create: '新增规则'
|
|
|
- },
|
|
|
- dialogPvVisible: false,
|
|
|
- pvData: [],
|
|
|
- roleDataRules: {
|
|
|
- whenScript: [{ required: true, message: '规则不能为空', trigger: 'change' }],
|
|
|
- execSort: [{ required: true, message: '优先级1-100', trigger: 'change' }],
|
|
|
- returnMessage: [{ required: true, message: '不能为空', trigger: 'change' }],
|
|
|
- ruleDesc: [{ required: true, message: '规则描述不能为空', trigger: 'change' }]
|
|
|
- // interfaceName: [{ required: true, message: '接口名称不能为空', trigger: 'change' }],
|
|
|
- // serviceVersion: [{ required: true, message: '服务版本不能为空', trigger: 'change' }],
|
|
|
- // protocol: [{ required: true, message: '请选择协议类型', trigger: 'change' }],
|
|
|
- // consumerIds: [{ required: false, message: '请选择消费者', trigger: 'change' }],
|
|
|
- // methodName: [{ required: true, message: '方法名称不能为空', trigger: 'change' }],
|
|
|
- // methodParamsTypes: [{ required: true, message: '入参类型不能为空', trigger: 'change' }],
|
|
|
- // returnDataStructure: [{ required: true, message: '返回值类型不能为空', trigger: 'change' }]
|
|
|
- },
|
|
|
- downloadLoading: false,
|
|
|
- desc: true
|
|
|
-=======
|
|
|
create: '新增'
|
|
|
},
|
|
|
desc: true,
|
|
|
dataFrom: {}
|
|
|
->>>>>>> 35077813b17465e1ad88ec639629e669deba7849
|
|
|
}
|
|
|
},
|
|
|
created() {
|
|
|
@@ -588,62 +492,15 @@ export default {
|
|
|
changeStatus(statusData).then(response => {
|
|
|
if (response.code === 200) {
|
|
|
row.status = status
|
|
|
-<<<<<<< HEAD
|
|
|
- this.$message({
|
|
|
- message: '规则ID:' + row.id.toString() + ' 操作成功！',
|
|
|
- type: 'success'
|
|
|
- })
|
|
|
- } else {
|
|
|
- this.$message({
|
|
|
- message: '规则ID:' + row.id.toString() + ' 操作失败！',
|
|
|
- type: 'danger'
|
|
|
- })
|
|
|
-=======
|
|
|
this.$message({ message: row.id.toString() + ' 操作成功！', type: 'success' })
|
|
|
} else {
|
|
|
this.$message({ message: row.id.toString() + ' 操作失败！', type: 'danger' })
|
|
|
->>>>>>> 35077813b17465e1ad88ec639629e669deba7849
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
|
|
|
// 复制Data
|
|
|
handleCopy(row) {
|
|
|
-<<<<<<< HEAD
|
|
|
- // this.ruleData = {
|
|
|
- // // id: row.id,
|
|
|
- // customName: row.customName,
|
|
|
- // httpUrl: row.httpUrl,
|
|
|
- // execSort: row.execSort,
|
|
|
- // whenScript: row.whenScript,
|
|
|
- // methodProtocol: row.methodProtocol,
|
|
|
- // status: row.status,
|
|
|
- // returnMessage: row.returnMessage
|
|
|
- // }
|
|
|
- this.ruleData = Object.assign({}, row) // copy obj
|
|
|
- this.ruleData.timestamp = new Date(this.ruleData.timestamp)
|
|
|
- this.dialogStatus = 'create'
|
|
|
- this.dialogFormVisible = true
|
|
|
- this.showSubmit = true
|
|
|
- this.$nextTick(() => {
|
|
|
- this.$refs['ruleDataForm'].clearValidate()
|
|
|
- })
|
|
|
- },
|
|
|
- updateData() {
|
|
|
- this.$refs['ruleDataForm'].validate((valid) => {
|
|
|
- if (valid) {
|
|
|
- // const tempData = Object.assign({}, this.ruleData)
|
|
|
- const tempData = {
|
|
|
- id: this.ruleData.id,
|
|
|
- methodId: parseInt(this.$route.path.split('/')[3]),
|
|
|
- updator: '',
|
|
|
- execSort: this.ruleData.execSort,
|
|
|
- whenScript: this.ruleData.whenScript,
|
|
|
- returnMessage: this.ruleData.returnMessage,
|
|
|
- mehtodName: this.$route.query.methodName,
|
|
|
- methodProtocol: this.$route.query.methodProtocol,
|
|
|
- ruleDesc: this.ruleData.ruleDesc
|
|
|
-=======
|
|
|
var queryData = { id: row.id }
|
|
|
fetchRuleById(queryData).then(response => {
|
|
|
this.ruleForm = response.data.mockRuleList[0]
|
|
|
@@ -659,7 +516,6 @@ export default {
|
|
|
this.$set(this.ruleForm, 'expression2', a.expression.split('.')[1])
|
|
|
this.$set(this.ruleForm, 'judgeType', a.judgeType)
|
|
|
this.$set(this.ruleForm, 'judgeValue', a.judgeValue)
|
|
|
->>>>>>> 35077813b17465e1ad88ec639629e669deba7849
|
|
|
}
|
|
|
}
|
|
|
this.dialogStatus = 'create'
|
qinzhipeng_v