测试远程配置和下行任务

src/views/downlinktask/taskremotecfg/index.vue

@@ -52,37 +52,32 @@
             <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">水表口径:DN {{ props.row.dnType }} </p>
-            <p m="t-0 b-2" v-if="props.row.digitNum != null">数字个数: {{ props.row.digitNum }}</p>
-            <p m="t-0 b-2" v-if="props.row.uintType != null">水表尾数单位: {{ unitTypeMap[Number(props.row.uintType)].label }}
-              m³</p>
-            <!-- <p m="t-0 b-2" v-if="props.row.setupDir != null">安装方向: {{ props.row.setupDir == '0' ? '正向' : '反向' }}</p> -->
-            <p m="t-0 b-2" v-if="props.row.setupDir != null">安装方向: {{ setupDirMap[props.row.setupDir].label }}</p>
             <p m="t-0 b-2" v-if="props.row.sampleInterval != null">采样间隔: {{ props.row.sampleInterval }} 分钟</p>
             <p m="t-0 b-2" v-if="props.row.upInterval != null">上传服务器间隔: {{ props.row.upInterval }} 分钟</p>
             <p m="t-0 b-2" v-if="props.row.ltSampleInterval != null">低温采样间隔: {{ props.row.ltSampleInterval }} 小时</p>
-            <p m="t-0 b-2" v-if="props.row.workLt != null">工作温度范围: {{ props.row.workLt }} -- {{ props.row.workHt }}</p>
-            <p m="t-0 b-2" v-if="props.row.batAlarmSoc != null">电池报警电量: {{ props.row.batAlarmSoc }} %</p>
-            <!-- <p m="t-0 b-2" v-if="props.row.workHt != null">最高工作温度: {{ props.row.workHt }}</p> -->
-            <p m="t-0 b-2" v-if="props.row.batAlarmVt != null">电压报警值: {{ props.row.batAlarmVt }} V</p>
-            <p m="t-0 b-2" v-if="props.row.cpuVersion != null">CPU版本: {{ props.row.cpuVersion }}</p>
-            <p m="t-0 b-2" v-if="props.row.tongxunVersion != null">通讯版本: {{ props.row.tongxunVersion }}</p>
-            <p m="t-0 b-2" v-if="props.row.tianxianType != null">天线类型: {{ props.row.tianxianType == '0' ? '内置' : '外置' }}
-            </p>
-            <p m="t-0 b-2" v-if="props.row.tongxunWay != null">通讯方式: {{ props.row.tongxunWay == '0' ? 'NB' : 'CAT1' }}
-            </p>
-            <p m="t-0 b-2" v-if="props.row.networkRegTimeout != null">网络注册超时时间(秒): {{ props.row.networkRegTimeout }} 秒
-            </p>
+            <p m="t-0 b-2" v-if="props.row.digitNum != null">数字个数: {{ props.row.digitNum }}</p>
+            <p m="t-0 b-2" v-if="props.row.wheelNum != null">字轮个数: {{ props.row.wheelNum }}</p>
+            <p m="t-0 b-2" v-if="props.row.uintType != null">水表尾数单位: {{ unitTypeMap[Number(props.row.uintType)].label }}m³</p>
+            <p m="t-0 b-2" v-if="props.row.networkRegTimeout != null">入网超时时间(秒): {{ props.row.networkRegTimeout }} 秒</p>
+            <p m="t-0 b-2" v-if="props.row.tongxunWay != null">数传类型: {{ props.row.tongxunWay == '2' ? 'NB' : 'CAT1' }}</p>
+            <p m="t-0 b-2" v-if="props.row.tianxianType != null">天线类型: {{ props.row.tianxianType == '2' ? '内置' : '外置' }}</p>
+            <p m="t-0 b-2" v-if="props.row.lastVal != null">当前读数: {{ props.row.lastVal }}</p>
+            <p m="t-0 b-2" v-if="props.row.dnType != null">水表口径:DN {{ props.row.dnType }} </p>
+            <p m="t-0 b-2" v-if="props.row.setupDir != null">安装方向: {{ setupDirMap[props.row.setupDir].label }}</p>
             <p m="t-0 b-2" v-if="props.row.setupYear != null">安装年份: {{ props.row.setupYear }} 年</p>
