Bläddra i källkod

Merge branch 'gyj' of SH-Arbitrate/Mediation-Frontend into dev

gaogaoyujie 2 år sedan
förälder
incheckning
f3b90edb88

Binär
public/favicon.ico Visa fil


Binär
public/favicon1.ico Visa fil


Binär
src/assets/images/logo.png Visa fil


Binär
src/assets/images/logos.png Visa fil


Binär
src/assets/logo/logo.png Visa fil


+ 5
- 2
src/views/caseManagement/components/mediation.vue Visa fil

188
         this.caseApplicationSelectByIdFn({
188
         this.caseApplicationSelectByIdFn({
189
           id: this.mediationData.id
189
           id: this.mediationData.id
190
         });
190
         });
191
-        this.getUser();
191
+        this.getUser(); 
192
       }
192
       }
193
     }
193
     }
194
   },
194
   },
199
       secretaryRoleByUserId({
199
       secretaryRoleByUserId({
200
         userId: this.userId
200
         userId: this.userId
201
       }).then(res => {
201
       }).then(res => {
202
-        this.isSecretaryRole = res.data.isSecretaryRole;
202
+         this.isSecretaryRole = res.data.isSecretaryRole;
203
+         if(this.recordArrMediate){
204
+          this.isSecretaryRole = false
205
+        }
203
       })
206
       })
204
     },
207
     },
205
     /**上传地址*/
208
     /**上传地址*/

+ 6
- 6
src/views/login.vue Visa fil

176
     width: 50%;
176
     width: 50%;
177
     height: 90%;
177
     height: 90%;
178
     .leftIcon {
178
     .leftIcon {
179
-      height: 10%;
179
+      height: 20%;
180
       width: 100%;
180
       width: 100%;
181
-      margin: 5% 10% 1% 15%;
181
+      margin: 0% 10% 1% 15%;
182
       .Icon {
182
       .Icon {
183
-        width: 45px;
184
-        height: 45px;
185
-        background-image: url("../assets/images/mediate.svg");
183
+        width: 100px;
184
+        height: 105px;
185
+        background-image: url("../assets/images/logos.png");
186
         background-size: cover;
186
         background-size: cover;
187
       }
187
       }
188
       div {
188
       div {
189
-        font-size: 17px;
189
+        font-size: 18px;
190
       }
190
       }
191
     }
191
     }
192
     .leftImage {
192
     .leftImage {