浏览代码

合并了上次更新

duanxiaoduan 1 年之前
父节点
当前提交
e5f57749f9

文件差异内容过多而无法显示
+ 0 - 1
dist/index.html


+ 12 - 0
src/views/asset/basics/index.vue

@@ -702,6 +702,18 @@
                     <el-input ref="levelthreeTime" v-model="seeTemp.levelthreeTime" placeholder="" disabled />
                   </el-form-item>
                 </el-col>
+                <el-col :span="6">
+                  <el-form-item label="物联网编码" prop="license">
+                    <el-input ref="license" v-model="seeTemp.license" placeholder="物联网编码" disabled />
+                  </el-form-item>
+                </el-col>
+               </el-row>
+               <el-row>
+                 <el-col :span="6">
+                   <el-form-item label="标准工作时长" prop="duration">
+                     <el-input ref="duration" v-model="seeTemp.duration" placeholder="标准工作时长" disabled />
+                   </el-form-item>
+                 </el-col>
                </el-row>
                 <el-row>
                   <el-col>

+ 0 - 1
src/views/report/queryCombustion/index.vue

@@ -1073,7 +1073,6 @@ export default {
     }
   }
 </style>
-
 <style lang="scss" scoped>
 .group{
   float: right;margin-bottom: 20px;

+ 0 - 1
src/views/report/queryElec/index.vue

@@ -892,7 +892,6 @@ export default {
     }
   }
 </style>
-
 <style lang="scss" scoped>
 .group{
   float: right;margin-bottom: 20px;

+ 0 - 1
src/views/report/queryRepair/index.vue

@@ -936,7 +936,6 @@ export default {
     }
   }
 </style>
-
 <style lang="scss" scoped>
 .group{
   float: right;margin-bottom: 20px;

部分文件因为文件数量过多而无法显示