Просмотр исходного кода

主风机,局部风机详情界面修改-提交

lxh 2 часов назад
Родитель
Сommit
512255bb8a

+ 1 - 1
src/utils/http/axios/index.ts

@@ -321,7 +321,7 @@ function createAxios(opt?: Partial<CreateAxiosOptions>) {
         // authenticationScheme: 'Bearer',
         authenticationScheme: '',
         // timeout: 5 * 60 * 1000,
-        timeout: 1000,
+        timeout: 10000,
         // 基础接口地址
         // baseURL: globSetting.apiUrl,
         headers: { 'Content-Type': ContentTypeEnum.JSON },

+ 3 - 2
src/views/vent/monitorManager/fanLocalMonitor/components/faultEchartLine.vue

@@ -10,7 +10,7 @@
       <a-select ref="select" v-model:value="historyParams.interval" placeholder="请选择间隔时间" size="small"
         style="position: absolute; z-index: 99; top: 2px; left: 350px; width: 150px">
         <a-select-option v-for="(item, index) in skipOption" :key="index" :value="item.value">{{ item.label
-          }}</a-select-option>
+        }}</a-select-option>
       </a-select>
     </div>
     <div ref="echartline" class="echart-line"></div>
@@ -208,7 +208,8 @@ function getOption() {
 
 async function getData() {
   if (props.selectData.stationtype && props.selectData.stationtype != 'redis') {
-    let res = await listdays({ ttime_begin: historyParams.startTime, ttime_end: historyParams.endTime, strtype: props.deviceType, gdeviceid: props.deviceId, skip: historyParams.skip, pageSize: 100, pageNo: 1 })
+    let deviceNum = props.warningMonitorRowIndex == 0 ? 'Fan1' : 'Fan2'
+    let res = await listdays({ deviceNum: deviceNum, ttime_begin: historyParams.startTime, ttime_end: historyParams.endTime, strtype: props.deviceType, gdeviceid: props.deviceId, skip: historyParams.skip, pageSize: 100, pageNo: 1 })
     let data = res.datalist.records
     xData.value = res.xlist
     if (props.Type == 'windSpeed') {

+ 2 - 1
src/views/vent/monitorManager/mainFanMonitor/components/faultEchartLine.vue

@@ -208,7 +208,8 @@ function getOption() {
 
 async function getData() {
   if (props.selectData.stationtype && props.selectData.stationtype != 'redis') {
-    let res = await listdays({ ttime_begin: historyParams.startTime, ttime_end: historyParams.endTime, strtype: props.deviceType, gdeviceid: props.deviceId, skip: historyParams.skip, pageSize: 100, pageNo: 1 })
+    let deviceNum=props.warningMonitorRowIndex==0 ? 'Fan1' : 'Fan2'
+    let res = await listdays({deviceNum:deviceNum, ttime_begin: historyParams.startTime, ttime_end: historyParams.endTime, strtype: props.deviceType, gdeviceid: props.deviceId, skip: historyParams.skip, pageSize: 100, pageNo: 1 })
     let data = res.datalist.records
     xData.value = res.xlist
     if (props.Type == 'tempZw') {