召测增加查询参数

src/types/api/downlinktask/ttaskdown/index.ts

@@ -6,6 +6,8 @@ import { PageQueryParam } from '@/types/api/base';
 export interface TTaskDownQueryParam extends PageQueryParam {
     deviceSn?:string,
     stationCode?: string;
+    taskType?:string;
+    taskLevel?:number;
     finishedFlag?:string;
     createTimeStart?:Date;
     createTimeEnd?:Date;

src/views/downlinktask/taskremotecfg/index.vue

@@ -4,7 +4,7 @@
       <el-form-item label="设备SN:">
         <el-input v-model="queryParams.deviceSn" placeholder="设备SN" size="small" style="max-width:110px;" maxlength="11"/>
       </el-form-item>
-      <el-form-item label="遥测站编码:">
+      <el-form-item label="遥测站编码:" style="margin-left: 10px;">
         <el-input v-model="queryParams.stationCode" placeholder="遥测站编码" size="small" style="max-width:100px;" maxlength="10"/>
       </el-form-item>
       <el-form-item label="任务状态:" style="margin-left: 10px;">
@@ -45,10 +45,10 @@
         <template #default="props">
           <div m="4">
             <p m="t-0 b-2" v-if="props.row.stationCode != null">遥测站编码: {{ props.row.stationCode }}</p>
-            <p m="t-0 b-2" v-if="props.row.ip1Port1 != null">通道1地址:: {{ props.row.ip1Port1 }}</p>
-            <p m="t-0 b-2" v-if="props.row.ip2Port2 != null">通道2地址:: {{ props.row.ip2Port2 }}</p>
-            <p m="t-0 b-2" v-if="props.row.ip3Port3 != null">通道3地址:: {{ props.row.ip3Port3 }}</p>
-            <p m="t-0 b-2" v-if="props.row.ip4Port4 != null">通道4地址:: {{ props.row.ip4Port4 }}</p>
+            <p m="t-0 b-2" v-if="props.row.ip1Port1 != null">通道1地址: {{ props.row.ip1Port1 }}</p>
+            <p m="t-0 b-2" v-if="props.row.ip2Port2 != null">通道2地址: {{ props.row.ip2Port2 }}</p>
+            <p m="t-0 b-2" v-if="props.row.ip3Port3 != null">通道3地址: {{ props.row.ip3Port3 }}</p>
+            <p m="t-0 b-2" v-if="props.row.ip4Port4 != null">通道4地址: {{ props.row.ip4Port4 }}</p>
             <p m="t-0 b-2" v-if="props.row.domainNamePort != null">紧急域名及端口: {{ props.row.domainNamePort }}</p>
             <p m="t-0 b-2" v-if="props.row.dnType != null">水表口径: {{ props.row.dnType }}</p>
             <p m="t-0 b-2" v-if="props.row.digitNum != null">数字个数: {{ props.row.digitNum }}</p>

src/views/downlinktask/ttaskdown/index.vue

@@ -1,13 +1,26 @@
 <template>
   <!-- <div class="title">召测配置页面</div> -->
   <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-    <el-form-item label="设备SN:">
-      <el-input v-model="queryParams.deviceSn" placeholder="设备SN" width="120px" size="small" maxlength="11" />
+    <el-form-item label="设备SN:" style="width: 190px;">
+      <el-input v-model="queryParams.deviceSn" placeholder="设备SN" width="90px" size="small" maxlength="11" />
     </el-form-item>
-    <el-form-item label="遥测站编码:">
-      <el-input v-model="queryParams.stationCode" placeholder="遥测站编码" width="120px" size="small" maxlength="10"/>
+    <el-form-item label="遥测站编码:" style="margin-left: 10px;width: 200px;">
+      <el-input v-model="queryParams.stationCode" placeholder="遥测站编码" width="90px" size="small" maxlength="10"/>
     </el-form-item>
 
+      <el-form-item label="任务类型:" style="margin-left: 10px;width: 220px;">
+        <el-select v-model="queryParams.taskType" class="filter-item" placeholder="安装/召测/配置" size="small"
+          style="max-width: 150px;">
+          <el-option v-for="(key, value) in taskTypeQueryMap" :key="key" :label="key" :value="value" />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="任务等级:" style="margin-left: 10px;width: 200px;">
+        <el-select v-model="queryParams.taskLevel" class="filter-item" placeholder="任务等级" size="small">
+          <el-option v-for="item in taskLevelsQuery" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
+      </el-form-item>
+
     <el-form-item label="创建日期:" style="margin-left: 10px;">
       <el-config-provider :locale="locale">
         <el-date-picker v-model="queryParams.createTimeStart" type="date" placeholder="选择开始日期" :shortcuts="shortcuts"
@@ -195,6 +208,14 @@ const taskTypeMap = {
   '4': "审核结果",
 };
 
+const taskTypeQueryMap = {
+  '1': "召测配置",
+  '2': "召测数据",
+  '3': "远程配置",
+  '4': "审核结果",
+  '0': "全部",
+};
+
 
 /* const taskLevelMap = {
   1: "常规任务",
@@ -223,6 +244,30 @@ const taskLevels = [
   },
 ]
 
+//任务等级
+const taskLevelsQuery = [
+  {
+    value: 1,
+    label: '常规任务',
+  },
+  {
+    value: 2,
+    label: '普通任务',
+  },
+  {
+    value: 3,
+    label: '紧急任务',
+  },
+  {
+    value: 99,
+    label: '特权任务',
+  },
+    {
+    value: 0,
+    label: '全部',
+  },
+]
+
 const handleAdd = () => {
   state.adddialog = {
     title: "新增召测任务",

src/views/taicbqcfg/index.vue

@@ -5,7 +5,7 @@
       <el-form-item label="设备SN:">
         <el-input v-model="queryParams.deviceSn" placeholder="设备SN" size="small" style="max-width:110px;" maxlength="11"/>
       </el-form-item>
-      <el-form-item label="遥测站编码:">
+      <el-form-item label="遥测站编码:" style="margin-left: 10px;">
         <el-input v-model="queryParams.stationCode" placeholder="遥测站编码" size="small" style="max-width:100px;" maxlength="10"/>
       </el-form-item>
       <el-form-item label="数据来源:" style="margin-left: 10px;">