From ba6af100be8d622b6db2acca6be77066a9e3f7f5 Mon Sep 17 00:00:00 2001
From: icewint <icewint@qq.com>
Date: Tue, 13 Aug 2024 16:36:15 +0800
Subject: [PATCH] =?UTF-8?q?<add>[important]=E6=B7=BB=E5=8A=A0=E5=A0=86?=
 =?UTF-8?q?=E5=9E=9B=E6=9C=BA=E6=95=85=E9=9A=9C=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/axios/base/base.axios.js                  |   4 +-
 src/axios/stacker.js                          |   4 +
 .../stackerStatus/ShowStackerErr.vue          | 127 ++++++++++++++++++
 src/view/layout/MainPage.vue                  |   2 +-
 src/view/tab/systemStatus/StackerStatus.vue   |  29 ++--
 vue.config.js                                 |   1 +
 6 files changed, 150 insertions(+), 17 deletions(-)
 create mode 100644 src/view/component/stackerStatus/ShowStackerErr.vue

diff --git a/src/axios/base/base.axios.js b/src/axios/base/base.axios.js
index 1658302..32af7f5 100644
--- a/src/axios/base/base.axios.js
+++ b/src/axios/base/base.axios.js
@@ -3,11 +3,11 @@ import axios from "axios";
 if(process.env.NODE_ENV === 'development') {
     axios.defaults.baseURL = 'http://localhost:18990';
 }else {
-    axios.defaults.baseURL = 'http://192.168.103.200:18990';
+    axios.defaults.baseURL = 'http://10.90.36.70:443/wcsServe';
 }
 //axios.defaults.headers.post['Content-Type'] = 'application/json';
 //axios.defaults.responseType = 'application/json'
