Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/device/airDisinfect.vue

@@ -69,7 +69,7 @@
                    <span v-if="scope.row.modifications == 2">撤消</span>
                 </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="180">
+            <el-table-column label="操作" align="center" width="180" fixed="right">
                 <template slot-scope="scope">
                     <el-button
                     size="mini"
@@ -317,7 +317,7 @@
         form: {
           id:0,
           start_time:"", 
-          created_time:"",
+          created_time:new Date(),
           class:"",
           disinfection_methods:"",
           disinfection_fluid:"",
@@ -549,3 +549,8 @@
     }
 }
 </style>
+<style lang="scss">
+::-webkit-scrollbar{
+  height: 15px;
+}
+</style>

src/xt_pages/device/objectTableDisinfect.vue

@@ -70,7 +70,7 @@
                    <span v-if="scope.row.modifications == 2">撤消</span>
                 </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="180">
+            <el-table-column label="操作" align="center" width="180" fixed="right">
                 <template slot-scope="scope">
                     <el-button
                     size="mini"
@@ -304,7 +304,7 @@
         form: {
           id:0,
           start_time:"", 
-          created_time:"",
+          created_time:new Date(),
           class:"",
           disinfection_methods:"",
           disinfection_fluid:"",
@@ -537,3 +537,9 @@
     }
 }
 </style>
+
+<style lang="scss">
+::-webkit-scrollbar{
+  height: 15px;
+}
+</style>