diff --git a/src/api/systemManagement/companyScore/index.js b/src/api/systemManagement/companyScore/index.js
new file mode 100644
index 0000000..e8eeb58
--- /dev/null
+++ b/src/api/systemManagement/companyScore/index.js
@@ -0,0 +1,10 @@
+// 企业赋分模块接口 
+import request from '@/utils/request'
+// 请求企业赋分表格主页
+export function getSafeCompany(params) {
+    return request({
+        url: '/safety/system/tbSafeCompanyStatisticsScore/getSafeCompanyStatisticsScore',
+        method: 'post',
+        params
+    })
+}
\ No newline at end of file
diff --git a/src/views/systemManagement/companyScore/components/companyTable.vue b/src/views/systemManagement/companyScore/components/companyTable.vue
new file mode 100644
index 0000000..70b7ac0
--- /dev/null
+++ b/src/views/systemManagement/companyScore/components/companyTable.vue
@@ -0,0 +1,43 @@
+<template>
+  <div>
+    <el-table class="company_table">
+      <el-table-column prop="date" label="企业名称" width="300">
+      </el-table-column>
+      <el-table-column prop="date" label="平安指数" width="160">
+      </el-table-column>
+      <el-table-column label="指标得分">
+        <el-table-column prop="province" label="防疫安全" width="140">
+        </el-table-column>
+        <el-table-column prop="city" label="内部治安安全" width="140">
+        </el-table-column>
+        <el-table-column prop="address" label="危化品运输安全" width="140">
+        </el-table-column>
+        <el-table-column prop="zip" label="消防安全" width="140">
+        </el-table-column>
+        <el-table-column prop="zip" label="人员安全" width="140">
+        </el-table-column>
+        <el-table-column prop="zip" label="网络安全" width="140">
+        </el-table-column>
+        <el-table-column prop="zip" label="道路安全" width="140">
+        </el-table-column>
+        <el-table-column prop="zip" label="列管物品安全" width="140">
+        </el-table-column>
+        <el-table-column prop="zip" label="防攻击安全" width="140">
+        </el-table-column>
+      </el-table-column>
+      <el-table-column prop="zip" label="操作"> </el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {};
+  },
+};
+</script>
+<style lang="less" scoped>
+.company_table {
+  width: 85.2vw;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/systemManagement/companyScore/components/season.vue b/src/views/systemManagement/companyScore/components/season.vue
new file mode 100644
index 0000000..a12cb5c
--- /dev/null
+++ b/src/views/systemManagement/companyScore/components/season.vue
@@ -0,0 +1,209 @@
+<template>
+  <div>
+    <!--背景-点击可关闭卡片-->
+    <mark
+      class="bgCard"
+      v-if="showSeason"
+      @click.stop="showSeason = false"
+    ></mark>
+    <el-input
+      placeholder="请选择季度"
+      v-model="showValue"
+      @focus="showSeason = true"
+    >
+      <i slot="prefix" class="el-input__icon el-icon-date"></i>
+    </el-input>
+    <el-card
+      class="box-card"
+      style="
+        width: 322px;
+        padding: 0 3px 20px;
+        margin-top: 10px;
+        position: fixed;
+        z-index: 9999;
+      "
+      v-if="showSeason"
+    >
+      <div
+        slot="header"
+        class="clearfix"
+        style="text-align: center; padding: 0"
+      >
+        <button
+          type="button"
+          aria-label="前一年"
+          class="el-picker-panel__icon-btn el-date-picker__prev-btn el-icon-d-arrow-left"
+          @click="prev"
+        ></button>
+        <span role="button" class="el-date-picker__header-label"
+          >{{ year }}年</span
+        >
+        <button
+          type="button"
+          aria-label="后一年"
+          @click="next"
+          class="el-picker-panel__icon-btn el-date-picker__next-btn el-icon-d-arrow-right"
+        ></button>
+      </div>
+      <div class="text item" style="text-align: center">
+        <el-button
+          type="text"
+          size="medium"
+          style="width: 40%; color: #606266; float: left"
+          @click="selectSeason(1)"
+          >第一季度</el-button
+        >
+        <el-button
+          type="text"
+          size="medium"
+          style="float: right; width: 40%; color: #606266"
+          @click="selectSeason(2)"
+          >第二季度</el-button
+        >
+      </div>
+      <div class="text item" style="text-align: center">
+        <el-button
+          type="text"
+          size="medium"
+          style="width: 40%; color: #606266; float: left"
+          @click="selectSeason(3)"
+          >第三季度</el-button
+        >
+        <el-button
+          type="text"
+          size="medium"
+          style="float: right; width: 40%; color: #606266"
+          @click="selectSeason(4)"
+          >第四季度</el-button
+        >
+      </div>
+    </el-card>
+  </div>
+</template>
+<script>
+/**
+ * @file:  View 组件 季节选择控件
+ * @date: 2021-03-22
+ * @description: UI组件  可选择季节
+ */
+export default {
+  props: {
+    /**
+     * @默认赋值
+     *  date类型，默认值传的是时间 2021-03-22
+     *  quarter 类型，是季度 2021-01
+     * */
+    defaultValue: {
+      type: String,
+      default: "",
+    },
+    /**
+     * @默认赋值类型
+     *  date类型，默认值传的是时间 2021-03-22
+     *  quarter 类型，是季度 2021-01
+     * */
+    defaultType: {
+      type: String,
+      default: "date",
+    },
+  },
+  data() {
+    return {
+      showSeason: false,
+      year: new Date().getFullYear(), //默认当前年
+      month: new Date().getMonth() + 1, //默认当前月
+      showValue: "", //页面上input的内容
+      season_num:'',
+    };
+  },
+  created() {
+    //如果有默认值，直接用，没有默认值，把当前日期作为默认值
+    if (this.defaultValue) {
+      this.changeDefaultVal();
+    } else {
+      this.defaultValue = this.year + "-" + this.month;
+      this.changeDefaultVal();
+    }
+  },
+  watch: {
+    defaultValue(value) {
+      console.log("value", value);
+      this.changeDefaultVal();
+    },
+  },
+  methods: {
+    /**
+     * 处理默认值
+     * @params value == 默认值
+     * @return 页面input内容回填默认值
+     * */
+    changeDefaultVal() {
+      let arr = this.defaultValue.split("-");
+      this.year = arr[0];
+      let quarter = ""; //季度
+      if (this.defaultType === "quarter") {
+        quarter = arr[1];
+        this.showValue = `${this.year}年${quarter}季度`;
+      } else if (this.defaultType === "date") {
+        let month = +arr[1];
+        if (month >= 1 && month <= 3) {
+          this.showValue = `${this.year}年1季度`;
+        } else if (month >= 4 && month <= 6) {
+          this.showValue = `${this.year}年2季度`;
+        } else if (month >= 7 && month <= 9) {
+          this.showValue = `${this.year}年3季度`;
+        } else if (month >= 10 && month <= 12) {
+          this.showValue = `${this.year}年4季度`;
+        }
+      }
+    },
+    prev() {
+      this.year = +this.year - 1;
+    },
+    next() {
+      this.year = +this.year + 1;
+    },
+    selectSeason(quarter) {
+        if(quarter === 1) {
+            this.season_num = '03'
+        } else if(quarter === 2) {
+            this.season_num = '06'
+        } else if(quarter === 3) {
+            this.season_num = '09'
+        } else if(quarter === 4) {
+            this.season_num = '12'
+        }
+      let result = {
+        date: `${this.year}-${this.season_num}`,
+        year: this.year,
+        quarter: quarter,
+      };
+      //发送事件给父元素
+      this.$emit("getValue", result);
+      this.showSeason = false;
+      this.showValue = `${this.year}年${quarter}季度`;
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.bgCard {
+  position: fixed;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  background: rgba(0, 0, 0, 0);
+  z-index: 999;
+}
+/deep/.el-input__inner {
+    background: rgba(0, 0, 0, 0);
+    border-radius: 0px;
+    color: #fff;
+    width: 10vw;
+    height: 4vh;
+}
+.el-date-picker__header-label {
+    color: black !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/systemManagement/companyScore/index.vue b/src/views/systemManagement/companyScore/index.vue
index e69de29..6b171f0 100644
--- a/src/views/systemManagement/companyScore/index.vue
+++ b/src/views/systemManagement/companyScore/index.vue
@@ -0,0 +1,218 @@
+<template>
+  <!-- 企业赋分 -->
+  <el-card class="box-card">
+    <div class="topZS"></div>
+    <div class="bottomZS"></div>
+    <div slot="header" class="clearfix">
+      <span>企业赋分</span>
+    </div>
+    <div class="cardBody">
+      <!-- 顶部下拉和搜索 -->
+      <div class="search_top">
+        <!-- 顶部下拉和日历 -->
+        <div class="select_left">
+          <el-select v-model="search_select" @change="date_select">
+            <el-option
+              v-for="item in day_list"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+          <el-date-picker
+            v-if="this.search_date === '1'"
+            v-model="month_date"
+            type="month"
+            @change="month_change"
+            value-format="yyyy-MM"
+            placeholder="选择月"
+          >
+          </el-date-picker>
+          <Season
+            v-if="this.search_date === '2'"
+            ref="season"
+            @getValue="getValue"
+          ></Season>
+          <el-date-picker
+            v-if="this.search_date === '3'"
+            v-model="year_date"
+            type="year"
+            @change="year_change"
+            value-format="yyyy"
+            placeholder="选择年"
+          >
+          </el-date-picker>
+        </div>
+        <!-- 顶部搜索 -->
+        <div class="search_right">
+          <el-input
+            class="search_right_input"
+            placeholder="输入企业名称"
+            v-model="search_company"
+          >
+          </el-input>
+          <el-button @click="search" icon="el-icon-search"></el-button>
+        </div>
+      </div>
+      <div class="table_body">
+        <CompanyTable ref="companyTable"></CompanyTable>
+      </div>
+    </div>
+  </el-card>
+</template>
+  <script>
+import Season from "./components/season";
+import CompanyTable from "./components/companyTable"
+import { getSafeCompany } from "@/api/systemManagement/companyScore";
+export default {
+  name: "CompanyScore",
+  components: {
+    Season,
+    CompanyTable
+  },
+  data() {
+    return {
+      search_select: "月度", // 度下拉
+      search_date: "1", // 根据度下拉选择情况控制日历展示形态
+      date_state: "",
+      month_date: "",
+      season_date: "", // 季度值
+      statistics_date: "", // 接收最终的日期值，无论是月，季，年
+      year_date: "",
+      search_company: "",
+      day_list: [
+        {
+          value: "month",
+          label: "月度",
+        },
+        {
+          value: "season",
+          label: "季度",
+        },
+        {
+          value: "year",
+          label: "年度",
+        },
+      ],
+    };
+  },
+  created() {},
+  methods: {
+    date_select(val) {
+      console.log("val", val);
+      this.date_state = val;
+      if (val === "month") {
+        this.search_date = "1";
+      } else if (val === "season") {
+        this.search_date = "2";
+      } else if (val === "year") {
+        this.search_date = "3";
+      }
+    },
+
+    month_change(val) {
+      // 日历月选择
+      console.log("month", val);
+      this.statistics_date = val; // 查询statisticsDate赋值
+    },
+    getValue(val) {
+      // 日历季度选择
+      console.log("val123", val);
+      this.statistics_date = val.date; // 查询statisticsDate赋值
+    },
+    year_change(val) {
+      // 日历年度选择
+      console.log("year", val);
+      this.statistics_date = val; // 查询statisticsDate赋值
+    },
+    search() {
+      const params = {
+        scoreType: this.date_state,
+        statisticsDate: this.statistics_date,
+        companyParamName: this.search_company,
+        levelIndex:'1'
+      };
+      getSafeCompany(params).then((res) => {
+        console.log("res", res);
+        this.$message.success('企业查询成功')
+      }).catch(err=>{
+        console.log(err);
+        this.$message.warning('企业查询失败')
+      })
+    },
+  },
+};
+</script>
+  <style lang="less" scoped>
+/* card统一样式 */
+.el-card.box-card.is-always-shadow {
+  border: 0px;
+  height: 89vh; /* 控制card布局高度,用于适配 */
+  position: relative;
+  background: url("~@/assets/companyFile/22136.png") no-repeat !important;
+  background-size: 100% 100% !important;
+}
+/* card统一样式 */
+/deep/.el-card__header {
+  border-bottom: 1px solid #a1a1a1 !important;
+  .clearfix {
+    span {
+      font-size: 17px;
+      font-weight: 400;
+      color: #fff;
+      text-shadow: 0 0 9px rgba(21, 255, 198, 0.64);
+    }
+  }
+}
+.cardBody {
+  .search_top {
+    width: 85.2vw;
+    height: 4.3vh;
+    border: 0.1px solid #4d8f89;
+    display: flex;
+    justify-content: space-between;
+    .select_left {
+      display: flex;
+      justify-content: space-between;
+      width: 22vw;
+    }
+    .search_right {
+      display: flex;
+      .el-button {
+        font-size: 18px;
+        border-radius: 0px;
+        color: #fff;
+        background: rgba(0, 0, 0, 0);
+      }
+      .el-button:hover {
+        background: #4d8f89;
+      }
+    }
+  }
+  .table_body {
+    width: 85.2vw;
+    height: 71vh;
+    margin-top: 3vh;
+    border: 0.1px solid #4d8f89;
+  }
+  /deep/.el-input--suffix .el-input__inner {
+    color: #fff;
+    border: 0.1px solid #fff;
+    border-radius: 0px;
+    background: rgba(0, 0, 0, 0);
+    width: 10vw;
+    height: 4vh;
+  }
+  /deep/ .search_right_input.el-input {
+    .el-input__inner {
+      color: #fff;
+      border: 0.1px solid #fff;
+      border-radius: 0px;
+      background: rgba(0, 0, 0, 0);
+      width: 10vw;
+      height: 4vh;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/systemManagement/safeIndex/components/indexmassageThree.vue b/src/views/systemManagement/safeIndex/components/indexmassageThree.vue
index 0ca2fa6..0922ba7 100644
--- a/src/views/systemManagement/safeIndex/components/indexmassageThree.vue
+++ b/src/views/systemManagement/safeIndex/components/indexmassageThree.vue
@@ -74,13 +74,12 @@
           </el-table-column>
           <el-table-column prop="score" label="分值设置">
             <template slot-scope="scope">
-                <el-input
-                  class="table_input"
-                  type="number"
-                  v-model="scope.row.score"
-                ></el-input>
-            </template>
-          </el-table-column
+              <el-input
+                class="table_input"
+                type="number"
+                v-model="scope.row.score"
+              ></el-input>
+            </template> </el-table-column
         ></el-table>
         <!-- 预警 -->
         <div class="title_btn">
@@ -114,6 +113,7 @@
                   placeholder="请填入预警等级"
                   class="table_input_warn_level"
                   v-model="scope.row.alarmLevel"
+                  @blur="input_warn_blur($event)"
                 ></el-input>
               </div>
             </template>
@@ -180,6 +180,7 @@ export default {
       color: "", // 预警新增的颜色
       sortValue: "",
       add_warn_disabled: false, // 预警新增是否禁用，如果四条时则不可再新增
+      input_warnning: "1", // 控制预警必填
     };
   },
   created() {
@@ -189,6 +190,7 @@ export default {
     bus.$on("send_three", (data) => {
       console.log("data", data);
       this.three_level_id = data.safeRuleId; // 根据传来的id找对应的三级数据
+      this.safeRuleId = data.safeRuleId;
       this.table_num = data.table_num; // 1还是2
       const new_arr = this.three_level_arr.filter(
         (item) => item.id == this.three_level_id
@@ -207,7 +209,7 @@ export default {
             this.is_flag = false;
           }
           this.tableData_all = []; // 清空表格内容
-          this.tableData_warn = []
+          this.tableData_warn = [];
           this.tableData_all = JSON.parse(res.data.calculationRule).calculation;
           console.log("this.tableData_all", this.tableData_all);
           this.safeRuleId = res.data.safeRuleId; // 此safeRuleId为保存表格数据时的safeRuleId，不和兄弟传来的safeRuleId混淆
@@ -253,6 +255,14 @@ export default {
         color: "#fff",
       };
     },
+    input_warn_blur(e) {
+      if (e.target.value === "") {
+        this.$message.warning("预警等级不能为空");
+        this.input_warnning = "1";
+      } else {
+        this.input_warnning = "0";
+      }
+    },
     // 点击添加一行数据
     add_data() {
       this.tableData_all.push({
@@ -280,6 +290,8 @@ export default {
         this.$message.warning("至多四条预警数据");
       }
       this.tableData_warn.push({
+        id: "",
+        safeRuleId: this.safeRuleId,
         alarmLevel: "",
         scoreLowerLimit: "0",
         scoreUpperLimit: "0",
@@ -331,33 +343,41 @@ export default {
         })
         .catch((err) => {
           console.log("errsave", err);
-          this.$message.warning('保存失败')
+          this.$message.warning("保存失败");
         });
     },
     // 保存预警数据
     save_data_warn() {
-      const obj = {
-        calculation: [],
-      };
-      obj.calculation = this.tableData_warn.map((item) => ({
-        id: item.id,
-        safeRuleId: item.safeRuleId,
-        alarmLevel: item.alarmLevel,
-        scoreUpperLimit: item.scoreUpperLimit,
-        scoreLowerLimit: item.scoreLowerLimit,
-        color: item.color,
-        sortValue: item.sortValue,
-      }));
-      const params = {
-        alarmRule: JSON.stringify(obj),
-      };
-      saveWarnTable(params).then((res) => {
-        console.log(res);
-        this.$message.success('保存成功')
-      }).catch(err=>{
-        console.log(err);
-        this.$message.warning('保存失败')
-      })
+      if (this.input_warnning === "1") {
+        this.$message.warning("请填入预警等级");
+      } else {
+        const obj = {
+          calculation: [],
+        };
+        obj.calculation = this.tableData_warn.map((item) => ({
+          id: item.id,
+          safeRuleId: item.safeRuleId,
+          alarmLevel: item.alarmLevel,
+          scoreUpperLimit: item.scoreUpperLimit,
+          scoreLowerLimit: item.scoreLowerLimit,
+          color: item.color,
+          sortValue: item.sortValue,
+        }));
+        const params = {
+          alarmRule: JSON.stringify(obj),
+        };
+        console.log("params_warn", params);
+        saveWarnTable(params)
+          .then((res) => {
+            console.log(res);
+            this.$message.success("保存成功");
+            this.input_warnning = "1";
+          })
+          .catch((err) => {
+            console.log(err);
+            this.$message.warning("保存失败");
+          });
+      }
     },
     // 跟后端返回判断预警颜色
     styleChange(color) {
diff --git a/src/views/systemManagement/safeIndex/index.vue b/src/views/systemManagement/safeIndex/index.vue
index b1e36f7..f14c920 100644
--- a/src/views/systemManagement/safeIndex/index.vue
+++ b/src/views/systemManagement/safeIndex/index.vue
@@ -277,6 +277,7 @@ export default {
           });
       } else {
         this.$message.warning("保存失败,各指标占比应大于等于0且总和应等于1");
+        this.btn_loading = false;
       }
     },
     // 取消修改综合指数 text_form