+            <p m="t-0 b-2" v-if="props.row.workLt != null">工作温度范围: {{ props.row.workLt }} -- {{ props.row.workHt }}</p>
+            <p m="t-0 b-2" v-if="props.row.batAlarmVt != null">低电压报警值: {{ props.row.batAlarmVt }} V</p>
+            <p m="t-0 b-2" v-if="props.row.batAlarmSoc != null">余电报警电量: {{ props.row.batAlarmSoc }} %</p>
             <p m="t-0 b-2" v-if="props.row.aiPullBack != null">强制拉回概率: {{ props.row.aiPullBack }}</p>
             <p m="t-0 b-2" v-if="props.row.aiPass != null">识别概率阈值: {{ props.row.aiPass }}</p>
             <p m="t-0 b-2" v-if="props.row.aiSinglePass != null">位概率阀值: {{ props.row.aiSinglePass }}</p>
-            <!-- <p m="t-0 b-2" v-if="props.row.aiThreshole3 != null">AI阈值4: {{ props.row.aiThreshole4 }}</p> -->
-            <p m="t-0 b-2" v-if="props.row.pwmHz != null">屏闪: {{ props.row.pwmHz }} HZ</p>
-            <p m="t-0 b-2" v-if="props.row.pwmDuty != null">占空比: {{ props.row.pwmDuty }}</p>
-            <p m="t-0 b-2" v-if="props.row.flashBrightMin != null">亮度范围: {{ props.row.flashBrightMin }} --
+
+            <p m="t-0 b-2" v-if="props.row.pwmHz != null">背光频率: {{ props.row.pwmHz }} HZ</p>
+            <p m="t-0 b-2" v-if="props.row.pwmDuty != null">背光占空比: {{ props.row.pwmDuty }}</p>
+            <p m="t-0 b-2" v-if="props.row.flashBrightMin != null">补光灯亮度范围: {{ props.row.flashBrightMin }} --
               {{ props.row.flashBrightMax }}</p>
-            <!-- <p m="t-0 b-2" v-if="props.row.flashBrightMax != null">亮度最高值: {{ props.row.flashBrightMax }}</p> -->
+            <p m="t-0 b-2" v-if="props.row.cpuVersion != null">CPU版本: {{ props.row.cpuVersion }}</p>
+            <p m="t-0 b-2" v-if="props.row.tongxunVersion != null">通讯版本: {{ props.row.tongxunVersion }}</p>
             <p m="t-0 b-2" v-if="props.row.upWholeImgWeekRule != null">带图上传周规则: {{
                 jxweekString(props.row.upWholeImgWeekRule)
             }}</p>
@@ -147,9 +142,9 @@
               <el-button type="primary" class="button" @click="loadConfig" style="margin-left:10px">加载配置</el-button>
             </el-form-item>
           </el-col>
-        </el-row>    
+        </el-row>
       </el-form>
-      <el-divider style="margin-top: 0;margin-bottom: 5;"/>
+      <el-divider style="margin-top: 0;margin-bottom: 5;" />
       <el-form ref="addFormRef" :model="formAddData" :rules="state.rules">
         <el-row>
           <!-- <el-col :span="7">
@@ -316,7 +311,7 @@
         <el-row>
           <el-col :span="7">
             <el-form-item label="入网超时时间:" label-width="150px">
-              <el-input v-model.number="formAddData.digitNum" placeholder="注册入网超时时间(秒)" type="number"
+              <el-input v-model.number="formAddData.networkRegTimeout" placeholder="注册入网超时时间(秒)" type="number"
                 :disabled="!networkRegTimeout" />
             </el-form-item>
           </el-col>
@@ -328,7 +323,7 @@
           <el-col :span="7">
             <el-form-item label="数传类型:" label-width="150px">
               <el-radio-group v-model="formAddData.tongxunWay" :disabled="!tongxunWay">
-                <el-radio label='0'>NB</el-radio>
+                <el-radio label='2'>NB</el-radio>
                 <el-radio label="1">CAT1</el-radio>
               </el-radio-group>
             </el-form-item>
@@ -342,7 +337,7 @@
           <el-col :span="7">
             <el-form-item label="天线类型:" label-width="150px">
               <el-radio-group v-model="formAddData.tianxianType" :disabled="!tianxianType">
-                <el-radio label="0">内置</el-radio>
+                <el-radio label="2">内置</el-radio>
                 <el-radio label="1">外置</el-radio>
               </el-radio-group>
             </el-form-item>
@@ -422,7 +417,7 @@
 
           <el-col :span="7">
             <el-form-item label="低电压报警值:" label-width="150px">
