wenhongquan 2 anni fa
parent
commit
a59d905281

+ 3 - 3
ruoyi-ui-vue3/src/views/gateway/modbusrtu/add.vue

@@ -110,7 +110,7 @@
                   </div>
                 </template>
                 <div class="content-w">
-                  <el-input v-model="currentdata.interval" placeholder="请输入"/>
+                  <el-input v-model="currentdata.intervals" placeholder="请输入"/>
                 </div>
               </el-descriptions-item>
 
@@ -181,7 +181,7 @@ const currentdata = ref({
   "parity": 0,
   "stopBits": 0,
   "uuid": "",
-  "interval": 0,
+  "intervals": 0,
   "remark": ""
 })
 
@@ -198,7 +198,7 @@ const initdata = ()=>{
     "parity": 0,
     "stopBits": 0,
     "uuid": "",
-    "interval": 0,
+    "intervals": 0,
     "remark": ""
   };
 }

+ 12 - 6
ruoyi-ui-vue3/src/views/gateway/modbusrtu/index.vue

@@ -13,14 +13,14 @@
           >
             <div style="font-size: 12px; width: 80px">协议名称:</div>
             <el-input
-              v-model="searchform.protocolname"
+              v-model="searchform.protocolName"
               placeholder="协议名称"
             ></el-input>
           </div>
         </div>
         <div>
-          <el-button type="primary" plain>重置</el-button>
-          <el-button type="primary">搜索</el-button>
+          <el-button type="primary" plain @click="initdata">重置</el-button>
+          <el-button type="primary" @click="getalldata">搜索</el-button>
         </div>
       </div>
 
@@ -88,7 +88,9 @@
                            small
                            background
                            layout="prev, pager, next"
-                           :total="50"
+                           :total="pagedata.total"
+                           :page-size="pagedata.size"
+                           :current-page="pagedata.current"
                            class="mt-4"
             />
           </el-col>
@@ -299,7 +301,7 @@ const currentdata = ref({
   "parity": 0,
   "stopBits": 0,
   "uuid": "",
-  "interval": 0,
+  "intervals": 0,
   "remark": ""
 });
 
@@ -365,7 +367,7 @@ const cloumdata = ref([
   {label: '停止位', prop:'stopBits',visible:true},
   {label: 'API接口地址', prop:'apiUrl',visible:true},
   {label: 'UUID', prop:'uuid',visible:true},
-  {label: '轮询时间(毫秒)', prop:'interval',visible:true},
+  {label: '轮询时间(毫秒)', prop:'intervals',visible:true},
   {label: '描述', prop:'remark',visible:true},
 ]);
 const ziduanshow = ref(false);
@@ -397,4 +399,8 @@ const goadd = ()=>{
   flex-direction: row;
   justify-content: space-between;
 }
+.content-w {
+  display: inline-flex;
+  max-width: 160px;
+}
 </style>