功能

src/views/module_kzks/dashboard/Analysis.vue

@@ -215,9 +215,10 @@
     { name: '专用费', value: 'zyf' },
     { name: '事务费', value: 'swf' },
     { name: '燃动费', value: 'rldlf' },
-    { name: '工资费', value: 'gzjlwf' },
+    { name: '工时费', value: 'gzjlwf' },
     { name: '固资费', value: 'gdzczj' },
     { name: '管理费', value: 'glf' },
+    { name: '工资费', value: 'gzjlwf' },
   ]
   export default {
     name: "dashboard-Analysis",

src/views/module_kzks/kpiImportList/KpiImportList.vue

@@ -32,7 +32,7 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> -->
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('年指标导入')">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
@@ -165,14 +165,14 @@
             align:"center",
             dataIndex: 'department'
           },
-          // {
-          //   title: '操作',
-          //   dataIndex: 'action',
-          //   align:"center",
-          //   fixed:"right",
-          //   width:147,
-          //   scopedSlots: { customRender: 'action' }
-          // }
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
         ],
         url: {
           list: "/kpiImportList/kpiImportList/list",

src/views/module_kzks/kpiImportList/modules/KpiImportListForm.vue

@@ -13,11 +13,11 @@
               <a-input v-model="model.kpi" placeholder="请输入指标金额"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <!-- <a-col :span="24">
             <a-form-model-item label="平均每月" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="kpiMonth">
               <a-input v-model="model.kpiMonth" placeholder="请输入平均每月"  ></a-input>
             </a-form-model-item>
-          </a-col>
+          </a-col> -->
           <a-col :span="24">
             <a-form-model-item label="指标部门" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="department">
               <a-input v-model="model.department" placeholder="请输入指标部门"  ></a-input>

src/views/module_kzks/projectContrastList/allList.vue

@@ -3,10 +3,10 @@
     <!-- <a-table :columns="columns" :data-source="data" bordered :scroll="{ x: 4750 }" :pagination="ipagination" rowKey="id"> -->
     <a-table :columns="columns" :data-source="tableData" bordered :scroll="{ x:true }" :pagination="false" rowKey="id">
     </a-table>
-    <div class="extra-item" style="margin-top: 20px;">
+    <!-- <div class="extra-item" style="margin-top: 20px;">
       <a-button :type="selectedMode==='single'?'primary':'link'" @click="selectedMode = 'single'">单选</a-button>
       <a-button :type="selectedMode==='multiple'?'primary':'link'" @click="selectedMode = 'multiple'">多选</a-button>
-    </div>
+    </div> -->
     <lineBarChart :xAxisData="xAxisData" :seriesData="seriesData" :selectedMode="selectedMode" style="height: 360px;"></lineBarChart>
   </div>
   
@@ -281,7 +281,9 @@ export default {
         showSizeChanger: true,
         total: 0
       },
-      selectedMode: 'single'
+      selectedMode: 'multiple',
+      // echarts
+      xAxisData: ['单台成本', '收入', '利润', '材料费', '外协费', '事务费', '专用费', '工时费', '燃动费', '管理费', '折旧费', '装机成本', '内部试验', '工时']
     };
   },
   watch: {
@@ -289,7 +291,10 @@ export default {
       handler(newValue, oldValue){
         console.log(newValue, oldValue)
         if(newValue){
-          this.tableData = newValue
+          this.tableData = newValue.compareAll
+          this.seriesData = newValue.compareOne.map(res => {
+            return 
+          })
         }
       },
       deep: true,
@@ -297,16 +302,16 @@ export default {
     },
   },
   computed: {
-    xAxisData(){
-      if(this.tableData.length === 0){
-        return []
-      }
-      var data = this.tableData.map(res => {
-        return res.taskno
-      })
-      console.log(data)
-      return data
-    },
+    // xAxisData(){
+    //   if(this.tableData.length === 0){
+    //     return []
+    //   }
+    //   var data = this.tableData.map(res => {
+    //     return res.taskno
+    //   })
+    //   console.log(data)
+    //   return data
+    // },
     seriesData(){
       if(this.tableData.length === 0){
         return []
@@ -327,6 +332,6 @@ export default {
     },
   },
   created(){
-  }
+  },
 };
 </script>

src/views/module_kzks/projectContrastList/wuliaoList.vue

@@ -38,14 +38,14 @@ const columns = [
 const data = [];
 
 export default {
-    props: {
-        // 对比表格数据
-        duibiclList: {
-        type: Array,
-        default: ()=>{},
-        required: false
-        }
-    },
+  props: {
+    // 对比表格数据
+    duibiclList: {
+      type: Array,
+      default: ()=>{},
+      required: false
+    }
+  },
   data() {
     return {
       data,

src/views/module_kzks/projectCostList/ProjectCostList.vue

@@ -5,18 +5,13 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="任务号">
-              <a-input placeholder="请输入任务号" v-model="queryParam.taskno"></a-input>
-            </a-form-item>
-          </a-col>
-          <!-- <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="任务名称">
               <a-input placeholder="请输入任务名称" v-model="queryParam.taskname"></a-input>
             </a-form-item>
-          </a-col> -->
+          </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="项目进度">
-              <a-input placeholder="请输入项目进度" v-model="queryParam.processpercent"></a-input>
+            <a-form-item label="任务号">
+              <a-input placeholder="请输入任务号" v-model="queryParam.taskno"></a-input>
             </a-form-item>
           </a-col>
           <template v-if="toggleSearchStatus">
@@ -71,6 +66,11 @@
               </a-form-item>
             </a-col> -->
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="项目进度">
+                <a-input placeholder="请输入项目进度" v-model="queryParam.processpercent"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="下达部门">
                 <a-input placeholder="请输入下达部门" v-model="queryParam.jycs"></a-input>
               </a-form-item>