123 1 år sedan
förälder
incheckning
7756ccf83f

+ 13 - 0
src/views/logs/index.vue

@@ -107,6 +107,19 @@ const gridOptions = reactive<VxeGridProps>({
     storage: true,
   },
   columns: [
+    {
+      field: 'sysName',
+      title: '系统名称',
+    },
+    {
+      field: 'rid',
+      title: '系统编号',
+      width: 100,
+    },
+    {
+      field: 'energyStationName',
+      title: '所属锅炉房',
+    },
     {
       field: 'date',
       title: '日期',

+ 1 - 1
src/views/runData/components/boilerData/index.vue

@@ -61,7 +61,7 @@ const gridOptions = reactive<VxeGridProps>({
     storage: true,
   },
   columns: tableCloumn,
-  data: tableData,
+  data: [],
   toolbarConfig: {
     custom: true,
     // custom: {

+ 13 - 9
src/views/runData/components/systemData/components/EditDialog.vue

@@ -60,7 +60,7 @@
                 ></t-radio-group>
               </t-form-item>
             </t-col>
-            <t-col :span="6">
+            <t-col :span="6" v-if="formData.controlModel !== 3">
               <t-form-item label="起始温度" name="startTemperature">
                 <t-input-number
                   v-model="formData.startTemperature"
@@ -125,14 +125,14 @@
                     v-model="item.start"
                     theme="normal"
                     :disabled="true"
-                    style="width: 80px"
+                    style="width: 90px"
                   ></t-input-number>
                 </t-form-item>
                 <span
                   style="
                     display: inline-block;
                     line-height: 32px;
-                    margin: 0 10px;
+                    margin: 0 5px;
                   "
                   >至</span
                 >
@@ -149,7 +149,7 @@
                       qulvInputChange(formData.curvatureList, item, index)
                     "
                     :disabled="index === formData.curvatureList.length - 1"
-                    style="width: 80px"
+                    style="width: 100px"
                   ></t-input-number>
                 </t-form-item>
                 <span
@@ -203,7 +203,11 @@
                   >恢复初始设置</t-button
                 >
               </h3>
-              <t-row v-for="(elem, idx) in formData.amendmentList" :key="idx">
+              <t-row
+                v-for="(elem, idx) in formData.amendmentList"
+                :key="idx"
+                style="padding: 0 10px"
+              >
                 <t-form-item
                   label-width="0"
                   :name="'amendmentList.' + idx + '.startTime'"
@@ -213,7 +217,7 @@
                     format="HH:mm"
                     placeholder="开始时间"
                     disabled
-                    style="width: 100px"
+                    style="width: 110px"
                   />
                 </t-form-item>
                 <span
@@ -238,7 +242,7 @@
                     :disabled="idx === formData.amendmentList.length - 1"
                     placeholder="结束时间"
                     :disable-time="disableTime"
-                    style="width: 100px"
+                    style="width: 110px"
                   />
                 </t-form-item>
                 <span
@@ -311,8 +315,8 @@ const qulvValidator = (item: any, index: number, data: []) => {
     {
       validator: (val: number) => {
         if (
-          (data.length - 1 !== index && val >= 30) ||
-          (data.length - 1 !== index && val <= -50)
+          (index !== 0 && data.length - 1 !== index && val >= 30) ||
+          (index !== 0 && data.length - 1 !== index && val <= -50)
         ) {
           return {
             result: false,

+ 6 - 1
src/views/runData/components/systemData/components/HistoryDialog.vue

@@ -94,6 +94,7 @@ import { getSystemHistory, histroyDownLoad } from '@/api/runData/index.ts';
 const EchartRef = ref(null);
 const state = reactive({
   visible: false,
+  dialogInfo: {},
   formData: {
     rid: '',
     saveStartDate: '',
@@ -144,7 +145,10 @@ const handleDownload = async () => {
   let dataCodesList = state.dataCodesArr.map((item) => item.value);
   let params = { rid, saveStartDate, saveEndData, dataCodes: dataCodesList };
   const res = await histroyDownLoad(params);
-  download(res.data, '历史数据表.xls');
+  let xlsTitle = state.dialogInfo._id
+    ? `${state.dialogInfo._id}-历史数据表`
+    : '历史数据表';
+  download(res.data, `${xlsTitle}.xls`);
 };
 const download = (data, fileName) => {
   if (!data) {
@@ -161,6 +165,7 @@ const download = (data, fileName) => {
 /**打开弹框 */
 const openDialog = (row) => {
   state.visible = true;
+  state.dialogInfo = { ...row };
   const today = new Date();
   const currentDate = formatTime(today, 'YYYY-MM-DD HH:mm:ss');
   const beginDate = new Date(today.getTime() - 24 * 60 * 60 * 1000);

+ 1 - 1
src/views/runData/components/systemData/constants.ts

@@ -8,7 +8,7 @@ export interface RowVO {
 
 export const tableCloumn = [
     { field: 'sysName', title: '系统名称', width: 120, fixed: 'left' },
-    { field: '_id', title: '编号', width: 100, visible: false },
+    { field: '_id', title: '系统编号', width: 100, visible: false },
     { field: 'energyStationName', title: '所属锅炉房', width: 120 },
     {
         field: 'controlModel', title: '控制模式', width: 100, formatter: ({ cellValue, row }) => {