Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
9ada342a by 任超
Options

style;样式修改

1 parent 466409f6
Inline Side-by-side
Showing 6 changed files with 20 additions and 28 deletions
...@@ -2,20 +2,5 @@ ...@@ -2,20 +2,5 @@
2 npm install 2 npm install
3 # 建议不要直接使用 cnpm 安装依赖，会有各种诡异的 bug。可以通过如下操作解决 npm 下载速度慢的问题 3 # 建议不要直接使用 cnpm 安装依赖，会有各种诡异的 bug。可以通过如下操作解决 npm 下载速度慢的问题
4 npm install --registry=https://registry.npm.taobao.org 4 npm install --registry=https://registry.npm.taobao.org
5 5 ### 菜单配置地址 http://192.168.2.235/fis
6 ## Git 贡献提交规范
7
8 - 参考 [vue](https://github.com/vuejs/vue/blob/dev/.github/COMMIT_CONVENTION.md) 规范 ([Angular](https://github.com/conventional-changelog/conventional-changelog/tree/master/packages/conventional-changelog-angular))
9
10 - `feat` 增加新功能
11 - `fix` 修复问题/BUG
12 - `style` 代码风格相关无影响运行结果的
13 - `perf` 优化/性能提升
14 - `refactor` 重构
15 - `revert` 撤销修改
16 - `test` 测试相关
17 - `docs` 文档/注释
18 - `chore` 依赖更新/脚手架配置修改等
19 - `wip` 开发中
20
21 6
......
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
83 display: block 83 display: block
84 } 84 }
85 } 85 }
86 86 .el-input__prefix {display: none;}
87 // fix date-picker ui bug in filter-item 87 // fix date-picker ui bug in filter-item
88 .el-range-editor.el-input__inner { 88 .el-range-editor.el-input__inner {
89 display: inline-flex !important; 89 display: inline-flex !important;
......
...@@ -7,7 +7,10 @@ ...@@ -7,7 +7,10 @@
7 display: flex; 7 display: flex;
8 justify-content: space-between; 8 justify-content: space-between;
9 } 9 }
10 10 .title {
11 display: flex;
12 align-items: center;
13 }
11 .workbench { 14 .workbench {
12 flex-wrap: wrap; 15 flex-wrap: wrap;
13 height: 100%; 16 height: 100%;
......
...@@ -351,6 +351,10 @@ export default { ...@@ -351,6 +351,10 @@ export default {
351 @import "~@/styles/mixin.scss"; 351 @import "~@/styles/mixin.scss";
352 @import "./index.scss"; 352 @import "./index.scss";
353 353
354 /deep/.el-card__header {
355 padding: 8px 15px
356 }
357
354 /deep/.el-card__body { 358 /deep/.el-card__body {
355 padding: 3px 10px 5px 10px; 359 padding: 3px 10px 5px 10px;
356 overflow: hidden; 360 overflow: hidden;
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 </el-input> 16 </el-input>
17 </el-form-item> 17 </el-form-item>
18 </el-col> 18 </el-col>
19 <el-col :span="10"> 19 <el-col :span="11">
20 <el-form-item label="查询时间"> 20 <el-form-item label="查询时间">
21 <el-date-picker v-model="queryForm.sqr" type="date" placeholder="开始日期" value-format="yyyy-MM-dd" 21 <el-date-picker v-model="queryForm.sqr" type="date" placeholder="开始日期" value-format="yyyy-MM-dd"
22 clearable> 22 clearable>
...@@ -26,10 +26,10 @@ ...@@ -26,10 +26,10 @@
26 </el-date-picker> 26 </el-date-picker>
27 </el-form-item> 27 </el-form-item>
28 </el-col> 28 </el-col>
29 <el-col :span="4" class="btnColRight"> 29 <el-col :span="3" class="btnColRight">
30 <el-form-item> 30 <el-form-item>
31 <el-button type="primary" native-type="submit" @click="queryClick">查询</el-button> 31 <el-button type="primary" native-type="submit" @click="queryClick">查询</el-button>
32 <el-button @click="moreQueryClick()">高级查询</el-button> 32 <!-- <el-button @click="moreQueryClick()">高级查询</el-button> -->
33 </el-form-item> 33 </el-form-item>
34 </el-col> 34 </el-col>
35 </el-row> 35 </el-row>
...@@ -53,14 +53,14 @@ import { getJtfcPage } from "@/api/sqcx"; ...@@ -53,14 +53,14 @@ import { getJtfcPage } from "@/api/sqcx";
53 export default { 53 export default {
54 name: "dydjb", 54 name: "dydjb",
55 mixins: [table], 55 mixins: [table],
56 mounted() { 56 mounted () {
57 sendThis(this); 57 sendThis(this);
58 this.queryClick(); 58 this.queryClick();
59 }, 59 },
60 computed: { 60 computed: {
61 ...mapGetters(["dictData"]), 61 ...mapGetters(["dictData"]),
62 }, 62 },
63 data() { 63 data () {
64 return { 64 return {
65 queryForm: { 65 queryForm: {
66 cxbh: "", 66 cxbh: "",
...@@ -75,7 +75,7 @@ export default { ...@@ -75,7 +75,7 @@ export default {
75 }, 75 },
76 methods: { 76 methods: {
77 // 初始化数据 77 // 初始化数据
78 queryClick() { 78 queryClick () {
79 this.$startLoading(); 79 this.$startLoading();
80 getJtfcPage({ ...this.queryForm, ...this.pageData }).then((res) => { 80 getJtfcPage({ ...this.queryForm, ...this.pageData }).then((res) => {
81 this.$endLoading(); 81 this.$endLoading();
...@@ -86,12 +86,12 @@ export default { ...@@ -86,12 +86,12 @@ export default {
86 } 86 }
87 }); 87 });
88 }, 88 },
89 dydjbClick(scope) { 89 dydjbClick (scope) {
90 popupDialog("打印登记薄", "sqcx/dydjb/components/dydjbInfo", { 90 popupDialog("打印登记薄", "sqcx/dydjb/components/dydjbInfo", {
91 sqcxdata: scope.row, 91 sqcxdata: scope.row,
92 }); 92 });
93 }, 93 },
94 handleSort(name, sort) { 94 handleSort (name, sort) {
95 console.log(name, sort); 95 console.log(name, sort);
96 }, 96 },
97 }, 97 },
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 </el-input> 16 </el-input>
17 </el-form-item> 17 </el-form-item>
18 </el-col> 18 </el-col>
19 <el-col :span="10"> 19 <el-col :span="11" class="flex">
20 <el-form-item label="查询时间"> 20 <el-form-item label="查询时间">
21 <el-date-picker v-model="queryForm.sqr" type="date" placeholder="开始日期" value-format="yyyy-MM-dd" 21 <el-date-picker v-model="queryForm.sqr" type="date" placeholder="开始日期" value-format="yyyy-MM-dd"
22 clearable> 22 clearable>
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
26 </el-date-picker> 26 </el-date-picker>
27 </el-form-item> 27 </el-form-item>
28 </el-col> 28 </el-col>
29 <el-col :span="4" class="btnColRight"> 29 <el-col :span="3" class="btnColRight">
30 <el-button type="primary" native-type="submit" @click="queryClick()">查询</el-button> 30 <el-button type="primary" native-type="submit" @click="queryClick()">查询</el-button>
31 <el-button type="primary" @click="handleAdd">新增</el-button> 31 <el-button type="primary" @click="handleAdd">新增</el-button>
32 </el-col> 32 </el-col>
......