mode

2022-03-10 15:25:59 +08:00 · 2022-03-10 15:25:59 +08:00 · c0a864dd29
parent eb59f31f06
commit c0a864dd29
12 changed files with 57 additions and 48 deletions
--- a/src/assets/css/general.scss
+++ b/src/assets/css/general.scss
@ -150,3 +150,6 @@ input[type="number"] {
  }
 }

+.el-popover__title {
+  font-family: "SRL";
+}
--- a/src/components/FecrHeader.vue
+++ b/src/components/FecrHeader.vue
@ -21,7 +21,7 @@
        </el-breadcrumb></el-col
      >
      <el-col
-        ><el-button @click="skip" type="primary" v-if="isLogin() !== 'true'"
+        ><el-button type="primary" v-if="isLogin() !== 'true'"
          >登录</el-button
        >
        <el-popover
@ -114,7 +114,6 @@ export default {
    outLogin() {
      this.$store.commit("del_token");
      this.$store.commit("del_login");
-      this.$store.commit("del_user_verfiy");
      this.$router.push("/user");
    },
  },
--- a/src/components/FecrLine.vue
+++ b/src/components/FecrLine.vue
@ -12,13 +12,15 @@ export default {
    return {};
  },
  mounted() {
-    this.initLine();
+    if (this.data) {
+      this.initLine();
+    }
  },
  methods: {
    initLine() {
      var chart = this.$echarts.init(document.getElementById("line"), "shine");
      var option = {
-         tooltip: {
+        tooltip: {
          trigger: "item",
          showContent: true,
          formatter: function (params) {
@ -28,8 +30,8 @@ export default {
        xAxis: {
          type: "category",
          boundaryGap: false,
-          data: this.data["数据"].map(item=>{
-            return item["年度"]
+          data: this.data["数据"].map((item) => {
+            return item["年度"];
          }),
          axisLine: {
            lineStyle: {
@ -67,9 +69,9 @@ export default {
        },
        series: [
          {
-            data: this.data["数据"].map(item=>{
-            return item["数据"]
-          }),
+            data: this.data["数据"].map((item) => {
+              return item["数据"];
+            }),
            type: "line",
            smooth: true,
            areaStyle: {
@ -106,23 +108,23 @@ export default {
    },
  },

-  watch:{
-    data:{
-      handler(val){
-        this.data = val
-        console.log(this.data)
-        this.initLine()
+  watch: {
+    data: {
+      handler(val) {
+        if (val["数据"]) {
+          this.data = val;
+          this.initLine();
+        }
      },
-      // immediate:true,
-      deep:true
+      // immediate: true,
+      deep: true,
    },
-
-  }
+  },
 };
 </script>

 <style lang="scss" scoped>
-canvas{
+canvas {
  display: flex;
  justify-content: center;
 }
--- a/src/components/FecrPie.vue
+++ b/src/components/FecrPie.vue
@ -17,7 +17,11 @@ export default {
      seriesData:[]
    };
  },
-  mounted() {},
+  mounted() {
+    if(this.data){
+      this.parseData()
+    }
+  },
  methods: {
    parseData() {
      this.nameArray = this.data["数据"].map((ele) => {
@ -109,7 +113,7 @@ export default {
          this.parseData();
        });
      },
-      immediate: true,
+      // immediate: true,
      deep: true,
    },
  },
--- a/src/components/FecrTranTable.vue
+++ b/src/components/FecrTranTable.vue
@ -66,9 +66,9 @@ export default {
      type: Boolean,
      default: true,
    },
-    height: {
-      type: String,
-      default: "100%",
+    height: { 
+      type: Number,
+      default: 0,
    },
    isInput: {
      type: Boolean,
--- a/src/store/index.js
+++ b/src/store/index.js
@ -25,10 +25,6 @@ const store = new Vuex.Store({
      localStorage.setItem("user_verify", user_verify)
      state.user.user_verify = localStorage.getItem("user_verify")
    },
-    del_user_verify(state) {
-      state.user_verify = false
-      localStorage.removeItem("user_verify")
-    },
    set_login(state, login) {
      localStorage.setItem("isLogin", login)
      state.isLogin = localStorage.getItem("isLogin")
--- a/src/view/appraisal/credit/stepState.vue
+++ b/src/view/appraisal/credit/stepState.vue
@ -21,7 +21,7 @@
        企业名称<span>{{ data["企业名称"] }}</span>
      </p>
      <p>
-        审计日期<span>{{ data["评价年度"] }}</span>
+        评价年度<span>{{ data["评价年度"] }}</span>
      </p>
      <p>
        行业选择
--- a/src/view/home/children/abstract.vue
+++ b/src/view/home/children/abstract.vue
@ -5,10 +5,7 @@
      <div class="service-words little">Comprehensive credit assesment</div>
      <div class="service-words">
        数字化综合信用等级评价是指远东资信评估有限公司（简称“远东资信”）通过数字化的方式对影响经济主体或者债务融资工具的信用风险因素进行分析，就其偿债能力、偿债意愿以及经营状况作出综合评价，并通过预先定义的信用等级符号进行表示。
-        受评企业长期综合信用等级分三等九级，即：AAA、AA、A、BBB、BB、B、CCC、CC、C。除AAA级、CCC级(含)以下等级外，每一个信用等级可用“+”、“-”符号进行微调，表示略高或略低于本等级。<span
-          class="more"
-          >More...</span
-        >
+        受评企业长期综合信用等级分三等九级，即：AAA、AA、A、BBB、BB、B、CCC、CC、C。除AAA级、CCC级(含)以下等级外，每一个信用等级可用“+”、“-”符号进行微调，表示略高或略低于本等级。
      </div>
    </div>
  </div>
--- a/src/view/user/login/index.vue
+++ b/src/view/user/login/index.vue
@ -33,7 +33,7 @@
              <el-input v-model="form.email"></el-input>
            </el-form-item>
            <el-form-item label="密码" prop="pwd">
-              <el-input v-model="form.pwd" type="password"></el-input>
+              <el-input v-model="form.pwd" show-password type="password"></el-input>
            </el-form-item>
          </el-form>
        </div>
@ -163,20 +163,12 @@ export default {
    home() {
      this.$store.commit("del_token");
      this.$store.commit("del_login");
-      this.$store.commit("del_user_verfiy");
      this.$router.push("/home");
    },
  },
  destroyed() {
    window.removeEventListener("keydown", this.keyDown, false);
  },
-  watch: {
-    activeName: {
-      handle(val) {
-        this.activeName = val;
-      },
-    },
-  },
 };
 </script>

--- a/src/view/user/register/index.vue
+++ b/src/view/user/register/index.vue
@ -44,13 +44,14 @@
                ></el-input>
              </el-form-item>
              <el-form-item label="密码" prop="pwd">
-                <el-input v-model="form.pwd" type="password"></el-input>
+                <el-input v-model="form.pwd" type="password" show-password></el-input>
              </el-form-item>
              <el-form-item label="确认密码" prop="checkpwd">
                <el-input
                  v-model="form.checkpwd"
                  type="password"
                  readonly
+                  show-password
                  onfocus="this.removeAttribute('readonly')"
                ></el-input>
              </el-form-item>
--- a/src/view/userInfo/account.vue
+++ b/src/view/userInfo/account.vue
@ -85,7 +85,7 @@
                    slot="append"
                    @click="sendMail"
                    v-if="!flag"
-                    type="primary"
+                    :disabled="checkEmail()"
                    >发送验证码</el-button
                  ><el-button slot="append" disabled v-if="flag"
                    >验证码已发送({{ this.time }})</el-button
@ -95,7 +95,7 @@
            </el-form>
          </el-row>
          <span slot="footer" class="dialog-footer">
-            <el-button @click="visible = false">取 消</el-button>
+            <el-button @click="emailVisible = false">取 消</el-button>
            <el-button type="primary" @click="confirmEmail('emailForm')"
              >更 换</el-button
            >
@ -258,6 +258,17 @@ export default {
      });
    },

+     checkEmail(){
+      const reg = new RegExp(
+          "^[a-z0-9]+([._\\-]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$"
+        );
+        if (!reg.test(this.email.email)) {
+          return true
+        }else{
+          return false
+        }
+    },
+
    // 更换头像
    changeAvatar(index) {
      const obj = {
@ -451,8 +462,8 @@ export default {
    width: 80%;
  }

-  .el-loading-mask{
-    width:80%;
+  .el-loading-mask {
+    width: 80%;
  }

  .el-loading-spinner {
--- a/src/view/userInfo/index.vue
+++ b/src/view/userInfo/index.vue
@ -41,4 +41,8 @@ export default {
    justify-content: flex-end;
  }
 }
+
+::v-deep .el-input__inner::placeholder{
+  color:#fff;
+}
 </style>