Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Frontend into gyj

src/views/caseManagement/components/addCase.vue

@@ -115,11 +115,11 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="选择机构或自然人" prop="affiliate.organizeFlag">
-                            <el-radio-group v-model="formData.affiliate.organizeFlag" @change="clearValidate">
-                                <el-radio :label="0">自然人</el-radio>
-                                <el-radio :label="1">机构</el-radio>
-                            </el-radio-group>
-               </el-form-item>
+              <el-radio-group v-model="formData.affiliate.organizeFlag" @change="clearValidate">
+                <el-radio :label="0">自然人</el-radio>
+                <el-radio :label="1">机构</el-radio>
+              </el-radio-group>
+            </el-form-item>
           </el-col>
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 1">
             <el-form-item label="申请机构名称" prop="affiliate.applicationName" :rules="[
@@ -133,14 +133,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 0">
-            <el-form-item label="申请人" prop="affiliate.applicationName1" :rules="[
+            <el-form-item label="申请人" prop="affiliate.applicationName" :rules="[
               {
                 required: true,
                 message: '申请人名称不能为空',
                 trigger: 'blur',
               },
             ]">
-              <el-input v-model="formData.affiliate.applicationName1" placeholder="请输入申请机构名称" />
+              <el-input v-model="formData.affiliate.applicationName" placeholder="请输入申请机构名称" />
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 1">
@@ -497,17 +497,18 @@ export default {
       } else if (val == 3) {
         this.title = "修改案件";
         this.modelFlag = true;
-        this.caseApplicationSelectByIdFn(this.caseData.id);
       } else if (val == 2) {
         this.title = "案件详情";
         this.modelFlag = true;
-        this.caseApplicationSelectByIdFn(this.caseData.id);
       }
     },
     addVisable(val) {
       if (val) {
         this.activeName = "first";
         this.getTemplateFn();
+        if (this.addModifyData != 1) {
+          this.caseApplicationSelectByIdFn(this.caseData.id);
+        }
       }
     },
   },
@@ -610,7 +611,7 @@ export default {
         }
       });
     },
-    clearValidate(){
+    clearValidate() {
       this.$refs["ruleForm"].clearValidate()
     },
     cancel() {

src/views/login.vue

@@ -1,7 +1,17 @@
 <template>
   <div class="login">
+    <!-- 左侧 -->
+    <div class="leftBox">
+      <div class="leftIcon">
+        <div class="Icon"></div>
+        <div>智慧调解系统</div>
+      </div>
+      <div class="leftImage"></div>
+    </div>
+    <!-- 右侧 -->
+    <div class="rightBox">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">智慧调解系统</h3>
+      <h2 class="title">用户登录</h2>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"
@@ -54,6 +64,7 @@
         </div>
       </el-form-item>
     </el-form>
+    </div>
     <!--  底部  -->
     <div class="el-login-footer">
       <span>Copyright © 2023 乙巢（上海）企业管理服务有限公司.</span>
@@ -161,13 +172,46 @@ export default {
   justify-content: center;
   align-items: center;
   height: 100%;
-  background-image: url("../assets/images/loginbg.jpg");
-  background-size: cover;
+  .leftBox {
+    width: 50%;
+    height: 90%;
+    .leftIcon {
+      height: 10%;
+      width: 100%;
+      margin: 5% 10% 1% 15%;
+      .Icon {
+        width: 45px;
+        height: 45px;
+        background-image: url("../assets/images/mediate.svg");
+        background-size: cover;
+      }
+      div {
+        font-size: 17px;
+      }
+    }
+    .leftImage {
+      width: 100%;
+      height: 90%;
+      margin-left: 10%;
+      margin-top: -15%;
+      background-image: url("../assets/images/login.svg");
+      background-size: cover;
+    }
+  }
+  
+  .rightBox {
+    width: 50%;
+    height: 90%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
 }
 .title {
   margin: 0px auto 30px auto;
   text-align: center;
-  color: #707070;
+  color: #1296db;
+  font-weight: 600;
 }
 
 .login-form {
@@ -202,6 +246,7 @@ export default {
   }
 }
 .el-login-footer {
+  background-color: rgb(126, 131, 135);
   height: 40px;
   line-height: 40px;
   position: fixed;