luowei 2 anni fa
parent
commit
4e4f07be39

+ 19 - 0
src/api/evaluateTable/evaluateTable.js

@@ -0,0 +1,19 @@
+import request from "@/utils/request";
+//统计报表评价
+// 查询列表分页
+export function list(query) {
+  return request({
+    url: "/core/task/statistics",
+    method: "get",
+    params: query,
+  });
+}
+export function getPlanList(query) {
+  return request({
+    url: "/core/evaluatePlan/allList",
+    method: "get",
+    params: query,
+  });
+}
+
+

+ 17 - 14
src/views/evaluateTable/index.vue

@@ -13,7 +13,7 @@
               size="small"
               :inline="true"
               v-show="showSearch"
-              label-width="100px"
+             
             >
               <el-form-item label="组织机构:" class="formTreeItem">
                 <tree-select
@@ -41,24 +41,22 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-              <el-button
+              
+            </el-form>
+            <!-- 按纽    -->
+        <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button
                 type="primary"
                 icon="el-icon-search"
                 size="mini"
                 @click="handleQuery"
                 >搜索</el-button
               >
-              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+              <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
                 >重置</el-button
               >
-            </el-form>
-          </div>
-        </div>
-
-        <!-- 按纽    -->
-        <!-- <el-row :gutter="10" class="mb8">
-              <el-col :span="1.5">
-                <el-button
+                <!-- <el-button
                   type="primary"
                   plain
                   icon="el-icon-plus"
@@ -66,9 +64,13 @@
                   @click="exportExcel"
                   
                   >导出</el-button
-                >
+                > -->
               </el-col>
-            </el-row> -->
+            </el-row>
+          </div>
+        </div>
+
+        
         <div
           v-if="obj && obj.length > 0"
           class="securityEquipmentMonitoringtable ml-4 flex-1"
@@ -94,7 +96,7 @@
 <script>
 import { mapGetters } from "vuex";
 import { findAllRole } from "@/api/system/role";
-import { list, getPlanList } from "@/api/scorestatistics/scorestatistics.js";
+import { list, getPlanList } from "@/api/evaluateTable/evaluateTable.js";
 import OrgTree from "@/components/orgTree";
 import { newDateMonth } from "@/utils/index.js";
 import { deptTreeSelect } from "@/api/system/public";
