fix:sth

src/api/tyler/common.js

@@ -96,4 +96,13 @@ export function draDeviceName(query) {
     method: 'get',
     params: query
   })
+}
+
+//风机系统风机名称下拉
+export function fanDeviceName(query) {
+  return request({
+    url: '/business/fan/base/deviceName',
+    method: 'get',
+    params: query
+  })
 }
\ No newline at end of file

src/api/tyler/fan.js

@@ -8,3 +8,21 @@ export function listFanHis(query) {
     params: query
   })
 }
+
+// 查询风机运行报警列表
+export function listalarmFan(query) {
+  return request({
+    url: '/business/fan/alarm/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 修改风机运行报警列表
+export function alarmFanEdit(query) {
+  return request({
+    url: '/business/fan/alarm/edit',
+    method: 'post',
+    data: query
+  })
+}
\ No newline at end of file

src/views/Screen/index.vue

@@ -51,7 +51,7 @@
           <div class="sub-header-mid">
             <div class="top-change">
               <span @click="changeMenu(0)">首页</span>
-              <span>企业宣传</span>
+              <span @click="openVideo">企业宣传</span>
               <span @click="goToSys">后台管理</span>
             </div>
           </div>
@@ -75,6 +75,8 @@
 <script>
 // import * as echarts from "echarts";
 // import { getScale } from "@/utils/tylerlcl";
+import { listVideo } from "@/api/tyler/mainVideo";
+
 import screenfull from "screenfull";
 import rydw from "./items/rydw.vue";
 import hjjc from "./items/hjjc.vue";
@@ -92,10 +94,13 @@ export default {
   },
   data() {
     return {
+      previewUrl: process.env.VUE_APP_API_TARGET,
       showMenu: 0,
+      videoData:null,
     };
   },
   mounted() {
+    this.getVideo()
     if (screenfull && screenfull.enabled && !screenfull.isFullscreen) {
       screenfull.request();
     }
@@ -103,6 +108,13 @@ export default {
     //     this.alarm30();
   },
   methods: {
+    getVideo(){
+      this.videoData = null;
+      listVideo().then(res => {
+        this.videoData = this.previewUrl + res.data;
+       
+      })
+    },
     changeMenu(val) {
       this.showMenu = val;
     },
@@ -114,6 +126,10 @@ export default {
       window.open(link.href);
       return;
     },
+    openVideo(){
+      window.open(this.videoData);
+      return;
+    },
   },
 };
 </script>

src/views/drainage/waterLevelAlarm/index.vue

@@ -23,7 +23,7 @@
     <el-table v-loading="loading" :data="historyList" @selection-change="handleSelectionChange">
       <el-table-column label="设备名称" align="center" prop="sumpName" />
       <el-table-column label="设备编号" align="center" prop="sumpId" />
-      <el-table-column label="设备安装位置" align="center" prop="installationLocation" />
+      <el-table-column label="设备安装描述" align="center" prop="installationLocation" />
       <el-table-column label="液位高度(m)" align="center" prop="heghtThreshold" />
       <el-table-column label="报警时间" align="center" prop="alarmTime" width="180">
         <template slot-scope="scope">

src/views/drainage/waterLevelHis/index.vue

@@ -23,7 +23,7 @@
     <el-table v-loading="loading" :data="historyList">
       <el-table-column label="设备名称" align="center" prop="sumpName" />
       <el-table-column label="设备编号" align="center" prop="sumpId" />
-      <el-table-column label="设备安装位置" align="center" prop="installationLocation" />
+      <el-table-column label="设备安装描述" align="center" prop="installationLocation" />
       <el-table-column label="液位高度（m）" align="center" prop="heghtThreshold" />
       <el-table-column label="监测时间" align="center" prop="time" width="180">
         <template slot-scope="scope">

src/views/drainage/waterPumpAlarmHis/index.vue

@@ -23,7 +23,7 @@
     <el-table v-loading="loading" :data="historyList" @selection-change="handleSelectionChange">
       <el-table-column label="水泵名称" align="center" prop="pumpName" />
       <el-table-column label="水泵编号" align="center" prop="pumpId" />
-      <el-table-column label="水泵安装位置" align="center" prop="installationLocation" />
+      <el-table-column label="水泵安装描述" align="center" prop="installationLocation" />
       <el-table-column label="报警项" align="center" prop="alarmProduct" />
       <el-table-column label="监测值" align="center" prop="alarmValue" />
       <el-table-column label="报警时间" align="center" prop="alarmTime" width="180">

src/views/fanSys/fanAlarm/index.vue

 <template>
-  <div>
-    暂无
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    
+      <el-form-item label="" prop="deviceName">
+        <el-select v-model="queryParams.deviceName" placeholder="风机名称" clearable>
+          <el-option
+            v-for="dict in deviceName"
+            :key="dict.value"
+            :label="dict.name"
+            :value="dict.name"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="">
+        <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    
+
+    <el-table v-loading="loading" :data="infoList">
+      <el-table-column label="风机名称" align="center" prop="deviceName"/>
+      <el-table-column label="风机编号" align="center" prop="deviceId"/>
+      <el-table-column label="风机安装描述" align="center" prop="installationLocation" />
+      <el-table-column label="报警项" align="center" prop="alarmProduct" />
+      <el-table-column label="监测值" align="center" prop="alarmValue" />
+      <el-table-column label="报警时间" align="center" prop="alarmTime" />
+      <el-table-column label="状态" align="center" prop="status" >
+        <template slot-scope="scope">
+          <el-button
+            type="primary"
+            @click="handleUpdate(scope.row)"
+            v-if="scope.row.status==1"
+          >处置</el-button>
+          <span v-else>已处置</span>
+       
+        </template>
+      </el-table-column>
+      <el-table-column label="解除报警时间" align="center" prop="delAlarmTime" />
+      <el-table-column label="解除原因" align="center" prop="delAlarmResion" />
+      
+     
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
+        <el-form-item label="解除原因" prop="delAlarmResion">
+          <el-input type="textarea" v-model="form.delAlarmResion" placeholder="请输入解除原因" />
+        </el-form-item>
+        <el-form-item label="解除报警时长(h)" prop="time">
+          <el-input v-model="form.time" placeholder="请输入解除报警时长(h)" />
+        </el-form-item>
+   
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
-</template>
+</template>
\ No newline at end of file
+
+<script>
+  import { listalarmFan, alarmFanEdit } from "@/api/tyler/fan";
+  import { fanDeviceName } from "@/api/tyler/common";
+
+  export default {
+  name: "Info",
+  data() {
+    return {
+      // 根路径
+      baseURL: process.env.VUE_APP_BASE_API,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 风机基本信息表格数据
+      infoList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        deviceName: null,
+        deviceId: null,
+    
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        id: [
+          { required: true, message: "id不能为空", trigger: "blur" }
+        ],
+        delAlarmResion: [
+          { required: true, message: "解除原因不能为空", trigger: "blur" }
+        ],
+        time: [
+          { required: true, message: "解除时长不能为空", trigger: "blur" }
+        ],
+      },
+      deviceName:[],
+      dateRange: [],
+    };
+  },
+  created() {
+    fanDeviceName().then(res=>{
+      this.deviceName = res.data;
+    })
+    this.getList();
+  },
+  methods: {
+    /** 查询风机基本信息列表 */
+    getList() {
+      this.loading = true;
+      listalarmFan(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+        this.infoList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        delAlarmResion:null,
+        time:null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+     
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = []
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.form.id = row.id;
+      this.open = true;
+      // getHistory(id).then(response => {
+      //   this.form = response.data;
+      //   this.open = true;
+      //   this.title = "修改设备历史信息";
+      // });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      console.log(this.form)
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            alarmFanEdit(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addHistory(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+  
+  }
+};
+</script>

src/views/fanSys/fanHis/index.vue

 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="风机名称" prop="deviceName">
-        <el-input
-          v-model="queryParams.deviceName"
-          placeholder="请输入风机名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+    
+      <el-form-item label="" prop="deviceName">
+        <el-select v-model="queryParams.deviceName" placeholder="风机名称" clearable>
+          <el-option
+            v-for="dict in deviceName"
+            :key="dict.value"
+            :label="dict.name"
+            :value="dict.name"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="">
         <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
@@ -24,7 +27,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="风机名称" align="center" prop="deviceName" width="120"/>
       <el-table-column label="风机编号" align="center" prop="deviceId" width="120"/>
-      <el-table-column label="风机安装位置" align="center" prop="installationLocation" width="120" />
+      <el-table-column label="监测时间" align="center" prop="time" width="160" />
       <el-table-column label="电源电压预警值(V)" align="center" prop="powerSupplyVoltage" width="140" />
       <el-table-column label="电机电流预警值(A)" align="center" prop="motorCurrent" width="140" />
       <el-table-column label="运行频率预警值(HZ)" align="center" prop="operatingFrequency" width="140" />
@@ -53,7 +56,8 @@
 </template>
 
 <script>
-  import { listFanHis, } from "@/api/tyler/fan";
+  import { listFanHis } from "@/api/tyler/fan";
+  import { fanDeviceName } from "@/api/tyler/common";
 
   export default {
   name: "Info",
@@ -100,17 +104,22 @@
         deviceId: [
           { required: true, message: "风机编号不能为空", trigger: "blur" }
         ],
-      }
+      },
+      deviceName:[],
+      dateRange:[],
     };
   },
   created() {
+    fanDeviceName().then(res=>{
+      this.deviceName = res.data;
+    })
     this.getList();
   },
   methods: {
     /** 查询风机基本信息列表 */
     getList() {
       this.loading = true;
-      listFanHis(this.queryParams).then(response => {
+      listFanHis(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
         this.infoList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -150,6 +159,7 @@
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.dateRange = []
       this.resetForm("queryForm");
       this.handleQuery();
     },

src/views/fanSys/fandev/index.vue

@@ -54,7 +54,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="风机名称" align="center" prop="deviceName" width="120"/>
       <el-table-column label="风机编号" align="center" prop="deviceId" width="120"/>
-      <el-table-column label="风机安装位置" align="center" prop="installationLocation" width="120" />
+      <el-table-column label="风机安装描述" align="center" prop="installationLocation" width="120" />
       <el-table-column label="电源电压预警值(V)" align="center" prop="powerSupplyVoltage" width="140" />
       <el-table-column label="电机电流预警值(A)" align="center" prop="motorCurrent" width="140" />
       <el-table-column label="运行频率预警值(HZ)" align="center" prop="operatingFrequency" width="140" />
@@ -102,8 +102,8 @@
         <el-form-item label="风机编号" prop="deviceId">
           <el-input v-model="form.deviceId" placeholder="请输入风机编号" />
         </el-form-item>
-        <el-form-item label="风机安装位置" prop="installationLocation">
-          <el-input v-model="form.installationLocation" placeholder="请输入风机安装位置" />
+        <el-form-item label="风机安装描述" prop="installationLocation">
+          <el-input v-model="form.installationLocation" placeholder="请输入风机安装描述" />
         </el-form-item>
         <el-divider content-position="left">设置设备参数预警值</el-divider>
         <el-row>

src/views/system/waterSysSet/index.vue

 <template>
   <div class="automation-control">
     <!-- 自动化控制排水系统开关 -->
-    <div class="control-header">
-      <span>自动化控制排水系统</span>
-      <el-switch
-        v-model="formData.status"
-        active-text="已开启"
-        inactive-text="已关闭"
-        active-value="1"
-        inactive-value="0"
-        @change="handleStatusChange"
-      ></el-switch>
-    </div>
-
+    <el-card>
+      <div class="control-header">
+        <span>自动化控制排水系统</span>
+        <el-switch
+          v-model="formData.status"
+          active-text="已开启"
+          inactive-text="已关闭"
+          active-value="1"
+          inactive-value="0"
+          @change="handleStatusChange"
+        ></el-switch>
+      </div>
+    </el-card>
     <!-- 峰谷值时间段设置 -->
-    <div class="section">
-      <h3>设置峰谷值时间段</h3>
-      <el-time-picker
-        is-range
-        v-model="timeRange"
-        range-separator="至"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-        format="HH:mm:ss"
-        value-format="HH:mm:ss"
-        @change="handleTimeRangeChange"
-      ></el-time-picker>
-    </div>
-
-    <!-- 液体高度设置 -->
-    <div class="section">
-      <h3>设置液体高度 <el-link type="primary" :underline="false">设置说明</el-link></h3>
-      
-      <!-- 每个水仓的设置 -->
-      <div v-for="(sump, index) in formData.draPeakSumpVos" :key="sump.sumpId">
-        <div class="sump-item">
-          <div class="sump-header">
-            <span>{{ sump.sumpName }}液位高度（m）：</span>
-          </div>
-          
-          <div class="threshold-inputs">
-            <div class="threshold-item">
-              <span>A点值</span>
-              <el-input v-model="sump.heghtThresholdA" placeholder="请输入A点值" size="small"></el-input>
-            </div>
-            <div class="threshold-item">
-              <span>B点值</span>
-              <el-input v-model="sump.heghtThresholdB" placeholder="请输入B点值" size="small"></el-input>
+    <el-card>
+      <div class="section">
+        <h3>设置峰谷值时间段</h3>
+        <el-time-picker
+          is-range
+          v-model="timeRange"
+          range-separator="至"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+          format="HH:mm:ss"
+          value-format="HH:mm:ss"
+          @change="handleTimeRangeChange"
+        ></el-time-picker>
+      </div>
+      <el-divider></el-divider>
+      <!-- 液体高度设置 -->
+      <div class="section">
+        <h3>设置液体高度 <el-link type="primary" :underline="false">设置说明</el-link></h3>
+        
+        <!-- 每个水仓的设置 -->
+        <div v-for="(sump, index) in formData.draPeakSumpVos" :key="sump.sumpId">
+          <div class="sump-item">
+            <div class="sump-header">
+              <span>{{ sump.sumpName }}液位高度（m）：</span>
             </div>
-            <div class="threshold-item">
-              <span>C点值</span>
-              <el-input v-model="sump.heghtThresholdC" placeholder="请输入C点值" size="small"></el-input>
+            
+            <div class="threshold-inputs">
+              <div class="threshold-item">
+                <span>A点值</span>
+                <el-input v-model="sump.heghtThresholdA" placeholder="请输入A点值" size="small"></el-input>
+              </div>
+              <div class="threshold-item">
+                <span>B点值</span>
+                <el-input v-model="sump.heghtThresholdB" placeholder="请输入B点值" size="small"></el-input>
+              </div>
+              <div class="threshold-item">
+                <span>C点值</span>
+                <el-input v-model="sump.heghtThresholdC" placeholder="请输入C点值" size="small"></el-input>
+              </div>
+              <div class="threshold-item">
+                <span>D点值</span>
+                <el-input v-model="sump.heghtThresholdD" placeholder="请输入D点值" size="small"></el-input>
+              </div>
             </div>
-            <div class="threshold-item">
-              <span>D点值</span>
-              <el-input v-model="sump.heghtThresholdD" placeholder="请输入D点值" size="small"></el-input>
+            
+            <div class="pump-selection">
+              <span>对应控制水泵：</span>
+              <div class="pump-checkboxes">
+                <el-checkbox
+                  v-for="pump in sump.draPeakPumpVos"
+                  :key="pump.pumpId"
+                  v-model="pump.pumpStatus"
+                  :true-label="1"
+                  :false-label="0"
+                  size="small"
+                >
+                  {{ pump.pumpName }}
+                </el-checkbox>
+              </div>
             </div>
           </div>
           
-          <div class="pump-selection">
-            <span>对应控制水泵：</span>
-            <div class="pump-checkboxes">
-              <el-checkbox
-                v-for="pump in sump.draPeakPumpVos"
-                :key="pump.pumpId"
-                v-model="pump.pumpStatus"
-                :true-label="1"
-                :false-label="0"
-                size="small"
-              >
-                {{ pump.pumpName }}
-              </el-checkbox>
-            </div>
-          </div>
+          <el-divider v-if="index < formData.draPeakSumpVos.length - 1"></el-divider>
         </div>
-        
-        <el-divider v-if="index < formData.draPeakSumpVos.length - 1"></el-divider>
       </div>
-    </div>
 
-    <!-- 按钮区域 -->
-    <div class="button-group">
-      <el-button @click="handleCancel">取消</el-button>
-      <el-button type="primary" @click="handleSave">保存设置</el-button>
-    </div>
+      <!-- 按钮区域 -->
+      <div class="button-group">
+        <el-button @click="handleCancel">取消</el-button>
+        <el-button type="primary" @click="handleSave">保存设置</el-button>
+      </div>
+    </el-card>
+    <!-- 弹窗 -->
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+        <div>
+          <div>tu</div>
+          <div>wen</div>
+        </div>
+      
+    </el-dialog>
   </div>
 </template>
 
@@ -94,6 +105,7 @@ export default {
   name: 'AutomationControl',
   data() {
     return {
+      open: false,
       formData: {
         status: "1", // 默认开启
         peakBeginTime: '',
@@ -187,6 +199,9 @@ export default {
   padding: 20px;
   background-color: #fff;
   border-radius: 4px;
+  display: flex;
+  flex-direction: column;
+  gap: 20px;
 }
 
 .control-header {
@@ -194,8 +209,9 @@ export default {
   align-items: center;
   justify-content: start;
   gap: 20px;
-  padding: 15px 0;
-  border-bottom: 1px solid #eee;
+  span{
+    font-weight: bold;
+  }
 }
 
 .section {
@@ -206,6 +222,7 @@ export default {
   font-size: 16px;
   margin-bottom: 15px;
   color: #333;
+  font-weight: bold;
 }
 
 .sump-item {
@@ -241,7 +258,7 @@ export default {
 
 .button-group {
   display: flex;
-  justify-content: flex-end;
+  justify-content: flex-start0.21;
   gap: 15px;
   margin-top: 20px;
 }