diff --git a/public/favicon.ico b/public/favicon.ico index 6775f58..6561f81 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/favicon1.ico b/public/favicon1.ico deleted file mode 100644 index 7d451c6..0000000 Binary files a/public/favicon1.ico and /dev/null differ diff --git a/src/api/system/homepage.js b/src/api/system/homepage.js new file mode 100644 index 0000000..d0afc22 --- /dev/null +++ b/src/api/system/homepage.js @@ -0,0 +1,10 @@ +import request from '@/utils/request' + +// 查询首页待办 +export function todoCount(data) { + return request({ + url: '/caseApplication/todoCount', + method: 'get', + params: data + }) +} \ No newline at end of file diff --git a/src/assets/images/daiban.png b/src/assets/images/daiban.png new file mode 100644 index 0000000..86806bc Binary files /dev/null and b/src/assets/images/daiban.png differ diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png new file mode 100644 index 0000000..e93620a Binary files /dev/null and b/src/assets/images/logo.png differ diff --git a/src/assets/images/logos.png b/src/assets/images/logos.png new file mode 100644 index 0000000..d3a1a2a Binary files /dev/null and b/src/assets/images/logos.png differ diff --git a/src/assets/logo/logo.png b/src/assets/logo/logo.png index 19d2ff7..e93620a 100644 Binary files a/src/assets/logo/logo.png and b/src/assets/logo/logo.png differ diff --git a/src/views/caseManagement/caseList.vue b/src/views/caseManagement/caseList.vue index 48ef846..b227270 100644 --- a/src/views/caseManagement/caseList.vue +++ b/src/views/caseManagement/caseList.vue @@ -72,13 +72,16 @@ icon="el-icon-edit">查看缴费单 上传证据 - 归档详情 -
+ 归档详情 +
{{ - item.nodeName }} + v-if="item.id == scope.row.caseFlowId && + checkPermi([item.buttonAuthFlag]) && + scope.row.signButtonFlag != 1 + ">{{ item.nodeName }}
@@ -143,26 +146,38 @@ diff --git a/src/views/caseManagement/components/mediation.vue b/src/views/caseManagement/components/mediation.vue index 604c575..15bd27e 100644 --- a/src/views/caseManagement/components/mediation.vue +++ b/src/views/caseManagement/components/mediation.vue @@ -188,7 +188,7 @@ export default { this.caseApplicationSelectByIdFn({ id: this.mediationData.id }); - this.getUser(); + this.getUser(); } } }, @@ -199,7 +199,10 @@ export default { secretaryRoleByUserId({ userId: this.userId }).then(res => { - this.isSecretaryRole = res.data.isSecretaryRole; + this.isSecretaryRole = res.data.isSecretaryRole; + if(this.recordArrMediate){ + this.isSecretaryRole = false + } }) }, /**上传地址*/ diff --git a/src/views/index.vue b/src/views/index.vue index 8200b4a..63d45dd 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -1,27 +1,129 @@ diff --git a/src/views/login.vue b/src/views/login.vue index bd057b8..520ed34 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -67,7 +67,8 @@
@@ -176,17 +177,17 @@ export default { width: 50%; height: 90%; .leftIcon { - height: 10%; + height: 20%; width: 100%; - margin: 5% 10% 1% 15%; + margin: 0% 10% 1% 15%; .Icon { - width: 45px; - height: 45px; - background-image: url("../assets/images/mediate.svg"); + width: 100px; + height: 105px; + background-image: url("../assets/images/logos.png"); background-size: cover; } div { - font-size: 17px; + font-size: 18px; } } .leftImage { @@ -247,8 +248,8 @@ export default { } .el-login-footer { background-color: rgb(126, 131, 135); - height: 40px; - line-height: 40px; + height: 55px; + line-height: 55px; position: fixed; bottom: 0; width: 100%; @@ -257,6 +258,9 @@ export default { font-family: Arial; font-size: 12px; letter-spacing: 1px; + div { + height: 30%; + } } .login-code-img { height: 38px;