@@ -161,6 +163,7 @@ export default {
       getPlanList().then((res) => {
         this.queryParams.planId = res[0].id;
         this.options = res;
+        console.log(res,'res');
         if (this.queryParams.orgId && this.queryParams.planId) {
           this.getList();
         }

+ 2 - 2
src/views/evaluationRule/index.vue

@@ -94,12 +94,12 @@
               @click="handleQuery"
               >搜索</el-button
             >
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+            <el-button icon="el-icon-refresh" type="primary" size="mini" @click="resetQuery"
               >重置</el-button
             >
             <el-button
               type="primary"
-              plain
+              
               icon="el-icon-plus"
               size="mini"
               @click="handleAdd"

+ 2 - 1
src/views/resumptionEvaluate/evaluate/index.vue

@@ -101,6 +101,7 @@
                 type="primary"
                   icon="el-icon-refresh"
                   size="mini"
+                  type="primary"
                   @click="resetQuery"
                   >重置</el-button
                 >
@@ -166,7 +167,7 @@
                   size="mini"
                   @click="publishHandler(row)"
                   type="text"
-                  class="el-icon-arrow-down"
+                  :class="row.isDistribute == 0? 'el-icon-arrow-down':'el-icon-top-left'"
                   >{{ row.isDistribute == "0" ? "" : "取消" }}发布</el-button
                 >
                 <el-button

+ 6 - 1
src/views/resumptionEvaluate/evaluatePlan/index.vue

@@ -21,9 +21,13 @@
               size="small"
               :inline="true"
               v-show="showSearch"
-              label-width="100px"
+              
             >
+<<<<<<< HEAD
               <el-form-item label="外包评价名称" prop="evaluateName" label-width="50">
+=======
+              <el-form-item label="外包评价名称" prop="evaluateName">
+>>>>>>> aaedead37c768ed842c7d1d6f75da0738d019e5d
                 <el-input
                   :maxlength="20"
                   v-model="queryParams.evaluateName"
@@ -77,6 +81,7 @@
                 type="primary"
                   icon="el-icon-refresh"
                   size="mini"
+                  type="primary"
                   @click="resetQuery"
                   >重置</el-button
                 >

+ 62 - 66
src/views/scorestatistics/index.vue

@@ -1,61 +1,63 @@
 <template>
   <div class="app-container">
-    <el-row >
+    <el-row>
       <!--用户数据-->
       <el-col>
         <div class="main-search-box">
-           <!--    搜索条件    -->
-        <el-form
-          :model="queryParams"
-          ref="queryForm"
-          size="small"
-          :inline="true"
-          v-show="showSearch"
-          label-width="100px"
-        >
-          <el-form-item label="组织机构" class="formTreeItem">
-            <tree-select
-              v-model="queryParams.orgId"
-              :options="deptOptions"
-              :show-count="true"
-              :normalizer="tenantIdnormalizer"
-              :props="{ checkStrictly: true, label: 'name' }"
-              placeholder="请选择归属机构"
-              clearValueText="清除"
-              :noChildrenText="''"
-              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>
-          <el-row :gutter="10" class="mb8">
+          <!--    搜索条件    -->
+          <el-form
+            :model="queryParams"
+            ref="queryForm"
+            size="small"
+            :inline="true"
+            v-show="showSearch"
+          >
+            <el-form-item label="组织机构" class="formTreeItem">
+              <tree-select
+                v-model="queryParams.orgId"
+                :options="deptOptions"
+                :show-count="true"
+                :normalizer="tenantIdnormalizer"
+                :props="{ checkStrictly: true, label: 'name' }"
+                placeholder="请选择归属机构"
+                clearValueText="清除"
+                :noChildrenText="''"
+                :clearable="false"
+                noOptionsText="没有数据"
+                noResultsText="没有搜索结果"
+              />
+            </el-form-item>
+            <el-form-item label="年月">
+              <el-date-picker
+                type="month"
+                v-model="queryParams.date"
+                placeholder="选择年月"
+                :clearable="false"
+                value-format="yyyy-MM"
+              >
+              </el-date-picker>
+            </el-form-item>
+            <el-row :gutter="10" class="mb8">
               <el-col :span="1.5">
                 <el-button
-            type="primary"
-            icon="el-icon-search"
-            size="mini"
-            @click="handleQuery"
-            >搜索</el-button
-          >
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-            >重置</el-button
-          >
+                  type="primary"
+                  icon="el-icon-search"
+                  size="mini"
+                  @click="handleQuery"
+                  >搜索</el-button
+                >
+                <el-button
+                  type="primary"
+                  icon="el-icon-refresh"
+                  size="mini"
+                  @click="resetQuery"
+                  >重置</el-button
+                >
               </el-col>
             </el-row>
-        </el-form>
-        
+          </el-form>
         </div>
-       
 
-      
         <el-table
           border
           height="650"
@@ -71,17 +73,13 @@
             type="index"
             width="100"
           ></el-table-column>
-          <el-table-column
-            label="年月"
-            
-            :formatter="formatterScore"
-          />
+          <el-table-column label="年月" :formatter="formatterScore" />
           <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-column label="70及以下 极高" prop="level_lt70">
           </el-table-column>
 
           <el-table-column
@@ -104,7 +102,6 @@
                 class="el-icon-edit-outline"
                 >重新计算</el-button
               >
-              
             </template>
           </el-table-column>
         </el-table>
@@ -129,10 +126,7 @@
 <script>
 import { mapGetters } from "vuex";
 import { findAllRole } from "@/api/system/role";
-import {
-  list,
-  anewDetail,
-} from "@/api/scorestatistics/scorestatistics.js";
+import { list, anewDetail } from "@/api/scorestatistics/scorestatistics.js";
 import OrgTree from "@/components/orgTree";
 import { newDateMonth } from "@/utils/index.js";
 import scorestatisticsDialog from "./scorestatisticsDialog.vue";
@@ -157,7 +151,7 @@ export default {
 
       queryParams: {
         orgId: null,
-        date: newDateMonth('','1'),
+        date: newDateMonth("", "1"),
 
         page: 1,
         size: 10,
@@ -170,7 +164,7 @@ export default {
     };
   },
   created() {
-    this.queryParams.orgId = this.orgId
+    this.queryParams.orgId = this.orgId;
     this.getList();
     this.getDeptTree();
   },
@@ -196,8 +190,8 @@ export default {
         children: node.children,
       };
     },
-    formatterScore({ dataYear,dataMonth }) {
-      return dataYear+'-'+dataMonth
+    formatterScore({ dataYear, dataMonth }) {
+      return dataYear + "-" + dataMonth;
     },
 
     //获取列表
@@ -225,7 +219,11 @@ export default {
         .confirm("重新计算将会等待一段时间,你确定要重新计算吗?")
         .then(function () {})
         .then(() => {
-          anewDetail({month:row.dataMonth,year:row.dataYear,orgId:row.orgId}).then((res) => {
+          anewDetail({
+            month: row.dataMonth,
+            year: row.dataYear,
+            orgId: row.orgId,
+          }).then((res) => {
             let { code, msg } = res;
             if (code == 200) {
               this.getList();
@@ -236,8 +234,6 @@ export default {
           });
         });
     },
-    
-   
 
     /** 搜索按钮操作 */
     handleQuery() {

+ 0 - 14
src/views/system/device/index.vue

@@ -37,20 +37,6 @@
                 </el-form-item>
               </el-form>
               <el-row :gutter="10">
-                <!-- <el-col :span="1.5">
-                  <el-button
-                    type="primary"
-                    icon="el-icon-search"
-                    size="mini"
-                    @click="handleQuery"
-                  >搜索</el-button
-                  >
-                </el-col>
-                <el-col :span="1.5">
-                  <el-button    type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
-                  >重置</el-button
-                  >
-                </el-col> -->
                 <el-col :span="1.5">
                   <el-button
                     type="primary"