Преглед изворни кода

主风机跳转、修改下拉框样式

hongrunxia пре 1 година
родитељ
комит
b06d1f72e6

+ 5 - 4
src/layouts/default/header/components/user-dropdown/index.vue

@@ -52,9 +52,9 @@
 
   import { createAsyncComponent } from '/@/utils/factory/createAsyncComponent';
 
-  import { refreshCache, queryAllDictItems } from '/@/views/system/dict/dict.api';
-  import { DB_DICT_DATA_KEY } from '/src/enums/cacheEnum';
-  import { removeAuthCache, setAuthCache } from '/src/utils/auth';
+  import { refreshCache, queryAllDictItems, refreshRedis } from '/@/views/system/dict/dict.api';
+  import { DB_DICT_DATA_KEY } from '/@/enums/cacheEnum';
+  import { removeAuthCache, setAuthCache } from '/@/utils/auth/index';
   import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
   import { getRefPromise } from '/@/utils/index';
 
@@ -122,7 +122,8 @@
       // 清除缓存
       async function clearCache() {
         const result = await refreshCache();
-        if (result.success) {
+        const refreshRedisResult = await refreshRedis()
+        if (result.success && refreshRedisResult) {
           const res = await queryAllDictItems();
           removeAuthCache(DB_DICT_DATA_KEY);
           setAuthCache(DB_DICT_DATA_KEY, res.result);

+ 3 - 0
src/layouts/default/sider/bottomSideder.vue

@@ -101,6 +101,8 @@
           // micro-vent-3dModal 
           if(route.path.startsWith('/subSysmodal/')) {
             router.replace('/micro-vent-3dModal' + path.path)
+          }else if(path.path == '/sw/monitor-fanmain') {
+            window.open('https://swkhmi.shendong.vip:9043/#SW_PW_NORTH', '_blank')
           }else{
             go(path.path);
           }
@@ -191,6 +193,7 @@
         .child-menu-item {
           width: 100px;
           padding: 2px 0;
+          text-align: center;
           // background-color: #086193;
           background: linear-gradient(#0d435d, #0e729d);
           border-radius: 2px;

+ 5 - 2
src/views/vent/comment/components/customHeader.vue

@@ -13,7 +13,7 @@
         popupClassName="drop"
         :field-names="fieldNames"
         :options="options"
-        :dropdownStyle="{ background : 'transparent',  borderBottom: '1px solid #ececec66', backdropFilter: 'blur(50px)'}"
+        :dropdownStyle="{ background : 'transparent',  borderBottom: '1px solid #ececec66', backdropFilter: 'blur(50px)', color: '#fff !important'}"
       >
         <!-- <a-select-option value="2">15212工作面</a-select-option>
         <a-select-option value="1598491318007898113">采煤工作面</a-select-option>
@@ -59,11 +59,14 @@ export default defineComponent({
 @import '/@/design/vent/modal.less';
 
 .@{ventSpace}-select-dropdown {
+  color: #fff !important;
   .@{ventSpace}-select-item-option-selected,
   .@{ventSpace}-select-item-option-active {
     background-color: #ffffff33 !important;
   }
-
+  .zxm-select-item{
+    color: #fff;
+  }
   .@{ventSpace}-select-item:hover {
     background-color: #ffffff33 !important;
   }

+ 1 - 1
src/views/vent/deviceManager/comment/DeviceModal.vue

@@ -16,7 +16,6 @@
       </a-tab-pane>
       <a-tab-pane key="2" tab="点表关联">
         <PointTable
-          v-if="record.strtype"
           :columns="pointColumns"
           :pointType="record.strtype"
           :deviceId="deviceData.id"
@@ -87,6 +86,7 @@
   
   //表单赋值
   const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    debugger
     //重置表单
     setModalProps({ confirmLoading: false });
     Object.assign(record, data.record);

+ 196 - 196
src/views/vent/deviceManager/comment/NormalTable.vue

@@ -34,227 +34,227 @@
         <slot name="filterCell" v-bind="{ column, record }"></slot>
       </template>
     </BasicTable>
-    <!-- <DeviceModal @register="registerModal" @saveOrUpdate="saveOrUpdateHandler" :showTab="showTab" :deviceType="deviceType" /> -->
-    <DeviceModal v-model:visible="modalVisible" @saveOrUpdate="saveOrUpdateHandler" :showTab="showTab"  />
+    <DeviceModal @register="registerModal" @saveOrUpdate="saveOrUpdateHandler" :showTab="showTab" :deviceType="deviceType" />
+    <!-- <DeviceModal v-model:visible="modalVisible" @saveOrUpdate="saveOrUpdateHandler" @close-modal="closeModal" :showTab="showTab"  /> -->
   </div>
 </template>
 
 <script lang="ts" setup>
-  //ts语法
-  import { ref, provide, reactive, toRaw, defineExpose } from 'vue';
-  import { BasicTable, TableAction, ActionItem, EditRecordRow, BasicColumn } from '/@/components/Table';
-  import { useModal } from '/@/components/Modal';
-  import DeviceModal from './DeviceModal.vue';
-  // import { getToken } from '/@/utils/auth';
-  // import { useGlobSetting } from '/@/hooks/setting';
-  import { getTableHeaderColumns } from '/@/hooks/web/useWebColumns';
-  import { useListPage } from '/@/hooks/system/useListPage';
-  import { getPopupContainer } from '/@/utils';
+//ts语法
+import { ref, provide, reactive, toRaw, defineExpose } from 'vue';
+import { BasicTable, TableAction, ActionItem, EditRecordRow, BasicColumn } from '/@/components/Table';
+import { useModal } from '/@/components/Modal';
+import DeviceModal from './DeviceModal.vue';
+// import { getToken } from '/@/utils/auth';
+// import { useGlobSetting } from '/@/hooks/setting';
+import { getTableHeaderColumns } from '/@/hooks/web/useWebColumns';
+import { useListPage } from '/@/hooks/system/useListPage';
+import { getPopupContainer } from '/@/utils';
 
-  const props = defineProps({
-    columnsType: {
-      type: String,
-      // required: true,
-    },
-    columns: {
-      type: Array,
-      // required: true,
-      default: () => [],
-    },
-    searchFormSchema: {
-      type: Array,
-      default: () => [],
-    },
-    formSchema: {
-      type: Array,
-      required: true,
-    },
-    list: {
-      type: Function,
-      required: true,
-    },
-    getImportUrl: {
-      type: String,
-      required: true,
-    },
-    getExportUrl: {
-      type: String,
-      required: true,
-    },
-    deleteById: {
-      type: Function,
-      required: true,
-    },
-    batchDelete: {
-      type: Function,
-    },
-    saveOrUpdate: {
-      type: Function,
-      required: true,
-    },
-    pointList: {
-      type: Function,
-    },
-    showTab: {
-      type: Boolean,
-      default: false,
-    },
-    designScope: {
-      type: String,
-    },
-    title: {
-      type: String,
-    },
-    deviceType: {
-      type: String,
-    },
-  });
+const props = defineProps({
+  columnsType: {
+    type: String,
+    // required: true,
+  },
+  columns: {
+    type: Array,
+    // required: true,
+    default: () => [],
+  },
+  searchFormSchema: {
+    type: Array,
+    default: () => [],
+  },
+  formSchema: {
+    type: Array,
+    required: true,
+  },
+  list: {
+    type: Function,
+    required: true,
+  },
+  getImportUrl: {
+    type: String,
+    required: true,
+  },
+  getExportUrl: {
+    type: String,
+    required: true,
+  },
+  deleteById: {
+    type: Function,
+    required: true,
+  },
+  batchDelete: {
+    type: Function,
+  },
+  saveOrUpdate: {
+    type: Function,
+    required: true,
+  },
+  pointList: {
+    type: Function,
+  },
+  showTab: {
+    type: Boolean,
+    default: false,
+  },
+  designScope: {
+    type: String,
+  },
+  title: {
+    type: String,
+  },
+  deviceType: {
+    type: String,
+  },
+});
 
-  const emit = defineEmits(['submitSuccess']);
+const emit = defineEmits(['submitSuccess']);
 
-  const isUpdate = ref(false);
-  const record = reactive({});
-  const modalVisible = ref(false)
+const isUpdate = ref(false);
+const record = reactive({});
 
-  const deviceTypeId = ref('')
-  const pageType = ref('')
+const deviceTypeId = ref('')
+const pageType = ref('')
 
-  provide('formSchema', props.formSchema);
-  provide('isUpdate', isUpdate);
-  provide('formData', record);
-  provide('deviceType', props.deviceType);
-  // const glob = useGlobSetting();
-  const [registerModal, { openModal, closeModal }] = useModal();
+provide('formSchema', props.formSchema);
+provide('isUpdate', isUpdate);
+provide('formData', record);
+provide('deviceType', props.deviceType);
+// const glob = useGlobSetting();
+const [registerModal, { openModal, closeModal }] = useModal();
 
-  const columnList = getTableHeaderColumns(props.columnsType);
+const columnList = getTableHeaderColumns(props.columnsType);
 
-  // 列表页面公共参数、方法
-  const { prefixCls, tableContext, onExportXls, onImportXls, doRequest } = useListPage({
-    designScope: props.designScope,
-    tableProps: {
-      title: props.title,
-      api: props.list,
-      columns: props.columns.length > 0 ? (props.columns as any[]) : columnList,
-      // size: 'small',
-      // bordered: false,
-      formConfig: {
-        showAdvancedButton: true,
-        // labelWidth: 100,
-        labelAlign: 'left',
-        labelCol: {
-          xs: 24,
-          sm: 24,
-          md: 24,
-          lg: 9,
-          xl: 7,
-          xxl: 5,
-        },
-        schemas: props.searchFormSchema as any[],
-      },
-      useSearchForm: props.searchFormSchema.length > 0 ? true : false,
-      striped: true,
-      actionColumn: {
-        width: 180,
-      },
-      beforeFetch: (params) => {
-        return Object.assign(params, { column: 'createTime', devicekind: props.deviceType });
+// 列表页面公共参数、方法
+const { prefixCls, tableContext, onExportXls, onImportXls, doRequest } = useListPage({
+  designScope: props.designScope,
+  tableProps: {
+    title: props.title,
+    api: props.list,
+    columns: props.columns.length > 0 ? (props.columns as any[]) : columnList,
+    // size: 'small',
+    // bordered: false,
+    formConfig: {
+      showAdvancedButton: true,
+      // labelWidth: 100,
+      labelAlign: 'left',
+      labelCol: {
+        xs: 24,
+        sm: 24,
+        md: 24,
+        lg: 9,
+        xl: 7,
+        xxl: 5,
       },
+      schemas: props.searchFormSchema as any[],
     },
-    exportConfig: {
-      name: props.title,
-      url: props.getExportUrl,
+    useSearchForm: props.searchFormSchema.length > 0 ? true : false,
+    striped: true,
+    actionColumn: {
+      width: 180,
     },
-    importConfig: {
-      url: props.getImportUrl,
+    beforeFetch: (params) => {
+      return Object.assign(params, { column: 'createTime', devicekind: props.deviceType });
     },
-  });
+  },
+  exportConfig: {
+    name: props.title,
+    url: props.getExportUrl,
+  },
+  importConfig: {
+    url: props.getImportUrl,
+  },
+});
 
-  //注册table数据
-  const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
+//注册table数据
+const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
 
-  const saveOrUpdateHandler = async (params) => {
-    try {
-      await props.saveOrUpdate(params, isUpdate.value);
-      !props.showTab ? modalVisible.value=false : '';
-      await doRequest(props.list, { confirm: false });
-      emit('submitSuccess', params)
-    } catch (error) {
-      message.error('保存失败,请联系管理员');
-    }
-  };
-
-  /**
-   * 新增事件
-   */
-  function handleAdd() {
-    for (let key in record) {
-      delete record[key];
-    }
-    isUpdate.value = false;
-    // openModal(true);
-    modalVisible.value = true
+const saveOrUpdateHandler = async (params) => {
+  try {
+    await props.saveOrUpdate(params, isUpdate.value);
+    !props.showTab ? closeModal() : '';
+    await doRequest(props.list, { confirm: false });
+    emit('submitSuccess', params)
+  } catch (error) {
+    message.error('保存失败,请联系管理员');
   }
+};
 
-  /**
-   * 编辑事件
-   */
-  function handleEdit(data) {
-    isUpdate.value = true;
-    Object.assign(record, toRaw(data));
-    // openModal(true, {
-    //   record,
-    // }, false);
-    modalVisible.value = true
+// const closeModalFn = () => {
+//   closeModal()
+// }
+/**
+ * 新增事件
+ */
+function handleAdd() {
+  for (let key in record) {
+    delete record[key];
   }
+  isUpdate.value = false;
+  openModal(true);
+}
 
-  /**
-   * 删除事件
-   */
-  async function handleDelete(record) {
-    await props.deleteById({id: record.id}, reload);
-  }
+/**
+ * 编辑事件
+ */
+function handleEdit(data) {
+  isUpdate.value = true;
+  Object.assign(record, toRaw(data));
+  openModal(true, {
+    record,
+  }, false);
+}
 
-  /**
-   * 批量删除事件
-   */
-  async function batchHandleDelete() {
-    doRequest(() => props.batchDelete({ ids: selectedRowKeys.value }));
-  }
-  /**
-   * 查看
-   */
-  // function handleDetail(record) {
-  //   iframeUrl.value = `${glob.uploadUrl}/sys/annountCement/show/${record.id}?token=${getToken()}`;
-  //   openDetail(true);
-  // }
-  /**
-   * 操作列定义
-   * @param record
-   */
-  function getActions(record: EditRecordRow, column: BasicColumn): ActionItem[]  {
-    return [
-      {
-        label: '编辑',
-        onClick: handleEdit.bind(null, record, column),
-      },
-      {
-        label: '删除',
-        popConfirm: {
-          title: '是否确认删除',
-          confirm: handleDelete.bind(null, record, column),
-        },
+/**
+ * 删除事件
+ */
+async function handleDelete(record) {
+  await props.deleteById({ id: record.id }, reload);
+}
+
+/**
+ * 批量删除事件
+ */
+async function batchHandleDelete() {
+  doRequest(() => props.batchDelete({ ids: selectedRowKeys.value }));
+}
+/**
+ * 查看
+ */
+// function handleDetail(record) {
+//   iframeUrl.value = `${glob.uploadUrl}/sys/annountCement/show/${record.id}?token=${getToken()}`;
+//   openDetail(true);
+// }
+/**
+ * 操作列定义
+ * @param record
+ */
+function getActions(record: EditRecordRow, column: BasicColumn): ActionItem[] {
+  return [
+    {
+      label: '编辑',
+      onClick: handleEdit.bind(null, record, column),
+    },
+    {
+      label: '删除',
+      popConfirm: {
+        title: '是否确认删除',
+        confirm: handleDelete.bind(null, record, column),
       },
-      // {
-      //   label: '查看',
-      //   onClick: handleDetail.bind(null, record),
-      // },
-    ];
-  }
+    },
+    // {
+    //   label: '查看',
+    //   onClick: handleDetail.bind(null, record),
+    // },
+  ];
+}
 
 
-  defineExpose({
-    doRequest, onExportXls, onImportXls, reload
-  });
+defineExpose({
+  doRequest, onExportXls, onImportXls, reload
+});
 
 </script>
 

+ 114 - 52
src/views/vent/deviceManager/comment/warningTabel/BaseModal.vue

@@ -1,11 +1,21 @@
 <template>
-  <BasicModal @register="register" :title="title" :width="800" :min-height="400" v-bind="$attrs" @ok="onSubmit">
-    <BasicForm @register="registerForm" ></BasicForm>
+  <BasicModal @register="register" :title="title" :width="800" :min-height="600" v-bind="$attrs" @ok="onSubmit">
+    <BasicForm @register="registerForm">
+      <template #monitor="{ model, field }">
+        <div class="vent-flex-row-between">
+          <Select ref="selectRef" disabled v-model:value="pointData" :options="option"
+            style="width: calc(100% - 65px);" />
+          <a-button class="vent-margin-b-5" type="primary" @click="selectPoint(model['strtype'])"
+            style="position: absolute; right: 0; top: 1px;">选择</a-button>
+        </div>
+      </template>
+    </BasicForm>
   </BasicModal>
-  <DevicePointTable @register="registerModal" :data-source="devicePointList" :selection-row-keys="pointData" @reload="setPoint" />
+  <DevicePointTable @register="registerModal" :data-source="devicePointList" :selection-row-keys="pointData"
+    @reload="setPoint" />
 </template>
 <script lang="ts" setup>
-  import { onMounted, ref, defineEmits, unref, nextTick } from 'vue';
+import { onMounted, ref, defineEmits, unref, nextTick } from 'vue';
 import { BasicForm, useForm } from '/@/components/Form/index';
 import { BasicModal, useModalInner, useModal } from '/@/components/Modal';
 import type { FormSchema } from '/@/components/Form/src/types/form';
@@ -13,59 +23,111 @@ import { Select, message } from 'ant-design-vue';
 import DevicePointTable from './DevicePointTable.vue';
 import { workFacePointList } from './warning.api'
 
-  const props = defineProps({
-    formSchemas: {
-      type: Array as PropType<FormSchema[]>,
-      default: () => ([]),
-    },
-    deviceId: { type: String },
-    monitorType: {
-      type: String,
-      default: '2'
-    }
-  })
-  const emit = defineEmits(['add', 'update', 'register'])
-  const devicePointList = ref<any[]>([])
-  const pointData = ref<String[]>([])
-  const title = ref('')
-  const isUpdate = ref(false)
-  // 注册 form
-  const [registerForm, { resetFields, setFieldsValue, validate, getFieldsValue }] = useForm({
-    schemas: props.formSchemas,
-    showActionButtonGroup: false,
-  });
-  
-  // 注册 modal
-  const [register, { setModalProps }] = useModalInner(async (data) => {
-    isUpdate.value = unref(data.isUpdate);
-    title.value = unref(data.title);
-    await resetFields();
-    if(data.isUpdate){
-      await setFieldsValue({ ...data.record });
-    }
-  });
+const props = defineProps({
+  formSchemas: {
+    type: Array as PropType<FormSchema[]>,
+    default: () => ([]),
+  },
+  deviceId: { type: String },
+  monitorType: {
+    type: String,
+    default: '2'
+  }
+})
+const emit = defineEmits(['add', 'update', 'register'])
+const option = ref<any[]>([])
+const devicePointList = ref<any[]>([])
+const pointData = ref<String[]>([])
+const title = ref('')
+const isUpdate = ref(false)
+// 注册 form
+const [registerForm, { resetFields, setFieldsValue, validate, getFieldsValue }] = useForm({
+  schemas: props.formSchemas,
+  showActionButtonGroup: false,
+});
+
+// 注册 modal
+const [register, { setModalProps }] = useModalInner(async (data) => {
+  isUpdate.value = unref(data.isUpdate);
+  title.value = unref(data.title);
+  await resetFields();
+  if (data.isUpdate) {
+    await setFieldsValue({ ...data.record });
+    pointData.value = [data.record['monitorId']]
 
-  const [registerModal] = useModal();
-  async function onSubmit() {
-    try {
-      const data = await getFieldsValue()
-      await setFieldsValue({...data, monitorId: pointData.value[0] })
-      const values = await validate();
-      setModalProps({ confirmLoading: true });
-      // 提交表单
-      if (!isUpdate.value) {
-        emit('add', 'add', values)
-      } else {
-        emit('update', 'update',values)
+    debugger
+    await getDevicePointList(data.record['deviceId'])
+    devicePointList.value.forEach(item => {
+      if (item['id'] == pointData.value) {
+        setPoint([item])
       }
-    } finally {
-      setModalProps({ confirmLoading: false });
+    })
+    // 初始打开有数据时候要查点表
+
+  } else if (data.record) {
+    await setFieldsValue({ relId: data.record['relId'] || data.record['id'], monitorId: '' });
+  }
+});
+
+const [registerModal, { openModal }] = useModal();
+
+async function getDevicePointList(strtype) {
+  try {
+    const result = await workFacePointList({ deviceType: strtype, valueType: props.monitorType });
+    devicePointList.value = result
+  } catch (error) {
+    devicePointList.value = []
+  }
+};
+
+async function onSubmit() {
+  try {
+    const data = await getFieldsValue()
+    await setFieldsValue({ ...data, monitorId: pointData.value[0] })
+    const values = await validate();
+    setModalProps({ confirmLoading: true });
+    debugger
+    // 提交表单
+    if (!isUpdate.value) {
+      emit('add', 'add', values)
+    } else {
+      emit('update', 'update', values)
     }
+    // //关闭弹窗
+    // closeModal();
+    // //刷新列表
+    // reload()
+  } finally {
+    setModalProps({ confirmLoading: false });
+  }
+}
+
+async function selectPoint(strtype) {
+  if (strtype) {
+
+    await getDevicePointList(strtype)
+    openModal()
+  } else {
+    message.info('请先选择设备!')
   }
+}
+
+function setPoint(value) {
+  const data = value[0]
+  option.value = [
+    {
+      value: data.id,
+      label: data.valuename
+    }
+  ]
+  nextTick(() => {
+    pointData.value = [data.id]
+  })
+}
+
+onMounted(async () => {
 
-  onMounted(async () => {
-    
-  });
+});
 
 </script>
 <style scoped lang="less"></style>

+ 2 - 0
src/views/vent/deviceManager/comment/warningTabel/index3.vue

@@ -51,6 +51,8 @@
   async function getWarningList() {
     const result = await warningLogList({ sysId: props.deviceId, pageSize: 100000  }) //id: props.deviceId
     warningList.value = result.records
+    debugger
+    
     activeID.value = warningList.value[0]['id']
   }
 

+ 1 - 1
src/views/vent/home/colliery/components/device-warn.vue

@@ -53,7 +53,7 @@
   //跳转详情
   function getDetail() {
     console.log('跳转详情');
-    emit('goDetail', 'sheb');
+    emit('goDetail', 'warning');
   }
   watch(
     () => props.warnData,

+ 1 - 1
src/views/vent/home/colliery/components/fan-monitor.vue

@@ -53,7 +53,7 @@
   });
   //跳转详情
   function getDetail() {
-    emit('goDetail', 'ju');
+    emit('goDetail', 'fanLocal');
   }
   //选项切换
   function changeSelect(val) {

+ 1 - 1
src/views/vent/home/colliery/components/main-monitor.vue

@@ -54,7 +54,7 @@
   //跳转详情
   function getDetail() {
     console.log('跳转详情');
-    emit('goDetail', 'zhu');
+    emit('goDetail', 'fanMain');
   }
   //选项切换
   function changeSelect(val) {

+ 1 - 1
src/views/vent/home/colliery/components/wind-device.vue

@@ -125,7 +125,7 @@
   //跳转详情
   function getDetail() {
     console.log('跳转详情');
-    emit('goDetail', 'fl')
+    // emit('goDetail', 'windrect')
   }
 
   watch(

+ 1 - 1
src/views/vent/home/colliery/components/wind-line.vue

@@ -79,7 +79,7 @@
   //跳转详情
   function getDetail() {
     console.log('跳转详情');
-    emit('goDetail', 'line')
+    emit('goDetail', 'majorpath')
   }
   //选项切换
   function changeSelect(val) {

+ 1 - 1
src/views/vent/home/colliery/components/wind-monitor.vue

@@ -22,7 +22,7 @@
   let echartData = reactive<any>({ ydata: [], xdata: [] });
   //跳转详情
   function getDetail() {
-    emit('goDetail', 'wind')
+    emit('goDetail', 'windrect')
   }
   function getOption() {
     nextTick(() => {

+ 1 - 1
src/views/vent/home/colliery/components/work-monitor.vue

@@ -55,7 +55,7 @@
   //跳转详情
   function getDetail() {
     console.log('跳转详情');
-    emit('goDetail', 'work');
+    // emit('goDetail', 'work');
   }
   //选项切换
   function changeSelect(val) {

+ 7 - 7
src/views/vent/home/colliery/index.vue

@@ -138,10 +138,10 @@ function goDetail(deviceType) {
   //lxh
   // pageType.value = deviceType;
   // changeModalBox();
-  if (deviceType == 'zhu') {
-    router.push('/monitorChannel/monitor-fan-main');
-  } else if (deviceType == 'ju') {
-    router.push('/monitorChannel/monitor-fan-local');
+  if (deviceType == 'fanMain') {
+    router.push('/monitorChannel/monitor-fanlocal');
+  } else if (deviceType == 'fanLocal') {
+    router.push('/monitorChannel/monitor-fanmain');
   } else {
     router.push('/monitorChannel/monitor-gate');
   }
@@ -178,12 +178,12 @@ function getList() {
     fanLocalList.push(res.fanlocal);
     mainList.value = res.fanmain;
     centerList = res.midinfo[0].sysdata;
-    navList[0].valList = centerList.zongfengliang
+    navList[0].valList = centerList && centerList.zongfengliang
       ? centerList.zongfengliang.split('').map((el) => {
         return { val: el };
       })
       : [];
-    navList[1].valList = centerList.xufengliang
+    navList[1].valList = centerList && centerList.xufengliang
       ? centerList.xufengliang
         .toString()
         .split('')
@@ -192,7 +192,7 @@ function getList() {
         })
       : [];
 
-    if (centerList.zongfengliang && centerList.zonghuifeng) {
+    if (centerList && centerList.zongfengliang && centerList.zonghuifeng) {
       navList[3].val =
         (((parseFloat(centerList.zongfengliang) - parseFloat(centerList.zonghuifeng)) / parseFloat(centerList.zonghuifeng)) * 100).toFixed(2) + '%';
       navList[4].val = ((centerList.xufengliang / parseFloat(centerList.zongfengliang)) * 100).toFixed(2) + '%';

+ 1 - 0
src/views/vent/monitorManager/comment/less/workFace.less

@@ -689,4 +689,5 @@
 
 :deep(.zxm-select-dropdown) {
   background: #ffffff !important;
+  color: #fff !important;
 }

+ 1 - 2
src/views/vent/monitorManager/compressor/components/nitrogenHome1.vue

@@ -293,7 +293,7 @@
       const result = res;
       if (!result || result.msgTxt.length < 1) return;
       result.msgTxt.forEach((item) => {
-        if (item.typeName.indexOf('制氮机') != -1) {
+        if (item.type && item.type.startsWith('nitrogen')) {
           monitorData.value = item['datalist'].filter((data) => {
             const item = data.readData;
             return Object.assign(data, item);
@@ -316,7 +316,6 @@
           });
         }
       });
-      console.log(echartData, 'echart----------');
       monitorDataGroupNum.value = monitorData.value.length;
     }
   }

+ 1 - 0
src/views/vent/monitorManager/deviceMonitor/components/device/index.vue

@@ -1217,6 +1217,7 @@ onUnmounted(() => {
 
 :deep(.zxm-select-dropdown) {
   left: 0 !important;
+  color: #fff !important;
 }
 // :deep(.@{ventSpace}-pagination){
 //   margin-right: 20px !important;

+ 1 - 0
src/views/vent/monitorManager/deviceMonitor/index.vue

@@ -646,4 +646,5 @@ onUnmounted(() => {
 
 :deep(.zxm-select-dropdown) {
   left: 0 !important;
+  color: #fff !important;
 }</style>