diff --git a/admin_2/src/assets/css/common.less b/admin_2/src/assets/css/common.less index 57647a9b00407c2217b2c792b38caa3586e4434f..5ecfeed560a818598e2751fa1bb4e394af04d287 100644 --- a/admin_2/src/assets/css/common.less +++ b/admin_2/src/assets/css/common.less @@ -121,11 +121,11 @@ .el-drawer__body { border-top: 1px solid #ececec; } -.el-button--primary { - background: linear-gradient(90deg, #5ab6ff, #2e9aff) !important; - border: none !important; - border-color: transparent !important; -} +// .el-button--primary { +// background: linear-gradient(90deg, #5ab6ff, #2e9aff) !important; +// border: none !important; +// border-color: transparent !important; +// } .el-dialog__header { .el-dialog__title { color: #1890ff !important; @@ -149,13 +149,16 @@ } .is-active { .tab-label { - color:#2681e8 + color:var(--primary) } } } .el-tabs__header{ margin: 0px !important; } +.el-tabs__active-bar{ + background-color:var(--primary) +} // .search-popover{ // box-shadow: 0 0 12px 0 rgba(24, 144, 255, 0.1); diff --git a/admin_2/src/pages/market/EvaluateReport.vue b/admin_2/src/pages/market/EvaluateReport.vue index ac6edf1c2e0e28886160b8f3cd4babb90175f32d..8c615dcf3fa993bb5a8b84e3e063163e2f76ee73 100644 --- a/admin_2/src/pages/market/EvaluateReport.vue +++ b/admin_2/src/pages/market/EvaluateReport.vue @@ -81,15 +81,33 @@ </el-popover> </div> <div class="main max-w-[1396px] flex-1"> - <y-table border :tableData="tableData" :column="column"> </y-table> + <y-table + ref="MyTable" + :loading="loading" + :data="tableData" + :column="column" + border + tooltip-effect="dark" + :max-height="600" + :row-key="(row) => row.id" + @selection-change="handleSelectionChange" + ></y-table> </div> + <!-- 璇︽儏 --> + <EvaluateDetails :show.sync="show"></EvaluateDetails> </div> </template> <script> +import EvaluateDetails from "./components/EvaluateDetails.vue"; export default { + components: { + EvaluateDetails, + }, data() { return { + show: false, + loading: false, pickerOptions: { shortcuts: [ { @@ -125,7 +143,12 @@ export default { form2: { type: [], }, - tableData: [], + tableData: [ + { + name: "娴嬭瘯", + }, + ], + selectionRows: [], column: [ { type: "selection", @@ -144,6 +167,7 @@ export default { label: "绔欑偣鍚嶇О", align: "center", width: "150", + prop: "name", }, { label: "涓氬姟鍚嶇О", @@ -255,10 +279,31 @@ export default { align: "center", fixed: "right", width: "100", + formatter: (row) => { + return ( + <span + class="primary cursor-pointer" + onClick={() => { + this.checkDetails(row); + }} + > + 鏌ョ湅璇︽儏 + </span> + ); + }, }, ], }; }, + methods: { + checkDetails(row) { + console.log(row); + this.show = true; + }, + handleSelectionChange(rows) { + this.selectionRows = rows; + }, + }, }; </script> diff --git a/admin_2/src/pages/market/QueueUpReport.vue b/admin_2/src/pages/market/QueueUpReport.vue index 6042113052f0c4e0a577c58831a51bd6f99dae4b..585bd51fc71984b8b68294c1fc8fd473ed39fcfc 100644 --- a/admin_2/src/pages/market/QueueUpReport.vue +++ b/admin_2/src/pages/market/QueueUpReport.vue @@ -81,15 +81,34 @@ </el-popover> </div> <div class="main max-w-[1396px] flex-1"> - <y-table border :tableData="tableData" :column="column"> </y-table> + <y-table + ref="MyTable" + :loading="loading" + :data="tableData" + :column="column" + border + tooltip-effect="dark" + :max-height="600" + :row-key="(row) => row.id" + @selection-change="handleSelectionChange" + ></y-table> </div> + <!-- 璇︽儏 --> + <QueueUpDetails :show.sync="show"></QueueUpDetails> </div> </template> <script> +import QueueUpDetails from "./components/QueueUpDetails.vue"; export default { + components: { + QueueUpDetails, + }, data() { return { + show: false, + loading: false, + selectionRow: [], pickerOptions: { shortcuts: [ { @@ -125,7 +144,11 @@ export default { form2: { type: [], }, - tableData: [], + tableData: [ + { + name: "楂樺幙", + }, + ], column: [ { type: "selection", @@ -144,6 +167,7 @@ export default { label: "绔欑偣鍚嶇О", align: "center", width: "150", + prop: "name", }, { label: "涓氬姟鍚嶇О", @@ -255,10 +279,31 @@ export default { align: "center", fixed: "right", width: "100", + formatter: (row) => { + return ( + <span + class="primary cursor-pointer" + onClick={() => { + this.checkDetails(row); + }} + > + 鏌ョ湅璇︽儏 + </span> + ); + }, }, ], }; }, + methods: { + checkDetails(row) { + console.log(row); + this.show = true; + }, + handleSelectionChange(val) { + this.selectionRow = val; + }, + }, }; </script> diff --git a/admin_2/src/pages/market/components/EvaluateDetails.vue b/admin_2/src/pages/market/components/EvaluateDetails.vue new file mode 100644 index 0000000000000000000000000000000000000000..0641e527ac0c0778b432ca0cfdc4ee802b5c53fd --- /dev/null +++ b/admin_2/src/pages/market/components/EvaluateDetails.vue @@ -0,0 +1,178 @@ +<template> + <el-drawer + title="璇︽儏" + :visible.sync="drawer" + size="60%" + @close="drawer = false" + > + <div class="main h-full w-full p-[20px]"> + <el-descriptions + :column="3" + border + size="medium" + labelClassName="label-name" + > + <el-descriptions-item + v-for="(v, i) in detailsList" + :key="i" + :label="v.title" + > + {{ v.content }} + </el-descriptions-item> + </el-descriptions> + </div> + </el-drawer> +</template> + +<script> +export default { + props: { + show: { + type: Boolean, + default: false, + }, + }, + data() { + return { + detailsList: [ + { + title: "韬唤璇佸彿", + content: "娴嬭瘯", + }, + { + title: "濮撳悕", + content: "娴嬭瘯", + }, + { + title: "鎬у埆", + content: "娴嬭瘯", + }, + { + title: "鎵嬫満鍙�", + content: "娴嬭瘯", + }, + { + title: "璇勪环閫夐」", + content: "娴嬭瘯", + }, + { + title: "璇勪环鏍囩", + content: "娴嬭瘯", + }, + { + title: "璇勪环浜哄浘鐗囧湴鍧€", + content: "娴嬭瘯", + }, + { + title: "閮ㄩ棬", + content: "娴嬭瘯", + }, + { + title: "澶у巺鍚嶇О", + content: "娴嬭瘯", + }, + { + title: "璇勪环鏉ユ簮", + content: "娴嬭瘯", + }, + { + title: "鎵嬭緭鎰忚", + content: "娴嬭瘯", + }, + { + title: "绐楀彛鍚嶇О", + content: "娴嬭瘯", + }, + { + title: "绐楀彛缂栧彿", + content: "娴嬭瘯", + }, + { + title: "鎺掗槦缂栧彿", + content: "娴嬭瘯", + }, + { + title: "绐楀彛璇勪环", + content: "娴嬭瘯", + }, + { + title: "宸ヤ綔浜哄憳濮撳悕", + content: "娴嬭瘯", + }, + { + title: "宸ヤ綔浜哄憳宸ュ彿", + content: "娴嬭瘯", + }, + { + title: "璇勪环鍣∕AC鍦板潃", + content: "娴嬭瘯", + }, + { + title: "璇勪环鐘舵€�", + content: "娴嬭瘯", + }, + { + title: "鎴浘杩樻槸璇勪环", + content: "娴嬭瘯", + }, + { + title: "鎴浘鍦�", + content: "娴嬭瘯", + }, + { + title: "绛惧瓧鍥剧墖", + content: "娴嬭瘯", + }, + { + title: "鎶撴媿璇勪环浜虹収鐗�", + content: "娴嬭瘯", + }, + { + title: "闊宠棰戝湴鍧€", + content: "娴嬭瘯", + }, + { + title: "璇勪环鏍囪", + content: "娴嬭瘯", + }, + { + title: "璇勪环鎸囧悜", + content: "娴嬭瘯", + }, + { + title: "璇勪环鏃堕棿", + content: "娴嬭瘯", + }, + { + title: "绔欑偣缂栫爜", + content: "娴嬭瘯", + }, + { + title: "绔欑偣鍚嶇О", + content: "娴嬭瘯", + }, + { + title: "鎵╁睍缂栧彿", + content: "娴嬭瘯", + }, + ], + }; + }, + computed: { + drawer: { + get() { + return this.show; + }, + set(val) { + this.$emit("update:show", val); + }, + }, + }, +}; +</script> + +<style lang="less" scoped> +:deep(.label-name) { + width: 180px !important; +} +</style> diff --git a/admin_2/src/pages/market/components/QueueUpDetails.vue b/admin_2/src/pages/market/components/QueueUpDetails.vue new file mode 100644 index 0000000000000000000000000000000000000000..e650c0c45924a289337979122690426091405fee --- /dev/null +++ b/admin_2/src/pages/market/components/QueueUpDetails.vue @@ -0,0 +1,166 @@ +<template> + <el-drawer + title="璇︽儏" + :visible.sync="drawer" + size="60%" + @close="drawer = false" + > + <div class="main h-full w-full p-[20px]"> + <el-descriptions + :column="3" + border + size="medium" + labelClassName="label-name" + > + <el-descriptions-item + v-for="(v, i) in detailsList" + :key="i" + :label="v.title" + > + {{ v.content }} + </el-descriptions-item> + </el-descriptions> + </div> + </el-drawer> +</template> + +<script> +export default { + props: { + show: { + type: Boolean, + default: false, + }, + }, + data() { + return { + detailsList: [ + { + title: "棰勭害缂栧彿", + content: "娴嬭瘯", + }, + { + title: "鍙彿鐘舵€�", + content: "娴嬭瘯", + }, + { + title: "涓氬姟鍚嶇О", + content: "娴嬭瘯", + }, + { + title: "绐楀彛鍚嶇О", + content: "娴嬭瘯", + }, + { + title: "绐楀彛缂栧彿", + content: "娴嬭瘯", + }, + { + title: "娴佹按缂栧彿,褰撳ぉ鐨勭xxx鍙�", + content: "娴嬭瘯", + }, + { + title: "鍛煎彨杞Щ鍙�", + content: "娴嬭瘯", + }, + { + title: "濮撳悕", + content: "娴嬭瘯", + }, + { + title: "韬唤璇佸彿", + content: "娴嬭瘯", + }, + { + title: "鎬у埆", + content: "娴嬭瘯", + }, + { + title: "鎵嬫満鍙�", + content: "娴嬭瘯", + }, + { + title: "宸ヤ綔浜哄憳濮撳悕", + content: "娴嬭瘯", + }, + { + title: "宸ヤ綔浜哄憳宸ュ彿", + content: "娴嬭瘯", + }, + { + title: "鍙栧彿鏃堕棿", + content: "娴嬭瘯", + }, + { + title: "缁撴潫鏃堕棿", + content: "娴嬭瘯", + }, + { + title: "绛夊緟鏃堕棿", + content: "娴嬭瘯", + }, + { + title: "鍔炵悊鏃堕棿", + content: "娴嬭瘯", + }, + { + title: "鍙栧彿璁惧绫诲瀷", + content: "娴嬭瘯", + }, + { + title: "鍙栧彿璁惧鍚嶇О", + content: "娴嬭瘯", + }, + { + title: "鍛煎彨璁惧", + content: "娴嬭瘯", + }, + { + title: "浜嬮」鍚嶇О", + content: "娴嬭瘯", + }, + { + title: "鎺掑彿闃熷垪ID锛屽敮涓€", + content: "娴嬭瘯", + }, + { + title: "澶у巺鍚嶇О", + content: "娴嬭瘯", + }, + { + title: "绔欑偣ID", + content: "娴嬭瘯", + }, + { + title: "绔欑偣缂栫爜", + content: "娴嬭瘯", + }, + { + title: "绔欑偣鍚嶇О", + content: "娴嬭瘯", + }, + { + title: "鎵╁睍缂栧彿", + content: "娴嬭瘯", + }, + ], + }; + }, + computed: { + drawer: { + get() { + return this.show; + }, + set(val) { + this.$emit("update:show", val); + }, + }, + }, +}; +</script> + +<style lang="less" scoped> +:deep(.label-name) { + width: 180px !important; +} +</style> diff --git a/admin_2/src/pages/system/parameter/Parameter.vue b/admin_2/src/pages/system/parameter/Parameter.vue index b81bad9afa85bbf69b21560f99c31248330f9c6d..4e3e954d09b87bc1ee856a7a45409349be94604a 100644 --- a/admin_2/src/pages/system/parameter/Parameter.vue +++ b/admin_2/src/pages/system/parameter/Parameter.vue @@ -154,7 +154,7 @@ export default { width: "120", formatter: (row) => { return ( - <div class="flex justify-center gap-2"> + <div class="flex justify-center gap-4"> <span class="primary cursor-pointer" onClick={() => this.handleEdit(row)} diff --git a/admin_2/src/pages/system/task/TaskSet.vue b/admin_2/src/pages/system/task/TaskSet.vue index 657c3a9c582b77d465213ee0ed5e01e322914cac..0176d9c52d244e74435cae45d71ca631015ded2b 100644 --- a/admin_2/src/pages/system/task/TaskSet.vue +++ b/admin_2/src/pages/system/task/TaskSet.vue @@ -142,7 +142,7 @@ export default { width: "120", formatter: (row) => { return ( - <div class="flex justify-center gap-2"> + <div class="flex justify-center gap-4"> <span class="primary cursor-pointer" onClick={() => this.handleEdit(row)}