mes/nalinv-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化整合服务页面展示

Browse Source
This commit is contained in:
彭枝刚 2024-11-08 18:04:26 +08:00
parent 82c85734af
commit 1adffc6309
6 changed files with 44 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -69,6 +69,7 @@
"vue-echarts": "^4.1.0",
"vue-i18n": "^8.28.2",
"vue-json-editor": "^1.2.3",
"vue-json-pretty": "^1.9.5",
"vue-json-tree-view": "^2.1.4",
"vue-quill-editor": "3.0.6",
"vue-router": "^3.0.2",

85
src/views/mes/int/integrated-service-transaction-history-query/content/search-ui.vue
View File

@ -14,53 +14,29 @@
:model="searchForm"
:rules="rules"
:show-message="false"
label-width="120px"
label-width="100px"
hide-required-asterisk
>
<!-- 第一行 -->
<el-row :gutter="15">
<el-row :gutter="24">
<el-col :span="6">
<el-form-item :label="$t('mes.int.requestSide')" prop="fromSystem">
<el-select v-model="searchForm.fromSystem" :placeholder="$t('mes.selectMsg')" style="width: 100%" clearable>
<el-option v-for="item in fromSystemOptions" :key="item" :label="item" :value="item"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item prop="fromSystem">
<template slot="label">
<tooltip :content="$t('mes.int.requestSide')"> </tooltip>
</template>
<el-select
v-model="searchForm.fromSystem"
:placeholder="$t('mes.int.selectRequestSide')"
clearable
>
<el-option v-for="item in fromSystemOptions" :key="item" :label="item" :value="item">
</el-option>
<el-form-item prop="state" :label="$t('crud.column.label.status1')">
<el-select v-model="searchForm.state" :placeholder="$t('mes.int.selectStatus')" clearable style="width: 100%">
<el-option v-for="item in selectBox.status" :key="item.value" :label="$t(item.label)" :value="item.value"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item prop="state">
<template slot="label">
<tooltip :content="$t('crud.column.label.status1')"> </tooltip>
</template>
<el-select v-model="searchForm.state" :placeholder="$t('mes.int.selectStatus')" clearable>
<el-option
v-for="item in selectBox.status"
:key="item.value"
:label="$t(item.label)"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item prop="start">
<template slot="label">
<tooltip
:content="$t('mes.int.transactionTime')"
:require="rules.start && rules.start.some((rule) => rule.required)"
>
</tooltip>
</template>
<el-form-item prop="start" :label="$t('mes.int.transactionTime')">
<el-date-picker
v-model="searchForm.start"
value-format="yyyy-MM-dd HH:mm:ss"
@ -74,14 +50,12 @@
</el-col>
</el-row>
<!-- 第二行 -->
<el-row :gutter="15">
<el-row :gutter="24">
<el-col :span="6">
<el-form-item prop="toSystem">
<template slot="label">
<tooltip :content="$t('mes.int.receiverSide')"> </tooltip>
</template>
<el-form-item prop="toSystem" :label="$t('mes.int.receiverSide')">
<el-select
v-model="searchForm.toSystem"
style="width: 100%"
:placeholder="$t('mes.int.selectReceiverSide')"
clearable
>
@ -91,10 +65,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item prop="functionName">
<template slot="label">
<tooltip :content="$t('mes.int.methodName')"> </tooltip>
</template>
<el-form-item prop="functionName" :label="$t('mes.int.methodName')">
<el-input v-model.trim="searchForm.functionName" :placeholder="$t('mes.int.enterMethodName')">
<i
slot="suffix"
@ -118,20 +89,14 @@
</el-form-item>
</el-col>
</el-row>
<el-row
><el-col :span="6">
<el-form-item prop="sid">
<template slot="label">
<tooltip :content="$t('mes.int.transactionNumber')"> </tooltip>
</template>
<el-input v-model.trim="searchForm.sid"> </el-input>
</el-form-item>
</el-col>
<el-row :gutter="24">
<el-col :span="6">
<el-form-item :label="$t('mes.int.transactionNumber')" prop="sid">
<el-input v-model.trim="searchForm.sid" controls-position="right" style="width: 100%"> </el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="keyValue">
<template slot="label">
<tooltip :content="$t('mes.int.keyword')"> </tooltip>
</template>
<el-form-item prop="keyValue" :label="$t('mes.int.keyword')">
<el-input v-model.trim="searchForm.keyValue"> </el-input>
</el-form-item>
</el-col>

39
src/views/mes/int/integrated-service-transaction-history-query/content/transaction-history-view.vue
View File

