update:风机实时、提升历史

.env.production

@@ -2,13 +2,13 @@
 VUE_APP_TITLE = 银洞桐柏自动化
 
 # 生产环境端口
-port = 80
+port = 7777
 
 # 生产环境配置
 ENV = 'production'
 
 # 银洞桐柏自动化/生产环境
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = '/dev-api'
 
 # 生产环境的后端接口地址
-VUE_APP_API_TARGET = https://your-production-api.com
\ No newline at end of file
+VUE_APP_API_TARGET =  http://192.168.2.14:9091
\ No newline at end of file

.gitignore

@@ -18,6 +18,7 @@ selenium-debug.log
 *.njsproj
 *.sln
 *.local
+*.zip
 
 package-lock.json
 yarn.lock

src/api/tyler/fan.js

@@ -25,4 +25,13 @@ export function alarmFanEdit(query) {
     method: 'post',
     data: query
   })
-}
\ No newline at end of file
+}
+
+//风机运行实时数据
+export function listrealFan(query) {
+  return request({
+    url: '/business/fan/real/list',
+    method: 'get',
+    params: query
+  })
+}

src/api/tyler/hoistSys.js

+import request from '@/utils/request'
+
+// 查询提升机下拉
+export function listHoistSelectData(query) {
+  return request({
+    url: '/business/monitoring/base/deviceName',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询提升机历史数据列表
+export function listHoistHisData(query) {
+  return request({
+    url: '/business/monitoring/data/list',
+    method: 'get',
+    params: query
+  })
+}
+
+

src/views/fanSys/fanReal/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" @selection-change="handleSelectionChange">
+      <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="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" />
+      <el-table-column label="设定频率预警值(HZ)" align="center" prop="setFrequency" width="140" />
+      <el-table-column label="风压预警值(Kpa)" align="center" prop="windPressure" width="120" />
+      <el-table-column label="风速预警值(m/s)" align="center" prop="windSpeed" width="120" />
+      <el-table-column label="风量预警值(m³/s)" align="center" prop="airVolume" width="140" />
+      <el-table-column label="前轴温预警值(℃)" align="center" prop="frontAxisTemperature" width="120" />
+      <el-table-column label="后轴温预警值(℃)" align="center" prop="rearAxisTemperature" width="120" />
+      <el-table-column label="电机温度预警值(℃)" align="center" prop="motorTemperature" width="140" />
+      <el-table-column label="前振动预警值(mm/s)" align="center" prop="frontVibration" width="150" />
+      <el-table-column label="后振动预警值(mm/s)" align="center" prop="rearVibration"  width="150"/>
+     
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    
   </div>
-</template>
\ No newline at end of file
+</template>
+
+<script>
+  import { listrealFan } 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" }
+        ],
+        deviceName: [
+          { required: true, message: "风机名称不能为空", trigger: "blur" }
+        ],
+        deviceId: [
+          { required: true, message: "风机编号不能为空", trigger: "blur" }
+        ],
+      },
+      deviceName:[],
+      dateRange:[],
+    };
+  },
+  created() {
+    fanDeviceName().then(res=>{
+      this.deviceName = res.data;
+    })
+    this.getList();
+  },
+  methods: {
+    /** 查询风机基本信息列表 */
+    getList() {
+      this.loading = true;
+      listrealFan(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,
+        deviceName: null,
+        deviceId: null,
+        installationLocation: null,
+        powerSupplyVoltage: null,
+        motorCurrent: null,
+        operatingFrequency: null,
+        setFrequency: null,
+        windPressure: null,
+        windSpeed: null,
+        airVolume: null,
+        frontAxisTemperature: null,
+        rearAxisTemperature: null,
+        motorTemperature: null,
+        frontVibration: null,
+        rearVibration: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = []
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+ 
+    
+  
+  }
+};
+</script>

src/views/hoistSys/hoistHis/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="cageSection">
+      <el-select v-model="queryParams.cageSection" 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="dataList">
+      <el-table-column label="提升机名称" align="center" prop="cageSection" />
+      <el-table-column label="电渠电流" align="center" prop="powerChannelCurrent" />
+      <el-table-column label="闸压力" align="center" prop="gatePressure" />
+      <el-table-column label="电极电流" align="center" prop="electrodeCurrent" />
+      <el-table-column label="电机轴承温度" align="center" prop="motorBearingTemperature" />
+      <el-table-column label="水泵轴承温度" align="center" prop="pumpBearingTemperature" />
+      <el-table-column label="水泵流量" align="center" prop="pumpFlow" />
+      <el-table-column label="排水管路压力" align="center" prop="drainagePipePressure" />
+      <el-table-column label="监测时间" align="center" prop="monitoringTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.monitoringTime) }}</span>
+        </template>
+      </el-table-column>
+     
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+   
   </div>
-</template>
\ No newline at end of file
+</template>
+
+<script>
+  import { listHoistHisData, listHoistSelectData} from "@/api/tyler/hoistSys";
+
+  export default {
+  name: "Data",
+  data() {
+    return {
+      // 根路径
+      baseURL: process.env.VUE_APP_BASE_API,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 提升机历史数据表格数据
+      dataList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        cageSection: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        id: [
+          { required: true, message: "$comment不能为空", trigger: "blur" }
+        ],
+        cageSection: [
+          { required: true, message: "罐笼所在中段不能为空", trigger: "blur" }
+        ],
+       
+      },
+      deviceName:[],
+      dateRange:[],
+    };
+  },
+  created() {
+    listHoistSelectData().then(res => {
+      this.deviceName = res.data;
+    })
+    this.getList();
+  },
+  methods: {
+    /** 查询提升机历史数据列表 */
+    getList() {
+      this.loading = true;
+      listHoistHisData(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+        this.dataList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        cageSection: null,
+        powerChannelCurrent: null,
+        gatePressure: null,
+        electrodeCurrent: null,
+        motorBearingTemperature: null,
+        pumpBearingTemperature: null,
+        pumpFlow: null,
+        drainagePipePressure: null,
+        monitoringTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = []
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+  },
+   
+};
+</script>

src/views/system/waterSysSet/index.vue

@@ -32,7 +32,7 @@
       <el-divider></el-divider>
       <!-- 液体高度设置 -->
       <div class="section">
-        <h3>设置液体高度 <el-link type="primary" :underline="false">设置说明</el-link></h3>
+        <h3>设置液体高度 <el-link type="primary" :underline="false" @click="setDis">设置说明</el-link></h3>
         
         <!-- 每个水仓的设置 -->
         <div v-for="(sump, index) in formData.draPeakSumpVos" :key="sump.sumpId">
@@ -89,9 +89,15 @@
     </el-card>
     <!-- 弹窗 -->
     <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
-        <div>
-          <div>tu</div>
-          <div>wen</div>
+        <div class="warter-lev">
+          <div class="lev-pic"></div>
+          <div class="lev-content">
+            <p>①液位高度X>A时，不考虑是否在峰谷时间，自动开启水泵。</p>
+            <p>如果未在峰谷期内液压高度X<=B时，关闭水泵。</p>
+            <p>如果在峰谷期内液压高度X<=D时,关闭水泵。</p>
+            <p>②A>=X（液压高度）X<=C时，等待峰谷期内，自动开启水泵。</p>
+            <p>液压高度X<=D时，自动关闭水泵。</p>
+          </div>
         </div>
       
     </el-dialog>
@@ -112,7 +118,8 @@ export default {
         peakEndTime: '',
         draPeakSumpVos: []
       },
-      timeRange: []
+      timeRange: [],
+      title:'液位高度设置说明：'
     };
   },
   created() {
@@ -184,12 +191,15 @@ export default {
         this.$message.success('设置保存成功');
         this.getList();
       });
-    }
+    },
+    setDis(){
+      this.open = true;
+    },
   }
 };
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 .pump-checkboxes {
   display: flex;
   flex-wrap: wrap;
@@ -258,11 +268,28 @@ export default {
 
 .button-group {
   display: flex;
-  justify-content: flex-start0.21;
+  justify-content: start;
   gap: 15px;
   margin-top: 20px;
 }
-
+.warter-lev{
+  display: flex;
+  justify-content: center;
+  .lev-pic{
+    width: 105px;
+    height: 343px;
+    background: url("~@/assets/images/sys/warterSysSet.png") no-repeat center;
+    background-size: 100%;
+  }
+  .lev-content{
+    height: 343px;
+    display: flex;
+    justify-content: center;
+    // align-items: center;
+    flex-direction: column;
+    font-weight: bold;
+  }
+}
 ::v-deep .el-date-editor .el-range-separator {
   width: 30px;
 }