Merge branch 'swp-develop' into develop

src/views/login1.vue

+<template>
+  <div class="login">
+    <div class="logo">
+      <img src="@/assets/login/logo.png" alt="">
+    </div>
+      <div class="login-container">
+      <div class="login-left">
+        <div>欢迎登录</div>
+        <h2>融通地产危险源辨识系统</h2>
+      </div>
+      <div class="login-right">
+        <el-form
+          ref="loginForm"
+          :model="loginForm"
+          :rules="loginRules"
+          class="login-form"
+        >
+          <h4 class="title">账号登录<span class="bar"></span></h4>
+          <el-form-item prop="username">
+            <el-input
+              v-model="loginForm.username"
+              type="text"
+              auto-complete="off"
+              placeholder="账号"
+            >
+              <svg-icon
+                slot="prefix"
+                icon-class="user"
+                class="el-input__icon input-icon"
+              />
+            </el-input>
+          </el-form-item>
+          <el-form-item prop="password">
+            <el-input
+              v-model="loginForm.password"
+              type="password"
+              auto-complete="off"
+              placeholder="密码"
+              @keyup.enter.native="handleLogin"
+            >
+              <svg-icon
+                slot="prefix"
+                icon-class="password"
+                class="el-input__icon input-icon"
+              />
+            </el-input>
+          </el-form-item>
+          <el-form-item prop="code" v-if="captchaEnabled">
+            <el-input
+              v-model="loginForm.code"
+              auto-complete="off"
+              placeholder="验证码"
+              style="width: 63%"
+              @keyup.enter.native="handleLogin"
+            >
+              <svg-icon
+                slot="prefix"
+                icon-class="validCode"
+                class="el-input__icon input-icon"
+              />
+            </el-input>
+            <div class="login-code">
+              <img :src="codeUrl" @click="getCode" class="login-code-img" />
+            </div>
+          </el-form-item>
+          <el-checkbox
+            v-model="loginForm.rememberMe"
+            style="margin: 0px 0px 25px 0px"
+            >记住密码</el-checkbox
+          >
+          <el-form-item style="width: 100%">
+            <el-button
+              :loading="loading"
+              size="medium"
+              type="primary"
+              style="width: 100%"
+              @click.native.prevent="handleLogin"
+            >
+              <span v-if="!loading">登 录</span>
+              <span v-else>登 录 中...</span>
+            </el-button>
+            <div style="float: right" v-if="register">
+              <router-link class="link-type" :to="'/register'"
+                >立即注册</router-link
+              >
+            </div>
+          </el-form-item>
+        </el-form>
+      </div>
+      </div>
+    <!--  底部  -->
+    <div class="el-login-footer">
+      <span>Copyright © 2018-2023 censoft All Rights Reserved.</span>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getCodeImg } from "@/api/login";
+import Cookies from "js-cookie";
+import { encrypt, decrypt } from "@/utils/jsencrypt";
+
+export default {
+  name: "Login",
+  data() {
+    return {
+      codeUrl: "",
+      loginForm: {
+        username: "",
+        password: "",
+        rememberMe: false,
+        code: "",
+        uuid: "",
+      },
+      loginRules: {
+        username: [
+          { required: true, trigger: "blur", message: "请输入您的账号" },
+        ],
+        password: [
+          { required: true, trigger: "blur", message: "请输入您的密码" },
+        ],
+        code: [{ required: true, trigger: "change", message: "请输入验证码" }],
+      },
+      loading: false,
+      // 验证码开关
+      captchaEnabled: true,
+      // 注册开关
+      register: false,
+      redirect: undefined,
+    };
+  },
+  watch: {
+    $route: {
+      handler: function (route) {
+        this.redirect = route.query && route.query.redirect;
+      },
+      immediate: true,
+    },
+  },
+  created() {
+    this.getCode();
+    this.getCookie();
+  },
+  methods: {
+    getCode() {
+      getCodeImg().then((res) => {
+        this.captchaEnabled =
+          res.captchaEnabled === undefined ? true : res.captchaEnabled;
+        if (this.captchaEnabled) {
+          this.codeUrl = "data:image/gif;base64," + res.img;
+          this.loginForm.uuid = res.uuid;
+        }
+      });
+    },
+    getCookie() {
+      const username = Cookies.get("username");
+      const password = Cookies.get("password");
+      const rememberMe = Cookies.get("rememberMe");
+      this.loginForm = {
+        username: username === undefined ? this.loginForm.username : username,
+        password:
+          password === undefined ? this.loginForm.password : decrypt(password),
+        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe),
+      };
+    },
+    handleLogin() {
+      this.$refs.loginForm.validate((valid) => {
+        if (valid) {
+          this.loading = true;
+          if (this.loginForm.rememberMe) {
+            Cookies.set("username", this.loginForm.username, { expires: 30 });
+            Cookies.set("password", encrypt(this.loginForm.password), {
+              expires: 30,
+            });
+            Cookies.set("rememberMe", this.loginForm.rememberMe, {
+              expires: 30,
+            });
+          } else {
+            Cookies.remove("username");
+            Cookies.remove("password");
+            Cookies.remove("rememberMe");
+          }
+          this.$store
+            .dispatch("Login", this.loginForm)
+            .then(() => {
+              this.$router.push({ path: this.redirect || "/" }).catch(() => {});
+            })
+            .catch(() => {
+              this.loading = false;
+              if (this.captchaEnabled) {
+                this.getCode();
+              }
+            });
+        }
+      });
+    },
+  },
+};
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.login {
+  height: 100%;
+  width: 100%;
+  background: #e4f2fd;
+  padding:  28px 90px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  box-sizing: border-box;
+  .logo{
+    width: 128px;
+    position: fixed;
+    top: 28px;
+    left: 90px;
+    img{
+      width: 100%;
+    }
+  }
+  .login-container{
+      width: 70%;
+      display: flex;
+      box-shadow: 0px 0px 2px 2px #d1e3fa;
+      border-radius: 10px;
+      margin: 0 auto;
+      .login-left{
+        width: 60%;
+        height: 500px;
+        background: url('../assets/login/bg.png') center center;
+        background-size: cover;
+        color: #266eaa;
+        padding-left: 30px;
+        padding-top: 20px;
+        h2{
+          margin-top: 10px;
+        }
+        img{
+          width: 100%;
+          vertical-align: middle;
+        }
+      }
+      .login-right{
+        width: 40%;
+        align-self: stretch;
+        background: #fff;
+        border-radius:0 10px 10px 0;
+      }
+  }
+}
+
+.title {
+  margin: 0px auto 30px auto;
+  text-align: center;
+  color: #707070;
+   color: #266eaa;
+   position: relative;
+   margin-bottom: 30px;
+   .bar{
+      position: absolute;
+      bottom: -10px;
+      left: 50%;
+      margin-left: -25px;
+      display: inline-block;
+      width: 50px;
+      // border-bottom: 5px solid #266eaa;
+      height: 5px;
+      background: #266eaa;
+      border-radius: 10px;
+   }
+}
+
+.login-form {
+  border-radius: 6px;
+  background: #ffffff;
+  // width: 400px;
+  height: 100%;
+  padding: 25px 25px 5px 25px;
+  flex: 1;
+  .el-input {
+    height: 38px;
+    input {
+      height: 38px;
+    }
+  }
+  .input-icon {
+    height: 39px;
+    width: 14px;
+    margin-left: 2px;
+  }
+}
+.login-tip {
+  font-size: 13px;
+  text-align: center;
+  color: #bfbfbf;
+}
+.login-code {
+  width: 33%;
+  height: 38px;
+  float: right;
+  img {
+    cursor: pointer;
+    vertical-align: middle;
+  }
+}
+.el-login-footer {
+  height: 40px;
+  line-height: 40px;
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  text-align: center;
+  color: #fff;
+  font-family: Arial;
+  font-size: 12px;
+  letter-spacing: 1px;
+}
+.login-code-img {
+  height: 38px;
+}
+</style>

