项目成本修改+打包地址

.env.development

@@ -1,5 +1,6 @@
 NODE_ENV=development
-VUE_APP_API_BASE_URL=http://localhost:8888/jeecg-boot
+VUE_APP_API_BASE_URL=http://10.67.0.64:8888/jeecg-boot
+# VUE_APP_API_BASE_URL=http://localhost:8888/jeecg-boot
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
 

.env.production

@@ -1,4 +1,5 @@
 NODE_ENV=production
-VUE_APP_API_BASE_URL=http://localhost:8888/jeecg-boot
+VUE_APP_API_BASE_URL=http://10.67.0.64:8888/jeecg-boot
+# VUE_APP_API_BASE_URL=http://localhost:8888/jeecg-boot
 VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

src/views/module_kzks/projectCostList/ProjectCostList.vue

@@ -216,28 +216,28 @@
 
         <span slot="contractfpe" slot-scope="text, record">
           <!-- <a-button type="link">{{text}}</a-button> -->
-          <a-button type="link" @click="detailClick(text,record,'contractfpe','合同额')" :style="{color: (record.children || record.id === 'amount') ? 'rgba(0,0,0,.65)' : ''}">{{text?(text/10000).toFixed(2):null}}</a-button>
+          <a-button type="link" @click="detailClick(text,record,'contractfpe','合同额')" :style="{color: (record.children || record.id === 'amount') ? 'rgba(0,0,0,.65)' : ''}">{{(text/10000).toFixed(2)}}</a-button>
         </span>
         <span slot="taskmoney" slot-scope="text, record">
-          <a-button type="link" @click="detailClick(text,record,'taskmoney','已收款')" :style="{color: (record.children || record.id === 'amount') ? 'rgba(0,0,0,.65)' : ''}">{{text?(text/10000).toFixed(2):null}}</a-button>
+          <a-button type="link" @click="detailClick(text,record,'taskmoney','已收款')" :style="{color: (record.children || record.id === 'amount') ? 'rgba(0,0,0,.65)' : ''}">{{(text/10000).toFixed(2)}}</a-button>
         </span>
         <span slot="clf" slot-scope="text, record">
-          <a-button type="link" @click="detailClick(text,record,'clf','材料费')" :style="{color: (record.children || record.id === 'amount') ? 'rgba(0,0,0,.65)' : ''}">{{text?(text/10000).toFixed(2):null}}</a-button>
+          <a-button type="link" @click="detailClick(text,record,'clf','材料费')" :style="{color: (record.children || record.id === 'amount') ? 'rgba(0,0,0,.65)' : ''}">{{(text/10000).toFixed(2)}}</a-button>
         </span>
         <span slot="zyf" slot-scope="text, record">
-          <a-button type="link" @click="detailClick(text,record,'zyf','专用费')" :style="{color: (record.children || record.id === 'amount') ? 'rgba(0,0,0,.65)' : ''}">{{text?(text/10000).toFixed(2):null}}</a-button>
+          <a-button type="link" @click="detailClick(text,record,'zyf','专用费')" :style="{color: (record.children || record.id === 'amount') ? 'rgba(0,0,0,.65)' : ''}">{{(text/10000).toFixed(2)}}</a-button>
         </span>
         <span slot="swf" slot-scope="text, record">
-          <a-button type="link" @click="detailClick(text,record,'swf','事务费')" :style="{color: (record.children || record.id === 'amount') ? 'rgba(0,0,0,.65)' : ''}">{{text?(text/10000).toFixed(2):null}}</a-button>
+          <a-button type="link" @click="detailClick(text,record,'swf','事务费')" :style="{color: (record.children || record.id === 'amount') ? 'rgba(0,0,0,.65)' : ''}">{{(text/10000).toFixed(2)}}</a-button>
         </span>
         <span slot="wxf" slot-scope="text, record">
-          <a-button type="link" @click="detailClick(text,record,'wxf','外协费')" :style="{color: (record.children || record.id === 'amount') ? 'rgba(0,0,0,.65)' : ''}">{{text?(text/10000).toFixed(2):null}}</a-button>
+          <a-button type="link" @click="detailClick(text,record,'wxf','外协费')" :style="{color: (record.children || record.id === 'amount') ? 'rgba(0,0,0,.65)' : ''}">{{(text/10000).toFixed(2)}}</a-button>
         </span>
         <span slot="zjcb" slot-scope="text, record">
-          <a-button type="link" @click="detailClick(text,record,'zjcb','装机成本')" :style="{color: (record.children || record.id === 'amount') ? 'rgba(0,0,0,.65)' : ''}">{{text?(text/10000).toFixed(2):null}}</a-button>
+          <a-button type="link" @click="detailClick(text,record,'zjcb','装机成本')" :style="{color: (record.children || record.id === 'amount') ? 'rgba(0,0,0,.65)' : ''}">{{(text/10000).toFixed(2)}}</a-button>
         </span>
         <span slot="workhour" slot-scope="text, record">
-          <a-button type="link" @click="detailClick(text,record,'workhour','工时')" :style="{color: (record.children || record.id === 'amount') ? 'rgba(0,0,0,.65)' : ''}">{{text?(text/10000).toFixed(2):null}}</a-button>
+          <a-button type="link" @click="detailClick(text,record,'workhour','工时')" :style="{color: (record.children || record.id === 'amount') ? 'rgba(0,0,0,.65)' : ''}">{{(text/10000).toFixed(2)}}</a-button>
         </span>
         
 
