更新

src/views/vent/deviceManager/comment/NormalTable.vue

@@ -28,15 +28,28 @@
         </a-popconfirm>
         <a class="table-action-link" @click="handleBj(record)">{{ record.calibration == '0' ? '标校' :
           record.calibration == '1' ? '取消标校' : '' }}</a>
+        <a class="table-action-link" v-if="record.calibration" @click="handleBjHistory(record)">标校历史</a>
         <slot name="action" v-bind="{ record }"></slot>
       </template>
       <template #bodyCell="{ column, record }">
         <slot name="filterCell" v-bind="{ column, record }"></slot>
+        <div v-if="column.dataIndex == 'calibration'">{{ record.calibration == '0' ? '未标校' :
+          record.calibration == '1' ? '标校中' : '' }}</div>
       </template>
     </BasicTable>
     <DeviceModal @register="registerModal" @saveOrUpdate="saveOrUpdateHandler" :showTab="showTab"
       :deviceType="deviceType" />
     <!-- <DeviceModal v-model:visible="modalVisible" @saveOrUpdate="saveOrUpdateHandler" @close-modal="closeModal" :showTab="showTab"  /> -->
+    <a-modal v-model:visible="visibleBj" width="1000px" :footer="null" :title="bjTitle" centered destroyOnClose
+      @cancel="handleCancelBj">
+      <a-table size="small" :dataSource="dataSource" :columns="BjColumns" :scroll="{ y: 620 }" :pagination="pagination"
+        @change="pageChange">
+        <template #bodyCell="{ column, record }">
+          <div v-if="column.dataIndex == 'calibrationStatus'">{{ record.calibrationStatus == '0' ? '未标校' :
+            record.calibrationStatus == '1' ? '标校中' : '' }}</div>
+        </template>
+      </a-table>
+    </a-modal>
   </div>
 </template>
 
@@ -51,8 +64,10 @@ import DeviceModal from './DeviceModal.vue';
 import { getTableHeaderColumns } from '/@/hooks/web/useWebColumns';
 import { useListPage } from '/@/hooks/system/useListPage';
 import { getPopupContainer } from '/@/utils';
-import { toggle } from '../deviceTable/device.api'
+import { toggle, bjList } from '../deviceTable/device.api'
+import { BjColumns } from '../deviceTable/device.data'
 import { useMessage } from '/@/hooks/web/useMessage';