src/views/risk/plan/ledgerdata.vue

@@ -10,11 +10,16 @@
       <el-descriptions-item label="所属项目">{{
         InfoList.detailsDto.projectName
       }}</el-descriptions-item>
-      <el-descriptions-item label="所属楼栋" >
+      <el-descriptions-item label="所属楼栋">
         <!-- {{InfoList.detailsDto.buildingNames}} -->
         <template>
-        <div v-for="(buildingName, index) in InfoList.detailsDto.buildingNames.split(',')" :key="index">
-          {{buildingName}}
+          <div
+            v-for="(
+              buildingName, index
+            ) in InfoList.detailsDto.buildingNames.split(',')"
+            :key="index"
+          >
+            {{ buildingName }}
           </div>
         </template>
       </el-descriptions-item>
@@ -112,13 +117,60 @@
                 align="center"
                 prop="level"
               />
-              <el-table-column label="风险因素" align="center" prop="factor" />
-              <el-table-column label="准事故类型" align="center" prop="type" />
+              <el-table-column label="风险因素" align="center" prop="factor" >
+                <template slot-scope="scope">
+                  <el-popover
+                    placement="top-start"
+                    title="风险因素"
+                    width="200"
+                    trigger="hover"
+                    :content="scope.row.factor"
+                  >
+                    <span slot="reference">{{
+                      scope.row.factor.length > 10
+                        ? scope.row.factor.substring(0, 10) + "..."
+                        : scope.row.factor
+                    }}</span>
+                  </el-popover>
+                </template>
+              </el-table-column>
+              <el-table-column label="准事故类型" align="center" prop="type">
+                <template slot-scope="scope">
+                  <el-popover
+                    placement="top-start"
+                    title="准事故类型"
+                    width="200"
+                    trigger="hover"
+                    :content="scope.row.type"
+                  >
+                    <span slot="reference">{{
+                      scope.row.type.length > 10
+                        ? scope.row.type.substring(0, 10) + "..."
+                        : scope.row.type
+                    }}</span>
+                  </el-popover>
+                </template>
+              </el-table-column>
               <el-table-column
                 label="存在部位"
                 align="center"
                 prop="presenceLocation"
-              />
+              > <template slot-scope="scope">
+                  <el-popover
+                    placement="top-start"
+                    title="存在部位"
+                    width="200"
+                    trigger="hover"
+                    :content="scope.row.presenceLocation"
+                  >
+                    <span slot="reference">{{
+                      scope.row.presenceLocation.length > 10
+                        ? scope.row.presenceLocation.substring(0, 10) + "..."
+                        : scope.row.presenceLocation
+                    }}</span>
+                  </el-popover>
+                </template>
+              </el-table-column></el-table-column>
               <el-table-column label="操作" align="center" prop="describe">
                 <template slot-scope="scope">
                   <div>
@@ -136,10 +188,14 @@
                       @click="showDrawCanvas(scope.row.floorId)"
                       >查看四色图</el-button
                     >
-                    <router-link :to="'/risk/plan/inherentdata/index/' + scope.row.id" class="link-type">
-                      <el-button size="mini" type="text" icon="el-icon-view">详情</el-button>
+                    <router-link
+                      :to="'/risk/plan/inherentdata/index/' + scope.row.id"
+                      class="link-type"
+                    >
+                      <el-button size="mini" type="text" icon="el-icon-view"
+                        >详情</el-button
+                      >
                     </router-link>
-
                   </div>
                 </template>
               </el-table-column>