1

data-ui/src/views/data/housingconstruction/steelcylinder/index.vue

@@ -99,6 +99,14 @@
       <el-table-column label="修改时间" align="center" prop="updateTime"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleOperate(scope.row)"
+            v-hasPermi="['data:steelcylinder:operate']"
+          >运营
+          </el-button>
           <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
                        v-hasPermi="['system:role:edit']">
             <span class="el-dropdown-link">
@@ -116,14 +124,6 @@
               </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleOperate(scope.row)"
-            v-hasPermi="['data:steelcylinder:operate']"
-          >运营
-          </el-button>
         </template>
       </el-table-column>
     </el-table>

data-ui/src/views/data/housingconstruction/steelcylinderLog/index.vue

@@ -71,6 +71,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      steelcylinderId : null,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -84,14 +85,14 @@ export default {
     };
   },
   created() {
-    const id = this.$route.params && this.$route.params.id;
-    this.getList(id);
+    this.steelcylinderId = this.$route.params && this.$route.params.id;
+    this.getList();
   },
   methods: {
     /** 查询钢瓶日志列表 */
-    getList(id) {
+    getList() {
       this.loading = true;
-      this.queryParams.steelcylinderId = id
+      this.queryParams.steelcylinderId = this.steelcylinderId
       listSteelcylinderLog(this.queryParams).then(response => {
         this.listSteelcylinderLog = response.rows;
         this.total = response.total;