From fc966fba14564edf84bbd80660804150ddcc1dfa Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 26 Apr 2022 17:29:03 +0800 Subject: [PATCH 1/3] ss --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dbb18e32c..3def21d39 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ }, "dependencies": { "@riophae/vue-treeselect": "^0.4.0", - "@tinymce/tinymce-vue": "^4.0.4", + "@tinymce/tinymce-vue": "^3.2.8", "axios": "^0.19.0", "babel-eslint": "^8.0.1", "babel-plugin-component": "^1.1.1", From a9894b3c8d213190563aba1f6771c0cbc69ee160 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Wed, 27 Apr 2022 16:21:06 +0800 Subject: [PATCH 2/3] ss3 --- .../base/epidemic/natFocus/natFocusList.vue | 39 +- .../base/epidemic/veroFocus/veroFocusList.vue | 1265 +++++++++-------- 2 files changed, 705 insertions(+), 599 deletions(-) diff --git a/src/views/modules/base/epidemic/natFocus/natFocusList.vue b/src/views/modules/base/epidemic/natFocus/natFocusList.vue index c8215e63a..8d7fbc47f 100644 --- a/src/views/modules/base/epidemic/natFocus/natFocusList.vue +++ b/src/views/modules/base/epidemic/natFocus/natFocusList.vue @@ -670,21 +670,36 @@ export default { }) }, - handleEdit (row) { - this.editFormTitle = "修改核酸检测关注名单" - this.editFormShow = true + async handleEdit(row) { + this.editFormTitle = "修改核酸检测关注名单"; + this.editFormShow = true; - this.$nextTick(() => { - this.$refs.ref_form_edit.initForm('edit', row) - }) + let row2 = await this.getInfo(row); + this.$refs.ref_form_edit.initForm("edit", row2); }, - handleDetail (row) { - this.editFormTitle = "查看核酸检测关注名单" - this.editFormShow = true - this.$nextTick(() => { - this.$refs.ref_form_edit.initForm('detail', row) - }) + async handleDetail(row) { + this.editFormTitle = "查看核酸检测关注名单"; + this.editFormShow = true; + + let row2 = await this.getInfo(row); + this.$refs.ref_form_edit.initForm("detail", row2); + }, + + async getInfo(row) { + const url = "/epmetuser/icEpidemicSpecialAttention/detail"; + + let params = { + id: row.id, + }; + + const { data, code, msg } = await requestPost(url, params); + + if (code === 0) { + row.mobile = data.mobile; + row.idCard = data.idCard; + } + return row; }, handleSendNotice () { diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue index 4c65d7c98..435382800 100644 --- a/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue +++ b/src/views/modules/base/epidemic/veroFocus/veroFocusList.vue @@ -1,387 +1,491 @@ - - - - From 3109e4023c969b2f57d9405746180bde2dced0ad Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Fri, 29 Apr 2022 09:37:13 +0800 Subject: [PATCH 3/3] fsdfsa --- src/assets/scss/common.scss | 8 ++++++++ src/assets/scss/modules/warning.scss | 8 +++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss index 794afa6f7..b64e02d22 100644 --- a/src/assets/scss/common.scss +++ b/src/assets/scss/common.scss @@ -821,3 +821,11 @@ div.el-table div.cell { text-overflow: ellipsis; word-wrap: normal; } + +input::-webkit-outer-spin-button, +input::-webkit-inner-spin-button { + -webkit-appearance: none; +} +input[type="number"] { + -moz-appearance: textfield; +} diff --git a/src/assets/scss/modules/warning.scss b/src/assets/scss/modules/warning.scss index 2c6b9fa2c..2353a9435 100644 --- a/src/assets/scss/modules/warning.scss +++ b/src/assets/scss/modules/warning.scss @@ -85,7 +85,7 @@ content: ""; width: 8px; height: 8px; - background: #2194fe; + background: #f5f502; border-radius: 50%; position: absolute; left: 12px; @@ -93,6 +93,12 @@ transform: translate(0, -50%); } + &:nth-of-type(2) { + &::after { + background: #fb500d; + } + } + div:nth-child(1) { font-size: 16px; font-family: PingFang SC;