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 @@ ...@@ -7,5 +7,6 @@
7 "SERVERAPI": "/bdcsjsb", 7 "SERVERAPI": "/bdcsjsb",
8 "calcHeight": 200, 8 "calcHeight": 200,
9 "echartTextColor": "#FFFFFF", 9 "echartTextColor": "#FFFFFF",
10 "MANAGEMENTAPI": "http://192.168.2.38:8090/management" 10 "MANAGEMENTAPI": "http://192.168.2.38:8090/management",
11 "IPCONFIG": "http://192.168.2.38:8027"
11 } 12 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -7,5 +7,6 @@ ...@@ -7,5 +7,6 @@
7 "SERVERAPI": "/bdcsjsb", 7 "SERVERAPI": "/bdcsjsb",
8 "calcHeight": 160, 8 "calcHeight": 160,
9 "echartTextColor": "#4A4A4A", 9 "echartTextColor": "#4A4A4A",
10 "MANAGEMENTAPI": "http://192.168.2.38:8090/management" 10 "MANAGEMENTAPI": "http://192.168.2.38:8090/management",
11 "IPCONFIG": "http://192.168.2.38:8027"
11 } 12 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -7,5 +7,6 @@ ...@@ -7,5 +7,6 @@
7 "SERVERAPI": "/bdcsjsb", 7 "SERVERAPI": "/bdcsjsb",
8 "calcHeight": 200, 8 "calcHeight": 200,
9 "echartTextColor": "#FFFFFF", 9 "echartTextColor": "#FFFFFF",
10 "MANAGEMENTAPI": "http://192.168.2.38:8090/management" 10 "MANAGEMENTAPI": "http://192.168.2.38:8090/management",
11 "IPCONFIG": "http://192.168.2.38:8027"
11 } 12 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -7,5 +7,6 @@ ...@@ -7,5 +7,6 @@
7 "SERVERAPI": "/bdcsjsb", 7 "SERVERAPI": "/bdcsjsb",
8 "calcHeight": 160, 8 "calcHeight": 160,
9 "echartTextColor": "#4A4A4A", 9 "echartTextColor": "#4A4A4A",
10 "MANAGEMENTAPI": "http://192.168.2.38:8090/management" 10 "MANAGEMENTAPI": "http://192.168.2.38:8090/management",
11 "IPCONFIG": "http://192.168.2.38:8027"
11 } 12 }
...\ No newline at end of file ...\ No newline at end of file
......
1 <!-- 1 <!--
2 * @Description: 引入配置文件 2 * @Description: 引入配置文件
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-06 16:26:39 4 * @LastEditTime: 2023-05-08 15:02:53
5 --> 5 -->
6 <!DOCTYPE html> 6 <!DOCTYPE html>
7 <html> 7 <html>
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
18 </title> 18 </title>
19 </head> 19 </head>
20 <script> 20 <script>
21 fetch('/config.json') 21 fetch('<%= BASE_URL %>config.json')
22 .then(response => response.json()) 22 .then(response => response.json())
23 .then(config => { 23 .then(config => {
24 window.config = config 24 window.config = config
......
1 /* 1 /*
2 * @Description: 数据上报模块api文件 2 * @Description: 数据上报模块api文件
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-04-27 13:52:53 4 * @LastEditTime: 2023-05-06 10:29:06
5 */ 5 */
6 /* 引入axios请求文件 */ 6 /* 引入axios请求文件 */
7 import request from '@/utils/request' 7 import request from '@/utils/request'
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-23 17:19:52 4 * @LastEditTime: 2023-05-08 15:03:10
5 */ 5 */
6 import request from "@/utils/request"; 6 import request from "@/utils/request";
7 // let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
8 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl')) 7 let SERVER = window.config ? window.config : JSON.parse(localStorage.getItem('ApiUrl'))
9 // console.log(SERVER, 'SERVERSERVER');
10
11 export function loginIn (username, password) { 8 export function loginIn (username, password) {
12 return request({ 9 return request({
13 url: `${SERVER.MANAGEMENTAPI}/login?username=${username}&password=${password}`, 10 url: `${SERVER.MANAGEMENTAPI}/login?username=${username}&password=${password}`,
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 * @Author: yangwei 2 * @Author: yangwei
3 * @Date: 2023-01-16 09:10:12 3 * @Date: 2023-01-16 09:10:12
4 * @LastEditors: Please set LastEditors 4 * @LastEditors: Please set LastEditors
5 * @LastEditTime: 2023-05-06 16:38:08 5 * @LastEditTime: 2023-05-08 15:03:06
6 * @FilePath: \bdcjg-web\src\main.js 6 * @FilePath: \bdcjg-web\src\main.js
7 * @Description: 7 * @Description:
8 * 8 *
...@@ -60,7 +60,8 @@ axios.get("./config.json") ...@@ -60,7 +60,8 @@ axios.get("./config.json")
60 .then((res) => { 60 .then((res) => {
61 Vue.prototype.BASE_API = res.data 61 Vue.prototype.BASE_API = res.data
62 localStorage.setItem('ApiUrl', JSON.stringify(res.data)); 62 localStorage.setItem('ApiUrl', JSON.stringify(res.data));
63 window.TITLE = res.data.TITLE 63 process.env.TITLE = res.data.TITLE
64 process.env.IPCONFIG = res.data.IPCONFIG
64 require('./permission') 65 require('./permission')
65 new Vue({ 66 new Vue({
66 el: '#app', 67 el: '#app',
......
...@@ -420,7 +420,7 @@ ...@@ -420,7 +420,7 @@
420 420
421 .tab-pane-item { 421 .tab-pane-item {
422 line-height: 20px; 422 line-height: 20px;
423 color: #02d9fd; 423 color: #FFFFFF;
424 424
425 p { 425 p {
426 text-align: center; 426 text-align: center;
......
...@@ -637,7 +637,7 @@ ...@@ -637,7 +637,7 @@
637 637
638 .tab-pane-item { 638 .tab-pane-item {
639 line-height: 20px; 639 line-height: 20px;
640 color: #fff; 640 color: #FFFFFF;
641 641
642 p { 642 p {
643 text-align: center; 643 text-align: center;
......
1 /* 1 /*
2 * @Description: 此文件主要创建 axios 实例，然后添加请求拦截器和响应拦截器 2 * @Description: 此文件主要创建 axios 实例，然后添加请求拦截器和响应拦截器
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-29 10:14:34 4 * @LastEditTime: 2023-04-27 17:09:51
5 */ 5 */
6 import Vue from 'vue' 6 import Vue from 'vue'
7 import axios from "axios"; 7 import axios from "axios";
...@@ -88,9 +88,6 @@ function handleErrorData (status) { ...@@ -88,9 +88,6 @@ function handleErrorData (status) {
88 88
89 } 89 }
90 break; 90 break;
91 case 403:
92 Message.error("拒绝访问");
93 break;
94 case 404: 91 case 404:
95 Message.error("很抱歉，资源未找到!"); 92 Message.error("很抱歉，资源未找到!");
96 break; 93 break;
......
1 <template> 1 <template>
2 <!-- 修改登簿日志弹窗 --> 2 <!-- 修改登簿日志弹窗 -->
3 <el-dialog :close-on-click-modal="false" top="0" @close="closeDialog" 3 <el-dialog :close-on-click-modal="false" top="0" @close="closeDialog"
4 custom-class="dialogBox entryJournal commonDialog editDialogBox mainCenter" :visible.sync="dialogVisible" width="90%"> 4 custom-class="dialogBox entryJournal commonDialog editDialogBox mainCenter" :visible.sync="dialogVisible" width="90%">
5 <div slot="title" class="dialog_title" ref="dialogTitle"> 5 <div slot="title" class="dialog_title" ref="dialogTitle">
...@@ -188,18 +188,19 @@ ...@@ -188,18 +188,19 @@
188 <btn nativeType="cx" @click="submitForm">保 存</btn> 188 <btn nativeType="cx" @click="submitForm">保 存</btn>
189 </div> 189 </div>
190 <div class="d-center" v-if="!$store.state.business.Edit && titleName == 'xml'"> 190 <div class="d-center" v-if="!$store.state.business.Edit && titleName == 'xml'">
191 <btn nativeType="cx" @click="handleExtract">再次抽取</btn>
191 <btn nativeType="cx" @click="handleResubmit">重新上报</btn> 192 <btn nativeType="cx" @click="handleResubmit">重新上报</btn>
192 </div> 193 </div>
193 </el-dialog> 194 </el-dialog>
194 </template> 195 </template>
195 196
196 <script> 197 <script>
197 import { sbdata, sendThis } from './data/sbdata' 198 import { sbdata, sendThis } from './data/sbdata'
198 import { dbdata, sendThis1 } from './data/dbdata' 199 import { dbdata, sendThis1 } from './data/dbdata'
199 import { getDetail, edit, regenerateDbXml } from "@/api/recordLog.js" 200 import { getDetail, edit, regenerateDbXml } from "@/api/recordLog.js"
200 import JsonEditor from "@/components/JsonEditor.vue"; 201 import JsonEditor from "@/components/JsonEditor.vue";
201 import { judgeListComplete } from "@/utils/tools.js" 202 import { judgeListComplete } from "@/utils/tools.js"
202 export default { 203 export default {
203 components: { JsonEditor }, 204 components: { JsonEditor },
204 data () { 205 data () {
205 return { 206 return {
...@@ -427,6 +428,12 @@ export default { ...@@ -427,6 +428,12 @@ export default {
427 } 428 }
428 }, 600), 429 }, 600),
429 /** 430 /**
431 * @description: 登薄再次抽取
432 * @param {*} function
433 * @author: renchao
434 */
435 handleExtract () { },
436 /**
430 * @description: 登薄日志重新生成报文 437 * @description: 登薄日志重新生成报文
431 * @param {*} function 438 * @param {*} function
432 * @author: renchao 439 * @author: renchao
...@@ -442,7 +449,7 @@ export default { ...@@ -442,7 +449,7 @@ export default {
442 }).catch(() => { 449 }).catch(() => {
443 this.$message({ 450 this.$message({
444 type: 'info', 451 type: 'info',
445 message: '已取消删除' 452 message: '已取消上报报文'
446 }) 453 })
447 }) 454 })
448 function createXml () { 455 function createXml () {
...@@ -458,7 +465,7 @@ export default { ...@@ -458,7 +465,7 @@ export default {
458 } 465 }
459 } 466 }
460 } 467 }
461 } 468 }
462 </script> 469 </script>
463 470
464 471
......