修改EAP #97

Sapludināts
zwq sapludināja 1 revīzijas no zwq uz develop 2022-08-09 10:07:49 +08:00
16 mainīti faili ar 54 papildinājumiem un 32 dzēšanām

2
dist/index.html ārējs

Faila izmaiņas netiek rādītas, jo viena vai vairākas līnijas ir pārāk garas

Parādīt failu

@ -0,0 +1 @@
.app-container[data-v-3a23e516]{width:100%;height:200px}.waring[data-v-3a23e516]{padding:5px;border-radius:5px;background-color:#f56c6c;color:#fff}.normal[data-v-3a23e516]{padding:5px;border-radius:5px;background-color:#67c23a;color:#fff}

Parādīt failu

@ -1 +0,0 @@
.app-container[data-v-7174c48c]{width:100%;height:200px}.waring[data-v-7174c48c]{padding:5px;border-radius:5px;background-color:#f56c6c;color:#fff}.normal[data-v-7174c48c]{padding:5px;border-radius:5px;background-color:#67c23a;color:#fff}

Parādīt failu

@ -1 +0,0 @@
.app-container[data-v-7174c48c]{width:100%;height:200px}.waring[data-v-7174c48c]{padding:5px;border-radius:5px;background-color:#f56c6c;color:#fff}.normal[data-v-7174c48c]{padding:5px;border-radius:5px;background-color:#67c23a;color:#fff}.btn-container[data-v-692993ed]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:wrap;flex-wrap:wrap}.btndiv[data-v-692993ed]{width:20%;height:100px;margin:auto}.box-card[data-v-692993ed]{background-color:#3e8ef7;margin:10px;color:#fff}

Parādīt failu

@ -0,0 +1 @@
.app-container[data-v-3a23e516]{width:100%;height:200px}.waring[data-v-3a23e516]{padding:5px;border-radius:5px;background-color:#f56c6c;color:#fff}.normal[data-v-3a23e516]{padding:5px;border-radius:5px;background-color:#67c23a;color:#fff}.btn-container[data-v-2e322fe2]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-ms-flex-wrap:wrap;flex-wrap:wrap}.btndiv[data-v-2e322fe2]{width:20%;height:100px;margin:auto}.box-card[data-v-2e322fe2]{background-color:#3e8ef7;margin:10px;color:#fff}

1
dist/static/js/app.6fb7a37a.js ārējs Parasts fails

Faila izmaiņas netiek rādītas, jo viena vai vairākas līnijas ir pārāk garas

Faila izmaiņas netiek rādītas, jo viena vai vairākas līnijas ir pārāk garas

Faila izmaiņas netiek rādītas, jo viena vai vairākas līnijas ir pārāk garas

Faila izmaiņas netiek rādītas, jo viena vai vairākas līnijas ir pārāk garas

Faila izmaiņas netiek rādītas, jo viena vai vairākas līnijas ir pārāk garas

Faila izmaiņas netiek rādītas, jo viena vai vairākas līnijas ir pārāk garas

Parādīt failu

@ -235,3 +235,10 @@ export function sendSecsGemSetting() {
method: 'post'
})
}
export function sendAlarmReport() {
return request({
url: '/cigs-00a/IL1testcontroller/post/sendAlarmReport',
method: 'post'
})
}

Parādīt failu

@ -267,11 +267,11 @@ export default {
zh: '首页',
en: 'Home'
},
aSpc: {
eap: {
zh: 'EAP',
en: 'EAP'
},
spcControl: {
eapControl: {
zh: 'EAP控制',
en: 'EAP Control'
},

Parādīt failu

@ -93,24 +93,24 @@ export const constantRoutes = [
]
},
{
path: '/spc',
path: '/eap',
component: Layout,
redirect: '/spc',
name: 'spc',
meta: { title: routerTitle.aSpc?.[language] || routerTitle.aSpc.en, icon: 'form', iconPart: 'ArtManager', affix: true, required: true, requireToken: true },
redirect: '/eap',
name: 'eap',
meta: { title: routerTitle.eap?.[language] || routerTitle.eap.en, icon: 'form', iconPart: 'ArtManager', affix: true, required: true, requireToken: true },
children: [
{
path: 'spc',
component: () => import('@/views/00a-spc/index'),
name: 'spc',
meta: { title: routerTitle.aSpc?.[language] || routerTitle.aSpc.en, icon: 'form', affix: true, required: true, requireToken: true, noCache: true }
path: 'eap',
component: () => import('@/views/EAP/index'),
name: 'eap',
meta: { title: routerTitle.eap?.[language] || routerTitle.eap.en, icon: 'form', affix: true, required: true, requireToken: true, noCache: true }
},
{
path: 'spcControl',
component: () => import('@/views/00a-spc/spcControl'),
name: 'spcControl',
path: 'eapControl',
component: () => import('@/views/EAP/eapControl'),
name: 'eapControl',
hidden: true,
meta: { title: routerTitle.spcControl?.[language] || routerTitle.spcControl.en, icon: 'form', affix: true, required: true, requireToken: true, noCache: true }
meta: { title: routerTitle.eapControl?.[language] || routerTitle.eapControl.en, icon: 'form', affix: true, required: true, requireToken: true, noCache: true }
}
]
},

Parādīt failu

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2020-12-29 15:41:11
* @LastEditors: zwq
* @LastEditTime: 2022-07-29 16:01:24
* @LastEditTime: 2022-08-05 09:09:17
* @Description:
-->
<template>
@ -20,7 +20,7 @@
<span :class="dataForm.communicationState === 0? 'waring' : 'normal'">{{ dataForm.communicationState === 0? 'off' : 'on' }}</span>
<el-button type="primary" size="mini" @click="switchChange()">控制</el-button>
</el-form-item>
<div v-show="communicationShow">Result ={{ communicationStatus }}</div>
<!-- <div v-show="communicationShow">Result ={{ communicationStatus }}</div> -->
</el-col>
<el-col v-if="false" :span="6" :offset="1">
<el-form-item label="eqpState" prop="eqpState">
@ -32,7 +32,7 @@
:value="item.value"
/>
</el-select>
<div v-show="eqpStatusShow">Result ={{ eqpStatus }}</div>
<!-- <div v-show="eqpStatusShow">Result ={{ eqpStatus }}</div> -->
</el-form-item>
</el-col>
<el-col :span="8">
@ -46,13 +46,16 @@
/>
</el-select>
<span :class="controllerInfo === 'offline'? 'waring' : 'normal'">{{ controllerInfo }}</span>
<div v-show="controllerStatusShow">Result ={{ controllerStatus }}</div>
<!-- <div v-show="controllerStatusShow">Result ={{ controllerStatus }}</div> -->
</el-form-item>
</el-col>
</el-form>
<el-col :span="3" :offset="2">
<el-button type="primary" @click="sendSecsGemSetting()">Setting</el-button>
</el-col>
<el-col :span="3">
<el-button type="primary" @click="sendAlarmReport()">AlarmReport</el-button>
</el-col>
<el-col v-if="false" :span="3">
<el-button type="primary" @click="sendReportLinkedEventAndVid()"> ReportLinkedEventAndVid </el-button>
</el-col>
@ -68,8 +71,9 @@ import {
sendEqpState,
sendControllerState,
sendReportLinkedEventAndVid,
sendSecsGemSetting
} from '@/api/00a-spc'
sendSecsGemSetting,
sendAlarmReport
} from '@/api/EAP'
/**
* 表格表头配置项 TypeScript接口注释
* tableConfig<ConfigItem> = []
@ -216,6 +220,15 @@ export default {
})
})
},
sendAlarmReport() {
sendAlarmReport().then(response => {
this.$message({
message: this.$t('module.basicData.visual.success'),
type: 'success',
duration: 1500
})
})
},
initWebSocket() {
// weosocket
const path = `ws://${this.url}/opcua/websocket/${Math.round(Math.random() * 100)}`
@ -226,6 +239,7 @@ export default {
this.websock.onclose = this.websocketclose
},
websocketonopen() {
console.log('websocketonopen')
// send
// this.websocketsend(JSON.stringify('2'))
},
@ -267,6 +281,7 @@ export default {
websocketclose(e) {
//
console.log('断开连接', e)
this.initWebSocket()
}
}
}

Parādīt failu

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2020-12-29 15:41:11
* @LastEditors: zwq
* @LastEditTime: 2022-07-29 09:50:35
* @LastEditTime: 2022-08-03 16:30:27
* @Description:
-->
<template>
@ -17,8 +17,8 @@
</template>
<script>
import * as spcApi from '@/api/00a-spc'
import spcControl from './spcControl'
import * as spcApi from '@/api/EAP'
import spcControl from './eapControl'
// , handleLimit
/**
* 表格表头配置项 TypeScript接口注释
@ -57,9 +57,9 @@ export default {
'ControlStateRemote',
'AlarmDetected',
'AlarmCleared',
'SpoolTransmitFailure',
'SpoolingActivated',
'SpoolingDeactivated',
// 'SpoolTransmitFailure',
// 'SpoolingActivated',
// 'SpoolingDeactivated',
'ProcessingStarted',
'ProcessingCompleted',
'ProcessingStopped',