-              <el-input v-model.number="formAddData.batAlarmSoc" placeholder="工作电压下限报警值" type="number"
+              <el-input v-model.number="formAddData.batAlarmVt" placeholder="工作电压下限报警值" type="number"
                 :disabled="!batAlarmVt" />
             </el-form-item>
           </el-col>
@@ -548,6 +543,18 @@
               <el-switch class="switch_style" v-model="tongxunVersion" />
             </el-form-item>
           </el-col>
+
+          <el-col :span="7">
+            <el-form-item label="当前读数:" label-width="150px">
+              <el-input v-model.number="formAddData.lastVal" placeholder="水表当前读数" type="number" maxlength="10"
+                :disabled="!lastVal" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="1">
+            <el-form-item>
+              <el-switch class="switch_style" v-model="lastVal" />
+            </el-form-item>
+          </el-col>
         </el-row>
 
         <el-row>
@@ -809,7 +816,10 @@ const submitAddForm = () => {
       if (ip1ExpandOn.value) { state.submitData.ip1ExpandOn = state.formAddData.ip1ExpandOn }
       if (upInterval.value) { state.submitData.upInterval = state.formAddData.upInterval }
       if (ltSampleInterval.value) { state.submitData.ltSampleInterval = state.formAddData.ltSampleInterval }
-      if (workLt.value) { state.submitData.workLt = state.formAddData.workLt }
+      if (workLt.value) {
+        state.submitData.workLt = state.formAddData.workLt;
+        state.submitData.workHt = state.formAddData.workHt;
+      }
       if (batAlarmSoc.value) { state.submitData.batAlarmVt = state.formAddData.batAlarmVt }
       if (workHt.value) { state.submitData.workHt = state.formAddData.workHt }
       if (batAlarmVt.value) { state.submitData.batAlarmSoc = state.formAddData.batAlarmSoc }
@@ -818,6 +828,7 @@ const submitAddForm = () => {
       if (tianxianType.value) { state.submitData.tianxianType = state.formAddData.tianxianType }
       if (tongxunWay.value) { state.submitData.tongxunWay = state.formAddData.tongxunWay }
       if (wheelNum.value) { state.submitData.wheelNum = state.formAddData.wheelNum }
+      if (lastVal.value) { state.submitData.lastVal = state.formAddData.lastVal }
       //处理周规则
       if (upWholeImgWeekRule.value) {
         let weeks = "";
@@ -880,7 +891,7 @@ const loadDateByEdit = () => {
     week5.value = state.formAddData.upWholeImgWeekRule[4] == "1";
     week6.value = state.formAddData.upWholeImgWeekRule[5] == "1";
     week7.value = state.formAddData.upWholeImgWeekRule[6] == "1";
-    upWholeImgWeekRule.value=true;
+    upWholeImgWeekRule.value = true;
   }
 
   stationCode.value = state.formAddData.stationCode != null;
@@ -914,6 +925,7 @@ const loadDateByEdit = () => {
   tianxianType.value = state.formAddData.tianxianType != null;
   tongxunWay.value = state.formAddData.tongxunWay != null;
   wheelNum.value = state.formAddData.wheelNum != null;
+  lastVal.value = state.formAddData.lastVal != null;
 
   state.aiCbqCfgQueryParams.deviceSn = state.formAddData.deviceSn;
 
@@ -1007,6 +1019,7 @@ const loadConfig = () => {
           state.formAddData.tianxianType = state.formAddCfgData.tianxianType;         //天线类型在配置表中没有
           state.formAddData.tongxunWay = state.formAddCfgData.tongxunWay;
           state.formAddData.wheelNum = state.formAddCfgData.wheelNum;
+          state.formAddData.lastVal = state.formAddCfgData.lastVal;
 
           //转换周规则
           week1.value = state.formAddCfgData.upWholeImgWeek1 == '1';
@@ -1114,6 +1127,7 @@ const tongxunVersion = ref(false);
 const tongxunWay = ref(false);
 const tianxianType = ref(false);
 const wheelNum = ref(false);
+const lastVal = ref(false);
 /* 结束 ---- 记录打开了那一项的配置开关,简单写法,应该可优化 */
 
 const initData = () => {
@@ -1149,6 +1163,7 @@ const initData = () => {
   tianxianType.value = false;
   tongxunWay.value = false;
   wheelNum.value = false;
+  lastVal.value = false;
 
   week1.value = false;
   week2.value = false;

src/views/taicbqcfg/index.vue

@@ -3,10 +3,12 @@
   <div>
     <el-form ref="queryFormRef" :model="queryParams" :inline="true">
       <el-form-item label="设备SN:">
-        <el-input v-model="queryParams.deviceSn" placeholder="设备SN" size="small" style="max-width:110px;" maxlength="11"/>
+        <el-input v-model="queryParams.deviceSn" placeholder="设备SN" size="small" style="max-width:110px;"
+          maxlength="11" />
       </el-form-item>
       <el-form-item label="遥测站编码:" style="margin-left: 10px;">
-        <el-input v-model="queryParams.stationCode" placeholder="遥测站编码" size="small" style="max-width:100px;" maxlength="10"/>
+        <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;">
         <el-select v-model="queryParams.dataFrom" class="filter-item" placeholder="安装/召测/配置" size="small"
@@ -37,7 +39,7 @@
 
     <el-table v-loading="loading" :data="state.tableData" border stripe style="width: 100%" :height="tableHeight"
       highlight-current-row @current-change="handleCurrentRowChange"
-      :header-cell-style="{ background: '#606266', color: '#FFFFFF',padding: '0px'}">
+      :header-cell-style="{ background: '#606266', color: '#FFFFFF', padding: '0px' }">
       <el-table-column fixed type="index" width="50" align="center" />
       <el-table-column fixed prop="deviceSn" label="设备SN" header-align="center" width="120" />
       <el-table-column fit prop="stationCode" label="遥测站" header-align="center" width="120" />
@@ -72,19 +74,36 @@
         </template>
       </el-table-column>
 
-      <el-table-column fit prop="dnType" label="水表口径" header-align="center" width="80" />
+      <el-table-column fit prop="sampleInterval" label="采样间隔" header-align="center" width="80" />
+      <el-table-column fit prop="upInterval" label="上传间隔" header-align="center" width="80" />
+      <el-table-column fit prop="ltSampleInterval" label="低温采样间隔" header-align="center" width="110" />
+      <el-table-column fit prop="lastVal" label="当前读数" header-align="center" width="80" />
       <el-table-column fit prop="digitNum" label="数字个数" header-align="center" width="80" />
+      <el-table-column fit prop="wheelNum" label="字轮个数" header-align="center" width="80" />
       <el-table-column fit prop="uintType" label="尾数单位" header-align="center" width="80" />
-
+      <el-table-column fit prop="networkRegTimeout" label="入网超时时间" header-align="center" width="110" />
+      <el-table-column fit prop="tongxunWay" label="数传类型" header-align="center" width="110">
+        <template #default="scope">
+          <span v-if="scope.row.tongxunWay === '1'">CAT1</span>
+          <span v-if="scope.row.tongxunWay === '2'">NB</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="天线类型" header-align="center" width="80">
+        <template #default="scope">
+          <span v-if="scope.row.tianxianType === '1'">内置</span>
+          <span v-if="scope.row.tianxianType === '2'">外置</span>
+        </template>
+      </el-table-column>
+      <el-table-column fit prop="dnType" label="水表口径" header-align="center" width="80" />
       <el-table-column label="安装方向" header-align="center" width="80">
         <template #default="scope">
           <span v-if="scope.row.setupDir === '0'">正向</span>
           <span v-if="scope.row.setupDir === '1'">反向</span>
+          <span v-if="scope.row.setupDir === '2'">右90</span>
+          <span v-if="scope.row.setupDir === '3'">右90</span>
         </template>
       </el-table-column>
-      <el-table-column fit prop="sampleInterval" label="采样间隔" header-align="center" width="80" />
-      <el-table-column fit prop="upInterval" label="上传间隔" header-align="center" width="80" />
-      <el-table-column fit prop="ltSampleInterval" label="低温采样间隔" header-align="center" width="110" />
+      <el-table-column fit prop="setupYear" label="安装年份" header-align="center" width="80" />
 
       <el-table-column prop="workLt,workHt" label="工作温度范围:" width="110">
         <template #default="scope">
@@ -92,45 +111,34 @@
         </template>
       </el-table-column>
 
-      <el-table-column fit prop="batAlarmSoc" label="电池报警电量" header-align="center" width="110" />
-      <el-table-column fit prop="batAlarmVt" label="电压报警值" header-align="center" width="100" />
-
-      <el-table-column fit prop="cpuVersion" label="CPU版本" header-align="center" width="80" />
-      <el-table-column fit prop="tongxunVersion" label="通讯版本" header-align="center" width="80" />
-
-      <el-table-column label="天线类型" header-align="center" width="80">
-        <template #default="scope">
-          <span v-if="scope.row.tianxianType === '0'">内置</span>
-          <span v-if="scope.row.tianxianType === '1'">外置</span>
-        </template>
-      </el-table-column>
-      <el-table-column fit prop="networkRegTimeout" label="注册超时时间" header-align="center" width="110" />
-      <el-table-column fit prop="setupYear" label="安装年份" header-align="center" width="80" />
+      <el-table-column fit prop="batAlarmSoc" label="低电压报警值" header-align="center" width="110" />
+      <el-table-column fit prop="batAlarmVt" label="余电报警值" header-align="center" width="100" />
       <el-table-column fit prop="aiPullBack" label="强制拉回概率" header-align="center" width="120" />
       <el-table-column fit prop="aiPass" label="识别概率阈值" header-align="center" width="120" />
       <el-table-column fit prop="aiSinglePass" label="位概率阀值" header-align="center" width="100" />
-      <el-table-column fit prop="pwmHz" label="屏闪" header-align="center" width="60" />
+      <el-table-column fit prop="pwmHz" label="背光频率" header-align="center" width="60" />
       <el-table-column fit prop="pwmDuty" label="占空比" header-align="center" width="70" />
-
-      <el-table-column prop="flashBrightMin,flashBrightMax" label="亮度范围:" width="90">
+      <el-table-column prop="flashBrightMin,flashBrightMax" label="亮度范围" width="90">
         <template #default="scope">
           {{ scope.row.flashBrightMin }} - {{ scope.row.flashBrightMax }}
         </template>
       </el-table-column>
-
-      <el-table-column prop="upWholeImgWeek1,upWholeImgWeek2,upWholeImgWeek3,upWholeImgWeek4,upWholeImgWeek5,upWholeImgWeek6,upWholeImgWeek7" 
-      label="带图上传周规则:" width="140">
+      <el-table-column fit prop="cpuVersion" label="CPU版本" header-align="center" width="80" />
+      <el-table-column fit prop="tongxunVersion" label="通讯版本" header-align="center" width="80" />
+      <el-table-column
+        prop="upWholeImgWeek1,upWholeImgWeek2,upWholeImgWeek3,upWholeImgWeek4,upWholeImgWeek5,upWholeImgWeek6,upWholeImgWeek7"
+        label="带图上传周规则:" width="140">
         <template #default="scope">
-          {{ scope.row.upWholeImgWeek1=='1'?'一':'' }}
-          {{ scope.row.upWholeImgWeek2=='1'?'二':'' }}
-          {{ scope.row.upWholeImgWeek3=='1'?'三':'' }}
-          {{ scope.row.upWholeImgWeek4=='1'?'四':'' }}
-          {{ scope.row.upWholeImgWeek5=='1'?'五':'' }}
-          {{ scope.row.upWholeImgWeek6=='1'?'六':'' }}
-          {{ scope.row.upWholeImgWeek7=='1'?'七':'' }}
+          {{ scope.row.upWholeImgWeek1 == '1' ? '一' : '' }}
+          {{ scope.row.upWholeImgWeek2 == '1' ? '二' : '' }}
+          {{ scope.row.upWholeImgWeek3 == '1' ? '三' : '' }}
+          {{ scope.row.upWholeImgWeek4 == '1' ? '四' : '' }}
+          {{ scope.row.upWholeImgWeek5 == '1' ? '五' : '' }}
+          {{ scope.row.upWholeImgWeek6 == '1' ? '六' : '' }}
+          {{ scope.row.upWholeImgWeek7 == '1' ? '七' : '' }}
         </template>
       </el-table-column>
-      <el-table-column fit prop="ip1ExpandOn" label="IP1启用扩展协议" header-align="center" width="90" />
+      <!-- <el-table-column fit prop="ip1ExpandOn" label="IP1启用扩展协议" header-align="center" width="90" /> -->
 
       <el-table-column label="配置来源" header-align="center" width="80">
         <template #default="scope">
@@ -265,7 +273,7 @@ const shortcuts = [
 ]
 /* 日期控件结束 */
 
-onMounted(()=>{queryList()});
+onMounted(() => { queryList() });
 </script>
 
 <style lang="scss" scoped>