Merge remote-tracking branch 'origin/master'
commit
6dee7e0e78
|
@ -87,7 +87,7 @@ export function dels(id) {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//天机规则数据
|
//添加规则数据
|
||||||
export function add(data){
|
export function add(data){
|
||||||
return request({
|
return request({
|
||||||
url: "/engine/version/insertVersion",
|
url: "/engine/version/insertVersion",
|
||||||
|
|
|
@ -243,8 +243,6 @@
|
||||||
|
|
||||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||||
|
|
||||||
<el-button @click="cancel">取 消</el-button>
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
|
@ -122,11 +122,11 @@
|
||||||
|
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
|
|
||||||
<el-button v-show="scope.row.isActivate==1" @click="del(scope.row.id)" type="text" size="small">
|
<!-- <el-button v-show="scope.row.isActivate==1" @click="del(scope.row.id)" type="text" size="small">-->
|
||||||
|
|
||||||
删除引擎
|
<!-- 删除引擎-->
|
||||||
|
|
||||||
</el-button>
|
<!-- </el-button>-->
|
||||||
|
|
||||||
<el-button v-show="scope.row.isActivate==1" @click="forbiddenEngines(scope.row.id)" type="text" size="small">
|
<el-button v-show="scope.row.isActivate==1" @click="forbiddenEngines(scope.row.id)" type="text" size="small">
|
||||||
|
|
||||||
|
@ -208,8 +208,6 @@
|
||||||
|
|
||||||
<div slot="footer" class="dialog-footer">
|
<div slot="footer" class="dialog-footer">
|
||||||
|
|
||||||
<el-button @click="dialogFormVisible = false">取 消</el-button>
|
|
||||||
|
|
||||||
<el-button type="primary" @click="back()">确 定</el-button>
|
<el-button type="primary" @click="back()">确 定</el-button>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
@ -383,13 +381,16 @@ export default {
|
||||||
|
|
||||||
this.versions.status = 1
|
this.versions.status = 1
|
||||||
|
|
||||||
|
console.log(this.versions)
|
||||||
|
|
||||||
add(this.versions).then(res => {
|
add(this.versions).then(res => {
|
||||||
|
|
||||||
this.$modal.msgSuccess(res.msg || "新增成功")
|
|
||||||
|
this.$message.success(res.msg || "新增成功")
|
||||||
|
|
||||||
})
|
})
|
||||||
|
|
||||||
this.findById();
|
this.List();
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -401,7 +402,7 @@ export default {
|
||||||
|
|
||||||
})
|
})
|
||||||
|
|
||||||
this.findById();
|
this.List();
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -439,7 +440,8 @@ export default {
|
||||||
|
|
||||||
del(id) {
|
del(id) {
|
||||||
|
|
||||||
if (confirm("你确定删除吗?")) {
|
if (confirm("你确定" +
|
||||||
|
"删除吗?")) {
|
||||||
|
|
||||||
dels(id).then(res => {
|
dels(id).then(res => {
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,12 @@
|
||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
|
<el-form :model="form" label-width="80px">
|
||||||
|
<el-form-item>
|
||||||
|
<input v-model="form.userName" style="padding: 10px 10px;float: initial;" placeholder=请输入要查询的用户名>
|
||||||
|
<input v-model="form.connectorName" style="padding: 10px 10px;float: initial;margin-left: 20px" placeholder=请输入要查询的接口名称>
|
||||||
|
<el-button @click="findConnectorUserList()" style="padding: 10px 20px;margin-left: 40px">查询</el-button>
|
||||||
|
</el-form-item>
|
||||||
|
</el-form>
|
||||||
<p style="font-weight: bold;font-size: 20px">余额:{{ userBalanceData.userBalance || '加载中...' }}</p>
|
<p style="font-weight: bold;font-size: 20px">余额:{{ userBalanceData.userBalance || '加载中...' }}</p>
|
||||||
<el-table
|
<el-table
|
||||||
:data="tableData"
|
:data="tableData"
|
||||||
|
@ -44,17 +51,17 @@
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
||||||
<!-- <el-table-column label="操作">-->
|
<el-table-column label="操作">
|
||||||
<!-- <template slot-scope="scope">-->
|
<template slot-scope="scope">
|
||||||
<!-- <el-button-->
|
<el-button
|
||||||
<!-- size="mini"-->
|
size="mini"
|
||||||
<!-- @click="handleEdit(scope.$index, scope.row)">编辑</el-button>-->
|
@click="handleEdit(scope.$index, scope.row)">编辑</el-button>
|
||||||
<!-- <el-button-->
|
<el-button
|
||||||
<!-- size="mini"-->
|
size="mini"
|
||||||
<!-- type="danger"-->
|
type="danger"
|
||||||
<!-- @click="handleDelete(scope.$index, scope.row)">删除</el-button>-->
|
@click="handleDelete(scope.$index, scope.row)">删除</el-button>
|
||||||
<!-- </template>-->
|
</template>
|
||||||
<!-- </el-table-column>-->
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -6,8 +6,12 @@
|
||||||
<el-menu-item-group>
|
<el-menu-item-group>
|
||||||
<span style="font-weight: bold;font-size: 25px;">全部类型:</span>
|
<span style="font-weight: bold;font-size: 25px;">全部类型:</span>
|
||||||
</el-menu-item-group>
|
</el-menu-item-group>
|
||||||
<el-menu-item-group v-for="i in connectSort" :key="i.value" :label="i.connectorSort" :value="i.connectorSort" :disabled="item.disabled">>
|
<el-menu-item-group >
|
||||||
<el-link type="primary" style="font-weight: bold;font-size: 20px;" v-model="connectSort.connectorSort"></el-link>
|
<el-link type="primary" style="font-weight: bold;font-size: 20px;" v-for="(connectSort, index) in connectSort"
|
||||||
|
:key="index"
|
||||||
|
@click="findApiList(connectSort.connectorSort)">
|
||||||
|
{{ connectSort.connectorSort }}
|
||||||
|
</el-link>
|
||||||
</el-menu-item-group>
|
</el-menu-item-group>
|
||||||
</el-menu>
|
</el-menu>
|
||||||
</el-aside>
|
</el-aside>
|
||||||
|
@ -16,16 +20,16 @@
|
||||||
<el-main>
|
<el-main>
|
||||||
<el-form label-width="40px" :model="form">
|
<el-form label-width="40px" :model="form">
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<input v-model="form.connectorName" style="padding: 10px 10px;float: initial" placeholder=请输入关键字>
|
<input v-model="form.connectorName" style="padding: 10px 10px;float: initial;" placeholder=请输入关键字>
|
||||||
<el-button @click="findApiList" style="padding: 10px 10px">查询</el-button>
|
<el-button @click="findApiList()" style="padding: 10px 20px;margin-left: 40px">查询</el-button>
|
||||||
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<el-row :gutter="50">
|
<el-row :gutter="50">
|
||||||
<el-col :span="7" v-for="connector in connectorList" :key="connector.connectorId" v-if="connectorList.length !== 0">
|
<el-col :span="7" v-for="connector in connectorList" :key="connector.connectorId" v-if="connectorList.length !== 0">
|
||||||
<el-card class="box-card" style="margin-top: 15px;width: 450px; height: 600px;" shadow="hover">
|
<el-card class="box-card" style="margin-top: 15px;width: 400px; height: 600px;" shadow="hover">
|
||||||
<div slot="header" class="clearfix">
|
<div slot="header" class="clearfix">
|
||||||
<h1 style="font-weight: bold">{{connector.connectorName}}</h1>
|
<span style="font-weight: bold;font-size: 30px">{{connector.connectorName}}</span>
|
||||||
<el-button type="primary" style="float: right; padding: 10px 10px" @click="buy(connector)">购买</el-button>
|
<el-button type="primary" style="float: right; padding: 10px 10px" @click="buy(connector)">购买</el-button>
|
||||||
</div>
|
</div>
|
||||||
<span style="font-weight: bold;font-size: 20px">产品图片:</span><br>
|
<span style="font-weight: bold;font-size: 20px">产品图片:</span><br>
|
||||||
|
@ -109,26 +113,26 @@
|
||||||
<el-input v-model="formBirthday.hour" autocomplete="off" placeholder="请输入几点"></el-input>
|
<el-input v-model="formBirthday.hour" autocomplete="off" placeholder="请输入几点"></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<span style="font-weight: bold;font-size: 20px" v-if="formBirthday.reason==true">
|
<span style="font-weight: bold;font-size: 20px" v-if="formBirthday.reason==true">
|
||||||
years: {{this.formBirthday.years}}<br>
|
years: {{this.formBirthday.years}}<br>
|
||||||
months: {{this.formBirthday.months}}<br>
|
months: {{this.formBirthday.months}}<br>
|
||||||
days: {{this.formBirthday.days}}<br>
|
days: {{this.formBirthday.days}}<br>
|
||||||
animal: {{this.formBirthday.animal}}<br>
|
animal: {{this.formBirthday.animal}}<br>
|
||||||
imonthcn: {{this.formBirthday.imonthcn}}<br>
|
imonthcn: {{this.formBirthday.imonthcn}}<br>
|
||||||
idaycn: {{this.formBirthday.idaycn}}<br>
|
idaycn: {{this.formBirthday.idaycn}}<br>
|
||||||
cyear: {{this.formBirthday.cyear}}<br>
|
cyear: {{this.formBirthday.cyear}}<br>
|
||||||
cmonth: {{this.formBirthday.cmonth}}<br>
|
cmonth: {{this.formBirthday.cmonth}}<br>
|
||||||
cday: {{this.formBirthday.cday}}<br>
|
cday: {{this.formBirthday.cday}}<br>
|
||||||
gzyear: {{this.formBirthday.gzyear}}<br>
|
gzyear: {{this.formBirthday.gzyear}}<br>
|
||||||
gzmonth: {{this.formBirthday.gzmonth}}<br>
|
gzmonth: {{this.formBirthday.gzmonth}}<br>
|
||||||
gzday: {{this.formBirthday.gzday}}<br>
|
gzday: {{this.formBirthday.gzday}}<br>
|
||||||
isleap: {{this.formBirthday.isleap}}<br>
|
isleap: {{this.formBirthday.isleap}}<br>
|
||||||
ncweek: {{this.formBirthday.ncweek}}<br>
|
ncweek: {{this.formBirthday.ncweek}}<br>
|
||||||
isterm: {{this.formBirthday.isterm}}<br>
|
isterm: {{this.formBirthday.isterm}}<br>
|
||||||
term: {{this.formBirthday.term}}<br>
|
term: {{this.formBirthday.term}}<br>
|
||||||
astro: {{this.formBirthday.astro}}<br>
|
astro: {{this.formBirthday.astro}}<br>
|
||||||
eightall: {{this.formBirthday.eightall}}<br>
|
eightall: {{this.formBirthday.eightall}}<br>
|
||||||
fiveall: {{this.formBirthday.fiveall}}
|
fiveall: {{this.formBirthday.fiveall}}
|
||||||
</span>
|
</span>
|
||||||
</el-form>
|
</el-form>
|
||||||
<div slot="footer" class="dialog-footer">
|
<div slot="footer" class="dialog-footer">
|
||||||
<el-button type="primary" @click="getBirthday()">发起请求</el-button>
|
<el-button type="primary" @click="getBirthday()">发起请求</el-button>
|
||||||
|
@ -253,7 +257,9 @@ export default {
|
||||||
connectorList:[],
|
connectorList:[],
|
||||||
gridData:[],
|
gridData:[],
|
||||||
gridData2:[],
|
gridData2:[],
|
||||||
form:{},
|
form:{
|
||||||
|
connectorSort:"",
|
||||||
|
},
|
||||||
// 邮编查询
|
// 邮编查询
|
||||||
formPostCode:{
|
formPostCode:{
|
||||||
code:"",
|
code:"",
|
||||||
|
@ -474,7 +480,8 @@ export default {
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
findApiList(){
|
findApiList(connectorSort){
|
||||||
|
this.form.connectorSort=connectorSort;
|
||||||
findApiList(this.form).then((res)=>{
|
findApiList(this.form).then((res)=>{
|
||||||
this.connectorList=res.data;
|
this.connectorList=res.data;
|
||||||
console.log(res.data);
|
console.log(res.data);
|
||||||
|
|
Loading…
Reference in New Issue