Commit 3a86fa2d authored by zhangdong's avatar zhangdong

捷安菜后台样式

parent 01a8e223
...@@ -22,7 +22,7 @@ a { ...@@ -22,7 +22,7 @@ a {
.content-box { .content-box {
min-width: 1200px; min-width: 1400px;
/* width:1670px; */ /* width:1670px; */
position: absolute; position: absolute;
left: 250px; left: 250px;
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
:index="subItem.index" :index="subItem.index"
:key="subItem.index" :key="subItem.index"
> >
<template slot="title">{{ subItem.label }}</template> <template slot="title" >{{ subItem.label }}</template>
<el-menu-item <el-menu-item
v-for="(threeItem,i) in subItem.children" v-for="(threeItem,i) in subItem.children"
:key="i" :key="i"
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
v-else v-else
:index="subItem.index" :index="subItem.index"
:key="subItem.index" :key="subItem.index"
style="font-size:12px"
>{{ subItem.label }}</el-menu-item> >{{ subItem.label }}</el-menu-item>
</template> </template>
</el-submenu> </el-submenu>
......
<template> <template>
<div class="data-table"> <div class="data-table">
<!--面包 --> <!--面包 -->
<el-breadcrumb v-if="breads.length>0" separator="/" style="margin-bottom:30px"> <el-breadcrumb v-if="breads.length > 0" separator="/" style="margin-bottom: 30px">
<el-breadcrumb-item v-for="(item,index) in breads" :key="index">{{ item }}</el-breadcrumb-item> <el-breadcrumb-item v-for="(item, index) in breads" :key="index">{{ item }}</el-breadcrumb-item>
</el-breadcrumb> </el-breadcrumb>
<!--条件查询 --> <!--条件查询 -->
<el-form ref="checkData" :size="size" :label-width="labelWidth" :model="objInput" inline> <el-form ref="checkData" :size="size" :label-width="labelWidth" :model="objInput" inline>
<el-form-item v-for="(item,index) in checklist" :label="item.title" :key="index" :prop="item.model"> <el-form-item v-for="(item, index) in checklist" :label="item.title" :key="index" :prop="item.model">
<!-- 输入框 --> <!-- 输入框 -->
<el-input v-if="item.type==='input'" v-model.trim="objInput[item.model]" :size="size" :style="{width: item.width}" :disabled="item.disabled" placeholder="请输入" clearable maxlength="30"></el-input> <el-input
<!-- 下拉框 --> v-if="item.type === 'input'"
<el-select v-if="item.type==='select'" v-model="objInput[item.model]" :style="{width: item.width}" :size="size" placeholder="请选择" clearable @change="item.change(checklist[item.prop])"> v-model.trim="objInput[item.model]"
<el-option v-for="op in item.selectlist" :label="op.label" :value="op.value" :key="op.value"></el-option> :size="size"
</el-select> :style="{ width: item.width }"
<!-- 时间范围选择器 --> :disabled="item.disabled"
<el-date-picker placeholder="请输入"
v-if="item.type=='timeRange'" clearable
v-model="objInput[item.model]" maxlength="30"
type="daterange" ></el-input>
range-separator="至" <!-- 下拉框 -->
start-placeholder="开始日期" <el-select
end-placeholder="结束日期"> v-if="item.type === 'select'"
</el-date-picker> v-model="objInput[item.model]"
</el-form-item> :style="{ width: item.width }"
<div v-if="checklist.length>0" class="checklist-button"> :size="size"
<el-button type="primary" @click="query">查询</el-button> placeholder="请选择"
<el-button @click="rest('checkData')">重置</el-button> clearable
<slot name="moreButton"></slot> @change="item.change(checklist[item.prop])"
</div> >
</el-form> <el-option v-for="op in item.selectlist" :label="op.label" :value="op.value" :key="op.value"></el-option>
<!-- 表格 --> </el-select>
<el-table :data="tableData" :style="{marginTop: tableTop + 'px'}" border style="width:100%" @selection-change="handleSelectionChange"> <!-- 时间范围选择器 -->
<el-table-column <el-date-picker
v-if="isIndex" v-if="item.type == 'timeRange'"
type="index" v-model="objInput[item.model]"
width="100" type="daterange"
label="序号" range-separator="至"
align="center"> start-placeholder="开始日期"
</el-table-column> end-placeholder="结束日期"
<template v-for="(col, index) in columns"> >
<!-- check --> </el-date-picker>
<el-table-column v-if="col.selection" :key="index" align="left" type="selection" width="100"></el-table-column> </el-form-item>
<!-- 操作列/自定义列 --> <div v-if="checklist.length > 0" class="checklist-button">
<slot v-else-if="col.slot" :name="col.slot"></slot> <el-button type="primary" @click="query">查询</el-button>
<!-- 普通列 --> <el-button @click="rest('checkData')">重置</el-button>
<el-table-column <slot name="moreButton"></slot>
v-else </div>
:key="index" </el-form>
:prop="col.prop" <!-- 表格 -->
:label="col.label" <el-table
:width="col.width" :data="tableData"
:formatter="col.formatter" :style="{ marginTop: tableTop + 'px' }"
:sortable="col.sortable" border
align="center"> style="width: 100%"
</el-table-column> @selection-change="handleSelectionChange"
</template> >
</el-table> <el-table-column v-if="isIndex" type="index" width="100" label="序号" align="center"> </el-table-column>
<!-- 分页 --> <template v-for="(col, index) in columns">
<div v-if="isPageobj" :style="{ marginBottom: marginBottom + 'px', marginTop: marginTop + 'px' }" class="flex-center" > <!-- check -->
<el-pagination <el-table-column v-if="col.selection" :key="index" align="left" type="selection" width="100"></el-table-column>
:current-page="pageObj.currentPage" <!-- 操作列/自定义列 -->
:page-sizes="sizes" <slot v-else-if="col.slot" :name="col.slot"></slot>
:page-size="pageObj.size" <!-- 普通列 -->
:total="total" <el-table-column
layout="total, sizes, prev, pager, next, jumper" v-else
@size-change="handleSizeChange" :key="index"
@current-change="handleCurrentChange"> :prop="col.prop"
</el-pagination> :label="col.label"
:width="col.width"
:formatter="col.formatter"
:sortable="col.sortable"
align="center"
>
</el-table-column>
</template>
</el-table>
<!-- 分页 -->
<div v-if="isPageobj" :style="{ marginBottom: marginBottom + 'px', marginTop: marginTop + 'px' }" class="flex-center">
<el-pagination
:current-page="pageObj.currentPage"
:page-sizes="sizes"
:page-size="pageObj.size"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
>
</el-pagination>
</div>
</div> </div>
</div>
</template> </template>
<script> <script>
import {getTime1} from '@utils/time' import { getTime1 } from '@utils/time';
import { getList } from '@api/common/list' import { getList } from '@api/common/list';
export default { export default {
name: 'dataTable', name: 'dataTable',
props: { props: {
isIndex: { isIndex: {
type: Boolean, type: Boolean,
default: false default: false
}, },
isPageobj: { isPageobj: {
type: Boolean, type: Boolean,
default: true default: true
}, },
labelWidth: { size: {
type: String, type: String,
default: '100px' default: 'medium'
}, },
size: { // tableData: {
type: String, // type: Array,
default: 'medium' // default() {
}, // return []
// tableData: { // }
// type: Array, // },
// default() { columns: {
// return [] type: Array,
// } default() {
// }, return [];
columns: { }
type: Array, },
default() { sizes: {
return [] type: Array,
} default() {
}, return [10, 15, 20];
sizes: { }
type: Array, },
default() { pageObj: {
return [10, 15, 20] type: Object,
} default() {
}, return {};
pageObj: { }
type: Object, },
default() { breads: {
return {} type: Array,
} default() {
}, return [];
breads: { }
type: Array, },
default() { checklist: {
return [] type: Array,
} default() {
}, return [];
checklist: { }
type: Array, },
default() { tableTop: {
return [] type: Number,
} default: 0
}, },
tableTop: { marginTop: {
type: Number, type: Number,
default: 0 default: 200
}, },
marginTop: { marginBottom: {
type: Number, type: Number,
default: 200 default: 100
}, },
marginBottom: { url: {
type: Number, type: String,
default: 100 default: ''
},
url: {
type: String,
default: ''
}
},
data() {
return {
objInput: {},
ceshi: {},
tableData: [],
total: 1
}
},
created() {
console.log("分页")
if (this.checklist.length > 0) {
const obj = {}
this.checklist.forEach((item) => {
obj[item.model] = ''
})
this.objInput = obj
}
this.getauditList()
},
//
methods: {
async getauditList() {
let pageObj = this.pageObj
let url = this.url
const { code, data, total } = await getList(pageObj, url)
if (code === 200) {
for(let item of data){
if(item.endTime){
item.end=getTime1(item.endTime)
}
} }
this.tableData = data
this.total = total
}
},
// async list(pageObj) {
// let url = this.url
// const { code, data } = await getList(pageObj, url)
// if (code === 200) {
// for(let item of data){
// item.createTime=getTime1(item.createTime)
// item.endTime=getTime1(item.endTime)
// }
// this.tableData = data
// this.total = total
// }
// },
handleSizeChange(val) {
let pageObj = this.pageObj
pageObj.size = val
this.getauditList(pageObj)
console.log(`每页 ${val} 条`)
},
handleCurrentChange(val) {
let pageObj = this.pageObj
pageObj.currentPage = val
this.getauditList(pageObj)
console.log(`当前页: ${val}`)
}, },
// 查询 data() {
query() { return {
let message=this.objInput; objInput: {},
this.pageObj.currentPage=1 ceshi: {},
Object.assign(message,this.pageObj) tableData: [],
this.pageObj=message total: 1,
this.getauditList() labelWidth:''
};
}, },
// check选择id created() {
handleSelectionChange(val) { if (this.checklist.length > 0) {
this.$emit('sendSelection', val) let length =this.checklist[0].title.length ;
}, this.labelWidth=length*25+""
// 重置 const obj = {};
rest(data) { this.checklist.forEach((item) => {
this.$refs[data].resetFields() obj[item.model] = '';
this.pageObj.currentPage=1 });
this.pageObj.size=10 this.objInput = obj;
this.getauditList(this.pageObj); }
}, this.getauditList();
handlerelease() {
console.log('1')
}, },
indexMethod(index) { //
return index + 1 methods: {
async getauditList() {
let pageObj = this.pageObj;
let url = this.url;
const { code, data, total } = await getList(pageObj, url);
if (code === 200) {
for (let item of data) {
if (item.endTime) {
item.end = getTime1(item.endTime);
}
}
this.tableData = data;
this.total = total;
}
},
// async list(pageObj) {
// let url = this.url
// const { code, data } = await getList(pageObj, url)
// if (code === 200) {
// for(let item of data){
// item.createTime=getTime1(item.createTime)
// item.endTime=getTime1(item.endTime)
// }
// this.tableData = data
// this.total = total
// }
// },
handleSizeChange(val) {
let pageObj = this.pageObj;
pageObj.size = val;
this.getauditList(pageObj);
console.log(`每页 ${val} 条`);
},
handleCurrentChange(val) {
let pageObj = this.pageObj;
pageObj.currentPage = val;
this.getauditList(pageObj);
console.log(`当前页: ${val}`);
},
// 查询
query() {
let message = this.objInput;
this.pageObj.currentPage = 1;
Object.assign(message, this.pageObj);
this.pageObj = message;
this.getauditList();
},
// check选择id
handleSelectionChange(val) {
this.$emit('sendSelection', val);
},
// 重置
rest(data) {
this.$refs[data].resetFields();
this.pageObj.currentPage = 1;
this.pageObj.size = 10;
this.getauditList(this.pageObj);
},
handlerelease() {
console.log('1');
},
indexMethod(index) {
return index + 1;
}
} }
} };
}
</script> </script>
<style scoped> <style scoped>
.check { .check {
flex-wrap: wrap; flex-wrap: wrap;
} }
.check>div { .check > div {
margin-right: 50px; margin-right: 50px;
margin-bottom: 20px; margin-bottom: 20px;
} }
.check { .check {
margin-bottom: 30px margin-bottom: 30px;
} }
.checklist-button{ .checklist-button {
display: inline-block; margin-left: 50px;
margin-left: 50px; margin-bottom: 30px;
margin-bottom:30px float: right;
} }
</style> </style>
...@@ -68,10 +68,6 @@ export default { ...@@ -68,10 +68,6 @@ export default {
type: Boolean, type: Boolean,
default: false default: false
}, },
labelWidth: {
type: String,
default: '100px'
},
size: { size: {
type: String, type: String,
default: 'medium' default: 'medium'
...@@ -126,11 +122,14 @@ export default { ...@@ -126,11 +122,14 @@ export default {
data() { data() {
return { return {
objInput: {}, objInput: {},
ceshi: {} ceshi: {},
labelWidth:""
} }
}, },
created() { created() {
if (this.checklist.length > 0) { if (this.checklist.length > 0) {
let length =Number(this.checklist[0].title.length) ;
this.labelWidth=length*25+""
const obj = {} const obj = {}
this.checklist.forEach((item) => { this.checklist.forEach((item) => {
obj[item.model] = '' obj[item.model] = ''
......
<template> <template>
<div class="data-table"> <div class="data-table">
<!--面包 --> <!--面包 -->
<el-breadcrumb v-if="breads.length>0" separator="/" style="margin-bottom:30px"> <el-breadcrumb v-if="breads.length > 0" separator="/" style="margin-bottom: 30px">
<el-breadcrumb-item v-for="(item,index) in breads" :key="index">{{ item }}</el-breadcrumb-item> <el-breadcrumb-item v-for="(item, index) in breads" :key="index">{{ item }}</el-breadcrumb-item>
</el-breadcrumb> </el-breadcrumb>
<!--条件查询 --> <!--条件查询 -->
<el-form ref="checkData" :size="size" :label-width="labelWidth" :model="objInput" inline> <el-form ref="checkData" :size="size" :label-width="labelWidth" :model="objInput" inline>
<el-form-item v-for="(item,index) in checklist" :label="item.title" :key="index" :prop="item.model"> <el-form-item v-for="(item, index) in checklist" :label="item.title" :key="index" :prop="item.model">
<!-- 输入框 --> <!-- 输入框 -->
<el-input v-if="item.type==='input'" v-model.trim="objInput[item.model]" :size="size" :style="{width: item.width}" :disabled="item.disabled" placeholder="请输入" clearable maxlength="30"></el-input> <el-input
<!-- 下拉框 --> v-if="item.type === 'input'"
<el-select v-if="item.type==='select'" v-model="objInput[item.model]" :style="{width: item.width}" :size="size" placeholder="请选择" clearable @change="item.change(checklist[item.prop])"> v-model.trim="objInput[item.model]"
<el-option v-for="op in item.selectlist" :label="op.label" :value="op.id" :key="op.id"></el-option> :size="size"
</el-select> :style="{ width: item.width }"
<!-- 时间范围选择器 --> :disabled="item.disabled"
<el-date-picker placeholder="请输入"
v-if="item.type=='timeRange'" clearable
v-model="objInput[item.model]" maxlength="30"
type="daterange" ></el-input>
range-separator="至" <!-- 下拉框 -->
start-placeholder="开始日期" <el-select
end-placeholder="结束日期"> v-if="item.type === 'select'"
</el-date-picker> v-model="objInput[item.model]"
</el-form-item> :style="{ width: item.width }"
<div v-if="checklist.length>0" class="checklist-button"> :size="size"
<el-button type="primary" @click="query">查询</el-button> placeholder="请选择"
<el-button @click="rest('checkData')">重置</el-button> clearable
<slot name="moreButton"></slot> @change="item.change(checklist[item.prop])"
</div> >
</el-form> <el-option v-for="op in item.selectlist" :label="op.label" :value="op.id" :key="op.id"></el-option>
<!-- 表格 --> </el-select>
<el-table :data="tableData" :style="{marginTop: tableTop + 'px'}" border style="width:100%" @selection-change="handleSelectionChange"> <!-- 时间范围选择器 -->
<el-table-column <el-date-picker
v-if="isIndex" v-if="item.type == 'timeRange'"
type="index" v-model="objInput[item.model]"
width="100" type="daterange"
label="序号" range-separator="至"
align="center"> start-placeholder="开始日期"
</el-table-column> end-placeholder="结束日期"
<template v-for="(col, index) in columns"> >
<!-- check --> </el-date-picker>
<el-table-column v-if="col.selection" :key="index" align="left" type="selection" width="100"></el-table-column> </el-form-item>
<!-- 操作列/自定义列 --> <div v-if="checklist.length > 0" class="checklist-button">
<slot v-else-if="col.slot" :name="col.slot"></slot> <el-button type="primary" @click="query">查询</el-button>
<!-- 普通列 --> <el-button @click="rest('checkData')">重置</el-button>
<el-table-column <slot name="moreButton"></slot>
v-else </div>
:key="index" </el-form>
:prop="col.prop" <!-- 表格 -->
:label="col.label" <el-table
:width="col.width" :data="tableData"
:formatter="col.formatter" :style="{ marginTop: tableTop + 'px' }"
:sortable="col.sortable" border
align="center"> style="width: 100%"
</el-table-column> @selection-change="handleSelectionChange"
</template> >
</el-table> <el-table-column v-if="isIndex" type="index" width="100" label="序号" align="center"> </el-table-column>
</div> <template v-for="(col, index) in columns">
<!-- check -->
<el-table-column v-if="col.selection" :key="index" align="left" type="selection" width="100"></el-table-column>
<!-- 操作列/自定义列 -->
<slot v-else-if="col.slot" :name="col.slot"></slot>
<!-- 普通列 -->
<el-table-column
v-else
:key="index"
:prop="col.prop"
:label="col.label"
:width="col.width"
:formatter="col.formatter"
:sortable="col.sortable"
align="center"
>
</el-table-column>
</template>
</el-table>
</div>
</template> </template>
<script> <script>
import { queryList } from '@api/common/list' import { queryList } from '@api/common/list';
export default { export default {
name: 'dataTable', name: 'dataTable',
props: { props: {
isIndex: { isIndex: {
type: Boolean, type: Boolean,
default: false default: false
},
size: {
type: String,
default: 'medium'
},
// tableData: {
// type: Array,
// default() {
// return []
// }
// },
columns: {
type: Array,
default() {
return [];
}
},
breads: {
type: Array,
default() {
return [];
}
},
checklist: {
type: Array,
default() {
return [];
}
},
tableTop: {
type: Number,
default: 0
},
marginTop: {
type: Number,
default: 200
},
marginBottom: {
type: Number,
default: 100
},
url: {
type: String,
default: ''
},
sendData: {
type: Object,
default() {
return {};
}
}
}, },
labelWidth: { data() {
type: String, return {
default: '100px' objInput: {},
ceshi: {},
tableData: [],
labelWidth: ''
};
}, },
size: { created() {
type: String, if (this.checklist.length > 0) {
default: 'medium' let length = Number(this.checklist[0].title.length);
this.labelWidth=length*25+""
const obj = {};
this.checklist.forEach((item) => {
obj[item.model] = '';
});
this.objInput = obj;
}
this.getqueryList();
}, },
// tableData: { //
// type: Array, methods: {
// default() { // 查询
// return [] query() {
// } this.getqueryList();
// }, },
columns: { // check选择id
type: Array, handleSelectionChange(val) {
default() { this.$emit('sendSelection', val);
return [] },
} // 重置
}, rest(data) {
breads: { this.$refs[data].resetFields();
type: Array, this.getqueryList();
default() { },
return [] //
} async getqueryList() {
}, try {
checklist: { let message = {};
type: Array, let sendData = this.sendData;
default() { Object.assign(sendData, this.objInput);
return [] const { data, code } = await queryList(sendData, this.url);
} if (code === 200) {
}, console.log(data);
tableTop: { this.tableData = data;
type: Number, }
default: 0 } catch (e) {
}, console.log(e);
marginTop: { }
type: Number, }
default: 200
},
marginBottom: {
type: Number,
default: 100
},
url: {
type: String,
default: ''
},
sendData:{
type: Object,
default() {
return {}
}
}
},
data() {
return {
objInput: {},
ceshi: {},
tableData:[]
} }
}, };
created() {
if (this.checklist.length > 0) {
const obj = {}
this.checklist.forEach((item) => {
obj[item.model] = ''
})
this.objInput = obj
};
this.getqueryList();
},
//
methods: {
// 查询
query() {
this.getqueryList();
},
// check选择id
handleSelectionChange(val) {
this.$emit('sendSelection', val)
},
// 重置
rest(data) {
this.$refs[data].resetFields()
this.getqueryList();
},
//
async getqueryList() {
try {
let message={};
let sendData=this.sendData
Object.assign(sendData,this.objInput)
const {
data,
code
} = await queryList(sendData,this.url)
if (code === 200) {
console.log(data);
this.tableData = data
}
} catch (e) {
console.log(e)
}
}
}
}
</script> </script>
<style scoped> <style scoped>
.check { .check {
flex-wrap: wrap; flex-wrap: wrap;
} }
.check>div { .check > div {
margin-right: 50px; margin-right: 50px;
margin-bottom: 20px; margin-bottom: 20px;
} }
.check { .check {
margin-bottom: 30px margin-bottom: 30px;
} }
.checklist-button{ .checklist-button {
display: inline-block; display: inline-block;
margin-left: 50px; margin-left: 50px;
margin-bottom:30px margin-bottom: 30px;
} }
</style> </style>
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div> <div>
<div class="content"> <div class="content">
<dataTable :columns="columns" :page-obj="pageObj" :breads="breads" :checklist="checklist" url="/tender-project/list"> <dataTable :columns="columns" :page-obj="pageObj" :breads="breads" :checklist="checklist" url="/tender-project/list">
<el-button slot="moreButton" type="primary" style="margin-left: 50px;" @click="handlerelease">发布项目</el-button> <el-button slot="moreButton" type="primary" @click="handlerelease">发布项目</el-button>
<el-table-column slot="operate" label="项目类型" align="center" fixed="right" width="100"> <el-table-column slot="operate" label="项目类型" align="center" fixed="right" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.bidType==0">公开招标</div> <div v-if="scope.row.bidType==0">公开招标</div>
......
<template> <template>
<div> <div>
<div class="content"> <div class="content">
<dataBreadcrumb :breads="breads"></dataBreadcrumb> <dataBreadcrumb :breads="breads" :breadbottom="0"></dataBreadcrumb>
<el-button type="primary" @click="add">创建新的角色</el-button> <el-button type="primary" @click="add" class="add">创建新的角色</el-button>
<dataTable :table-data="tableData" :columns="columns" :is-pageobj="false" :tableTop="30"> <dataTable :table-data="tableData" :columns="columns" :is-pageobj="false" :tableTop="50">
<el-table-column slot="operate" label="操作" align="center" fixed="right"> <el-table-column slot="operate" label="操作" align="center" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click="see(scope.row)">查看</el-button> <el-button type="text" size="small" @click="see(scope.row)">查看</el-button>
<el-button type="text" size="small" @click="handdelete(scope.row)" v-if="scope.row.roleId!==1">删除</el-button> <el-button type="text" size="small" @click="handdelete(scope.row)" v-if="scope.row.roleId !== 1">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</dataTable> </dataTable>
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</template> </template>
<script> <script>
import { roleList,roledelete } from '@api/purchaser/organization'; import { roleList, roledelete } from '@api/purchaser/organization';
import dataTable from '@components/nopageTable.vue'; import dataTable from '@components/nopageTable.vue';
import dataBreadcrumb from '@components/dataBreadcrumb.vue'; import dataBreadcrumb from '@components/dataBreadcrumb.vue';
export default { export default {
...@@ -73,7 +73,7 @@ export default { ...@@ -73,7 +73,7 @@ export default {
console.log(e); console.log(e);
} }
}, },
see(row) { see(row) {
this.$router.push(`/purchaser/organization/jurisdictionSee?id=${row.roleId}`); this.$router.push(`/purchaser/organization/jurisdictionSee?id=${row.roleId}`);
}, },
add() { add() {
...@@ -97,4 +97,10 @@ export default { ...@@ -97,4 +97,10 @@ export default {
</script> </script>
<style scoped> <style scoped>
.add{
position: absolute;
top:10px;
left:180px;
}
</style> </style>
...@@ -15,7 +15,13 @@ ...@@ -15,7 +15,13 @@
</li> </li>
</ul> </ul>
<h2>项目信息</h2> <h2>项目信息</h2>
<dataTable :table-data="tabledata" :columns="columns"> </dataTable> <dataTable :table-data="tabledata" :columns="columns">
<el-table-column slot="operate" label="当前状态" align="left" width="500">
<template slot-scope="scope">
<div>{{ scope.row.state }}</div>
</template>
</el-table-column>
</dataTable>
<!-- <h2 class="se-h2">待办事项</h2> <!-- <h2 class="se-h2">待办事项</h2>
<ul class="project-list flex"> <ul class="project-list flex">
<li v-for="item in projectlist" :key="item.id"> <li v-for="item in projectlist" :key="item.id">
...@@ -133,15 +139,14 @@ export default { ...@@ -133,15 +139,14 @@ export default {
//表格第一行 //表格第一行
columns: [ columns: [
{ {
label: '当前状态', selection: true
prop: 'state'
}, },
{ {
label: '数量', slot: 'operate'
prop: 'number'
}, },
{ {
slot: 'opration' label: '数量',
prop: 'number'
} }
], ],
tabledata: [ tabledata: [
...@@ -217,16 +222,16 @@ export default { ...@@ -217,16 +222,16 @@ export default {
} }
.user-list > li { .user-list > li {
margin-right: 70px; margin-right: 70px;
font-size:30px; font-size: 30px;
color:#fff color: #fff;
} }
.user-list > li >p{ .user-list > li > p {
font-size: 18px; font-size: 18px;
margin-top:10px; margin-top: 10px;
margin-bottom: 10px; margin-bottom: 10px;
} }
.user-list > li >i{ .user-list > li > i {
color:#fff color: #fff;
} }
h5 { h5 {
margin-top: 30px; margin-top: 30px;
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<div> <div>
<div class="content"> <div class="content">
<dataBreadcrumb :breads="breads"></dataBreadcrumb> <dataBreadcrumb :breads="breads"></dataBreadcrumb>
<el-button type="primary" @click="add">创建新的角色</el-button> <el-button type="primary" @click="add" class="add">创建新的角色</el-button>
<dataTable :table-data="tableData" :columns="columns" :is-pageobj="false" :tableTop="30"> <dataTable :table-data="tableData" :columns="columns" :is-pageobj="false" :tableTop="50">
<el-table-column slot="operate" label="操作" align="center" fixed="right"> <el-table-column slot="operate" label="操作" align="center" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click="see(scope.row)">查看</el-button> <el-button type="text" size="small" @click="see(scope.row)">查看</el-button>
...@@ -97,4 +97,10 @@ export default { ...@@ -97,4 +97,10 @@ export default {
</script> </script>
<style scoped> <style scoped>
.add{
position: absolute;
top:10px;
left:180px;
}
</style> </style>
...@@ -7,7 +7,7 @@ import {requestUrl,homeUrl} from "./common.js" ...@@ -7,7 +7,7 @@ import {requestUrl,homeUrl} from "./common.js"
// 创建axios实例 // 创建axios实例
const service = axios.create({ const service = axios.create({
baseURL: `/apis`, baseURL: `/apis`,
// baseURL:"http://www.eugood.cn/apis", baseURL:"http://www.eugood.cn/apis",
timeout: 35000 // 请求超时时间 timeout: 35000 // 请求超时时间
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment