Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
a4b488eb by renchao@pashanhoo.com
Options

style:上报样式修改

2 parents 97f9e0db d0ddb155
Inline Side-by-side
Showing 12 changed files with 34 additions and 28 deletions
......@@ -7,5 +7,6 @@
"SERVERAPI": "/bdcsjsb",
"calcHeight": 200,
"echartTextColor": "#FFFFFF",
"MANAGEMENTAPI": "http://192.168.2.38:8090/management"
"MANAGEMENTAPI": "http://192.168.2.38:8090/management",
"IPCONFIG": "http://192.168.2.38:8027"
}
\ No newline at end of file
......
......@@ -7,5 +7,6 @@
"SERVERAPI": "/bdcsjsb",
"calcHeight": 160,
"echartTextColor": "#4A4A4A",
"MANAGEMENTAPI": "http://192.168.2.38:8090/management"
"MANAGEMENTAPI": "http://192.168.2.38:8090/management",
"IPCONFIG": "http://192.168.2.38:8027"
}
\ No newline at end of file
......
......@@ -7,5 +7,6 @@
"SERVERAPI": "/bdcsjsb",
"calcHeight": 200,
"echartTextColor": "#FFFFFF",
"MANAGEMENTAPI": "http://192.168.2.38:8090/management"
"MANAGEMENTAPI": "http://192.168.2.38:8090/management",
"IPCONFIG": "http://192.168.2.38:8027"
}
\ No newline at end of file
......
......@@ -7,5 +7,6 @@
"SERVERAPI": "/bdcsjsb",
"calcHeight": 160,
"echartTextColor": "#4A4A4A",
"MANAGEMENTAPI": "http://192.168.2.38:8090/management"
"MANAGEMENTAPI": "http://192.168.2.38:8090/management",
"IPCONFIG": "http://192.168.2.38:8027"
}
\ No newline at end of file
......
<!--
* @Description: 引入配置文件
* @Autor: renchao
* @LastEditTime: 2023-05-06 16:26:39
* @LastEditTime: 2023-05-08 15:02:53
-->
<!DOCTYPE html>
<html>
......@@ -18,7 +18,7 @@
</title>
</head>
<script>
fetch('/config.json')
fetch('<%= BASE_URL %>config.json')
.then(response => response.json())
.then(config => {
window.config = config
......
/*
* @Description: 数据上报模块api文件
* @Autor: renchao
* @LastEditTime: 2023-04-27 13:52:53
* @LastEditTime: 2023-05-06 10:29:06
*/
/* 引入axios请求文件 */
import request from '@/utils/request'
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-03-23 17:19:52
* @LastEditTime: 2023-05-08 15:03:10
*/
import request from "@/utils/request";
// let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
// console.log(SERVER, 'SERVERSERVER');
export function loginIn (username, password) {
return request({
url: `${SERVER.MANAGEMENTAPI}/login?username=${username}&password=${password}`,
......
......@@ -2,7 +2,7 @@
* @Author: yangwei
* @Date: 2023-01-16 09:10:12
* @LastEditors: Please set LastEditors
* @LastEditTime: 2023-05-06 16:38:08
* @LastEditTime: 2023-05-08 15:03:06
* @FilePath: \bdcjg-web\src\main.js
* @Description:
*
......@@ -60,7 +60,8 @@ axios.get("./config.json")
.then((res) => {
Vue.prototype.BASE_API = res.data
localStorage.setItem('ApiUrl', JSON.stringify(res.data));
window.TITLE = res.data.TITLE
process.env.TITLE = res.data.TITLE
process.env.IPCONFIG = res.data.IPCONFIG
require('./permission')
new Vue({
el: '#app',
......
......@@ -420,7 +420,7 @@
.tab-pane-item {
line-height: 20px;
color: #02d9fd;
color: #FFFFFF;
p {
text-align: center;
......
......@@ -637,7 +637,7 @@
.tab-pane-item {
line-height: 20px;
color: #fff;
color: #FFFFFF;
p {
text-align: center;
......
/*
* @Description: 此文件主要创建 axios 实例，然后添加请求拦截器和响应拦截器
* @Autor: renchao
* @LastEditTime: 2023-03-29 10:14:34
* @LastEditTime: 2023-04-27 17:09:51
*/
import Vue from 'vue'
import axios from "axios";
......@@ -88,9 +88,6 @@ function handleErrorData (status) {
}
break;
case 403:
Message.error("拒绝访问");
break;
case 404:
Message.error("很抱歉，资源未找到!");
break;
......
<template>
<!-- 修改登簿日志弹窗 -->
<!-- 修改登簿日志弹窗 -->
<el-dialog :close-on-click-modal="false" top="0" @close="closeDialog"
custom-class="dialogBox entryJournal commonDialog editDialogBox mainCenter" :visible.sync="dialogVisible" width="90%">
<div slot="title" class="dialog_title" ref="dialogTitle">
......@@ -188,18 +188,19 @@
<btn nativeType="cx" @click="submitForm">保 存</btn>
</div>
<div class="d-center" v-if="!$store.state.business.Edit && titleName == 'xml'">
<btn nativeType="cx" @click="handleExtract">再次抽取</btn>
<btn nativeType="cx" @click="handleResubmit">重新上报</btn>
</div>
</el-dialog>
</template>
<script>
import { sbdata, sendThis } from './data/sbdata'
import { dbdata, sendThis1 } from './data/dbdata'
import { getDetail, edit, regenerateDbXml } from "@/api/recordLog.js"
import JsonEditor from "@/components/JsonEditor.vue";
import { judgeListComplete } from "@/utils/tools.js"
export default {
import { sbdata, sendThis } from './data/sbdata'
import { dbdata, sendThis1 } from './data/dbdata'
import { getDetail, edit, regenerateDbXml } from "@/api/recordLog.js"
import JsonEditor from "@/components/JsonEditor.vue";
import { judgeListComplete } from "@/utils/tools.js"
export default {
components: { JsonEditor },
data () {
return {
......@@ -427,6 +428,12 @@ export default {
}
}, 600),
/**
* @description: 登薄再次抽取
* @param {*} function
* @author: renchao
*/
handleExtract () { },
/**
* @description: 登薄日志重新生成报文
* @param {*} function
* @author: renchao
......@@ -442,7 +449,7 @@ export default {
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
message: '已取消上报报文'
})
})
function createXml () {
......@@ -458,7 +465,7 @@ export default {
}
}
}
}
}
</script>
......