fix: 输入框样式更改

src/pages/Iot/dataServer/history.vue

@@ -3,8 +3,8 @@
   <a-row>
     <a-col>
       <a-space>
-        <span>产品: </span>
-        <a-select allowClear v-model:value="queryParams.modelId" style="width: 170px;" >
+
+        <a-select allowClear v-model:value="queryParams.modelId" placeholder="请选择产品" style="width: 170px;" >
           <a-select-option
             v-for="item in state.modelList"
             :key="item.id"
@@ -13,8 +13,8 @@
             {{item.modelLabel}}
           </a-select-option>
         </a-select>
-        <span>设备: </span>
-        <a-select allowClear v-model:value="queryParams.deviceId" style="width: 170px;" >
+
+        <a-select allowClear v-model:value="queryParams.deviceId" placeholder="请选择设备" style="width: 170px;" >
           <a-select-option
             v-for="item in state.deviceList"
             :key="item.id"
@@ -23,7 +23,7 @@
             {{item.deviceLabel}}
           </a-select-option>
         </a-select>
-        <span>触发时间: </span>
+
         <a-range-picker v-model:value="time" :format="['DD/MM/YYYY', 'DD/MM/YYYY']"  />
         <a-button type="primary"  @click="getHistoryPage">搜索</a-button>
       </a-space>
