提交

src/api/threshold.js

@@ -0,0 +1,25 @@
+
+import request from '@/utils/request'
+// 获取所有运矿管理阈值
+export function getThresholdList(params) {
+  return request({
+    url: '/trans/syscfg/estimatethreshold/list',
+    params
+  })
+}
+// 增加
+export function createThreshold(data) {
+  return request({
+    url: '/trans/syscfg/estimatethreshold/add',
+    method: 'POST',
+    data
+  })
+}
+// 修改
+export function updateThreshold(data) {
+  return request({
+    url: '/trans/syscfg/estimatethreshold/update',
+    method: 'PUT',
+    data
+  })
+}

src/router/modules/aqpt.js

@@ -77,12 +77,12 @@ const aqptRouter = [
           permit: 'aqpt_danger'
         }
       },
-      {
-        path: 'sensorCat',
-        component: () => import('@/views/goaf/sensorCat/index'),
-        name: 'aqpt_setting_sensor_cat',
-        meta: { title: '上下班配置', noCache: true, permit: 'aqpt_setting_equipment_cat' }
-      },
+      // {
+      //   path: 'sensorCat',
+      //   component: () => import('@/views/goaf/sensorCat/index'),
+      //   name: 'aqpt_setting_sensor_cat',
+      //   meta: { title: '上下班配置', noCache: true, permit: 'aqpt_setting_equipment_cat' }
+      // },
       {
         path: 'unloading_evaluation_threshold',
         component: () => import('@/views/goaf/unloading_evaluation_threshold'),

src/settings.js

@@ -37,8 +37,8 @@ module.exports = {
   * 服务API地址
   */
   serverUrl: 'http://113.141.93.143:1888', // 正式环境
-  devServerUrl: 'http://113.141.93.143:1888', // 开发环境
-  // devServerUrl: 'http://192.168.3.5:1888', // 开发环境 qu
+  // devServerUrl: 'http://113.141.93.143:1888', // 开发环境
+  devServerUrl: 'http://192.168.3.5:1888', // 开发环境 qu
   mqttUrl: 'ws://113.141.93.143:8894/mqtt', // mqtt地址
   /**
   * websocket 地址

src/views/bigScreen/goafCameraAlarm/index.vue

@@ -96,9 +96,9 @@
           </template>
         </el-table-column>
         <el-table-column property="transTimeInterval" label="时差（分钟）" />
-        <el-table-column property="transLoadWeight" label="卸货重量（吨）" />
+        <!-- <el-table-column property="transLoadWeight" label="载货重量（吨）" />
         <el-table-column property="transUnloadWeight" label="卸货重量（吨）" />
-        <el-table-column property="transWeightDifference" label="载物差（吨）" />
+        <el-table-column property="transWeightDifference" label="载物差（吨）" /> -->
         <el-table-column property="transEvaluate" label="结论" width="100" />
       </el-table>
     </template>

src/views/goaf/unloading_evaluation_threshold/Model.vue

@@ -15,10 +15,10 @@
       label-width="160px"
     >
       <el-form-item label="时差阈值" required>
-        <el-input-number v-model="formData.goafCanfillVolume" placeholder="时差阈值（分钟）" :controls="false" />
+        <el-input-number v-model="formData.transTimedifferenceThreshold" placeholder="时差阈值（分钟）" :controls="false" />
       </el-form-item>
       <el-form-item label="载物差阈值" required>
-        <el-input-number v-model="formData.goafCanfillVolume" placeholder="载物差阈值（吨）" :controls="false" />
+        <el-input-number v-model="formData.transWeightdifferenceThreshold" placeholder="载物差阈值（吨）" :controls="false" />
       </el-form-item>
     </el-form>
     <div class="btn-group">
@@ -28,7 +28,7 @@
   </el-drawer>
 </template>
 <script>
-import { createCamera, updateCamera } from '@/api/camera'
+import { createThreshold, updateThreshold } from '@/api/threshold'
 export default {
   name: 'CameraModel',
   data() {
@@ -45,8 +45,8 @@ export default {
       CameraCats: [],
       goaf: [],
       formData: {
-        goafOrebelt: 0,
-        goafOrebody: 0
+        transTimedifferenceThreshold: 0,
+        transWeightdifferenceThreshold: 0
       },
       rules: {}
     }
@@ -58,7 +58,6 @@ export default {
       this.actionType = 'ADD'
       this.title = '新增载物评估阈值配置'
       this.dialogVisible = true
-      this.formData.goafDevTypeId = this.CameraCats[0]?.CameraTypeId
     },
     // Show Edit Dialog
     showEditModel(data) {
@@ -72,8 +71,8 @@ export default {
     // Reset Form Data
     resetFormData() {
       this.formData = {
-        goafOrebelt: 0,
-        goafOrebody: 0
+        transTimedifferenceThreshold: 0,
+        transWeightdifferenceThreshold: 0
       }
     },
     // 提交
@@ -82,7 +81,7 @@ export default {
         if (valid) {
           switch (this.actionType) {
             case 'ADD':
-              createCamera(this.formData)
+              createThreshold(this.formData)
                 .then((resp) => {
                   const { code, msg } = resp
                   if (code === 0) {
@@ -96,7 +95,7 @@ export default {
               break
 
             case 'UPDATE':
-              updateCamera(this.formData)
+              updateThreshold(this.formData)
                 .then((resp) => {
                   const { code, msg } = resp
                   if (code === 0) {

src/views/goaf/unloading_evaluation_threshold/index.vue

@@ -17,42 +17,31 @@
     <el-row class="m-top-15">
       <el-table v-loading="listLoading" class="page-table" border fit :data="dataList">
         <el-table-column type="index" label="序号" header-align="center" align="center" width="60" />
-        <el-table-column prop="goafDevName" label="设备名称" />
-        <el-table-column prop="goafDevIp" label="设备IP" />
-        <el-table-column prop="goafDevLocation" label="安装地点" />
-        <el-table-column prop="goafDevTypename" label="设备类型" />
-        <el-table-column prop="goafDevGroupname" label="设备负责人部门" />
-        <el-table-column prop="goafDevAccountName" label="设备责任人" />
-        <el-table-column prop="goafInstallTime" label="安装时间" />
+        <el-table-column prop="transTimedifferenceThreshold" label=" 时间差阈值（分钟）" />
+        <el-table-column prop="transWeightdifferenceThreshold" label="重量差阈值（吨）" />
         <el-table-column label="操作" header-align="center" align="center" width="170">
           <template v-slot="{row}">
             <el-button size="mini" type="primary" icon="el-icon-edit" @click="handleUpdate(row)">修改</el-button>
-            <el-button size="mini" type="danger" icon="el-icon-edit" @click="handleDelete(row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
-      <div class="pagination-container" style="float:right;margin-right:40px;">
-        <pagination v-show="total>0" :total="total" :page.sync="conditions.page" :limit.sync="conditions.limit" @pagination="getData" />
-      </div>
     </el-row>
-    <hand-Model ref="Camera" @formSuccess="getData" />
+    <hand-Model ref="model" @formSuccess="getData" />
   </div>
 </template>
 <script>
-import { getCamera, delCamera } from '@/api/camera'
-import { Pagination } from '@/components'
+import { getThresholdList } from '@/api/threshold'
 import { NumConvertLM } from '@/utils'
 import handModel from './Model.vue'
 export default {
-  components: { Pagination, handModel },
+  components: { handModel },
   data() {
     return {
       dataList: [],
       total: 0,
       listLoading: false,
       conditions: {
-        page: 1,
-        limit: 10
+
       }
     }
   },
@@ -64,54 +53,22 @@ export default {
     NumConvertLM,
     getData() {
       this.listLoading = true
-      getCamera(this.conditions).then((resp) => {
+      getThresholdList(this.conditions).then((resp) => {
         this.listLoading = false
-        const { code, msg, data } = resp
-        if (code === 0) {
-          const start = (this.conditions.page - 1) * this.conditions.limit
-          const end = this.conditions.page * this.conditions.limit
-          const dataList = data.filter((item) => item.goafDevTypename.includes('摄像头'))
-          this.dataList = dataList.filter((item, index) => index >= start && index < end)
-          this.total = dataList.length
-        } else {
-          this.$message.error(msg)
-        }
+        const { data } = resp
+        this.dataList = data
       }).catch((error) => {
         console.log(error)
       })
     },
     // "Add Risk" Model
     handleAdd() {
-      this.$refs['Camera'].showAddModel('摄像头')
+      this.$refs['model'].showAddModel('阈值')
     },
 
     // "Edit Risk" Model
     handleUpdate(data) {
-      this.$refs['Camera'].showEditModel(JSON.parse(JSON.stringify(data)))
-    },
-
-    // Delete Action
-    handleDelete(data) {
-      const { typeId, riskSource } = data
-      this.$confirm(`此操作将删除该数据${riskSource}, 是否继续?`, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        delCamera(typeId).then((resp) => {
-          const { code, msg } = resp
-          if (code === 0) {
-            this.getData()
-            this.$message.success(msg)
-          } else {
-            this.$message.error(msg)
-          }
-        }).catch((error) => {
-          console.log(error)
-        })
-      }).catch(() => {
-        this.$message.info('已取消删除')
-      })
+      this.$refs['model'].showEditModel(JSON.parse(JSON.stringify(data)))
     }
   }
 }