shaun-sheep 4 years ago
parent
commit
8a19b272a2

+ 2 - 2
src/components/public/uploadFiles.vue

@@ -107,7 +107,7 @@
           let fileType = file.name.split(".");
           let type = fileType[fileType.length - 1];
           let key = "&key=" + fileType[0] + file.uid + "." + type
-          // let CreateTime = tools.formatDate(new Date(file.lastModified))
+          let CreateTime = tools.formatDate(new Date(file.lastModified))
           reader.onloadstart = function () {
             // 这个事件在读取开始时触发
           };
@@ -143,7 +143,7 @@
                       Key: key.split("=")[1],
                       Type: type,
                       Name: file.name,
-                      // CreateTime,
+                      CreateTime,
                       SystemId: 'dataPlatform'
                     }
 

+ 1 - 8
src/components/supplement/sagaSupplement.vue

@@ -39,7 +39,6 @@
 
               <el-input
                 v-else-if="item.InputMode == 'A1'||item.InputMode == 'A2'"
-                :class="item.InputMode == 'A1'||item.InputMode == 'A2' ? 'reset-width':''"
                 type="number"
                 v-model="ruleForm.ProdParam[item.Code]">
                 <template slot="append" v-if="item.Unit">{{item.Unit}}</template>
@@ -335,7 +334,7 @@
         border-bottom: 1px solid #eff0f1;
       }
 
-      .el-select, > > > .el-form-item__content, .el-cascader {
+      /deep/ .el-input__inner {
         width: 320px;
       }
     }
@@ -349,12 +348,6 @@
   /deep/ .el-scrollbar__wrap {
     overflow-x: hidden;
   }
-
-  .reset-width {
-    /*.el-input__inner {*/
-    /*   width: 200px;*/
-    /* }*/
-  }
 }
 
 ::-webkit-scrollbar-thumb {

+ 13 - 5
src/utils/tools.js

@@ -52,13 +52,21 @@ tools.isSimilarly = (newValue, oldValue) => {
                     }
                 })
             } catch (error) {
-                return false
+              return false
             }
-            return flag
+          return flag
         }
     } else {
-        return false
+      return false
     }
 }
-
-export default tools
+tools.formatDate = (now) => {
+  let year = now.getFullYear();
+  let month = now.getMonth() + 1;
+  let date = now.getDate();
+  let hour = now.getHours();
+  let minute = now.getMinutes();
+  let second = now.getSeconds();
+  return year + "-" + month + "-" + (date > 10 ? date : '0' + date) + " " + hour + ":" + (minute > 10 ? minute : '0' + minute) + ":" + (second > 10 ? second : '0' + second);
+};
+export default tools