diff --git a/src/components/commodity-cell.vue b/src/components/commodity-cell.vue index f8f522761f17f1d9bef0f1934c830bfde1a3d645..e3100c50823ee15de664d3f84029720c998d196e 100644 --- a/src/components/commodity-cell.vue +++ b/src/components/commodity-cell.vue @@ -7,7 +7,7 @@ />
-
水路货物周转量情况
+
水路货物周转量情况
资源摘要: export default { components: {}, + props: { + url: { type: String, default: "" } + }, data: () => ({}), computed: {}, watch: {}, - methods: {}, + methods: { + goUrl(parame) { + if (this.url != "") { + this.$router.push(this.url + parame); + } + } + }, mounted() {} }; @@ -71,6 +80,7 @@ export default { font-size: 22px; font-weight: 700; margin-bottom: 6px; + cursor: pointer; } .com_cell_item { font-size: 16px; diff --git a/src/components/commodity-list.vue b/src/components/commodity-list.vue index c8c908e36cd97222aefbf245303393451ff88b3c..ae96a43b8cea2c1ec4b0702704dfc0215175365a 100644 --- a/src/components/commodity-list.vue +++ b/src/components/commodity-list.vue @@ -1,6 +1,50 @@ @@ -10,16 +54,82 @@ export default { components: { "commodity-cell": CommodityCell }, + props: { + datas: { type: Array, default: [] }, + url: { type: String, default: "" }, + paginationShow: { + type: Boolean, + default: false + }, + pageSizeShow: { + type: Boolean, + default: false + } + }, data: () => ({ - list: [1, 2, 3, 4, 5, 6] + pagination: { + rowsPerPage: 10, + page: 1, + total: 0 + }, + pageOptions: [ + { + value: "10", + label: "10" + }, + { + value: "20", + label: "20" + }, + { + value: "50", + label: "50" + } + ] }), computed: {}, watch: {}, - methods: {}, - mounted() {} + methods: { + handleSizeChange(val) { + this.pagination.rowsPerPage = val; + this.$emit("refresh"); + }, + handleCurrentChange(val) { + this.pagination.page += val; + this.$emit("refresh"); + }, + getTotal() { + this.total = this.datas.length; + } + }, + mounted() { + this.getTotal(); + } }; - + \ No newline at end of file diff --git a/src/components/cropper.vue b/src/components/cropper.vue index 19e795a787f683bfcdba967c71fd70577de4e85a..10958a797b3da1518a7cfe65a43a33dd21772eac 100644 --- a/src/components/cropper.vue +++ b/src/components/cropper.vue @@ -146,18 +146,18 @@ export default { margin-left: 10px; } .add_pic { - width: 100px; - height: 100px; - border: 1px #409eff solid; + width: 140px; + height: 140px; + border: 3px #f6f7fb solid; border-radius: 5px; position: relative; } .add_icon { position: absolute; - top: calc((100% - 40px) / 2); - left: calc((100% - 40px) / 2); - color: #409eff; - font-size: 40px; + top: calc((100% - 70px) / 2); + left: calc((100% - 70px) / 2); + color: #e3e6f0; + font-size: 70px; } .up_input { display: inline-block; diff --git a/src/components/table-um.vue b/src/components/table-um.vue index 65d90cc68197a623f4457c489b9cac8df55d9ec9..087702eacbeb90b42ded8d833904a5372d52e9d5 100644 --- a/src/components/table-um.vue +++ b/src/components/table-um.vue @@ -24,8 +24,7 @@ type="primary" @click="addRow()" class="ces_toolbar_btn" - >新增 + >新增 - + - + - {{ btn.label }} - - - {{ btn.label }} - - - {{ btn.line }} - + >{{ btn.label }} + {{ btn.line }} @@ -178,9 +154,7 @@ trigger="hover" :content="scope.row[item.prop]" > -
- {{ scope.row[item.prop] }} -
+
{{ scope.row[item.prop] }}
{{ scope.row[item.prop] }} @@ -217,8 +191,8 @@ @click="handleCurrentChange(-1)" :disabled="pagination.page == 1" > - 第{{ pagination.page }}页 / 共{{ - Math.ceil(pagination.total / pagination.rowsPerPage) +   第{{ pagination.page }}页 / 共{{ + Math.ceil(pagination.total / pagination.rowsPerPage) }}页
- - @@ -255,7 +221,7 @@ export default { "v-apaas-table-input": tableInput, "v-apaas-table-select": tableSelect, "v-apaas-table-umhref": tableUmhref, - "d-confirm": DConfirm, + "d-confirm": DConfirm }, props: { // 表格型号:mini,medium,small @@ -280,91 +246,78 @@ export default { // }, searchShow: { type: Boolean, - default: false, + default: false }, url: { type: String, - default: "", + default: "" }, detailsUrl: { type: String, - default: "", + default: "" }, rowprop: { type: String, - default: "", + default: "" }, ready: { type: Boolean, - default: false, + default: false }, addRowBtn: { type: Boolean, - default: false, + default: false }, couldNotEdit: { type: Boolean, - default: false, - }, - // 是否显示删除弹窗 - isDialog: { type: Boolean, default: false }, - confirmOptions: { - type: Object, - default: () => { - return { - title: "提示", //提示 - message: "", //"" - btnCancelText: "取消", //取消 - btnSubmitText: "确定", - }; - }, + default: false }, refreshInit: { type: Boolean }, sortBy: { type: String, - default: "", + default: "" }, searchNoName: { type: Boolean, default: false }, emptyText: { type: String, - default: "暂无数据", + default: "暂无数据" }, autoAdd: { type: Boolean, - default: false, + default: false }, border: { type: Boolean, - default: false, + default: false }, stripe: { type: Boolean, - default: false, + default: false }, radius: { type: Boolean, - default: false, + default: false }, pageSizeShow: { type: Boolean, - default: false, + default: false }, paginationShow: { type: Boolean, - default: false, + default: false }, headerCellClassName: { type: String, - default: "", + default: "" }, filterList: { type: Array, - default: null, + default: null }, showHeader: { type: Boolean, - default: true, - }, + default: true + } }, data() { return { @@ -372,7 +325,7 @@ export default { pagination: { rowsPerPage: 10, page: 1, - total: 0, + total: 0 }, delSelect: null, helper: helper, @@ -381,23 +334,23 @@ export default { pageOptions: [ { value: "10", - label: "10", + label: "10" }, { value: "20", - label: "20", + label: "20" }, { value: "50", - label: "50", - }, + label: "50" + } ], search: "", times: null, showFliterList: false, filterData: null, // 筛选条件 filterToggle: null, // 控制筛选条件的展开和收起 - filterLength: 0, // 每行最多可容纳多少个过滤条件 + filterLength: 0 // 每行最多可容纳多少个过滤条件 }; }, mounted() { @@ -410,20 +363,20 @@ export default { if (val) { this.getDataFromApiSync(); } - }, + } }, url: { handler(val) { this.getDataFromApiSync(); }, - deep: true, + deep: true }, filterList: { handler(val) { this.initFilterData(); }, - deep: true, - }, + deep: true + } }, methods: { // get data @@ -439,14 +392,14 @@ export default { } } else { this.getDataFromApi().then( - (data) => { + data => { this.selectedTabsPage = JSON.parse(JSON.stringify(data.newArr)); this.pagination.total = data.total; if (this.autoAdd) { this.addRow(); } }, - (err) => { + err => { console.log("失败" + err); } ); @@ -459,7 +412,7 @@ export default { this.all_url = `/static/data.json`; this.$http .get(this.all_url) - .then((response) => { + .then(response => { let newArr = response.data.data[this.url]; // if it is true url, total is response's total let total = newArr.length; @@ -498,17 +451,11 @@ export default { console.log(obj.column); return h("span", { class: "ces-table-require" }, obj.column.label); }, - handleRemove(row, label) { - this.$refs.myConfirm.showModel(); - this.delSelect = row; - this.delSelect.label = label; - this.label = label; - }, refreshuseList() { this.$message({ showClose: true, message: this.label + "成功", - type: "success", + type: "success" }); }, switchChange(val) { @@ -578,7 +525,7 @@ export default { if (this.filterList && this.filterList.length) { this.filterData = {}; this.filterToggle = {}; - this.filterList.forEach((item) => { + this.filterList.forEach(item => { this.$set(this.filterData, item.prop, []); this.$set(this.filterToggle, item.prop, false); }); @@ -591,8 +538,8 @@ export default { this.filterData[prop].push(filter); } console.log(this.filterData); - }, - }, + } + } }; @@ -834,4 +781,7 @@ em { background-color: #515fe7; color: #f4f7fc; } +.ces_page_control .el-button { + border: 0; +} diff --git a/src/components/upload_file.vue b/src/components/upload_file.vue index 856038594b78e4876a68b77b7774e1cde690b7fb..bff5f2a8fc66f10a76151cc6581f9010aea4619e 100644 --- a/src/components/upload_file.vue +++ b/src/components/upload_file.vue @@ -170,8 +170,8 @@ export default { \ No newline at end of file diff --git a/src/pages/fwzc_fwcs.vue b/src/pages/fwzc_fwcs.vue index c467da2977cc9a1087a98b91f91acefb5191918d..c98eef23f415bf230f705f7d776f672b018bce30 100644 --- a/src/pages/fwzc_fwcs.vue +++ b/src/pages/fwzc_fwcs.vue @@ -183,11 +183,11 @@

服务描述:

- +

服务领域:

- +

所属组织:

- +

接口编码:

- +

开放程度:

@@ -231,9 +231,9 @@
- - 取消 - 保存 + + 上一步 + 服务注册
@@ -367,11 +367,14 @@ export default { this.jcxxtx = true; }, // edit form - onSubmit() { - console.log("submit!"); - }, getNewList(val) { console.log(val); + }, + previous() { + this.jcxxtx = false; + }, + registe() { + console.log("submit!"); } }, mounted() {} @@ -447,6 +450,16 @@ export default { background-color: #0f2683; color: #f8f9fd; } +.btn_footer .previous { + width: 100px; + background-color: #c3caf8; + color: #0f2683; +} +.btn_footer .registe { + width: 100px; + background-color: #0f2683; + color: #f8f9fd; +} .sqxx_row { padding: 0 20px; } @@ -503,6 +516,9 @@ export default { font-size: 14px; margin-left: 10px; } +.form_in { + width: 1000px; +}