Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

.env.development

@@ -10,9 +10,11 @@ ENV = 'development'
 #罗俊
 # VUE_APP_BASE_API = 'http://10.87.10.49:8080'
 #罗伟
-VUE_APP_BASE_API = 'http://10.87.10.47:8080'
+# VUE_APP_BASE_API = 'http://10.87.10.47:8080'
 #高雄
 #VUE_APP_BASE_API = 'http://10.87.11.94:8080'
+#景远超
+VUE_APP_BASE_API = 'http://10.87.11.173:8080'
 # VUE_APP_BASE_API = 'http://localhost:8080'
 # 55环境
 # VUE_APP_BASE_API = 'http://10.87.10.55:8080'

src/api/scorestatistics/scorestatistics.js

@@ -1,17 +1,42 @@
 import request from "@/utils/request";
-//对押运公司月度评价报表
+//综合计算得分
 // 查询列表分页
 export function list(query) {
   return request({
-    url: "/core/task/statistics",
+    url: "/core/safeMonthScore/list",
     method: "get",
     params: query,
   });
 }
-//获取所有计划
-export function getPlanList() {
+// 评分重新计算
+export function  anewDetail(data) {
   return request({
-    url: "/core/evaluatePlan/allList",
+    url: "/core/safetyExceptionData/reCalculate",
+    method: "post",
+    data
+  });
+}
+// 详情
+export function detail(data) {
+  return request({
+    url: "/core/safeMonthScore/detail",
+    method: "post",
+    data,
+  });
+}
+// 编辑规则配置
+export function editTargetEvaluate(data) {
+  return request({
+    url: "/core/safetyIndexRule",
+    method: "put",
+    data,
+  });
+}
+// 获取详情
+export function getEvaluateById(id) {
+  return request({
+    url: `/core/safetyIndexRule/${id}`,
     method: "get",
   });
 }
+

src/views/scorestatistics/index.vue

@@ -86,7 +86,8 @@
           <el-table-column label="80-90 中" prop="level_80_90" />
           <el-table-column label="70-80 高" prop="level_70_80" />
           
-          <el-table-column label="70及以下 极高" prop="level_lt70" />
+          <el-table-column label="70及以下 极高" prop="level_lt70" >
+          </el-table-column>
 
           <el-table-column
             label="操作"
@@ -173,6 +174,7 @@ export default {
     };
   },
   created() {
+    this.queryParams.orgId = this.orgId
     this.getList();
     this.getDeptTree();
   },

src/views/scorestatistics/scorestatisticsDialog.vue

@@ -27,13 +27,13 @@
         <el-table :data="tableData" style="width: 100%" height="400px">
           <el-table-column label="序号" type="index" width="50">
           </el-table-column>
-          <el-table-column prop="indicatorNote" label="营业场所">
+          <el-table-column prop="orgName" label="营业场所">
           </el-table-column>
-          <el-table-column prop="indicatorDays" label="场所分类">
+          <el-table-column prop="orgTypeText" label="场所分类">
           </el-table-column>
-          <el-table-column prop="indicatorDays" label="安全指数">
+          <el-table-column prop="orgScore" label="安全指数">
           </el-table-column>
-          <el-table-column prop="indicatorDays" label="安全等级">
+          <el-table-column prop="levelName" label="安全等级">
           </el-table-column>
         </el-table>
         <pagination
@@ -106,9 +106,9 @@ export default {
     //获取分页数据
     getDetailList() {
       detail(this.queryParams).then((res) => {
-        let { code, msg, data } = res;
+        let { code, msg, rows } = res;
         if (code == 200) {
-          this.tableData = [];
+          this.tableData = rows||[];
           this.isShow = true;
         } else {
           this.$message.error(msg);