coys пре 2 година
родитељ
комит
6ac6dc1246
3 измењених фајлова са 162 додато и 77 уклоњено
  1. 2 2
      .env.development
  2. 5 30
      src/api/scorestatistics/scorestatistics.js
  3. 155 45
      src/views/evaluateTable/index.vue

+ 2 - 2
.env.development

@@ -10,12 +10,12 @@ 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://localhost:8080'
 # 55环境
-VUE_APP_BASE_API = 'http://10.87.10.55:8080'
+# VUE_APP_BASE_API = 'http://10.87.10.55:8080'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

+ 5 - 30
src/api/scorestatistics/scorestatistics.js

@@ -1,42 +1,17 @@
 import request from "@/utils/request";
-//综合计算得分
+//对押运公司月度评价报表
 // 查询列表分页
 export function list(query) {
   return request({
-    url: "/core/safeMonthScore/list",
+    url: "/core/task/statistics",
     method: "get",
     params: query,
   });
 }
-// 评分重新计算
-export function  anewDetail(data) {
+//获取所有计划
+export function getPlanList() {
   return request({
-    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}`,
+    url: "/core/evaluatePlan/allList",
     method: "get",
   });
 }
-

+ 155 - 45
src/views/evaluateTable/index.vue

@@ -12,7 +12,7 @@
           v-show="showSearch"
           label-width="100px"
         >
-          <el-form-item label="组织机构" class="formTreeItem">
+          <el-form-item label="组织机构:" class="formTreeItem">
             <tree-select
               v-model="queryParams.orgId"
               :options="deptOptions"
@@ -22,18 +22,21 @@
               placeholder="请选择归属机构"
               clearValueText="清除"
               :noChildrenText="''"
+              @select="changeSelect"
               noOptionsText="没有数据"
               noResultsText="没有搜索结果"
             />
           </el-form-item>
-          <el-form-item label="年月">
-            <el-date-picker
-              type="month"
-              v-model="queryParams.date"
-              placeholder="选择年月"
-              value-format="yyyy-MM"
-            >
-            </el-date-picker>
+          <el-form-item label="外包评价名称:">
+            <el-select v-model="queryParams.planId" @change="changeHandler">
+              <el-option
+                v-for="item in options"
+                :key="item.id"
+                :label="item.evaluateName"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
           </el-form-item>
           <el-button
             type="primary"
@@ -47,78 +50,115 @@
           >
         </el-form>
 
-        <el-table
-          border
-          size="small"
-          v-loading="loading"
-          :data="dataList"
-          align="center"
-          fixed
-        >
-          <el-table-column
-            label="序号"
-            type="index"
-            width="50"
-          ></el-table-column>
-
-          <el-table-column label="机构名称" prop="orgName" />
-          <el-table-column label=">90 低" prop="level_gt90" />
-          <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>
+        <!-- 按纽    -->
+        <!-- <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  icon="el-icon-plus"
+                  size="mini"
+                  @click="exportExcel"
+                  
+                  >导出</el-button
+                >
+              </el-col>
+            </el-row> -->
+        <div v-if="obj&&obj.length>0" class="securityEquipmentMonitoringtable ml-4 flex-1">
+          <div class="title">{{ fullTableTitle }}</div>
+          <table ref="tb11" class="table-scroll" >
+            <tr>
+              <th colspan="1" rowspan="1">序号</th>
+              <th colspan="1" rowspan="1" :key="item" v-for="item in obj">
+                {{ item }}
+              </th>
+            </tr>
+            <tr v-for="(item, index) in targetList" :key="index">
+              <td>{{ index }}</td>
+              <td v-for="i in obj" :key="i"> {{ item[i] }}</td>
+             
+            </tr>
+          </table>
+        </div>
       </el-col>
     </el-row>
   </div>
 </template>
 <script>
 import { mapGetters } from "vuex";
-
-import { list } from "@/api/scorestatistics/scorestatistics.js";
+import { findAllRole } from "@/api/system/role";
+import { list, getPlanList } from "@/api/scorestatistics/scorestatistics.js";
 import OrgTree from "@/components/orgTree";
+import { newDateMonth } from "@/utils/index.js";
 import { deptTreeSelect } from "@/api/system/public";
 export default {
   name: "SocWebIndex",
-  dicts: ["plan_status"],
 
   components: {
     OrgTree,
   },
   data() {
+    const { params, query } = this.$route;
     return {
-      targetListChild: [],
-      targetListGrandson: [],
+      targetList: [],
+      obj: {},
       loading: false,
       selectedValues: [],
       planRoles: [],
-
+      options: [],
+      fullTableTitle: "对押运公司月度评价",
       queryParams: {
         orgId: null,
-        date: "",
+        planId: "",
+        // date: newDateMonth("", "1"),
       },
       // 显示搜索条件
       showSearch: true,
-
+      total: 0,
       dataList: [],
       deptOptions: [], //机构数组
     };
   },
   created() {
-    this.getList();
     this.getDeptTree();
+    this.getevlauteList();
+  },
+  watch: {
+    queryParams() {
+      this.getList();
+    },
+  },
+  mounted() {
+    if (this.deptOptions) {
+      this.queryParams.orgId = this.orgId;
+    }
   },
-  mounted() {},
   computed: {
     ...mapGetters(["orgId"]),
   },
   methods: {
+    changeHandler() {
+      this.getList();
+    },
+    changeSelect() {
+      this.getList();
+    },
     /** 查询机构树数据 */
     getDeptTree() {
       deptTreeSelect().then((response) => {
         this.deptOptions = response.data;
       });
     },
+    /** 获取所有计划列表 */
+    getevlauteList() {
+      getPlanList().then((res) => {
+        this.queryParams.planId = res[0].id;
+        this.options = res;
+        if (this.queryParams.orgId && this.queryParams.planId) {
+          this.getList();
+        }
+      });
+    },
     /** treeSelect组件自定义数据*/
     tenantIdnormalizer(node, instanceId) {
       if (node.children && !node.children.length) {
@@ -134,14 +174,27 @@ export default {
     //获取列表
     getList() {
       this.loading = true;
-      // this.queryParams.orgId = this.orgId;
-      list(this.queryParams).then((res) => {
-        this.dataList = res?.rows || [];
 
+      list(this.queryParams).then((res) => {
+        let { code, data, msg } = res;
+        if (code == 200) {
+          this.targetList = data || [];
+          if (this.targetList) {
+            this.obj = Object.keys(this.targetList[0]);
+          }
+        }
         this.loading = false;
       });
     },
 
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.$refs.Evaluate.show();
+    },
+    editHandler(row) {
+      this.$refs.Evaluate.show(row);
+    },
+
     /** 搜索按钮操作 */
     handleQuery() {
       this.getList();
@@ -149,12 +202,14 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.queryParams = {
-        orgId: null,
-        date: "",
+        orgId: this.orgId,
+        planId: this.options[0].id,
       };
 
       this.getList();
     },
+    //导出
+    exportExcel() {},
   },
 };
 </script>
@@ -164,4 +219,59 @@ export default {
     width: 264px;
   }
 }
+.securityEquipmentMonitoringtable {
+  background-color: #fff;
+  .table-scroll {
+    // table-layout:auto;
+
+    color: #000000;
+    min-width: 100%;
+    border-spacing: 0;
+    text-align: center;
+    border-collapse: collapse;
+    max-height: 500px;
+    overflow-y: auto;
+    font-family: "仿宋_GB2312";
+
+    .orgName {
+      min-width: 180px !important;
+      width: 180px !important;
+    }
+
+    tr th,
+    tr td {
+      height: 25px;
+      border: 1px solid rgb(0, 0, 0);
+      // min-width: 75px;
+    }
+
+    .jump {
+      color: #02a7f0;
+      text-decoration: underline;
+    }
+
+    .nojump {
+      color: #000000;
+      font-size: 10;
+      //font-weight: bold;
+    }
+
+    .greentd {
+      color: green;
+    }
+    .redtd {
+      color: red;
+    }
+  }
+}
+
+.title {
+  clear: both;
+  margin: auto;
+  text-align: center;
+  color: black;
+  font-size: x-large;
+  letter-spacing: 3px;
+  font-weight: bold;
+}
 </style>