@@ -93,8 +93,8 @@ const queryParams = reactive({
   page: 1,
   pageSize: 10,
   total: 0,
-  deviceId: '',
-  modelId: '',
+  deviceId: null,
+  modelId: null,
   attributeKey: '',
   startTime: '',
   endTime: ''

src/pages/Iot/devOps/msgTracking.vue

@@ -11,21 +11,20 @@
   <a-card style="margin-top: 20px" >
     <a-row  justify="space-between" v-if="state.dataSource.length === 0" >
       <a-col>
-        <a-form layout="inline" >
-          <a-form-item label="业务类型" >
-            <a-select allowClear v-model:value="queryParamsState.eventType" style="width: 170px;"  >
-            <a-select-option
-              v-for="item in eventTypeList"
-              :key="item.key"
-              :value="item.key"
-              placeholder="请选择业务类型"
-            >
-              {{item.name}}
-            </a-select-option>
-          </a-select>
-          </a-form-item>
-          <a-form-item label="消息状态" >
-            <a-select allowClear v-model:value="queryParamsState.success" style="width: 170px;" >
+        <a-row :gutter="[8, 8]" >
+          <a-col>
+            <a-select allowClear  placeholder="请选择业务类型" v-model:value="queryParamsState.eventType" style="width: 170px;"  >
+              <a-select-option
+                v-for="item in eventTypeList"
+                :key="item.key"
+                :value="item.key"
+              >
+                {{item.name}}
+              </a-select-option>
+            </a-select>
+          </a-col>
+          <a-col>
+            <a-select allowClear placeholder="请选择消息状态" v-model:value="queryParamsState.success" style="width: 170px;" >
               <a-select-option
                 v-for="item in successList"
                 :key="item.key"
@@ -34,11 +33,11 @@
                 {{item.name}}
               </a-select-option>
             </a-select>
-          </a-form-item>
-          <a-form-item label="时间区域" >
+          </a-col>
+          <a-col>
             <a-range-picker v-model:value="time" :format="['DD/MM/YYYY', 'DD/MM/YYYY']"  />
-          </a-form-item>
-        </a-form>
+          </a-col>
+        </a-row>
 
     </a-col>
     <a-col>
@@ -139,7 +138,7 @@ const queryParamsState = reactive({
   deviceId: deviceId,
   page: 1,
   pageSize: 10,
-  eventType: '',
+  eventType: null,
   success: false,
   total: 0,
   startTime: '',

src/pages/Iot/device/index.vue

@@ -22,7 +22,7 @@
     <a-row justify="space-between" >
       <a-col :span="20"  >
         <a-form layout="inline" >
-          <a-form-item label="设备状态"  >
+          <a-form-item  >
             <a-select  allowClear style="width: 176px;"  v-model:value="searchState.deviceStatus" placeholder="请输入设备状态">
               <a-select-option
                 v-for="item in DeviceContriller.deviceStatus"
@@ -234,7 +234,7 @@ const searchState = reactive({
   page: 1,
   pageSize: 10,
   total: 0,
-  deviceStatus: '',
+  deviceStatus: null,
   modelId: modelId,
   searchKey: 'deviceId',
   searchValue: '',
@@ -338,4 +338,5 @@ onMounted(() => {
   font-size: 18px;
   color: @sublabel-color;
 }
+
 </style>

src/pages/Iot/ota/index.vue

@@ -4,13 +4,13 @@
     <a-col :span="16" >
       <a-row :gutter="[8, 8]" >
         <a-col>
-          包名：<a-input allowClear style="width: 170px;" v-model:value="queryState.label" ></a-input>
+          <a-input allowClear placeholder="请输入包名" style="width: 170px;" v-model:value="queryState.label" ></a-input>
         </a-col>
         <a-col>
-          版本：<a-input allowClear style="width: 170px;" v-model:value="queryState.version" ></a-input>
+          <a-input   placeholder="请输入版本" allowClear style="width: 170px;" v-model:value="queryState.version" ></a-input>
         </a-col>
         <a-col>
-          包类型：<a-select style="width: 170px;" allowClear v-model:value="queryState.pkgType" >
+          <a-select style="width: 170px;" allowClear v-model:value="queryState.pkgType" placeholder="请选择包类型" >
           <a-select-option
               v-for="item in OtaController.pkgTypeList"
               :key="item.value"
@@ -135,7 +135,7 @@ const queryState = reactive({
   total: 0,
   label: '',
   version: '',
-  pkgType: ''
+  pkgType: null
 })
 
 const state = reactive<{

src/pages/Iot/rule/forwardRule.vue

@@ -4,23 +4,17 @@
     :list="state.forwardCount"
   />
 <a-card style="margin-top: 20px;" >
-  <a-row justify="space-between" >
+  <a-row justify="space-between"   >
     <a-col :span="18" >
-    <a-form style="width: 100%;"  :label-col="{span: 6}" :wrapper-col="{span: 16}" >
-      <a-row style="width: 100%" :gutter="[8, 8]" >
-        <a-col :xs="20" :md="12" :xl="7">
-          <a-form-item label="规则ID" >
-            <a-input allowClear v-model:value="queryParams.ruleId" placeholder="请输入规则id"></a-input>
-          </a-form-item>
+      <a-row style="width: 100%"  :gutter="[8,8]" >
+        <a-col :xs="20" :md="12" :xl="5">
+          <a-input  allowClear v-model:value="queryParams.ruleId" placeholder="请输入规则id"></a-input>
         </a-col>
-        <a-col :xs="20" :md="12" :xl="7">
-          <a-form-item label="规则名称" >
-              <a-input allowClear v-model:value="queryParams.ruleLabel" placeholder="请输入规则名称" ></a-input>
-            </a-form-item>
+        <a-col :xs="20" :md="12" :xl="5">
+          <a-input allowClear v-model:value="queryParams.ruleLabel" placeholder="请输入规则名称" ></a-input>
         </a-col>
-        <a-col :xs="20" :md="12" :xl="7" >
-          <a-form-item label="数据来源" >
-              <a-select allowClear v-model:value="queryParams.subjectResource"    placeholder="选择数据来源">
+        <a-col :xs="20" :md="12" :xl="5" >
+              <a-select allowClear style="width: 100% !important;" v-model:value="queryParams.subjectResource"    placeholder="选择数据来源">
                 <a-select-option
                   v-for="item in subjectResourceList"
                   :key="item.key"
@@ -29,11 +23,9 @@
                 {{item.name}}
                 </a-select-option>
               </a-select>
-            </a-form-item>
         </a-col>
-        <a-col :xs="20" :md="12" :xl="7" >
-          <a-form-item label="触发事件" >
-              <a-select allowClear v-model:value="queryParams.subjectEvent"  placeholder="选择触发事件">
+        <a-col :xs="20" :md="12" :xl="5" >
+              <a-select allowClear style="width: 100% !important;" v-model:value="queryParams.subjectEvent"  placeholder="选择触发事件">
                 <a-select-option
                   v-for="item in Array.from(RuleController.SubjectEventMap, ([key, value]) => ({ ...value, value: value.key }))"
                   :key="item.key"
@@ -42,11 +34,9 @@
                 {{item.name}}
                 </a-select-option>
               </a-select>
-            </a-form-item>
         </a-col>
-        <a-col :xs="20" :md="12" :xl="7" >
-          <a-form-item label="状态" >
-              <a-select allowClear v-model:value="queryParams.status" >
+        <a-col :xs="20" :md="12" :xl="4" >
+              <a-select allowClear style="width: 100% !important;" v-model:value="queryParams.status" >
                 <a-select-option
                   v-for="item in statusList"
                   :key="item.key"
@@ -55,10 +45,8 @@
                 {{item.name}}
                 </a-select-option>
               </a-select>
-            </a-form-item>
         </a-col>
       </a-row>
-    </a-form>
     </a-col>
     <a-col>
       <a-space>
@@ -588,8 +576,8 @@ let queryParams = reactive({
   ruleId: '',
   ruleLabel: '',
   status: '',
-  subjectEvent: '',
-  subjectResource: ''
+  subjectEvent: null,
+  subjectResource: null
 })
 
 const state = reactive({

src/pages/Iot/sys/notice.vue

@@ -2,15 +2,14 @@
   <a-card>
     <a-row>
       <a-col span="12">
-        <a-form layout="inline" >
-          <a-form-item label="通知名称" >
-            <a-input allowClear v-model:value="queryParamsState.label" placeholder="请输入通知名称"/>
-          </a-form-item>
-          <a-form-item  label='通知数据来源' >
+        <a-row :gutter="[8, 8]" >
+          <a-col> <a-input allowClear v-model:value="queryParamsState.label" placeholder="请输入通知名称"/>  </a-col>
+          <a-col>
             <a-select
-            allowClear
+              allowClear
               style="width: 170px"
               v-model:value="queryParamsState.source"
+              placeholder="请选择数据来源"
             >
               <a-select-option
                 v-for="item in sourceList"
@@ -20,11 +19,12 @@
                 {{item.label}}
               </a-select-option>
             </a-select>
-          </a-form-item >
-          <a-form-item>
+          </a-col>
+          <a-col>
             <a-button type="primary" @click="getNoticePage">搜索</a-button>
-          </a-form-item>
-      </a-form>
+          </a-col>
+        </a-row>
+
       </a-col>
       <a-col span="12" >
         <a-row justify="end" >
@@ -211,7 +211,7 @@ const queryParamsState = reactive({
   page: 1,
   pageSize: 10,
   label: '',
-  source: ''
+  source: null
 })
 
 const state = reactive({

src/pages/Iot/task/manage.vue

@@ -7,15 +7,14 @@
 <a-card style="margin-top: 20px;" >
   <a-row justify="space-between" >
     <a-col span="12" >
-      <a-form layout="inline" >
-          <a-form-item label="任务名称" >
-            <a-input allowClear v-model:value="queryParamsState.taskLabel" placeholder="请输入任务名称"/>
-          </a-form-item>
-          <a-form-item  label='任务状态' >
+        <a-row :gutter="[8, 8]" >
+          <a-col><a-input allowClear placeholder="请输入任务名称" v-model:value="queryParamsState.taskLabel"/></a-col>
+          <a-col>
             <a-select
               allowClear
               style="width: 170px"
               v-model:value="queryParamsState.status"
+              placeholder="请选择任务状态"
             >
               <a-select-option
                 v-for="item in statusList"
@@ -25,11 +24,12 @@
                 {{item.label}}
               </a-select-option>
             </a-select>
-          </a-form-item >
-          <a-form-item>
+          </a-col>
+          <a-col>
             <a-button type="primary" @click="getTaskPage">搜索</a-button>
-          </a-form-item>
-      </a-form>
+          </a-col>
+        </a-row>
+
     </a-col>
     <a-col span="12" >
       <a-row justify="end" >
@@ -253,7 +253,7 @@ const queryParamsState = reactive({
   pageSize: 10,
   total: 0,
   taskLabel: '',
-  status: ''
+  status: null
 })
 
 const modalTitle = computed(() => state.opraState === 'add' ? '新增任务' : '编辑任务')