diff --git a/src/components/FecrBar.vue b/src/components/FecrBar.vue
index 8fbc206..70e821e 100644
--- a/src/components/FecrBar.vue
+++ b/src/components/FecrBar.vue
@@ -21,20 +21,39 @@ export default {
     },
     parseSeries() {
       const color = ["#66c18c", "#1177b0"];
-      return Object.keys(this.data).map((key, index) => {
-        return {
-          name: key,
-          type: "bar",
-          data: Object.keys(this.data[key]).map((i) => {
-            return this.data[key][i];
-          }),
-          barWidth: 30,
-          itemStyle: {
-            color: color[index],
-            barBorderRadius: [2],
-          },
-        };
-      });
+      if (Object.keys(this.data).length === 1) {
+        const key = Object.keys(this.data)[0]
+          return {
+            name:key,
+            type: "bar",
+            data: Object.keys(this.data[key]).map(i=>{
+              return this.data[key][i];
+            }),
+            barWidth: 30,
+            itemStyle: {
+              normal: {
+                color: function (params) {
+                  return params.data < 0 ? "#f50" : "#5970CA";
+                },
+              },
+            },
+          };
+      } else {
+        return Object.keys(this.data).map((key, index) => {
+          return {
+            name: key,
+            type: "bar",
+            data: Object.keys(this.data[key]).map((i) => {
+              return this.data[key][i];
+            }),
+            barWidth: 30,
+            itemStyle: {
+              color: color[index],
+              barBorderRadius: [2],
+            },
+          };
+        });
+      }
     },
     init() {
       var chart = this.$echarts.init(document.getElementById(this.id), "shine");
@@ -54,8 +73,8 @@ export default {
           y: "top",
           padding: [0, 50, 0, 0],
           data: Object.keys(this.data).map((key) => {
-              return key;
-            })
+            return key;
+          }),
         },
         title: {
           text: "",
diff --git a/src/components/FecrTable.vue b/src/components/FecrTable.vue
index 6836e6b..eabb9f6 100644
--- a/src/components/FecrTable.vue
+++ b/src/components/FecrTable.vue
@@ -6,7 +6,7 @@
       stripe
       border
       :max-height="height || '100%'"
-      :style="{ background: background }"
+      :style="{ background: background,minHeight:minHeight }"
       :span-method="spanMethod"
       :header-cell-style="headClass"
     >
@@ -79,6 +79,10 @@ export default {
     },
     page: [Object],
     height: [String],
+    minHeight:{
+      type: String,
+      default: "auto"
+    },
     background: [String],
     spanMethod: {
       type: Function,
diff --git a/src/view/appraisal/credit/stepFinancial.vue b/src/view/appraisal/credit/stepFinancial.vue
index 3d93e56..cb6d5a2 100644
--- a/src/view/appraisal/credit/stepFinancial.vue
+++ b/src/view/appraisal/credit/stepFinancial.vue
@@ -16,7 +16,7 @@
         <span class="block">3. 单位：元</span>
         <i class="el-icon-warning warning" slot="reference" />
       </el-popover>
-      <el-select v-model="unit">
+      <el-select v-model="unit" style="width:100px">
         <el-option
           v-for="(item, index) in options"
           :key="index"
@@ -129,9 +129,9 @@ export default {
             if (this.unit === "元") {
               return { [key]: item[key] };
             } else if (this.unit === "万元") {
-              return { [key]: item[key] * 10000 };
+              return { [key]: item[key] };
             } else {
-              return { [key]: item[key] * 100000000 };
+              return { [key]: item[key]};
             }
           } else {
             return { [key]: item[key] };
diff --git a/src/view/appraisal/index.vue b/src/view/appraisal/index.vue
index 71ebbcd..72c07ce 100644
--- a/src/view/appraisal/index.vue
+++ b/src/view/appraisal/index.vue
@@ -172,7 +172,7 @@ export default {
   methods: {
     init() {
       get("/input/rating_records").then((res) => {
-        this.data = res.result;
+        this.data = res.result
         this.data.length === 0
           ? null
           : (this.columns = Object.keys(this.data[0]).map((item) => {
@@ -196,7 +196,12 @@ export default {
     viewReport(val) {
       this.reportVisible = true;
       BlobGet(val).then((res) => {
-        this.loadPdfHandler(res);
+        if(res.info){
+          this.$message.warning(res.info)
+        }else{
+           this.loadPdfHandler(res);
+        }
+       
       });
     },
 
diff --git a/src/view/company/stepElementsAppraisal.vue b/src/view/company/stepElementsAppraisal.vue
index d6fba0f..d9fe4c8 100644
--- a/src/view/company/stepElementsAppraisal.vue
+++ b/src/view/company/stepElementsAppraisal.vue
@@ -1,44 +1,79 @@
 <!-- 财务要素评价 -->
 <template>
   <el-row>
-    <el-col :span="12">
-      <el-card style="height: 100%" class="left">
-        <el-row type="flex" justify="space-between" style="align-items: center">
-          <el-select v-model="selectBar">
-            <el-option
-              v-for="(item, index) in optionsBar"
-              :key="index"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-        </el-row>
-        <fecr-bar
-          :data="data[selectBar]"
-          :id="'elements-appraisal'"
-          :xAxis="xAxis"
-          v-if="state === 'fifth'"
-        />
-      </el-card>
-      <el-card class="left" style="height: auto">
-        <el-row type="flex" justify="space-between" style="align-items: center">
-          <el-select v-model="selectTable" @change="getTableData">
-            <el-option
-              v-for="(item, index) in optionsTable"
-              :key="index"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-        </el-row>
-        <fecr-table :data="tableData" :columns="column" class="top" />
-      </el-card>
-    </el-col>
-    <el-col :span="12">
+    <el-row>
+      <el-col :span="12">
+        <el-card style="height: 100%" class="left">
+          <p>去年对比图</p>
+          <fecr-bar
+            :data="data['去年对比图']"
+            :id="'elements-appraisal-1'"
+            :xAxis="xAxis"
+            v-if="state === 'fifth'"
+          />
+        </el-card>
+        <el-card class="left" style="height: auto">
+          <p>去年对比表</p>
+          <fecr-bar
+            :data="{'去年对比表':data['去年对比表']}"
+            :id="'elements-appraisal-2'"
+            :xAxis="xAxis"
+            v-if="state === 'fifth'"
+          />
+        </el-card>
+      </el-col>
+      <el-col :span="12">
+        <el-card style="height: 100%" class="left">
+          <p>同行对比图</p>
+          <fecr-bar
+            :data="data['同行对比图']"
+            :id="'elements-appraisal-3'"
+            :xAxis="xAxis"
+            v-if="state === 'fifth'"
+          />
+        </el-card>
+        <el-card class="left" style="height: auto">
+          <p>同行对比表</p>
+          <fecr-bar
+            :data="{'同行对比表':data['同行对比表']}"
+            :id="'elements-appraisal-4'"
+            :xAxis="xAxis"
+            v-if="state === 'fifth'"
+          />
+        </el-card>
+      </el-col>
+    </el-row>
+    <el-row>
       <el-card class="right" style="height: auto">
-        <span>指标详情</span>
+        <span>指标详情</span
+        ><el-popover
+          placement="bottom"
+          title="提示:"
+          width="500"
+          trigger="click"
+        >
+          <div style="height: 300px; overflow: auto">
+            <div v-for="(item, index) in paraphrase" :key="index">
+              <p>{{ index }}</p>
+              <div
+                v-for="(child, i) in item"
+                :key="i"
+                style="margin-bottom: 10px"
+              >
+                <span>{{ i }}：</span>
+                <div
+                  v-for="(grandson, j) in child"
+                  :key="j"
+                  style="margin-top: 10px"
+                >
+                  <div class="badge"></div>
+                  <span>{{ grandson }}</span>
+                </div>
+              </div>
+            </div>
+          </div>
+          <i class="el-icon-warning warning" slot="reference" />
+        </el-popover>
         <fecr-table
           :data="secondaryIndicatorsData"
           :columns="secondaryIndicatorsColumns"
@@ -47,24 +82,7 @@
           :height="'400px'"
         />
       </el-card>
-      <el-card class="right" style="height: 325px; overflow: auto">
-        <span>释义</span>
-        <div v-for="(item, index) in paraphrase" :key="index">
-          <p>{{ index }}</p>
-          <div v-for="(child, i) in item" :key="i" style="margin-bottom: 10px">
-            <span>{{ i }}：</span>
-            <div
-              v-for="(grandson, j) in child"
-              :key="j"
-              style="margin-top: 10px"
-            >
-              <div class="badge"></div>
-              <span>{{ grandson }}</span>
-            </div>
-          </div>
-        </div>
-      </el-card>
-    </el-col>
+    </el-row>
   </el-row>
 </template>
 
@@ -224,17 +242,15 @@ export default {
 
   methods: {
     init() {
-      get("/company/financial_elements").then(
-        (res) => {
+      get("/company/financial_elements").then((res) => {
         if (Object.keys(res.result).length === 0) {
-          this.$emit("getDisabled",{disabled:true,index:4})
+          this.$emit("getDisabled", { disabled: true, index: 4 });
         } else {
-           this.data = res.result;
+          this.data = res.result;
           this.getTableData(this.selectTable);
           this.secondaryIndicators();
         }
-        }
-      );
+      });
     },
 
     getTableData(val) {
@@ -280,4 +296,10 @@ export default {
 </script>
 <style lang='scss' scoped>
 @import "@/assets/css/company.scss";
+
+.warning {
+  margin-left: 10px;
+  color: #ffe51d;
+  font-size: 1vw;
+}
 </style>
\ No newline at end of file
diff --git a/src/view/company/stepRiskAppraisal.vue b/src/view/company/stepRiskAppraisal.vue
index fce4500..ababb6c 100644
--- a/src/view/company/stepRiskAppraisal.vue
+++ b/src/view/company/stepRiskAppraisal.vue
@@ -1,65 +1,84 @@
 <!-- 公司风险分析 -->
 <template>
-  <el-row>
-    <el-col :span="12">
-      <el-card class="left" style="height: auto">
-        <span>风险级别</span>
-        <el-row type="flex" class="progress"
-          ><span>低风险</span
-          ><el-progress
-            type="dashboard"
-            :percentage="data['风险分数']"
-            :format="format"
-            :color="data['风险分数'] > 50 ? '#ff9300' : '#1989fa'"
-          ></el-progress
-          ><span>高风险</span>
-        </el-row>
-        <el-row v-for="(item, index) in options" :key="index" class="last">
-          <el-col
-            :span="12"
-            class="business-item"
-            style="background-color: #eaf1f8"
-            ><span>{{ item }}</span></el-col
-          >
-          <el-col :span="12" class="business-item-last"
-            ><span>{{ data[item] }}</span></el-col
-          >
-        </el-row>
-        <el-row class="left-risk">
-          <span>自身风险</span>
-          <fecr-table
-            :data="ownRiskData"
-            :columns="column"
-            class="top"
-          ></fecr-table>
-          <span>经营风险</span>
-          <fecr-table
-            :data="businessRiskData"
-            :columns="column"
-            class="top"
-          ></fecr-table>
-          <span>变更记录</span>
-          <fecr-table
-            :data="changeRecordData"
-            :columns="column"
-            class="top"
-          ></fecr-table>
-        </el-row>
+  <div>
+    <el-row style="margin-bottom:20px">
+      <el-card style="height:auto;min-height:300px">
+        <p>风险级别</p>
+        <el-col :span="12">
+          <el-row type="flex" class="progress"
+            ><span>低风险</span
+            ><el-progress
+              type="dashboard"
+              :percentage="data['风险分数']"
+              :format="format"
+              :color="data['风险分数'] > 50 ? '#ff9300' : '#1989fa'"
+            ></el-progress
+            ><span>高风险</span>
+          </el-row>
+        </el-col>
+        <el-col :span="12">
+          <el-row v-for="(item, index) in options" :key="index" class="last">
+            <el-col
+              :span="12"
+              class="business-item"
+              style="background-color: #eaf1f8"
+              ><span>{{ item }}</span></el-col
+            >
+            <el-col :span="12" class="business-item-last"
+              ><span>{{ data[item] }}</span></el-col
+            >
+          </el-row>
+        </el-col>
       </el-card>
-    </el-col>
-    <el-col :span="12">
-      <el-card class="right" style="height: auto">
-        <span>周边风险</span>
-        <fecr-table
-          :data="sideRiskData"
-          :columns="sideRiskColumn"
-          class="top"
-          :shortWidth="[0, 1]"
-          :height="'1300px'"
-        ></fecr-table>
-      </el-card>
-    </el-col>
-  </el-row>
+    </el-row>
+    <el-row>
+      <el-col :span="12">
+        <el-card class="left" style="height: auto">
+          <el-row class="left-risk">
+            <span>自身风险</span>
+            <fecr-table
+              :data="ownRiskData"
+              :columns="column"
+              class="top"
+              :height="'300px'"
+              :minHeight="'300px'"
+            ></fecr-table>
+            <span>变更记录</span>
+            <fecr-table
+              :data="changeRecordData"
+              :columns="column"
+              class="top"
+              :height="'300px'"
+              :minHeight="'300px'"
+            ></fecr-table>
+          </el-row>
+        </el-card>
+      </el-col>
+      <el-col :span="12">
+        <el-card class="right" style="height: auto">
+          <el-row class="left-risk">
+            <span>经营风险</span>
+            <fecr-table
+              :data="businessRiskData"
+              :columns="column"
+              class="top"
+              :height="'300px'"
+              :minHeight="'300px'"
+            ></fecr-table>
+            <span>周边风险</span>
+            <fecr-table
+              :data="sideRiskData"
+              :columns="sideRiskColumn"
+              class="top"
+              :shortWidth="[0, 1]"
+              :height="'300px'"
+              :minHeight="'300px'"
+            ></fecr-table>
+          </el-row>
+        </el-card>
+      </el-col>
+    </el-row>
+  </div>
 </template>
 
 <script>
@@ -97,19 +116,17 @@ export default {
 
   methods: {
     init() {
-      get("/company/operating_risk").then(
-        (res) => {
-          if (Object.keys(res.result).length === 0) {
-            this.$emit("getDisabled", {disabled:true,index:5});
-          } else {
-            this.data = res.result;
-            this.ownRiskData = this.optimizeData(this.data["合规风险"], 0);
-            this.businessRiskData = this.optimizeData(this.data["经营风险"], 0);
-            this.sideRiskData = this.optimizeData(this.data["周边风险"], 1);
-            this.changeRecordData = this.optimizeData(this.data["变更记录"], 0);
-          }
+      get("/company/operating_risk").then((res) => {
+        if (Object.keys(res.result).length === 0) {
+          this.$emit("getDisabled", { disabled: true, index: 5 });
+        } else {
+          this.data = res.result;
+          this.ownRiskData = this.optimizeData(this.data["合规风险"], 0);
+          this.businessRiskData = this.optimizeData(this.data["经营风险"], 0);
+          this.sideRiskData = this.optimizeData(this.data["周边风险"], 1);
+          this.changeRecordData = this.optimizeData(this.data["变更记录"], 0);
         }
-      );
+      });
     },
 
     format(percentage) {
@@ -194,13 +211,13 @@ export default {
   border-left: 0.25px solid #707070;
 }
 
-.last:nth-child(5) {
+.last:nth-child(3) {
   border-bottom: 0.25px solid #707070;
 }
 
 .left-risk {
-  span {
-    margin-top: 20px;
+  span:nth-child(3) {
+    margin-top: 40px;
   }
 }
 </style>
\ No newline at end of file
diff --git a/src/view/user/login/reset.vue b/src/view/user/login/reset.vue
index ee57996..192c4c2 100644
--- a/src/view/user/login/reset.vue
+++ b/src/view/user/login/reset.vue
@@ -188,7 +188,7 @@ export default {
     },
     //发送验证码
     mail() {
-      BlockPost("/user/verify_email", { email: this.form.email,v_type:"resetpwd" })
+      BlockPost("/notice/email/send_verify_info", { email: this.form.email,v_type:"resetpwd" })
         .then((res) => {
           if (res.info === "邮件已发送") {
             this.$message({
diff --git a/src/view/user/register/index.vue b/src/view/user/register/index.vue
index 89fff33..db918eb 100644
--- a/src/view/user/register/index.vue
+++ b/src/view/user/register/index.vue
@@ -228,7 +228,7 @@ export default {
     },
     //发送验证码
     mail() {
-      BlockPost("/user/verify_email", {
+      BlockPost("/notice/email/send_verify_info", {
         email: this.form.email,
         v_type: "register",
       })
diff --git a/src/view/userInfo/account.vue b/src/view/userInfo/account.vue
index c061dd0..d4345d4 100644
--- a/src/view/userInfo/account.vue
+++ b/src/view/userInfo/account.vue
@@ -358,7 +358,7 @@ export default {
 
     //发送邮箱验证码
     sendMail() {
-      BlockPost("/user/verify_email", {
+      BlockPost("/notice/email/send_verify_info", {
         email: this.email.email,
         v_type: "resetemail",
       })