+import { message } from 'ant-design-vue';
 
 const props = defineProps({
   columnsType: {
@@ -117,8 +132,20 @@ const { createMessage } = useMessage();
 const isUpdate = ref(false);
 const record = reactive({});
 const formSchemaData = ref(props.formSchema);
-const deviceTypeId = ref('');
-const pageType = ref('');
+let visibleBj = ref(false)
+let bjTitle = ref('标校历史')
+let dataSource = ref<any[]>([])
+//分页参数配置
+let pagination = reactive({
+  current: 1, // 当前页码
+  pageSize: 10, // 每页显示条数
+  total: 0, // 总条目数，后端返回
+  // showTotal: (total, range) => `${range[0]}-${range[1]} 条，总共 ${total} 条`, // 分页右下角显示信息
+  showSizeChanger: true, // 是否可改变每页显示条数
+  pageSizeOptions: ['10', '20', '50'], // 可选的每页显示条数
+})
+// const deviceTypeId = ref('');
+// const pageType = ref('');
 watch(
   () => props.formSchema,
   (val) => {
@@ -283,6 +310,27 @@ async function handleBj(record) {
     tableKey.value = new Date().getTime()
   }
 }
+//打开标校历史弹窗
+function handleBjHistory() {
+  visibleBj.value = true
+  pagination.current = 1
+  getBjList()
+}
+//关闭标校历史弹窗
+function handleCancelBj() {
+  visibleBj.value = false
+}
+async function getBjList() {
+  let res = await bjList({ pageNo: pagination.current, pageSize: pagination.pageSize })
+  dataSource.value = res.records || []
+  pagination.total = res.total
+}
+//切换分页
+function pageChange(val) {
+  pagination.current = val.current
+  pagination.pageSize = val.pageSize
+  getBjList()
+}
 
 defineExpose({
   doRequest,
@@ -297,6 +345,10 @@ defineExpose({
 @ventSpace: zxm;
 @vent-table-no-hover: #00bfff10;
 
+:deep(.@{ventSpace}-table) {
+  margin: 15px !important;
+}
+
 :deep(.@{ventSpace}-table-cell-row-hover) {
   background: #264d8833 !important;
 }

src/views/vent/deviceManager/deviceTable/device.api.ts

@@ -16,6 +16,7 @@ enum Api {
   exportXls = '/safety/ventanalyMonitorParams/exportXls',
   importExcel1 = '/safety/gasDayReport/importByExcel',
   toggle='/safety/ventanalyCalibrationOperation/toggle',//标较
+  bjList='/safety/ventanalyCalibrationOperation/list'//标较历史
 
 }
 /**
@@ -106,3 +107,8 @@ export const listF = (params) => defHttp.get({ url: Api.list, params });
  * @param params
  */
 export const toggle = (params) => defHttp.post({ url: Api.toggle, params });
+/**
+ * 标较历史
+ * @param params
+ */
+export const bjList = (params) => defHttp.get({ url: Api.bjList, params });

src/views/vent/deviceManager/deviceTable/device.data.ts

@@ -4,6 +4,37 @@ import { list } from '../substationTabel/substation.api';
 import { listF } from './device.api';
 import { getAutoScrollContainer } from '/@/utils/common/compUtils';
 
+//标校历史
+export const BjColumns: BasicColumn[] = [
+ {
+    title: '序号',
+    width: 60,
+    align: 'center',
+    customRender: ({ index }: { index: number }) => `${index + 1}`
+  },
+  {
+    title: '设备ID',
+    dataIndex: 'deviceid',
+    align:'center',
+  },
+  {
+    title: '标校状态',
+    align:'center',
+    dataIndex: 'calibrationStatus',
+  },
+  {
+    title: '标校时间',
+    align:'center',
+    dataIndex: 'operateTime',
+  },
+  {
+    title: '操作人',
+    align:'center',
+    dataIndex: 'createBy',
+  },
+ 
+];
+
 export const columns: BasicColumn[] = [
   {
     title: '名称',

src/views/vent/home/configurable/components/content.vue

@@ -128,7 +128,7 @@
           <gasInjectChart class="content__module" :option="config.config.option" :echartData="config.data" />
         </template>
         <template v-else-if="config.name === 'gas_inject_list'">
-          <gasInjectList class="content__module" :option="config.config.option" :listData="config.data" />
+          <gasInjectList class="content__module"  :listData="config.data" />
         </template>
         <template v-else-if="config.name === 'gas_zy_chart'">
           <gasZyChart class="content__module" :data="config.data" />

src/views/vent/home/configurable/components/gasInject/DetailInfo.vue

@@ -13,15 +13,14 @@
     </template>
     <!-- 注气驱替促抽效果评价   -->
     <template v-if="deviceType == 'gas_cc_detail'">
-      <curveEchartDetail :sysType="'Cc-xg'" :isShowExport="false" :tableColumn="tableColumnCcxg"
-        :strtype="data.pumpStrtype"></curveEchartDetail>
+      <TableAndLine activeFlag="xgpj"></TableAndLine>
     </template>
     <!-- 抽采数据  -->
     <template v-if="deviceType == 'gas_cc_data'">
-      <TableAndLine></TableAndLine>
+       <TableAndLine activeFlag="ccsj"></TableAndLine>
     </template>
     <template v-if="deviceType == 'gas_zq-yl'">
-      <curveEchartDetail :sysType="'Zq'" :isShowExport="false" ></curveEchartDetail>
+      <curveEchartDetail :sysType="'Zq'" :isShowExport="false"></curveEchartDetail>
     </template>
     <!-- 注气数据监测 -->
     <!-- <template v-if="deviceType == 'gas_zq_sj'">
@@ -31,7 +30,7 @@
     </template> -->
     <!-- 环境监测 -->
     <template v-if="deviceType == 'gas_zq_hj'">
-      <environmentDetailTable :isShowExport="true" :deviceData="data" ></environmentDetailTable>
+      <environmentDetailTable :isShowExport="true" :deviceData="data"></environmentDetailTable>
     </template>
     <!-- 装备运行工况监测 -->
     <template v-if="deviceType == 'gas_zq_paramline'">
@@ -47,7 +46,7 @@
     </template>
     <!-- 异常提醒 -->
     <template v-if="deviceType == 'warn-info'">
-      <warnDetailTable ></warnDetailTable>
+      <warnDetailTable></warnDetailTable>
     </template>
     <!-- 装备运行状态与控制 -->
     <template v-if="deviceType == 'device_status_control'">
@@ -63,7 +62,7 @@
 <script setup lang="ts">
 import { computed, reactive, ref, watch } from 'vue'
 import curveEchartDetail from './curveEchartDetail.vue'
-import { columnControl, tableColumnZqcs, tableColumnCcs, tableColumnCcxg,echartOptionGk } from './gasInject.data'
+import { columnControl, tableColumnZqcs, tableColumnCcs, echartOptionGk } from './gasInject.data'
 import systemDetailTable from './systemDetailTable.vue'
 import warnDetailTable from './warnDetailTable.vue'
 import LineAndBarDetail from './LineAndBarDetail.vue'
@@ -92,7 +91,7 @@ let $emit = defineEmits(['closeModal'])
 
 //弹窗标题
 let modalTitle = computed(() => {
-  if (props.deviceType == 'cc_gas_nd' || props.deviceType == 'cc_gas_ll' ) {
+  if (props.deviceType == 'cc_gas_nd' || props.deviceType == 'cc_gas_ll') {
     return '抽采参数时程曲线'
   } else if (props.deviceType == 'gas_zq-yl') {
     return '注气参数时程曲线'
@@ -129,7 +128,7 @@ watch(() => props.showDetail, (newV, oldV) => {
 
 <style lang="less">
 .history-pad {
-  min-height: 400px;
+  min-height: 550px;
   padding: 15px 20px;
   box-sizing: border-box;
 }

src/views/vent/home/configurable/components/gasInject/LineAndBarDetail.vue

@@ -159,7 +159,7 @@ watch(() => props.isShowExport, (newV, oldV) => {
   --image-inject_curve_bg: url('@/assets/images/gasInjection/9-3.png');
   --image-inject_curve_bg1: url('@/assets/images/gasInjection/9-4.png');
   width: 100%;
- min-height: 400px;
+ min-height: 550px;
  padding: 15px 20px;
   box-sizing: border-box;
 

src/views/vent/home/configurable/components/gasInject/TableAndLine.vue

@@ -19,7 +19,7 @@
       </div>
 
       <a-tabs v-model:activeKey="activeKey" @change="tabChange">
-        <a-tab-pane key="1" tab="瞬时混量">
+        <a-tab-pane v-if="activeFlag == 'ccsj'" key="1" tab="瞬时混量">
           <a-table size="small" :dataSource="dataSource" :columns="tableColumn" :scroll="{ y: 200 }"
             :pagination="false">
             <template #action="{ record }">
@@ -27,7 +27,31 @@
             </template>
           </a-table>
         </a-tab-pane>
-        <a-tab-pane key="2" tab="累计混量">
+        <a-tab-pane v-if="activeFlag == 'ccsj'" key="2" tab="累计混量">
+          <a-table size="small" :dataSource="dataSource" :columns="tableColumn" :scroll="{ y: 200 }"
+            :pagination="false">
+            <template #action="{ record }">
+              <!-- <a class="table-action-link" @click="handleSpDetail(record)">审批详情</a> -->
+            </template>
+          </a-table>
+        </a-tab-pane>
+        <a-tab-pane v-if="activeFlag == 'xgpj'" key="3" tab="抽采率">
+          <a-table size="small" :dataSource="dataSource" :columns="tableColumn" :scroll="{ y: 200 }"
+            :pagination="false">
+            <template #action="{ record }">
+              <!-- <a class="table-action-link" @click="handleSpDetail(record)">审批详情</a> -->
+            </template>
+          </a-table>
+        </a-tab-pane>
+        <a-tab-pane v-if="activeFlag == 'xgpj'" key="4" tab="残余瓦斯含量">
+          <a-table size="small" :dataSource="dataSource" :columns="tableColumn" :scroll="{ y: 200 }"
+            :pagination="false">
+            <template #action="{ record }">
+              <!-- <a class="table-action-link" @click="handleSpDetail(record)">审批详情</a> -->
+            </template>
+          </a-table>
+        </a-tab-pane>
+        <a-tab-pane v-if="activeFlag == 'xgpj'" key="5" tab="瓦斯含量降低速率">
           <a-table size="small" :dataSource="dataSource" :columns="tableColumn" :scroll="{ y: 200 }"
             :pagination="false">
             <template #action="{ record }">
@@ -42,7 +66,7 @@
       <div class="curve-content-item" v-for="(item, index) in listData" :key="index">
         <div class="content-item-title">{{ item.label }}</div>
         <div class="content-echart-box">
-          <echartLineDate :ecahrtData="item" :echartOption="ccHlEchartOption"></echartLineDate>
+          <echartLineDate :ecahrtData="item" :echartOption="EchartOption"></echartLineDate>
         </div>
       </div>
     </div>
@@ -50,23 +74,41 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, reactive, ref } from 'vue'
+import { computed, onMounted, reactive, ref } from 'vue'
 import echartLineDate from './echartLineDate.vue'
-import { tableColumnSshl, tableColumnLjhl } from './gasInject.data'
-import { ccHlEchartOption, } from './gasInject.data'
+import { tableColumnSshl, tableColumnLjhl, tableColumnCcl, tableColumnWshl, tableColumnJdsl } from './gasInject.data'
+import { ccHlEchartOption,ccLEchartOption,wshLEchartOption,jdsLEchartOption } from './gasInject.data'
 import { listdays } from './gasInject.api'
 import dayjs from 'dayjs'
 
+let props = defineProps({
+  activeFlag: {
+    type: String
+  }
+})
+
 let timerTabs = ref('9')
-let activeKey = ref('1')
+let activeKey = props.activeFlag == 'ccsj' ? ref('1') : ref('3')
 let searchData = reactive({
   startTime: dayjs().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss'),
   endTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
 })
 let dataSource = ref<any[]>([])
-let tableColumn = ref(tableColumnSshl)
+let tableColumn = props.activeFlag == 'ccsj' ? ref(tableColumnSshl) : ref(tableColumnCcl)
 let listData = ref<any[]>([])
 
+let EchartOption=computed(()=>{
+  if(props.activeFlag=='ccsj'){
+    return ccHlEchartOption
+  }else if(props.activeFlag!='ccsj' && activeKey.value=='3'){
+    return ccLEchartOption
+  }else if(props.activeFlag!='ccsj' && activeKey.value=='4'){
+    return wshLEchartOption
+  }else if(props.activeFlag!='ccsj' && activeKey.value=='5'){
+    return jdsLEchartOption
+  }
+})
+
 //时间间隔切换
 function changeRadio(val) {
   timerTabs.value = val.target.value
@@ -88,11 +130,23 @@ function tabChange(val) {
       tableColumn.value = tableColumnLjhl
       getHistoryData(timerTabs.value)
       break;
+    case '3':
+      tableColumn.value = tableColumnCcl
+      getHistoryData(timerTabs.value)
+      break;
+    case '4':
+      tableColumn.value = tableColumnWshl
+      getHistoryData(timerTabs.value)
+      break;
+    case '5':
+      tableColumn.value = tableColumnJdsl
+      getHistoryData(timerTabs.value)
+      break;
   }
 }
 //查询
 function getSearch() {
-   getHistoryData(timerTabs.value)
+  getHistoryData(timerTabs.value)
 }
 async function getHistoryData(skip) {
   let res = await listdays({ pageNo: 1, pageSize: 1000, strtype: 'pump', ttime_begin: searchData.startTime, ttime_end: searchData.endTime, skip: skip })
@@ -116,7 +170,7 @@ async function getHistoryData(skip) {
           yData1: res.datalist.records.filter(fl => fl.gdevicetype == el).map(dl => dl.readData['gasConcentration']),
         }
       })
-    } else {
+    } else if (activeKey.value == '2') {
       listData.value = count.map((el, index) => {
         return {
           label: `汇流管${index + 1}`,
@@ -125,6 +179,30 @@ async function getHistoryData(skip) {
           yData1: res.datalist.records.filter(fl => fl.gdevicetype == el).map(dl => dl.readData['gasConcentration']),
         }
       })
+    } else if (activeKey.value == '3') {
+      listData.value = count.map((el, index) => {
+        return {
+          label: `汇流管${index + 1}`,
+          xData: res.xlist,
+          yData: res.datalist.records.filter(fl => fl.gdevicetype == el).map(dl => dl.readData['ext_rate_percent']),
+        }
+      })
+    }else if (activeKey.value == '4') {
+      listData.value = count.map((el, index) => {
+        return {
+          label: `汇流管${index + 1}`,
+          xData: res.xlist,
+          yData: res.datalist.records.filter(fl => fl.gdevicetype == el).map(dl => dl.readData['residual_gas_content_m3_t']),
+        }
+      })
+    }else if (activeKey.value == '5') {
+      listData.value = count.map((el, index) => {
+        return {
+          label: `汇流管${index + 1}`,
+          xData: res.xlist,
+          yData: res.datalist.records.filter(fl => fl.gdevicetype == el).map(dl => dl.readData['gas_drop_rate_m3_t_mon']),
+        }
+      })
     }
     console.log(listData.value, 'listData.value')
   }
@@ -150,7 +228,7 @@ onMounted(() => {
   --image-inject_curve_bg: url('@/assets/images/gasInjection/9-3.png');
   --image-inject_curve_bg1: url('@/assets/images/gasInjection/9-4.png');
   width: 100%;
-  min-height: 400px;
+  min-height: 550px;
   padding: 15px 20px;
   box-sizing: border-box;
 }

src/views/vent/home/configurable/components/gasInject/commonTable.vue

@@ -38,7 +38,7 @@ let props=defineProps({
   --image-inject_zq_monitor: url('@/assets/images/gasInjection/9-3.png');
   position: relative;
   width: 100%;
-  min-height: 400px;
+  min-height: 550px;
   
 
  

src/views/vent/home/configurable/components/gasInject/curveEchartDetail.vue

@@ -188,7 +188,7 @@ watch(() => props.isShowExport, (newV, oldV) => {
   --image-inject_curve_bg: url('@/assets/images/gasInjection/9-3.png');
   --image-inject_curve_bg1: url('@/assets/images/gasInjection/9-4.png');
   width: 100%;
-  min-height: 400px;
+  min-height: 550px;
   padding: 15px 20px;
   box-sizing: border-box;
 

src/views/vent/home/configurable/components/gasInject/environmentDetailTable.vue

@@ -65,7 +65,7 @@ onBeforeMount(() => {
 <style lang="less" scoped>
 .environment-detail-table {
   width: 100%;
- min-height: 400px;
+ min-height: 550px;
   padding: 15px 20px;
   box-sizing: border-box;
 }

src/views/vent/home/configurable/components/gasInject/gasInject.data.ts

@@ -444,8 +444,8 @@ export let tableColumnLjhl: BasicColumn[] = [
     ellipsis: true,
   },
 ]
-//注气驱替促抽效果评价
-export let tableColumnCcxg: BasicColumn[] = [
+//效果评价-抽采率
+export let tableColumnCcl: BasicColumn[] = [
   {
     title: '序号',
     width: 60,
@@ -473,6 +473,36 @@ export let tableColumnCcxg: BasicColumn[] = [
     align: 'center',
     ellipsis: true,
   },
+  {
+    title: '时间',
+    dataIndex: 'ttime',
+    key: 'ttime',
+    align: 'center',
+    ellipsis: true,
+  },
+]
+//效果评价-残余瓦斯含量
+export let tableColumnWshl: BasicColumn[] = [
+  {
+    title: '序号',
+    width: 60,
+    align: 'center',
+    customRender: ({ index }: { index: number }) => `${index + 1}`
+  },
+  {
+    title: '设备名称',
+    dataIndex: 'gdevicename',
+    key: 'gdevicename',
+    align: 'center',
+    ellipsis: true,
+  },
+  {
+    title: '安装位置',
+    dataIndex: 'ginstallpos',
+    key: 'ginstallpos',
+    align: 'center',
+    ellipsis: true,
+  },
   {
     title: '残余瓦斯含量(m³/t)',
     dataIndex: 'residual_gas_content_m3_t',
@@ -480,6 +510,36 @@ export let tableColumnCcxg: BasicColumn[] = [
     align: 'center',
     ellipsis: true,
   },
+  {
+    title: '时间',
+    dataIndex: 'ttime',
+    key: 'ttime',
+    align: 'center',
+    ellipsis: true,
+  },
+]
+//效果评价-瓦斯含量降低速率
+export let tableColumnJdsl: BasicColumn[] = [
+  {
+    title: '序号',
+    width: 60,
+    align: 'center',
+    customRender: ({ index }: { index: number }) => `${index + 1}`
+  },
+  {
+    title: '设备名称',
+    dataIndex: 'gdevicename',
+    key: 'gdevicename',
+    align: 'center',
+    ellipsis: true,
+  },
+  {
+    title: '安装位置',
+    dataIndex: 'ginstallpos',
+    key: 'ginstallpos',
+    align: 'center',
+    ellipsis: true,
+  },
   {
     title: '瓦斯含量降低速率(m³/t/mon)',
     dataIndex: 'gas_drop_rate_m3_t_mon',
@@ -1659,6 +1719,336 @@ export let ccHlEchartOption = {
     },
   ]
 }
+//效果评价-抽采率
+export let ccLEchartOption = {
+  showTime: false,
+  tooltip: {
+    trigger: 'axis',
+    padding: 8,
+    backgroundColor: 'rgba(0, 0, 0, .6)',
+    textStyle: {
+      color: '#fff',
+      fontSize: 12,
+    },
+  },
+  grid: {
+    top: '28%',
+    left: '6%',
+    right: '6%',
+    bottom: '7%',
+    containLabel: true
+  },
+  legend: {
+    top: '1%',
+    right: '3%',
+    icon: 'circle',
+    itemWidth: 8,
+    itemHeight: 8,
+    itemGap: 12,
+    textStyle: {
+      color: '#fff',
+      fontSize: 12,
+    },
+    data: [
+      { name: '抽采率' },
+    ]
+  },
+  yAxis: [
+    {
+      type: 'value',
+      position: 'left', // Y轴1在左边
+      name: '(%)',
+      nameTextStyle: {
+        color: "#a3a7ae",
+        fontSize: 12,
+        padding: 0
+      },
+      min: 0,
+      splitLine: {
+        show: true,
+        lineStyle: {
+          color: 'rgba(4, 49, 79)',
+        },
+      },
+      axisLine: {
+        show: true,
+        lineStyle: {
+          color: 'rgba(4, 49, 79)',
+        },
+      },
+      axisLabel: {
+        show: true,
+        textStyle: {
+          color: '#a3a7ae',
+          padding: 5
+        },
+        formatter: '{value}',
+      },
+      axisTick: {
+        show: false,
+      },
+    },
+  ],
+  series: [
+    {
+      name: '抽采率',
+      type: 'line',
+      symbol: 'circle', // 默认是空心圆（中间是白色的），改成实心圆
+      showAllSymbol: true,
+      symbolSize: 0,
+      smooth: true,
+      lineStyle: {
+        normal: {
+          width: 2,
+          color: 'rgba(236, 255, 62,1)', // 线条颜色
+        },
+        borderColor: 'rgba(0,0,0,.4)',
+      },
+      itemStyle: {
+        color: 'rgba(236, 255, 62,1)',
+        borderColor: "#646ace",
+        borderWidth: 2
+      },
+      areaStyle: { //区域填充样式
+        normal: {
+          //线性渐变，前4个参数分别是x0,y0,x2,y2(范围0~1);相当于图形包围盒中的百分比。如果最后一个参数是‘true’，则该四个值是绝对像素位置。
+          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+            offset: 0,
+            color: "rgba(236, 255, 62,.4)"
+          },
+          {
+            offset: 1,
+            color: "rgba(236, 255, 62, .1)"
+          }
+          ], false),
+          shadowColor: 'rgba(236, 255, 62, 0.5)', //阴影颜色
+          shadowBlur: 20 //shadowBlur设图形阴影的模糊大小。配合shadowColor,shadowOffsetX/Y, 设置图形的阴影效果。
+        }
+      },
+      data: 'yData'
+    },
+  ]
+}
+//效果评价-残余瓦斯含量
+export let wshLEchartOption = {
+  showTime: false,
+  tooltip: {
+    trigger: 'axis',
+    padding: 8,
+    backgroundColor: 'rgba(0, 0, 0, .6)',
+    textStyle: {
+      color: '#fff',
+      fontSize: 12,
+    },
+  },
+  grid: {
+    top: '28%',
+    left: '6%',
+    right: '6%',
+    bottom: '7%',
+    containLabel: true
+  },
+  legend: {
+    top: '1%',
+    right: '3%',
+    icon: 'circle',
+    itemWidth: 8,
+    itemHeight: 8,
+    itemGap: 12,
+    textStyle: {
+      color: '#fff',
+      fontSize: 12,
+    },
+    data: [
+      { name: '残余瓦斯含量' },
+    ]
+  },
+  yAxis: [
+    {
+      type: 'value',
+      position: 'left', // Y轴1在左边
+      name: '(m³/t)',
+      nameTextStyle: {
+        color: "#a3a7ae",
+        fontSize: 12,
+        padding: 0
+      },
+      min: 0,
+      splitLine: {
+        show: true,
+        lineStyle: {
+          color: 'rgba(4, 49, 79)',
+        },
+      },
+      axisLine: {
+        show: true,
+        lineStyle: {
+          color: 'rgba(4, 49, 79)',
+        },
+      },
+      axisLabel: {
+        show: true,
+        textStyle: {
+          color: '#a3a7ae',
+          padding: 5
+        },
+        formatter: '{value}',
+      },
+      axisTick: {
+        show: false,
+      },
+    },
+  ],
+  series: [
+    {
+      name: '残余瓦斯含量',
+      type: 'line',
+      symbol: 'circle', // 默认是空心圆（中间是白色的），改成实心圆
+      showAllSymbol: true,
+      symbolSize: 0,
+      smooth: true,
+      lineStyle: {
+        normal: {
+          width: 2,
+          color: 'rgba(236, 255, 62,1)', // 线条颜色
+        },
+        borderColor: 'rgba(0,0,0,.4)',
+      },
+      itemStyle: {
+        color: 'rgba(236, 255, 62,1)',
+        borderColor: "#646ace",
+        borderWidth: 2
+      },
+      areaStyle: { //区域填充样式
+        normal: {
+          //线性渐变，前4个参数分别是x0,y0,x2,y2(范围0~1);相当于图形包围盒中的百分比。如果最后一个参数是‘true’，则该四个值是绝对像素位置。
+          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+            offset: 0,
+            color: "rgba(236, 255, 62,.4)"
+          },
+          {
+            offset: 1,
+            color: "rgba(236, 255, 62, .1)"
+          }
+          ], false),
+          shadowColor: 'rgba(236, 255, 62, 0.5)', //阴影颜色
+          shadowBlur: 20 //shadowBlur设图形阴影的模糊大小。配合shadowColor,shadowOffsetX/Y, 设置图形的阴影效果。
+        }
+      },
+      data: 'yData'
+    },
+  ]
+}
+//效果评价-瓦斯含量降低速率
+export let jdsLEchartOption = {
+  showTime: false,
+  tooltip: {
+    trigger: 'axis',
+    padding: 8,
+    backgroundColor: 'rgba(0, 0, 0, .6)',
+    textStyle: {
+      color: '#fff',
+      fontSize: 12,
+    },
+  },
+  grid: {
+    top: '28%',
+    left: '6%',
+    right: '6%',
+    bottom: '7%',
+    containLabel: true
+  },
+  legend: {
+    top: '1%',
+    right: '3%',
+    icon: 'circle',
+    itemWidth: 8,
+    itemHeight: 8,
+    itemGap: 12,
+    textStyle: {
+      color: '#fff',
+      fontSize: 12,
+    },
+    data: [
+      { name: '瓦斯含量降低速率' },
+    ]
+  },
+  yAxis: [
+    {
+      type: 'value',
+      position: 'left', // Y轴1在左边
+      name: '(m³/t/mon)',
+      nameTextStyle: {
+        color: "#a3a7ae",
+        fontSize: 12,
+        padding: 0
+      },
+      min: 0,
+      splitLine: {
+        show: true,
+        lineStyle: {
+          color: 'rgba(4, 49, 79)',
+        },
+      },
+      axisLine: {
+        show: true,
+        lineStyle: {
+          color: 'rgba(4, 49, 79)',
+        },
+      },
+      axisLabel: {
+        show: true,
+        textStyle: {
+          color: '#a3a7ae',
+          padding: 5
+        },
+        formatter: '{value}',
+      },
+      axisTick: {
+        show: false,
+      },
+    },
+  ],
+  series: [
+    {
+      name: '瓦斯含量降低速率',
+      type: 'line',
+      symbol: 'circle', // 默认是空心圆（中间是白色的），改成实心圆
+      showAllSymbol: true,
+      symbolSize: 0,
+      smooth: true,
+      lineStyle: {
+        normal: {
+          width: 2,
+          color: 'rgba(236, 255, 62,1)', // 线条颜色
+        },
+        borderColor: 'rgba(0,0,0,.4)',
+      },
+      itemStyle: {
+        color: 'rgba(236, 255, 62,1)',
+        borderColor: "#646ace",
+        borderWidth: 2
+      },
+      areaStyle: { //区域填充样式
+        normal: {
+          //线性渐变，前4个参数分别是x0,y0,x2,y2(范围0~1);相当于图形包围盒中的百分比。如果最后一个参数是‘true’，则该四个值是绝对像素位置。
+          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+            offset: 0,
+            color: "rgba(236, 255, 62,.4)"
+          },
+          {
+            offset: 1,
+            color: "rgba(236, 255, 62, .1)"
+          }
+          ], false),
+          shadowColor: 'rgba(236, 255, 62, 0.5)', //阴影颜色
+          shadowBlur: 20 //shadowBlur设图形阴影的模糊大小。配合shadowColor,shadowOffsetX/Y, 设置图形的阴影效果。
+        }
+      },
+      data: 'yData'
+    },
+  ]
+}
 
 //注气驱替促抽效果评价详情图表配置项
 export let ccxgEchartOption = {

src/views/vent/home/configurable/components/gasInject/zqHistoryExport.vue

@@ -189,7 +189,7 @@ onMounted(() => {
   --image-inject_zq_monitor: url('@/assets/images/gasInjection/9-3.png');
   position: relative;
   width: 100%;
-  min-height: 400px;
+  min-height: 550px;
 
   .icon-style-back {
     position: absolute;
@@ -260,7 +260,6 @@ onMounted(() => {
     justify-content: space-between;
     width: 100%;
     height: calc(100% - 54px);
-    min-height: 500px;
   }
 }
 

src/views/vent/home/configurable/components/gasInject/zqMonitorDetail.vue

@@ -50,7 +50,7 @@ let props = defineProps({
     --image-inject_zq_monitor: url('@/assets/images/gasInjection/9-3.png');
     --image-inject_zq_monitor1: url('@/assets/images/gasInjection/9-6.png');
     width: 100%;
-    min-height: 400px;
+    min-height: 550px;
     padding: 15px 25px;
     box-sizing: border-box;
 

src/views/vent/home/configurable/components/header.vue

@@ -3,7 +3,7 @@
   <!-- Header部分 -->
   <div
     v-if="headerConfig.show"
-    class="w-100% flex costume-header"
+    class="w-98% flex costume-header"
     :class="headerConfig.selector.toggleIcon ? 'costume-headerToggleIcon' : 'costume-header'"
   >
     <!-- 选择下拉框，自动填充剩余空间，这种实现是因为 Select 不支持 suffix -->
@@ -91,7 +91,8 @@
 
   .costume-header {
     height: 30px;
-    background-image: linear-gradient(90deg, var(--vent-base-light-bg-opcity), transparent 20%, transparent 80%, var(--vent-base-light-bg-opcity));
+    margin: 0px 4px;
+     background-image: linear-gradient(90deg, rgba(29, 111, 191), transparent 20%, transparent 80%, rgba(  29, 111, 191));
   }
   .costume-headerToggleIcon {
     height: 30px;

src/views/vent/home/configurable/components/preset/gasInjectList.vue

@@ -1,11 +1,53 @@
 <template>
   <div class="gas-inject-list">
-    <div class="list-box-item" v-for="(item, index) in option" :key="index">
+    <!-- <div class="list-box-item" v-for="(item, index) in option" :key="index">
       <div class="box-item-label">{{ item.label }}</div>
       <div class="box-item-value">
         <span> {{ listDatas[item.value] }}</span>
         <span style="margin-left: 5px; color: aliceblue">{{ item.unit }}</span>
       </div>
+    </div> -->
+    <div class="list-box-item">
+      <div class="box-item-label">工作面名称</div>
+      <div class="box-item-value">
+        <span> {{ listDatas['strinstallpos'] }}</span>
+        <span style="margin-left: 5px; color: aliceblue"></span>
+      </div>
+    </div>
+    <div class="list-box-item">
+      <div class="box-item-label">区段长度</div>
+      <div class="box-item-value">
+        <span> {{ listDatas['quduanLength'] }}</span>
+        <span style="margin-left: 5px; color: aliceblue">m</span>
+      </div>
+    </div>
+    <div class="list-box-item">
+      <div class="box-item-label">区段宽度</div>
+      <div class="box-item-value">
+        <span> {{ listDatas['quduanWidth'] }}</span>
+        <span style="margin-left: 5px; color: aliceblue">m</span>
+      </div>
+    </div>
+    <div class="list-box-item">
+      <div class="box-item-label">平均煤厚</div>
+      <div class="box-item-value">
+        <span> {{ listDatas['avgMeihou'] }}</span>
+        <span style="margin-left: 5px; color: aliceblue">m</span>
+      </div>
+    </div>
+    <div class="list-box-item">
+      <div class="box-item-label">煤层瓦斯含量</div>
+      <div class="box-item-value">
+        <span> {{ listDatas['wasiHanliang'] }}</span>
+        <span style="margin-left: 5px; color: aliceblue">m³/t</span>
+      </div>
+    </div>
+    <div class="list-box-item">
+      <div class="box-item-label">区段瓦斯储量</div>
+      <div class="box-item-value">
+        <span> {{ listDatas['wasiHanliang'] }}</span>
+        <span style="margin-left: 5px; color: aliceblue">m³</span>
+      </div>
     </div>
   </div>
 </template>
@@ -14,9 +56,6 @@
 import { reactive, ref, watch } from 'vue';
 
 let props = defineProps({
-  option: {
-    type: Array as any,
-  },
   listData: {
     type: Object as any
   }
@@ -49,7 +88,7 @@ watch(() => props.listData, (newV, oldV) => {
   align-items: center;
   width: 100%;
   height: 100%;
-  padding: 13px 15px;
+  padding: 10px 15px;
   box-sizing: border-box;
   overflow-y: auto;
 
@@ -74,7 +113,6 @@ watch(() => props.listData, (newV, oldV) => {
     font-size: 15px;
     font-weight: 700;
     // font-family: 'douyuFont';
-
     color: #91faff;
   }
 }

src/views/vent/home/configurable/components/preset/gasZyChart.vue

@@ -13,8 +13,8 @@ let props = defineProps({
     type: Object as any
   }
 })
-let gasZyChart = ref(null)
 
+let gasZyChart = ref(null)
 //选项标签
 let series = ref<any[]>([]);
 //x轴开始时间
@@ -22,7 +22,7 @@ let startTimeAll = ref(0);
 //x轴结束时间
 let endTimeAll = ref(0);
 //1为运行状态，0为停止状态
-let categories = ref<any[]>([1, 0]);
+let categories = ref<any[]>(['注气开', '抽采开', '注气关', '抽采关']);
 let seriesValue = ref<any[]>([]);
 let jsonData = ref<any[]>([])
 
@@ -39,15 +39,21 @@ function getXDate(time) {
   let minutes = time.getMinutes();
   let seconds = time.getSeconds();
   return year + '-' + month + '-' + day + ' ' + hour + ':' + minutes + ':' + seconds;
+  // if (hour.toString().length < 2) {
+  //   hour = '0' + hour
+  // } else if (minutes.toString().length < 2) {
+  //   minutes = '0' + minutes
+  // } else if (seconds.toString().length < 2) {
+  //   seconds = '0' + seconds
+  // }
+  // return hour + ':' + minutes + ':' + seconds;
 }
 
-
-
 function renderItem(params, api) {
   let categoryIndex = api.value(0);
   let start = api.coord([api.value(1), categoryIndex]);
   let end = api.coord([api.value(2), categoryIndex]);
-  let height = api.size([0, 1])[1] * 0.1;
+  let height = api.size([0, 1])[1] * 0.15;
 
   let rectShape = echarts.graphic.clipRectByRect(
     {
@@ -85,13 +91,13 @@ function getOption() {
           fontSize: 12,
         },
         formatter: function (params) {
-          return params.marker + params.name + ': ' + params.value[3] / 1000 / 60 / 60 + ' h';
+          return params.marker + params.name + ': ' +( params.value[3] / 1000 / 60 / 60).toFixed(2) + ' h' ;
         },
       },
       grid: {
         top: "12%",
-        left: "10%",
-        right: "10%",
+        left: "7%",
+        right: "18%",
         bottom: "3%",
         containLabel: true,
       },
@@ -114,7 +120,7 @@ function getOption() {
         {
           min: startTimeAll.value,
           max: endTimeAll.value,
-          interval: 3600 * 24 * 1000,
+          interval: 3600 * 12 * 1000,
           axisLabel: {
             show: true,
             fontSize: 12,
@@ -184,7 +190,7 @@ watch(() => props.data, (newV, oldV) => {
     let yData = newV.devices[0].segments.map(el => {
       return {
         series: newV.devices[0].name,
-        category: el.status,
+        category: el.status + 0.5 == 1.5 ? '注气开' : el.status + 0.5 == 0.5 ? '注气关' : '',
         startTime: el.start,
         endTime: el.end,
       }
@@ -192,13 +198,12 @@ watch(() => props.data, (newV, oldV) => {
     let yData1 = newV.devices[1].segments.map(el => {
       return {
         series: newV.devices[1].name,
-        category: el.status,
+        category: el.status == 1 ? '抽采开' : el.status == 0 ? '抽采关' : '',
         startTime: el.start,
         endTime: el.end,
       }
     })
     jsonData.value = [...yData, ...yData1]
-
     echarts.util.each(categories.value, function (category, index: number) {
       let cgory = categories.value[index];
       series.value.forEach((itemS, indexS) => {

src/views/vent/home/configurable/configurable.api.ts

@@ -712,11 +712,6 @@ export const getSystemApi = (params) => {
       Pressure: zqData.readData.Pressure,
       paiqiPressure: zqData.readData.paiqiPressure,
     };
-    //注气/抽采历史图表数据
-   //let historyDataZq = reactive<any>({})
-   //historyDataZq.hourData = await getZqSystem({ pageNo: 1, pageSize: 100, gdeviceids: zqData.deviceID, strtype: zqData.deviceType, skip: '8' })
-   //historyDataZq.minitesData = await getZqSystem({ pageNo: 1, pageSize: 100, gdeviceids: zqData.deviceID, strtype: zqData.deviceType, skip: '6' })
-   //res.historyDataZq = historyDataZq
     //装备运行状态与控制
     res.deviceStatusControl = {
       deviceId: zqData.deviceID,
@@ -759,19 +754,16 @@ export const getSystemApi = (params) => {
     res.pumpData = res.msgTxt[res.msgTxt.length - 1].empty_device[0].datalist[0]
     res.pumpDeviceId = res.pumpData.deviceID
     res.pumpStrtype = 'pump'
-    res.pumpStrtypes=res.pumpData.deviceType
-   // let historyDataCc = reactive<any>({})
-   // historyDataCc.hourData = await getZqSystem({ pageNo: 1, pageSize: 100, gdeviceids: res.pumpData.deviceID, strtype: res.pumpData.deviceType, skip: '8' })
-   // historyDataCc.minitesData = await getZqSystem({ pageNo: 1, pageSize: 100, gdeviceids: res.pumpData.deviceID, strtype: res.pumpData.deviceType, skip: '6' })
-   // res.historyDataCc = historyDataCc
+    res.pumpStrtypes = res.pumpData.deviceType
+
     //应用场景信息
-    res.workInfo = {
-      strinstallpos: res.pumpData.strinstallpos || '-',
-      quduanLength: res.pumpData.quduanLength || '-',
-      quduanWidth: res.pumpData.quduanWidth || '-',
-      avgMeihou: res.pumpData.avgMeihou || '-',
-      wasiHanliang: res.pumpData.wasiHanliang || '-',
-    }
+    res.workInfo = res.msgTxt[res.msgTxt.length - 1].empty_device.map(v => {
+      return {
+        id: v.datalist[0].deviceID,
+        ...v.datalist[0],
+        ...v.datalist[0].readData
+      }
+    })
     //单元抽采数据
     res.dyCcData = res.msgTxt[res.msgTxt.length - 1].empty_device.filter(v => v.type != 'pump_under_1' && v.type != 'sys')
 
@@ -838,7 +830,7 @@ export const getSystemApi = (params) => {
     }
     res.hlgEchart = hlgEchart
     res.ccEchart = ccEchart
-    console.log( res.ccEchart,'res.ccEchart')
+    console.log(res.ccEchart, 'res.ccEchart')
 
     //注气驱替促抽效果评价
     res.ccPjData = {
@@ -854,9 +846,9 @@ export const getSystemApi = (params) => {
     let SummaryD = await getSummary({})
     console.log(SummaryD, 'SummaryD')
     res.warnechartD = [
+       { name: "装备运行异常", value: SummaryD.alarmTypeStats[2].count },
       { name: "环境监测异常", value: SummaryD.alarmTypeStats[0].count },
       { name: "信号传输异常", value: SummaryD.alarmTypeStats[1].count },
-      { name: "装备运行异常", value: SummaryD.alarmTypeStats[2].count },
       { name: "驱替数据异常", value: 0 },
     ]
     res.warnListD = {

src/views/vent/home/configurable/configurable.data.ts

@@ -526,15 +526,15 @@ export const testConfigGasInject: Config[] = [
     },
   },
   {
-    deviceType: 'work-info',
+    deviceType: 'workInfo',
     moduleName: '应用场景信息',
     pageType: 'gas_injection',
     moduleData: {
       header: {
-        show: false,
+        show: true,
         readFrom: '',
         selector: {
-          show: false,
+          show: true,
           value: '${strinstallpos}',
         },
         slot: {
@@ -565,15 +565,7 @@ export const testConfigGasInject: Config[] = [
       complex_list: [],
       preset: [
         {
-          readFrom: 'workInfo',
-          option: [
-            { label: '工作面名称', value: 'strinstallpos', unit: '' },
-            { label: '区段长度', value: 'quduanLength', unit: 'm' },
-            { label: '区段宽度', value: 'quduanWidth', unit: 'm' },
-            { label: '平均煤厚', value: 'avgMeihou', unit: 'm' },
-            { label: '煤层瓦斯含量', value: 'wasiHanliang', unit: 'm³/t' },
-            { label: '区段瓦斯储量', value: 'wasiHanliang', unit: 'm³' },
-          ],
+          readFrom: '',
         },
       ],
     },