@@ -45,12 +45,12 @@ defineExpose({ targetScrollDom });
</div>
<main class="chat-main flex flex-1 flex-col justify-between">
<div class="chat-scroll" ref="targetScrollDom">
- <div class="w-[800px] m-auto ">
+ <div class="w-[900px] m-auto ">
<slot></slot>
</main>
- <footer class="chat-footer relative w-[800px] m-auto pb-[30px]" v-if="isFooter">
+ <footer class="chat-footer relative w-[900px] m-auto pb-[30px]" v-if="isFooter">
<slot name="footer" />
</footer>
@@ -216,7 +216,7 @@ const handleOpenContent = async ({ id, category, reason:title }) => {
warnKey: '报警值',
statusVal: !!warningActive.value ? '系统关闭' : basic['状态']
});
-
+ console.log( "csData", csData );
jsTableData.value = [jsData];
csTableData.value = [csData];
@@ -47,7 +47,7 @@ export const getAreaOptions = ({ xAxisData, seriesList }) => {
show: true,
formatter: function (params) {
const [item] = params.filter(item => item.value);
- const color = item.dataIndex <= 5 ? '#2185da' : '#2ee055'
+ const color = item?.dataIndex <= 5 ? '#2185da' : '#2ee055'
return `
<div class="text-[12px]">
<p>时间:${item.name + ':00'}</p>
@@ -74,6 +74,15 @@ export const inColumns = [
]
export const outColumns = [
+ {
+ title: () => renderTooltip(h( 'span', '流量(m³/h)' ), '出水流量 | 在线仪表'),
+ key: '流量',
+ titleAlign: 'center',
+ align: 'center',
+ className: 'small',
+ width: '80px',
+ render: (row) => renderRowDom({ row, key: '流量' })
+ },
{
title: () => renderTooltip(h( 'span', 'COD(mg/L)' ), '出水cod | 在线仪表'),
key: 'COD',
@@ -29,7 +29,7 @@ const handleSubmit = async () => {
try {
loading.value = true;
- const { token } = await userApi.postLogin({ username, password });
+ const { token } = await userApi.postLogin({ username, password, type: 0 });
userStore.setUserInfo({ token });
const { user } = await userApi.getUserInfo();
errorMsg.value = '';