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>
......
This diff is collapsed.
...@@ -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'"
v-model.trim="objInput[item.model]"
:size="size"
:style="{ width: item.width }"
:disabled="item.disabled"
placeholder="请输入"
clearable
maxlength="30"
></el-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])"> <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])"
>
<el-option v-for="op in item.selectlist" :label="op.label" :value="op.id" :key="op.id"></el-option> <el-option v-for="op in item.selectlist" :label="op.label" :value="op.id" :key="op.id"></el-option>
</el-select> </el-select>
<!-- 时间范围选择器 --> <!-- 时间范围选择器 -->
<el-date-picker <el-date-picker
v-if="item.type=='timeRange'" v-if="item.type == 'timeRange'"
v-model="objInput[item.model]" v-model="objInput[item.model]"
type="daterange" type="daterange"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<div v-if="checklist.length>0" class="checklist-button"> <div v-if="checklist.length > 0" class="checklist-button">
<el-button type="primary" @click="query">查询</el-button> <el-button type="primary" @click="query">查询</el-button>
<el-button @click="rest('checkData')">重置</el-button> <el-button @click="rest('checkData')">重置</el-button>
<slot name="moreButton"></slot> <slot name="moreButton"></slot>
</div> </div>
</el-form> </el-form>
<!-- 表格 --> <!-- 表格 -->
<el-table :data="tableData" :style="{marginTop: tableTop + 'px'}" border style="width:100%" @selection-change="handleSelectionChange"> <el-table
<el-table-column :data="tableData"
v-if="isIndex" :style="{ marginTop: tableTop + 'px' }"
type="index" border
width="100" style="width: 100%"
label="序号" @selection-change="handleSelectionChange"
align="center"> >
</el-table-column> <el-table-column v-if="isIndex" type="index" width="100" label="序号" align="center"> </el-table-column>
<template v-for="(col, index) in columns"> <template v-for="(col, index) in columns">
<!-- check --> <!-- check -->
<el-table-column v-if="col.selection" :key="index" align="left" type="selection" width="100"></el-table-column> <el-table-column v-if="col.selection" :key="index" align="left" type="selection" width="100"></el-table-column>
...@@ -52,7 +70,8 @@ ...@@ -52,7 +70,8 @@
:width="col.width" :width="col.width"
:formatter="col.formatter" :formatter="col.formatter"
:sortable="col.sortable" :sortable="col.sortable"
align="center"> align="center"
>
</el-table-column> </el-table-column>
</template> </template>
</el-table> </el-table>
...@@ -60,7 +79,7 @@ ...@@ -60,7 +79,7 @@
</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: {
...@@ -68,10 +87,6 @@ export default { ...@@ -68,10 +87,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'
...@@ -85,19 +100,19 @@ export default { ...@@ -85,19 +100,19 @@ export default {
columns: { columns: {
type: Array, type: Array,
default() { default() {
return [] return [];
} }
}, },
breads: { breads: {
type: Array, type: Array,
default() { default() {
return [] return [];
} }
}, },
checklist: { checklist: {
type: Array, type: Array,
default() { default() {
return [] return [];
} }
}, },
tableTop: { tableTop: {
...@@ -116,10 +131,10 @@ export default { ...@@ -116,10 +131,10 @@ export default {
type: String, type: String,
default: '' default: ''
}, },
sendData:{ sendData: {
type: Object, type: Object,
default() { default() {
return {} return {};
} }
} }
}, },
...@@ -127,17 +142,20 @@ export default { ...@@ -127,17 +142,20 @@ export default {
return { return {
objInput: {}, objInput: {},
ceshi: {}, ceshi: {},
tableData:[] tableData: [],
} labelWidth: ''
};
}, },
created() { created() {
if (this.checklist.length > 0) { if (this.checklist.length > 0) {
const obj = {} let length = Number(this.checklist[0].title.length);
this.labelWidth=length*25+""
const obj = {};
this.checklist.forEach((item) => { this.checklist.forEach((item) => {
obj[item.model] = '' obj[item.model] = '';
}) });
this.objInput = obj this.objInput = obj;
}; }
this.getqueryList(); this.getqueryList();
}, },
// //
...@@ -148,51 +166,48 @@ export default { ...@@ -148,51 +166,48 @@ export default {
}, },
// check选择id // check选择id
handleSelectionChange(val) { handleSelectionChange(val) {
this.$emit('sendSelection', val) this.$emit('sendSelection', val);
}, },
// 重置 // 重置
rest(data) { rest(data) {
this.$refs[data].resetFields() this.$refs[data].resetFields();
this.getqueryList(); this.getqueryList();
}, },
// //
async getqueryList() { async getqueryList() {
try { try {
let message={}; let message = {};
let sendData=this.sendData let sendData = this.sendData;
Object.assign(sendData,this.objInput) Object.assign(sendData, this.objInput);
const { const { data, code } = await queryList(sendData, this.url);
data,
code
} = await queryList(sendData,this.url)
if (code === 200) { if (code === 200) {
console.log(data); console.log(data);
this.tableData = data this.tableData = data;
} }
} catch (e) { } catch (e) {
console.log(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 {
...@@ -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