From 1b3f4dd63fe08c6e8a48a635746aec1ea49c9c43 Mon Sep 17 00:00:00 2001
From: yang <1441163367@qq.com>
Date: 星期三, 26 十月 2022 14:19:12 +0800
Subject: [PATCH] 修改
---
vue.config.js | 4 ++--
src/views/padSunmaryProcedure/word_mange/mangeJD.vue | 8 +++++---
src/router/axios.js | 4 ++--
src/views/padSunmaryProcedure/padWord.vue | 6 +++---
src/views/padSunmaryProcedure/word_mange/mangeBL.vue | 1 +
5 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/router/axios.js b/src/router/axios.js
index 50f9dd0..a11ba74 100644
--- a/src/router/axios.js
+++ b/src/router/axios.js
@@ -24,7 +24,6 @@
let loadingInstance =null;
// HTTPrequest鎷︽埅
axios.interceptors.request.use(config => {
- console.log(config,'config--')
/*NProgress.start() // start progress bar
loadingInstance = Loading.service({
lock: true,
@@ -35,8 +34,9 @@
const TENANT_ID = getStore({ name: 'tenantId' })
const isToken = (config.headers || {}).isToken === false
const token = window.android.getAppToken()
+ // const token = `dd271fdb-4b69-4eb3-a940-52d70232e56b`
if (token && !isToken) {
- config.headers['Authorization'] = 'Bearer ' + token// token
+ config.headers['Authorization'] = 'bearer ' + token// token
}
if (TENANT_ID) {
config.headers['TENANT-ID'] = TENANT_ID // 绉熸埛ID
diff --git a/src/views/padSunmaryProcedure/padWord.vue b/src/views/padSunmaryProcedure/padWord.vue
index b8d3d2c..104e2c4 100644
--- a/src/views/padSunmaryProcedure/padWord.vue
+++ b/src/views/padSunmaryProcedure/padWord.vue
@@ -2,7 +2,7 @@
<div style="width: 100%;height: 100%;overflow: auto;">
<div id="navs">
<el-button icon="el-icon-arrow-left" @click="goHome">杩斿洖</el-button>
- <div>{{ name1 }}</div>
+<!-- <div>{{ name1 }}</div>-->
<el-button icon="el-icon-upload el-icon--right" @click="submit">鎻愪氦</el-button>
</div>
<el-tabs type="border-card" style="margin-top: 10px!important;" v-model="activeName" @tab-click="handleClick"
@@ -36,7 +36,7 @@
data() {
return {
form:{
- id:''
+ id:this.id,
},
name1: "",
activeName: 'first'
@@ -56,7 +56,7 @@
})
},
submit() {
- submitcase(this.id).then(res => {
+ submitcase(this.form).then(res => {
this.goHome()
})
},
diff --git a/src/views/padSunmaryProcedure/word_mange/mangeBL.vue b/src/views/padSunmaryProcedure/word_mange/mangeBL.vue
index 286b242..48376c8 100644
--- a/src/views/padSunmaryProcedure/word_mange/mangeBL.vue
+++ b/src/views/padSunmaryProcedure/word_mange/mangeBL.vue
@@ -175,6 +175,7 @@
},
mounted() {
this.id = this.$store.state.user.id
+ console.log(this.id,'id')
this.getDataList()
window.getSignUrl =this.getSignUrl;
window.getFingerUrl =this.getFingerUrl;
diff --git a/src/views/padSunmaryProcedure/word_mange/mangeJD.vue b/src/views/padSunmaryProcedure/word_mange/mangeJD.vue
index 9cd0ffd..61b8c95 100644
--- a/src/views/padSunmaryProcedure/word_mange/mangeJD.vue
+++ b/src/views/padSunmaryProcedure/word_mange/mangeJD.vue
@@ -144,8 +144,10 @@
},
methods: {
init() {
- nowpenaltydecision(this.id).then(res => {
- this.form = res.data.data
+ this.$nextTick(() => {
+ nowpenaltydecision(this.id).then(res => {
+ this.form = res.data.data
+ })
})
},
//鐐瑰嚮淇濆瓨鏁版嵁
@@ -176,7 +178,7 @@
this.$router.push({
path: '/WordYulan',
query: {
- id:this.id,
+ id: this.id,
downWordData: data,
src: '/wordes/penaltyDecision.docx',
name: '澶勭綒鍐冲畾涔�',
diff --git a/vue.config.js b/vue.config.js
index 737fe5f..ded5ba0 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -3,10 +3,10 @@
* https://cli.vuejs.org/zh/config/
*/
// const url = 'http://localhost:9999'
-const url = 'http://192.168.0.164:9999'
+// const url = 'http://192.168.0.164:9999'
// const url = 'http://192.168.0.134:9999'
// const url = 'http://boying.tpddns.cn:9999/'
-// const url = 'http://36.138.175.42:9999/'
+const url = 'http://36.138.175.42:9999/'
const webpack = require('webpack')
const CompressionWebpackPlugin = require('compression-webpack-plugin')
const productionGzipExtensions = ['js', 'css']
--
Gitblit v1.9.1