From ee54740c2c085b5c17d1f31ae3546d25b872ff37 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期三, 23 十一月 2022 15:16:20 +0800
Subject: [PATCH] 修改前端页面
---
src/components/common/Header.vue | 6
src/components/page/street/index.vue | 18 +-
src/components/page/park/index.vue | 6
src/components/page/user/index.vue | 26 ++-
src/components/page/costRule/index.vue | 214 ++++++++++++++++++++++++++++++
src/components/common/Sidebar.vue | 6
src/components/page/park/index2.vue | 28 ++-
src/components/page/whiteList/index.vue | 9
src/components/page/Login.vue | 12 -
src/components/page/violationType/index.vue | 6
src/router/index.js | 5
src/assets/js/ByUtils.js | 44 +++---
12 files changed, 309 insertions(+), 71 deletions(-)
diff --git a/src/assets/js/ByUtils.js b/src/assets/js/ByUtils.js
index cf261c0..d1f5570 100644
--- a/src/assets/js/ByUtils.js
+++ b/src/assets/js/ByUtils.js
@@ -104,7 +104,7 @@
}).then((response) => {
vm.$loading().close();
let data = response.data;
- if (data && data.success) {
+ if (data && data.code==0) {
callBackFunction(data);
} else {
if(data.message=='-9999'){
@@ -137,8 +137,8 @@
if (null === data) {
data = {};
}
- data.page = vm.pageData.page;
- data.pageSize = vm.pageData.pageSize;
+ data.current = vm.pageData.page;
+ data.size = vm.pageData.pageSize;
vm.pageData.isLoading = true;
vm.$axios({
url: url,
@@ -150,10 +150,10 @@
}).then((response) => {
vm.pageData.isLoading = false;
let data = response.data;
- if (data && data.success) {
- let page = data.obj;
- vm.pageData.rows = page.content;
- vm.pageData.total = page.totalElements;
+ if (data && data.code==0) {
+ let page = data.data;
+ vm.pageData.rows = page.records;
+ vm.pageData.total = page.total;
} else {
if(data.message=='-9999'){
vm.$router.push({'path': '/login'});
@@ -201,8 +201,8 @@
}).then((response) => {
vm.pageData.isLoading = false;
let data = response.data;
- if (data && data.success) {
- let page = data.obj;
+ if (data && data.code==0) {
+ let page = data.data;
vm.pageData.rows = page.records;
vm.pageData.total = page.total;
} else {
@@ -265,7 +265,7 @@
}).then((response) => {
//vm.$loading().close();
let data = response.data;
- if (data && data.success) {
+ if (data && data.code==0) {
callBackFunction(data);
} else {
if(data.message=='-9999'){
@@ -304,7 +304,7 @@
data: data
}).then((response) => {
let data = response.data;
- if (data && data.success) {
+ if (data && data.code==0) {
callBackFunction(data);
} else {
vm.$alert('鎿嶄綔澶辫触锛�' + data.message, {'title': '鎻愮ず', 'type': 'warning', 'center': true, 'showClose': false});
@@ -334,7 +334,7 @@
return;
}
let callBackFunction = function (data) {
- vm.$message({message: data.message, type: 'success'});
+ vm.$message({message: '鍒犻櫎鎴愬姛', type: 'success'});
vm.loadData();
}
if (successCallBackFunction) {
@@ -352,7 +352,7 @@
}).then((response) => {
vm.$loading().close();
let data = response.data;
- if (data && data.success) {
+ if (data && data.code == 0) {
callBackFunction(data);
} else {
if(data.message=='-9999'){
@@ -408,7 +408,7 @@
}).then((response) => {
vm.$loading().close();
let data = response.data;
- if (data && data.success) {
+ if (data && data.code==0) {
callBackFunction(data);
} else {
if(data.message=='-9999'){
@@ -464,7 +464,7 @@
}).then((response) => {
vm.$loading().close();
let data = response.data;
- if (data && data.success) {
+ if (data && data.code==0) {
callBackFunction(data);
} else {
if(data.message=='-9999'){
@@ -520,7 +520,7 @@
}).then((response) => {
vm.$loading().close();
let data = response.data;
- if (data && data.success) {
+ if (data && data.code==0) {
callBackFunction(data);
} else {
if(data.message=='-9999'){
@@ -557,10 +557,10 @@
}).then((response) => {
vm.pageData.isLoading = false;
let data = response.data;
- if (data && data.success) {
- let page = data.result;
- vm.pageData.rows = page.items;
- vm.pageData.total = page.totalCount;
+ if (data && data.code==0) {
+ let page = data.data;
+ vm.pageData.rows = page.records;
+ vm.pageData.total = page.total;
vm.pageData.SkipCount = 1;
} else {
if(data.message=='-9999'){
@@ -598,7 +598,7 @@
}).then((response) => {
vm.pageData.isLoading = false;
let data = response.data;
- if (data && data.success) {
+ if (data && data.code==0) {
let page = data.result;
vm.pageData.rows = page.items;
vm.pageData.total = page.totalCount;
@@ -716,7 +716,7 @@
}).then((response) => {
vm.$loading().close();
let data = response.data;
- if (data && data.success) {
+ if (data && data.code==0) {
callBackFunction(data);
} else {
if(data.message=='-9999'){
diff --git a/src/components/common/Header.vue b/src/components/common/Header.vue
index dbbccb3..8e0f955 100644
--- a/src/components/common/Header.vue
+++ b/src/components/common/Header.vue
@@ -157,15 +157,15 @@
},
url:this.$systemconfig.basePath + '/user/updatePassword '
}).then(res => {
- if(res.data.success){
+ if(res.data.code==0){
this.form.oldPassword = ''
this.form.newPassword = ''
this.form.surePassword = ''
this.errTishi = ''
- this.$message({message: res.data.message, type: 'success'});
+ this.$message({message:'淇敼鎴愬姛', type: 'success'});
this.dialogFormVisible = false
}else{
- this.$message({message: res.data.message, type: 'false'});
+ this.$message({message: '淇敼澶辫触', type: 'false'});
}
})
}
diff --git a/src/components/common/Sidebar.vue b/src/components/common/Sidebar.vue
index 209137b..b73af67 100644
--- a/src/components/common/Sidebar.vue
+++ b/src/components/common/Sidebar.vue
@@ -88,6 +88,12 @@
name: '琛楅亾绠＄悊',
indexUrl: 'street'
},
+ {
+ id:8,
+ icon: 'el-icon-document',
+ name: '鏀惰垂瑙勫垯绠＄悊',
+ indexUrl: 'costRule'
+ },
// {
// id:3,
// icon: 'el-icon-folder-opened',
diff --git a/src/components/page/Login.vue b/src/components/page/Login.vue
index de8641f..691914d 100644
--- a/src/components/page/Login.vue
+++ b/src/components/page/Login.vue
@@ -47,16 +47,14 @@
methods: {
submitForm(formName) {
this.$refs[formName].validate((valid) => {
- //this.$byutil.setUser({username:123})
- //this.$router.push({'path': '/'});
if (valid) {
var url = this.$systemconfig.basePath + '/user/login';
this.$byutil.postData(this,url,this.ruleForm,res=>{
- let data = res;
- if (data) {
- localStorage.userId = data.obj.id
- localStorage.name = data.obj.name
- localStorage.type = data.obj.type
+ let data = res.data;
+ if (data) {
+ localStorage.userId = data.id
+ localStorage.name = data.name
+ localStorage.type = data.type
this.$router.push({'path': '/home'});
// if (this._isMobile()) {
// this.$router.push({'path': '/index4'});
diff --git a/src/components/page/costRule/index.vue b/src/components/page/costRule/index.vue
new file mode 100644
index 0000000..c1993f4
--- /dev/null
+++ b/src/components/page/costRule/index.vue
@@ -0,0 +1,214 @@
+<template>
+ <div>
+ <div style="padding: 10px 10px 0px 10px;">
+ <el-form :inline="true" :model="searchForm">
+ <el-select v-model="searchForm.parkId">
+ <el-option v-for="item in table1" :key="item.id" :label="item.name" :value="item.id"></el-option>
+ </el-select>
+ <el-form-item>
+ <el-button type="primary" size="small" @click="onSearch" icon="el-icon-search">鏌ヨ</el-button>
+ <el-button type="primary" size="small" @click="onAdd" icon="el-icon-plus">澧炲姞</el-button>
+ </el-form-item>
+ </el-form>
+ </div>
+
+ <el-table :data="pageData.rows" v-loading="pageData.isLoading" border style="width:100%;border:1px solid #bcbec2;">
+ <el-table-column type="index" width="50" label="搴忓彿" align="center"> </el-table-column>
+ <el-table-column prop="parkName" label="鍋滆溅鍦�" align="center" width="150"></el-table-column>
+ <el-table-column prop="armyCar" label="鍐涜溅鏄惁鍏嶈垂" align="center" width="100">
+ <template slot-scope="scope">
+ <p v-if="scope.row.armyCar==0">鍏嶈垂</p>
+ <p v-if="scope.row.armyCar==1">鏀惰垂</p>
+ </template>
+ </el-table-column>
+ <el-table-column prop="freeTime" label="鍋滆溅鍏嶈垂鏃堕暱(鍒嗛挓)" align="center" width="150"></el-table-column>
+ <el-table-column prop="status" label="瑙勫垯鍚敤" align="center" width="100">
+ <template slot-scope="scope">
+ <p v-if="scope.row.status==0">鍚敤</p>
+ <p v-if="scope.row.status==1">鍋滅敤</p>
+ </template>
+ </el-table-column>
+ <el-table-column prop="chargeStartTime1" label="璁¤垂寮�濮嬫椂闂�" align="center"></el-table-column>
+ <el-table-column prop="chargeEndTime1" label="璁¤垂缁撴潫鏃堕棿" align="center"></el-table-column>
+ <el-table-column prop="cost1" label="姣忓皬鏃舵敹璐�(鍏�)" align="center"></el-table-column>
+ <el-table-column prop="maxCost1" label="灏侀《浠锋牸(鍏�)" align="center"></el-table-column>
+ <el-table-column prop="chargeStartTime2" label="璁¤垂寮�濮嬫椂闂�2" align="center"></el-table-column>
+ <el-table-column prop="chargeEndTime2" label="璁¤垂缁撴潫鏃堕棿2" align="center"></el-table-column>
+ <el-table-column prop="cost2" label="姣忓皬鏃舵敹璐�(鍏�)" align="center"></el-table-column>
+ <el-table-column prop="maxCost2" label="灏侀《浠锋牸(鍏�)" align="center"></el-table-column>
+ <el-table-column prop="chargeStartTime3" label="璁¤垂寮�濮嬫椂闂�3" align="center"></el-table-column>
+ <el-table-column prop="chargeEndTime3" label="璁¤垂缁撴潫鏃堕棿3" align="center"></el-table-column>
+ <el-table-column prop="cost3" label="姣忓皬鏃舵敹璐�(鍏�)" align="center"></el-table-column>
+ <el-table-column prop="maxCost3" label="灏侀《浠锋牸(鍏�)" align="center"></el-table-column>
+ <el-table-column label="鎿嶄綔" fixed="right" width="150" align="center">
+ <template slot-scope="scope">
+ <el-button size="mini" @click="onEdit(scope.row)">缂栬緫</el-button>
+ <el-button size="mini" type="danger" @click="onDelete(scope.row)">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <el-pagination background @size-change="onPageSizeChange" @current-change="onCurrentPageChange" :current-page="pageData.currentPage" :page-size="pageData.pageSize" :total="pageData.total" style="float: right"></el-pagination>
+
+ <el-dialog title="缂栬緫" :visible.sync="flag" width="40%">
+ <el-form :model="formData" ref="formData" label-width="100px">
+ <el-form-item label="鍋滆溅鍦�" prop="parkId" :rules="[{ required: true, message: '璇烽�夋嫨鍋滆溅鍦�', trigger: 'change'}]">
+ <el-option v-for="item in table1" :key="item.id" :label="item.name" :value="item.id"></el-option>
+ </el-form-item>
+ <el-form-item label="鍐涜溅鏄惁鍏嶈垂" prop="armyCar" :rules="[{ required: true, message: '璇烽�夋嫨', trigger: 'change'}]">
+ <el-select v-model="formData.armyCar" >
+ <el-option label="鍏嶈垂" :value=0></el-option>
+ <el-option label="鏀惰垂" :value=1></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="璁¤垂寮�濮嬫椂闂�" prop="chargeStartTime1">
+ <el-date-picker type="date" placeholder="閫夋嫨鏃堕棿" v-model="formData.chargeStartTime1"></el-date-picker>
+ </el-form-item>
+ <el-form-item label="璁¤垂缁撴潫鏃堕棿" prop="chargeEndTime1">
+ <el-date-picker type="date" placeholder="閫夋嫨鏃堕棿" v-model="formData.chargeEndTime1"></el-date-picker>
+ </el-form-item>
+ <el-form-item label="姣忓皬鏃舵敹璐�(鍏�)" prop="cost1">
+ <el-input-number v-model="formData.cost1"></el-input-number>
+ </el-form-item>
+ <el-form-item label="灏侀《浠锋牸(鍏�)" prop="maxCost1">
+ <el-input-number v-model="formData.maxCost1"></el-input-number>
+ </el-form-item>
+
+ <el-form-item label="璁¤垂寮�濮嬫椂闂�2" prop="chargeStartTime2">
+ <el-date-picker type="date" placeholder="閫夋嫨鏃堕棿" v-model="formData.chargeStartTime2"></el-date-picker>
+ </el-form-item>
+ <el-form-item label="璁¤垂缁撴潫鏃堕棿2" prop="chargeEndTime2">
+ <el-date-picker type="date" placeholder="閫夋嫨鏃堕棿" v-model="formData.chargeEndTime2"></el-date-picker>
+ </el-form-item>
+ <el-form-item label="姣忓皬鏃舵敹璐�(鍏�)2" prop="cost2">
+ <el-input-number v-model="formData.cost2"></el-input-number>
+ </el-form-item>
+ <el-form-item label="灏侀《浠锋牸(鍏�)2" prop="maxCost2">
+ <el-input-number v-model="formData.maxCost2"></el-input-number>
+ </el-form-item>
+
+ <el-form-item label="璁¤垂寮�濮嬫椂闂�3" prop="chargeStartTime3">
+ <el-date-picker type="date" placeholder="閫夋嫨鏃堕棿" v-model="formData.chargeStartTime3"></el-date-picker>
+ </el-form-item>
+ <el-form-item label="璁¤垂缁撴潫鏃堕棿3" prop="chargeEndTime3">
+ <el-date-picker type="date" placeholder="閫夋嫨鏃堕棿" v-model="formData.chargeEndTime3"></el-date-picker>
+ </el-form-item>
+ <el-form-item label="姣忓皬鏃舵敹璐�(鍏�)3" prop="cost3">
+ <el-input-number v-model="formData.cost3"></el-input-number>
+ </el-form-item>
+ <el-form-item label="灏侀《浠锋牸(鍏�)3" prop="maxCost3">
+ <el-input-number v-model="formData.maxCost3"></el-input-number>
+ </el-form-item>
+
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="flag = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="onSave">纭� 瀹�</el-button>
+ </div>
+ </el-dialog>
+ </div>
+</template>
+
+<script>
+ export default {
+ name: "index",
+ data: function () {
+ return {
+ flag:false,
+ flag2:false,
+ searchForm: {
+ parkId: ''
+ },
+ pageData: this.$byutil.defaultPageData(),
+ formData: {
+ armyCar: 0,
+ chargeStartTime1: '',
+ chargeEndTime1: '',
+ cost1:'',
+ maxCost1:'',
+ chargeStartTime2: '',
+ chargeEndTime2: '',
+ cost2:'',
+ maxCost2:'',
+ chargeStartTime3: '',
+ chargeEndTime3: '',
+ cost3:'',
+ maxCost3:'',
+ parkId:null
+ },
+ urlPath:this.$systemconfig.basePath + '/rule/',
+ table1:[],
+ }
+ },
+ mounted() {
+ this.loadData();
+ this.$byutil.postData(this, this.$systemconfig.basePath+'/park/findAll', this.formData, res => {
+ this.table1 = res.data;
+ })
+ },
+ methods: {
+ onSave(){
+ this.$refs['formData'].validate((valid) => {
+ if (valid) {
+ this.$byutil.postData(this, this.urlPath+'save', this.formData, res => {
+ this.$refs['formData'].resetFields();
+ this.flag=false;
+ this.$message({message:'淇濆瓨鎴愬姛', type: 'success'});
+ this.loadData();
+ })
+ } else {
+ return false;
+ }
+ });
+ },
+ loadData() {
+ this.$byutil.loadPageData(this, this.urlPath+'findPage', this.searchForm);
+ },
+ onSearch() {
+ this.pageData = this.$byutil.defaultPageData();
+ this.loadData();
+ },
+ onAdd() {
+ this.flag=true;
+ this.$refs['formData'].resetFields();
+ this.formData = {
+ armyCar: 0,
+ chargeStartTime1: '',
+ chargeEndTime1: '',
+ cost1:'',
+ maxCost1:'',
+ chargeStartTime2: '',
+ chargeEndTime2: '',
+ cost2:'',
+ maxCost2:'',
+ chargeStartTime3: '',
+ chargeEndTime3: '',
+ cost3:'',
+ maxCost3:'',
+ parkId:null
+ }
+ },
+ onEdit(row) {
+ this.flag=true;
+ this.formData = row;
+ },
+ onDelete(row) {
+ this.$byutil.deleteData(this,this.urlPath+"delete",{id:row.id}, res => {
+ this.$message({message: '鍒犻櫎鎴愬姛', type: 'success'});
+ this.loadData();
+ })
+ },
+ onPageSizeChange(val) {
+ this.pageData.pageSize = val;
+ this.loadData();
+ },
+ onCurrentPageChange(val) {
+ this.pageData.page = val;
+ this.loadData();
+ },
+ }
+ }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/page/park/index.vue b/src/components/page/park/index.vue
index e78239a..5ad6bc8 100644
--- a/src/components/page/park/index.vue
+++ b/src/components/page/park/index.vue
@@ -96,7 +96,7 @@
this.$byutil.postData(this, this.urlPath+'save', this.formData, res => {
this.$refs['formData'].resetFields();
this.flag=false;
- this.$message({message: res.message, type: 'success'});
+ this.$message({message: '淇濆瓨鎴愬姛', type: 'success'});
this.loadData();
})
} else {
@@ -127,7 +127,7 @@
},
onDelete(index, row) {
this.$byutil.deleteData(this,this.urlPath+"delete",{id:row.id}, res => {
- this.$message({message: res.message, type: 'success'});
+ this.$message({message: '鍒犻櫎鎴愬姛', type: 'success'});
this.loadData();
})
},
@@ -150,4 +150,4 @@
<style scoped>
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/page/park/index2.vue b/src/components/page/park/index2.vue
index 9c1159f..7ce2bb3 100644
--- a/src/components/page/park/index2.vue
+++ b/src/components/page/park/index2.vue
@@ -15,8 +15,8 @@
<el-table :data="pageData.rows" v-loading="pageData.isLoading" border style="width:100%;margin-left: 3px;border:1px solid #bcbec2;margin-right: 5px;">
<el-table-column type="index" width="50" label="搴忓彿" align="center"> </el-table-column>
<el-table-column prop="name" label="鍚嶇О" align="center"></el-table-column>
- <el-table-column prop="code" label="缂栧彿" align="center"></el-table-column>
- <el-table-column prop="code2" label="鏀粯缂栧彿" align="center"></el-table-column>
+ <el-table-column prop="code" label="璁惧搴忓垪鍙�" align="center"></el-table-column>
+ <el-table-column prop="code2" label="閬撻椄缂栧彿" align="center"></el-table-column>
<el-table-column prop="status" label="杩炴帴鐘跺喌" align="center">
<template slot-scope="scope">
<p v-if="scope.row.status==0">姝ｅ父</p>
@@ -43,12 +43,18 @@
<el-form-item label="閬撻椄鍚嶇О" prop="name" :rules="[{required: true, message: '璇疯緭鍏ラ亾闂稿悕绉�', trigger: 'blur'}]">
<el-input v-model="formData.name"></el-input>
</el-form-item>
- <el-form-item label="閬撻椄缂栧彿" prop="code" :rules="[{required: true, message: '璇疯緭鍏ラ亾闂哥紪鍙�', trigger: 'blur'}]">
+ <el-form-item label="璁惧搴忓垪鍙�" prop="code" :rules="[{required: true, message: '璇疯緭鍏ヨ澶囧簭鍒楀彿', trigger: 'blur'}]">
<el-input v-model="formData.code"></el-input>
</el-form-item>
- <el-form-item label="鏀粯缂栧彿" prop="code2" :rules="[{required: true, message: '璇疯緭鍏ユ敮浠樼紪鍙�', trigger: 'blur'}]">
+ <el-form-item label="閬撻椄缂栧彿" prop="code2" :rules="[{required: true, message: '璇疯緭鍏ラ亾闂哥紪鍙�', trigger: 'blur'}]">
<el-input v-model="formData.code2"></el-input>
</el-form-item>
+ <el-form-item label="璁惧ip" prop="ipAddress" :rules="[{required: true, message: '璇疯緭鍏p鍦板潃', trigger: 'blur'}]">
+ <el-input v-model="formData.ipAddress"></el-input>
+ </el-form-item>
+ <el-form-item label="璁惧绔彛鍙�" prop="port" :rules="[{required: true, message: '璇疯緭鍏ョ鍙ｅ彿', trigger: 'blur'}]">
+ <el-input type="number" v-model="formData.port"></el-input>
+ </el-form-item>
<el-form-item label="鏂逛綅" prop="type" :rules="[{required: true, message: '璇烽�夋嫨鏂逛綅', trigger: 'blur'}]">
<el-select v-model="formData.type">
<el-option label="鍑�" :value=0></el-option>
@@ -80,7 +86,9 @@
name: '',
parkId: null,
type: '',
- code:""
+ code:"",
+ ipAddress:'',
+ port:'',
},
urlPath:this.$systemconfig.basePath + '/barrier/',
}
@@ -101,7 +109,7 @@
this.$byutil.postData(this, this.urlPath+'save', this.formData, res => {
this.$refs['formData'].resetFields();
this.flag=false;
- this.$message({message: res.message, type: 'success'});
+ this.$message({message: '淇濆瓨鎴愬姛', type: 'success'});
this.loadData();
})
} else {
@@ -124,7 +132,9 @@
name: '',
parkId: null,
type: '',
- code:''
+ code:'',
+ ipAddress: '',
+ port: '',
}
},
onEdit(index, row) {
@@ -133,7 +143,7 @@
},
onDelete(index, row) {
this.$byutil.deleteData(this,this.urlPath+"delete",{id:row.id}, res => {
- this.$message({message: res.message, type: 'success'});
+ this.$message({message: '鍒犻櫎鎴愬姛', type: 'success'});
this.loadData();
})
},
@@ -155,4 +165,4 @@
<style scoped>
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/page/street/index.vue b/src/components/page/street/index.vue
index e64c732..230c2ce 100644
--- a/src/components/page/street/index.vue
+++ b/src/components/page/street/index.vue
@@ -39,7 +39,7 @@
<el-dialog title="琛楅亾绠＄悊" :visible.sync="flag" width="40%">
<el-form :model="formData" ref="formData" label-width="100px">
- <el-form-item label="璧板悜" prop="code">
+ <el-form-item label="灞炴��" prop="code">
<el-select v-model="formData.type" placeholder="璇烽�夋嫨">
<el-option label="璺�" :value="0"></el-option>
<el-option label="琛�" :value="1"></el-option>
@@ -49,7 +49,7 @@
<el-input v-model="formData.name" auto-complete="off"></el-input>
</el-form-item>
<el-form-item label="缂栧彿" prop="code" :rules="[{required: true, message: '璇疯緭鍏ョ紪鍙�', trigger: 'blur'}]">
- <el-input type="number" v-model="formData.code" auto-complete="off"></el-input>
+ <el-input v-model="formData.code"></el-input>
</el-form-item>
</el-form>
@@ -67,7 +67,7 @@
<el-table-column type="index" width="50" label="搴忓彿" align="center"> </el-table-column>
<el-table-column prop="name" label="琛楅亾鍚嶇О" align="center"></el-table-column>
<el-table-column prop="code" label="缂栧彿" align="center"></el-table-column>
- <el-table-column prop="type" label="璧板悜" align="center">
+ <el-table-column prop="type" label="灞炴��" align="center">
<template slot-scope="scope">
<p v-if="scope.row.type==0">璺�</p>
<p v-if="scope.row.type==1">琛�</p>
@@ -150,14 +150,14 @@
},
loadSelect(){
this.$byutil.postData(this, this.$systemconfig.basePath + '/street/findList', {}, res => {
- this.select3 = res.obj.list2
+ this.select3 = res.data.list2
})
},
streetEdit(id){
this.flag2 = true;
this.roadId = id;
this.$byutil.postData(this, this.$systemconfig.basePath + '/street/findById', {id:id,type:0}, res => {
- this.table2 = res.obj;
+ this.table2 = res.data;
})
},
onSave(){
@@ -166,7 +166,7 @@
this.$byutil.postData(this, this.$systemconfig.basePath + '/street/save', this.formData, res => {
this.$refs['formData'].resetFields();
this.flag=false;
- this.$message({message: res.message, type: 'success'});
+ this.$message({message: '淇濆瓨鎴愬姛', type: 'success'});
this.loadData();
this.loadSelect();
})
@@ -197,13 +197,13 @@
},
onDelete(index, row) {
this.$byutil.deleteData(this,this.$systemconfig.basePath+"/street/delete",{id:row.id}, res => {
- this.$message({message: res.message, type: 'success'});
+ this.$message({message: '鍒犻櫎鎴愬姛', type: 'success'});
this.loadData();
})
},
onDelete2(index, row) {
this.$byutil.deleteData(this,this.$systemconfig.basePath+"/street/delete2",{id:row.id}, res => {
- this.$message({message: res.message, type: 'success'});
+ this.$message({message: '鍒犻櫎鎴愬姛', type: 'success'});
this.streetEdit(this.roadId)
})
},
@@ -221,4 +221,4 @@
<style scoped>
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/page/user/index.vue b/src/components/page/user/index.vue
index ad5645d..55bbea8 100644
--- a/src/components/page/user/index.vue
+++ b/src/components/page/user/index.vue
@@ -3,7 +3,7 @@
<div style="padding: 10px 10px 0px 10px;">
<el-form :inline="true" :model="searchForm">
<el-form-item label="鍚嶇О">
- <el-input v-model="searchForm.name"></el-input>
+ <el-input v-model="searchForm.name" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" size="small" @click="onSearch" icon="el-icon-search">鏌ヨ</el-button>
@@ -102,7 +102,7 @@
this.$byutil.postData(this, this.$systemconfig.basePath + '/user/save', this.formData, res => {
this.$refs['formData'].resetFields();
this.flag=false;
- this.$message({message: res.message, type: 'success'});
+ this.$message({message: '淇濆瓨鎴愬姛', type: 'success'});
this.loadData();
})
} else {
@@ -115,7 +115,7 @@
},
getParkList(){
this.$byutil.postData(this, this.$systemconfig.basePath + '/park/findAll',null,res => {
- this.parkList = res.obj
+ this.parkList = res.data.data
});
},
onSearch() {
@@ -135,20 +135,24 @@
}
},
onEdit(index, row) {
+ this.parkIds = []
this.getParkList()
this.flag=true;
this.formData = row;
- let ids = this.formData.parkIds.split(",")
- let resList = [];
- ids.forEach(item => {
- resList.push(Number(item))
- })
- this.parkIds = resList;
+ let ids = null
+ if(this.formData.parkIds){
+ ids=this.formData.parkIds.split(",")
+ let resList = [];
+ ids.forEach(item => {
+ resList.push(Number(item))
+ })
+ this.parkIds = resList;
+ }
console.log(this.parkIds)
},
onDelete(index, row) {
this.$byutil.deleteData(this,this.$systemconfig.basePath+"/user/delete",{id:row.id}, res => {
- this.$message({message: res.message, type: 'success'});
+ this.$message({message: '鍒犻櫎鎴愬姛', type: 'success'});
this.loadData();
})
},
@@ -166,4 +170,4 @@
<style scoped>
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/page/violationType/index.vue b/src/components/page/violationType/index.vue
index f865d0c..6e7c4aa 100644
--- a/src/components/page/violationType/index.vue
+++ b/src/components/page/violationType/index.vue
@@ -83,7 +83,7 @@
this.$byutil.postData(this, this.urlPath+'save', this.formData, res => {
this.$refs['formData'].resetFields();
this.flag=false;
- this.$message({message: res.message, type: 'success'});
+ this.$message({message: '淇濆瓨鎴愬姛', type: 'success'});
this.loadData();
})
} else {
@@ -114,7 +114,7 @@
},
onDelete(index, row) {
this.$byutil.deleteData(this,this.urlPath+"delete",{id:row.id}, res => {
- this.$message({message: res.message, type: 'success'});
+ this.$message({message: '鍒犻櫎鎴愬姛', type: 'success'});
this.loadData();
})
},
@@ -132,4 +132,4 @@
<style scoped>
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/page/whiteList/index.vue b/src/components/page/whiteList/index.vue
index 3299801..b108f5e 100644
--- a/src/components/page/whiteList/index.vue
+++ b/src/components/page/whiteList/index.vue
@@ -89,7 +89,7 @@
mounted() {
this.loadData();
this.$byutil.postData(this, this.$systemconfig.basePath+'/park/findAll', this.formData, res => {
- this.table1 = res.obj;
+ this.table1 = res.data;
})
},
methods: {
@@ -106,7 +106,7 @@
this.$byutil.postData(this, this.urlPath+'save', this.formData, res => {
this.$refs['formData'].resetFields();
this.flag=false;
- this.$message({message: res.message, type: 'success'});
+ this.$message({message:'淇濆瓨鎴愬姛', type: 'success'});
this.loadData();
})
} else {
@@ -123,6 +123,7 @@
},
onAdd() {
this.flag=true;
+ this.flag2=false;
this.$refs['formData'].resetFields();
this.formData = {
carNo: '',
@@ -141,7 +142,7 @@
},
onDelete(row) {
this.$byutil.deleteData(this,this.urlPath+"delete",{id:row.id}, res => {
- this.$message({message: res.message, type: 'success'});
+ this.$message({message: '鍒犻櫎鎴愬姛', type: 'success'});
this.loadData();
})
},
@@ -159,4 +160,4 @@
<style scoped>
-</style>
\ No newline at end of file
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index b092ff5..32d185b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -48,6 +48,11 @@
component: resolve => require(['../components/page/street/index.vue'], resolve),
meta: { title: '缃氬崟绠＄悊' }
},
+ {
+ path: '/costRule',
+ component: resolve => require(['../components/page/costRule/index.vue'], resolve),
+ meta: { title: '鏀惰垂瑙勫垯绠＄悊' }
+ },
]
},
{
--
Gitblit v1.9.1