日志，导入计算，推送等

src/api/kzksApi.js

@@ -27,6 +27,7 @@ const getDbClList = (params)=>getAction("wzOutboundOrder/wzOutboundOrderH/compar
 const getModalIdList = (params)=>getAction("/costModelList/costModelList/queryByIdBeforeEdit", params);
 // 加入产品价格库（模型）
 const insertIntoProject = (params)=>postAction("/projectCostHuiji/projectCostHuiji/insertIntoCostModel", params);
+const visibleClientStart = (params)=>getAction("/visibleClient/start", params);
 
 
 // 成本模型知会
@@ -60,6 +61,7 @@ export {
   getdataBySk,
   deptZhibiaoPaihang,
   insertIntoProject,
+  visibleClientStart,
 }
 
 

src/views/module_kzks/logDataXJob/LogDataXJobList.vue

@@ -127,7 +127,7 @@
             dataIndex: 'jobGroup'
           },
           {
-            title:'任务，主键ID',
+            title:'任务主键ID',
             align:"center",
             dataIndex: 'jobId'
           },
@@ -137,7 +137,7 @@
             dataIndex: 'jobDesc'
           },
           {
-            title:'执行器地址，本次执行的地址',
+            title:'执行器地址(本次执行的地址)',
             align:"center",
             dataIndex: 'executorAddress'
           },
@@ -152,7 +152,8 @@
             dataIndex: 'executorParam'
           },
           {
-            title:'执行器任务分片参数，格式如 1/2',
+            title:'执行器任务分片参数',
+            // ，格式如 1/2
             align:"center",
             dataIndex: 'executorShardingParam'
           },
@@ -162,7 +163,7 @@
             dataIndex: 'executorFailRetryCount'
           },
           {
-            title:'调度-时间',
+            title:'调度时间',
             align:"center",
             dataIndex: 'triggerTime',
             customRender:function (text) {
@@ -170,49 +171,49 @@
             }
           },
           {
-            title:'调度-结果',
+            title:'调度结果',
             align:"center",
             dataIndex: 'triggerCode'
           },
-          {
-            title:'调度-日志',
-            align:"center",
-            dataIndex: 'triggerMsg'
-          },
-          {
-            title:'执行-时间',
-            align:"center",
-            dataIndex: 'handleTime',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            }
-          },
-          {
-            title:'执行-状态',
-            align:"center",
-            dataIndex: 'handleCode'
-          },
-          {
-            title:'执行-日志',
-            align:"center",
-            dataIndex: 'handleMsg'
-          },
-          {
-            title:'告警状态',
-            // 0-默认、1-无需告警、2-告警成功、3-告警失败
-            align:"center",
-            dataIndex: 'alarmStatus_dictText'
-          },
-          {
-            title:'datax进程Id',
-            align:"center",
-            dataIndex: 'processId'
-          },
-          {
-            title:'增量表max id',
-            align:"center",
-            dataIndex: 'maxId'
-          },
+          // {
+          //   title:'调度-日志',
+          //   align:"center",
+          //   dataIndex: 'triggerMsg'
+          // },
+          // {
+          //   title:'执行-时间',
+          //   align:"center",
+          //   dataIndex: 'handleTime',
+          //   customRender:function (text) {
+          //     return !text?"":(text.length>10?text.substr(0,10):text)
+          //   }
+          // },
+          // {
+          //   title:'执行-状态',
+          //   align:"center",
+          //   dataIndex: 'handleCode'
+          // },
+          // {
+          //   title:'执行-日志',
+          //   align:"center",
+          //   dataIndex: 'handleMsg'
+          // },
+          // {
+          //   title:'告警状态',
+          //   // 0-默认、1-无需告警、2-告警成功、3-告警失败
+          //   align:"center",
+          //   dataIndex: 'alarmStatus_dictText'
+          // },
+          // {
+          //   title:'datax进程Id',
+          //   align:"center",
+          //   dataIndex: 'processId'
+          // },
+          // {
+          //   title:'增量表max id',
+          //   align:"center",
+          //   dataIndex: 'maxId'
+          // },
           // {
           //   title: '操作',
           //   dataIndex: 'action',

src/views/module_kzks/projectCostList/ProjectCostList.vue

@@ -116,6 +116,7 @@
       <!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> -->
       <a-button @click="handleExpand" type="primary" icon="column-height">折叠/展开</a-button>
       <a-button @click="handleAdd" type="primary" icon="plus">导入</a-button>
+      <a-button @click="handleComputed" type="primary" icon="reconciliation">计算</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,7 +166,7 @@
       <a-table
         ref="table"
         size="middle"
-        :scroll="{x:true,y: scrollHeight}"
+        :scroll="{x:true,}"
         bordered
         rowKey="id"
         :columns="columns"
@@ -325,7 +326,7 @@
   // import VueDraggableResizable from 'vue-draggable-resizable';
   // Vue.component('vue-draggable-resizable', VueDraggableResizable);
 
-  import { columnsSelect, columnsEdit, proCostYSKdetail, proCostContractdetail, getDbList, getHjList, getDbClList, insertIntoProject } from '@/api/kzksApi.js'
+  import { columnsSelect, columnsEdit, proCostYSKdetail, proCostContractdetail, getDbList, getHjList, getDbClList, insertIntoProject, visibleClientStart } from '@/api/kzksApi.js'
 
   import '@/assets/less/TableExpand.less'
   import { mixinDevice } from '@/utils/mixin'
@@ -1035,6 +1036,14 @@ import { number } from 'echarts';
           }
         }
       },
+      // 费用导入后执行一次计算程序
+      handleComputed(){
+        this.loading = true
+        visibleClientStart().then(response => {
+          console.log(response)
+          this.loadData()
+        })
+      },
       // 比对
       batchDuiBi(){
         // console.log(this.selectedRowKeys,this.selectionRows)

src/views/module_kzks/projectPushList/ProjectPushListList.vue

@@ -172,7 +172,8 @@
             {
               title:'推送至',
               align:"center",
-              dataIndex: 'pushTo_dictText'
+              dataIndex: 'pushTo'
+              // dataIndex: 'pushTo_dictText'
             },
             {
               title:'推送类型',