-axios.defaults.timeout = 5000
+axios.defaults.timeout = 10000
 
 axios.interceptors.request.use(function (config) {
     // 在发送请求之前做些什么
diff --git a/src/axios/stacker.js b/src/axios/stacker.js
index daf2d0e..8857369 100644
--- a/src/axios/stacker.js
+++ b/src/axios/stacker.js
@@ -13,4 +13,8 @@ export default {
     editStackerData(stackerDataItem) {
         return axios.post('/api/wcs/stacker/editStacker', stackerDataItem)
     },
+    // 查询报警代码
+    queryStackerErr(query) {
+        return axios.post('/api/wcs/stacker/queryErrInfo', query)
+    }
 }
\ No newline at end of file
diff --git a/src/view/component/stackerStatus/ShowStackerErr.vue b/src/view/component/stackerStatus/ShowStackerErr.vue
new file mode 100644
index 0000000..c25e5e8
--- /dev/null
+++ b/src/view/component/stackerStatus/ShowStackerErr.vue
@@ -0,0 +1,127 @@
+<!--  -->
+<template>
+  <div>
+    <el-dialog
+        :model-value="modelValue"
+        title="报警详情"
+        @close="() => {$emit('update:modelValue', false)}"
+    >
+      <el-form label-position="left" label-width="120px">
+        <el-form-item label="所属区域：">
+          <el-input class="showInput" v-model="errInfo.area"/>
+        </el-form-item>
+        <el-form-item label="报警编号：">
+          <el-input class="showInput" v-model="errInfo.errNo"/>
+        </el-form-item>
+        <el-form-item label="报警类型：">
+          <el-input class="showInput" v-model="errInfo.errType"/>
+        </el-form-item>
+        <el-form-item label="报警信息：">
+          <el-input class="showInput" v-model="errInfo.errMsg"
+                    :autosize="{ minRows: 3, maxRows: 20 }"
+                    type="textarea"/>
+        </el-form-item>
+        <el-form-item label="建议：">
+          <el-input class="showInput" v-model="errInfo.suggest"
+                    :autosize="{ minRows: 3, maxRows: 20 }"
+                    type="textarea"/>
+        </el-form-item>
+        <el-form-item label="备注信息：">
+          <el-input class="showInput" v-model="errInfo.remark"
+                    :autosize="{ minRows: 3, maxRows: 20 }"
+                    type="textarea"/>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="danger" @click="$emit('update:modelValue', false)">关闭窗口</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+// import  《组件名称》  from '《组件路径》 ';
+
+
+import stacker from "@/axios/stacker";
+import {ElMessage} from "element-plus";
+
+export default {
+  // import 引入的组件需要注入到对象中才能使用
+  components: {},
+  props: ['modelValue'],
+  emits: ['update:modelValue'],
+  data() {
+    // 这里存放数据
+    return {
+      errInfo: {}
+
+    }
+  },
+  // 计算属性 类似于 data 概念
+  computed: {},
+  // 监控 data 中的数据变化
+  watch: {},
+  // 方法集合
+  methods: {
+    query(area, errNo) {
+      this.errInfo = {}
+      stacker.queryStackerErr({area: area, errNo: errNo }).then(res=>{
+        const responseData = res.data
+        if(responseData.code === 0){
+          ElMessage({
+            message: '查询成功',
+            type: 'success',
+          })
+          this.errInfo = Object.freeze(responseData["returnData"])
+        }else{
+          ElMessage({
+            message: '服务器返回失败：' + responseData.msg,
+            type: 'warning',
+          })
+        }
+      }).catch(ex=>{
+        ElMessage({
+          message: '请求服务器失败：' + ex,
+          type: 'error',
+        })
+      })
+    }
+
+  },
+  // 组合式 API
+  setup() {
+  },
+  // 创建之前
+  beforeCreate() {
+  },
+  // 创建完成(可以访问 this 实例)
+  created() {
+  },
+  // 生命周期 - 挂载之前
+  beforeMount() {
+  },
+  // 生命周期 - 挂载完成（可以访问 DOM 元素）
+  mounted() {
+  },
+  // 更新之前
+  beforeUpdate() {
+  },
+  // 更新之后
+  updated() {
+  },
+  // 销毁之前
+  beforeUnmount() {
+  },
+  // 销毁完成
+  unmounted() {
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+
+</style>
\ No newline at end of file
diff --git a/src/view/layout/MainPage.vue b/src/view/layout/MainPage.vue
index bde68f1..a07edd8 100644
--- a/src/view/layout/MainPage.vue
+++ b/src/view/layout/MainPage.vue
@@ -1,4 +1,4 @@
-主要框架
+<!--主要框架-->
 <template>
   <div>
     <MainHeader style="width: 100%; height: 50px"/>
diff --git a/src/view/tab/systemStatus/StackerStatus.vue b/src/view/tab/systemStatus/StackerStatus.vue
index d3b4de3..14aaca3 100644
--- a/src/view/tab/systemStatus/StackerStatus.vue
+++ b/src/view/tab/systemStatus/StackerStatus.vue
@@ -41,19 +41,9 @@
             </el-button>
           </template>
         </el-table-column>
-<!--        <el-table-column fixed="right" label="操作" align="center" width="80">-->
-<!--          <template #default="scope">-->
-<!--            <el-button-group class="ml-4">-->
-<!--              <el-tooltip content="查询" placement="top" effect="light">-->
-<!--                <el-button type="primary" size="small"  @click="search(scope.row)">-->
-<!--                  <el-icon><Search/></el-icon>-->
-<!--                </el-button>-->
-<!--              </el-tooltip>-->
-<!--            </el-button-group>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
       </el-table>
     </el-row>
+    <ShowStackerErr v-model="showErrDia" ref="showStackerErr"></ShowStackerErr>
   </div>
 </template>
 
@@ -64,16 +54,19 @@ import {ElLoading, ElMessage} from "element-plus";
 import {formatterOnOrOffEnum} from "@/enum/base/on.off.enum";
 import {formatterStackerControlModel} from "@/enum/stacker/stackerControlModelEnum";
 import {formatterStackerStatus} from "@/enum/stacker/stackerStatusEnum";
+import ShowStackerErr from "@/view/component/stackerStatus/ShowStackerErr.vue";
 
 export default {
   // import 引入的组件需要注入到对象中才能使用
-  components: {},
+  components: {ShowStackerErr},
   props: [],
   emits: [],
   data() {
     // 这里存放数据
     return {
-      stackerInfo:[]
+      stackerInfo:[],
+      // 展示报警弹窗
+      showErrDia: false,
     }
   },
   // 计算属性 类似于 data 概念
@@ -118,7 +111,15 @@ export default {
     },
     // 显示故障
     showErr(row) {
-
+      if(row.errCode === 0) {
+        ElMessage({
+          message: '当前没有报警，或者可以查询刷新后再试',
+          type: 'success',
+        })
+        return
+      }
+      this.showErrDia = true;
+      this.$refs.showStackerErr.query('S', row.errCode);
     }
   },
   // 组合式 API
diff --git a/vue.config.js b/vue.config.js
index c1d825f..033da89 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,5 +1,6 @@
 const { defineConfig } = require('@vue/cli-service')
 module.exports = defineConfig({
+  publicPath: '/wcs',
   transpileDependencies: true,
   chainWebpack: (config) => {
     config.plugin('define').tap((defineConfig) => {