@ -5,10 +5,9 @@
v-el-drag-dialog
:close-on-click-modal="false"
:close-on-press-escape="false"
:fullscreen="false"
:fullscreen="true"
:visible.sync="formVisible"
top="100px"
width="85%"
:title="$t('mes.int.integratedServiceTransactionHistoryView')"
@close="closeForm"
center
@ -19,11 +18,11 @@
<el-form
ref="form"
:model="form"
label-width="120px"
style="position: relative; left: 30%; transform: translate(-30%); width: 80%"
label-width="90px"
style="position: relative; left: 30%; transform: translate(-30%); width: 90%"
>
<!-- 第一行 -->
<el-row>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item :label="$t('mes.int.transactionSID') + ':'" prop="sid">
<el-input v-model.trim="modalObj.sid" readonly> </el-input> </el-form-item
@ -35,7 +34,7 @@
></el-col>
</el-row>
<!-- 第二行 -->
<el-row>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item :label="$t('mes.int.requestSide') + ':'" prop="fromSystem">
<el-input v-model.trim="modalObj.fromSystem" readonly>
@ -47,7 +46,7 @@
></el-col>
</el-row>
<!-- 第三行 -->
<el-row>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item :label="$t('mes.int.receiverSide') + ':'" prop="toSystem">
<el-input v-model.trim="modalObj.toSystem" readonly> </el-input> </el-form-item
@ -58,7 +57,7 @@
></el-col>
</el-row>
<!-- 第四行 -->
<el-row>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item :label="$t('mes.int.methodName') + ':'" prop="functionName">
<el-input v-model.trim="modalObj.functionName" readonly>
@ -70,32 +69,20 @@
></el-col>
</el-row>
<!-- 第五行 -->
<el-row>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item :label="$t('mes.int.requestContent') + ':'">
<b-code-editor
:key="editorKey"
v-model="modalObj.request"
:indent-unit="2"
height="auto"
:readonly="true"
/>
<vue-json-pretty :data="modalObj.request"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('mes.int.responseContent') + ':'">
<b-code-editor
:key="editorKey"
v-model="modalObj.response"
:indent-unit="2"
height="auto"
:readonly="true"
/>
<vue-json-pretty :data="modalObj.response" theme="dark"/>
</el-form-item>
</el-col>
</el-row>
<!-- 第六行 -->
<el-row>
<el-row :gutter="24">
<el-col :span="24">
<el-form-item :label="$t('mes.int.message') + ':'" prop="message">
<el-input
@ -215,9 +202,11 @@ import { showLoading, hideLoading } from '@/const/loading'
import { historyFormInit, historyTableObj } from '../init'
import { getIntInDataLog } from '@/api/mes/int/integrated-service-transaction-history-query/master'
import ContentView from '@/views/mes/int/integrated-service-transaction-history-query/content/content-view.vue'
import VueJsonPretty from 'vue-json-pretty';
import 'vue-json-pretty/lib/styles.css';
export default {
components: { ContentView },
components: { VueJsonPretty,ContentView },
props: {
visible: {
type: Boolean,

2
src/views/mes/int/integrated-service-transaction-history-query/index.vue
View File

@ -124,6 +124,8 @@ export default {
methods: {
showHistory(row) {
this.selectedRowData = row // 存储选中的行数据
this.selectedRowData.request = JSON.parse(row.request);
this.selectedRowData.response = JSON.parse(row.response);
this.historyShow = true // 打开交易历史记录组件
},

2
vue.config.js
View File

@ -2,7 +2,7 @@
* 配置参考:
* https://cli.vuejs.org/zh/config/
*/
const url = 'http://192.168.100.8:11001'
const url = 'http://mom-gateway:9999'
const CompressionWebpackPlugin = require('compression-webpack-plugin')
const productionGzipExtensions = ['js', 'css']
const path = require('path')

2
web.conf
View File

@ -14,7 +14,7 @@ server {
root /app/www;
# 若新增后端路由前缀注意在此处添加（|新增）
location ~* ^/(code|auth|admin|monitor|actuator|gen|job|tx|act|mp|pay|jimu|aj|rpt|iep-app|iep-pms|iep-tms|iep-tap|iep-qms|iep-alm|tqm-lims|iep-oem|iep-tds|iep-wms|iep-flow|iep-dcc|iMES-jxls|nlv-wms|nlv-print|iep-int) {
location ~* ^/(code|auth|admin|monitor|actuator|gen|job|tx|act|mp|pay|jimu|aj|rpt|iep-app|iep-pms|iep-tms|iep-tap|iep-qms|iep-alm|tqm-lims|iep-oem|iep-tds|iep-wms|iep-flow|iep-dcc|iMES-jxls|nlv-wms|nlv-print|mom-xxl-job-admin|iep-int) {
proxy_pass http://mom-gateway:9999;
proxy_connect_timeout 15s;
proxy_send_timeout 15s;