소스 검색

移动端选择项目时长调整

Lijy 3 년 전
부모
커밋
52f20e2073
2개의 변경된 파일13개의 추가작업 그리고 12개의 파일을 삭제
  1. 3 2
      fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/index.vue
  2. 10 10
      fhKeeper/formulahousekeeper/timesheet_h5/vue.config.js

+ 3 - 2
fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/index.vue

@@ -92,7 +92,7 @@
                     <van-cell title="专业进度" v-if="user.company.packageEngineering == 1">
                     </van-cell>
                     <van-field :disabled="!canEdit"
-                        type="number"  :name="'progress_'+pItem.professionId" input-align="right" 
+                        type="number"  :name="'progress_'+pItem.professionId" input-align="right"  
                         v-for="pItem in item.professionProgress" :key="pItem.professionId"
                         :label="'--    '+pItem.professionName"  
                     >
@@ -942,7 +942,8 @@
                                 id: null,
                                 projectId: "",
                                 projectName: "",
-                                workingTime: t.type==3?(t.allday).toFixed(1):"8.0",
+                                // workingTime: t.type==3?(t.allday).toFixed(1):"8.0",
+                                workingTime: t.type==3?(t.allday).toFixed(1):this.user.timeType.allday+'.0',
                                 content: "",
                                 state: 2,
                                 progress:100,

+ 10 - 10
fhKeeper/formulahousekeeper/timesheet_h5/vue.config.js

@@ -3,17 +3,17 @@ const pxtorem = require("postcss-pxtorem");
 const path = require('path');
 const themePath = path.resolve(__dirname,'src/assets/style/theme.less');
 
-// var ip = '192.168.2.2'
+var ip = '192.168.2.2'
 // var ip = '127.0.0.1'
-var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
-for (var i in ifaces) {
-    for (var j in ifaces[i]) {
-        var val = ifaces[i][j]
-        if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
-            ip = val.address
-        }
-    }
-}
+// var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
+// for (var i in ifaces) {
+//     for (var j in ifaces[i]) {
+//         var val = ifaces[i][j]
+//         if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
+//             ip = val.address
+//         }
+//     }
+// }
 
 module.exports = {
     // 关闭eslint检查