@@ -439,24 +439,24 @@ import { number } from 'echarts';
             title:'单台收入',
             align:"center",
             dataIndex: 'oneIncome',
-            customRender: (text) => {
-              return text?(text/10000).toFixed(2):null
+            customRender: (text, record) => {
+              return record.id === 'amount'?null:(text/10000).toFixed(2)
             },
           },
           {
             title:'单台成本',
             align:"center",
             dataIndex: 'oneCost',
-            customRender: (text) => {
-              return text?(text/10000).toFixed(2):null
+            customRender: (text, record) => {
+              return record.id === 'amount'?null:(text/10000).toFixed(2)
             },
           },
           {
             title:'单台利润',
             align:"center",
             dataIndex: 'oneProfit',
-            customRender: (text) => {
-              return text?(text/10000).toFixed(2):null
+            customRender: (text, record) => {
+              return record.id === 'amount'?null:(text/10000).toFixed(2)
             },
           },
           {
@@ -464,7 +464,7 @@ import { number } from 'echarts';
             align:"center",
             dataIndex: 'lre',
             customRender: (text) => {
-              return text?(text/10000).toFixed(2):null
+              return (text/10000).toFixed(2)
             },
           },
           {
@@ -480,7 +480,7 @@ import { number } from 'echarts';
             align:"center",
             dataIndex: 'estimationcoat',
             customRender: (text) => {
-              return text?(text/10000).toFixed(2):null
+              return (text/10000).toFixed(2)
             },
           },
           {
@@ -506,7 +506,7 @@ import { number } from 'echarts';
             align:"center",
             dataIndex: 'zcb',
             customRender: (text) => {
-              return text?(text/10000).toFixed(2):null
+              return (text/10000).toFixed(2)
             },
           },
           {
@@ -560,7 +560,7 @@ import { number } from 'echarts';
             align:"center",
             dataIndex: 'rldlf',
             customRender: (text) => {
-              return text?(text/10000).toFixed(2):null
+              return (text/10000).toFixed(2)
             },
           },
           {
@@ -568,7 +568,7 @@ import { number } from 'echarts';
             align:"center",
             dataIndex: 'gdzczj',
             customRender: (text) => {
-              return text?(text/10000).toFixed(2):null
+              return (text/10000).toFixed(2)
             },
           },
           {
@@ -576,7 +576,7 @@ import { number } from 'echarts';
             align:"center",
             dataIndex: 'gzjlwf',
             customRender: (text) => {
-              return text?(text/10000).toFixed(2):null
+              return (text/10000).toFixed(2)
             },
           },
           {
@@ -584,7 +584,7 @@ import { number } from 'echarts';
             align:"center",
             dataIndex: 'glf',
             customRender: (text) => {
-              return text?(text/10000).toFixed(2):null
+              return (text/10000).toFixed(2)
             },
           },
           {

src/views/module_kzks/projectCostList/modulesDetail/ProjectDetailModal.vue

@@ -25,6 +25,10 @@
     <ky-bg-detail-list v-if="columnValue === 'workhour'" :taskno="taskno"></ky-bg-detail-list>
     <!-- 批产任务 -->
     <pichan-task-list v-if="columnValue === 'pichanTask'" :pichanInfo="pichanInfo"></pichan-task-list>
+
+    <template slot="footer">
+      <a-button @click="handleCancel">关闭</a-button>
+    </template>
   </j-modal>
 </template>
 

vue.config.js

@@ -14,8 +14,8 @@ module.exports = {
    */
   // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
   productionSourceMap: false,
-  //qiankuan打包时放开
-  //outputDir: "../dist/main",
+  // qiankuan打包时放开
+  // outputDir: "../dist/main",
   // 多入口配置
   // pages: {
   //   index: {
@@ -24,10 +24,10 @@ module.exports = {
   //     filename: 'index.html',
   //   }
   // },
-  //打包app时放开该配置
-  //publicPath:'/',
+  // 打包app时放开该配置
+  // publicPath:'/',
   configureWebpack: config => {
-    //生产环境取消 console.log
+    // 生产环境取消 console.log
     if (process.env.NODE_ENV === 'production') {
       config.optimization.minimizer[0].options.terserOptions.compress.drop_console = true
     }
@@ -40,7 +40,7 @@ module.exports = {
       .set('@comp', resolve('src/components'))
       .set('@views', resolve('src/views'))
 
-    //生产环境，开启js\css压缩
+    // 生产环境，开启js\css压缩
     if (process.env.NODE_ENV === 'production') {
         config.plugin('compressionPlugin').use(new CompressionPlugin({
           test: /\.(js|css|less)$/, // 匹配文件名
@@ -108,7 +108,8 @@ module.exports = {
      //  /* 注意：jeecgboot前端做了改造，此处不需要配置跨域和后台接口（只需要改.env相关配置文件即可）
      //      issues/3462 很多人此处做了配置，导致刷新前端404问题，请一定注意*/
       '/jeecg-boot': {
-        target: 'http://localhost:8888',
+        target: 'http://10.67.0.64:8888',
+        // target: 'http://localhost:8888',
         ws: false,
         changeOrigin: true
       },