提交

src/pages/eq/hall/components/hallModal.vue

@@ -3,33 +3,40 @@
     title="设定频率"
     :visible.sync="hallModalVisible"
     :append-to-body="true"
+    width='30%'
   >
     <el-form>
       <el-form-item label="设定频率：" :label-width="formLabelWidth">
-        <el-input size="mini" autocomplete="off"></el-input>
+        <el-input size="mini" autocomplete="off" style='width:300px' v-model="frequency"></el-input>
       </el-form-item>
       <!-- <el-form-item label="启动控制：" :label-width="formLabelWidth">
         <el-switch></el-switch>
       </el-form-item> -->
     </el-form>
     <div slot="footer">
-      <el-button @click="cancelhandle">取 消</el-button>
-      <el-button type="primary" @click="cancelhandle">确 定</el-button>
+      <el-button size="mini" @click="hallModalVisible=false">取 消</el-button>
+      <el-button size="mini" type="primary" @click="cancelhandle">确 定</el-button>
     </div>
   </el-dialog>
 </template>
 <script lang="ts">
 export default {
   name: 'hallModal',
-  props: ['hallModalVisible'],
   data() {
     return {
-      formLabelWidth: '120px'
+      formLabelWidth: '120px',
+      hallModalVisible: false,
+      frequency: ''
     }
   },
   methods: {
+    init(data) {
+      console.log('data', data)
+      this.frequency = data.current_frequency
+      this.hallModalVisible = true
+    },
     cancelhandle() {
-      this.$emit('cancelhandle')
+      this.hallModalVisible = false
     }
   }
 }

src/pages/eq/hall/page.vue

@@ -136,7 +136,7 @@
             >
             <el-button
               type="text"
-              @click="handleBtnClick"
+              @click="handleBtnClick(scope.scope.row)"
               v-if="activeTab != 'b45827c068254695864ee3c1d42573cb'"
               >设置频率</el-button
             >
@@ -150,8 +150,7 @@
       @parentMethod="getDataList"
     ></table-pagination>
     <hall-modal
-      v-on:cancelhandle="cancelhandle"
-      :hallModalVisible="hallModalVisible"
+    ref='hallModal'
     ></hall-modal>
   </div>
 </template>
@@ -416,8 +415,11 @@ export default {
         this.hallModalVisible = false
       })
     },
-    handleBtnClick() {
-      this.hallModalVisible = true
+    // 设置频率
+    handleBtnClick(data) {
+        this.$nextTick(() => {
+          this.$refs.hallModal.init(data)
+        })
     },
     handleType(id) {
       if (id !== this.currentId) {

src/pages/eq/view/query-detail.vue

@@ -43,7 +43,7 @@
             el-input(size="mini", style="width: 60px", v-model="speed")
             span  转
             el-button(type="primary", size="mini", style="margin-left: 10px") 设定
-          el-col.text-size(:span="24") 当前频率：
+          el-col.text-size(:span="24" v-if='params.length') 当前频率：
             span(style="color: blue") {{ params[0].current_frequency }}
             span  转/分
             //- 卷帘门