FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
super_liu
2022-06-09 11:56:39 +08:00
parent 9ba66fd42a 5ab506d60e
commit 9cbea72c50
10 changed files with 58 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+2 -1
View File
@@ -28,7 +28,8 @@
"vue-contextmenujs": "^1.3.13",
"vue-i18n": "^8.22.4",
"vue-router": "^3.2.0",
"vuex": "^3.4.0"
"vuex": "^3.4.0",
"qs": "latest"
},
"devDependencies": {
"@vue/cli-plugin-babel": "~4.5.0",
src/api/phoneWeLink.js
+3 -10
View File
@@ -1,16 +1,9 @@
import axios from "@/common/axiosV2Phone";
export function getUserInfoByAuthCode (data) {
export function getTokenToWeLink (data) {
return axios({
url: 'getUserInfoByAuthCode',
method: 'get',
params: data
})
}
// 编辑
export function getIftappCodeByWelinkCode (data) {
return axios({
url: 'getIftappCodeByWelinkCode',
url: '/api/getTokenToWeLink',
method: 'post',
params: data
})
src/common/axiosV2Phone/index.js
+7 -1
View File
@@ -4,6 +4,8 @@ import store from '@/store'
import {Message} from 'element-ui'
import { baseUrl,webLoginType,ssoLoginUrlDev } from '@/sysConfig'
import isMobile from "../../store/isMobile";
import Qs from 'qs';
import domMessage from '../messageOnce/messageOnce'
@@ -25,7 +27,10 @@ let formData = (data) => {
}
const service = axios.create({
baseURL: 'https://iftappwelink.foton.com.cn/devserver/welink/'
baseURL: process.env.NODE_ENV === 'production' ? baseUrl : '/',
paramsSerializer: function(params) {//序列化请求参数，避免get请求参数出现&,空格等识别错误的问题
return Qs.stringify(params, {arrayFormat: 'brackets'})
}
})
service.defaults.timeout = 99999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999
@@ -48,6 +53,7 @@ service.interceptors.request.use(
*/
service.interceptors.response.use(
res => {
console.log(res)
// IE 8-9
if (res.data == null && res.config.responseType === 'json' && res.request.responseText != null) {
try {
src/main.js
-2
View File
@@ -1,5 +1,4 @@
import '@babel/polyfill'
import Es6Promise from 'es6-promise'
require('es6-promise').polyfill();
require('es6-promise/auto');
import Vue from 'vue'
@@ -65,7 +64,6 @@ import VConsole from 'vuex'
import isMobile from "./store/isMobile";
// 路由拦截
router.beforeEach(function (to, from, next) {
let fromName = from.name
if(fromName === undefined || fromName === null){
window.sessionStorage.clear()
src/pages/loginVerifyPhone/index.vue
+13 -33
View File
@@ -8,7 +8,7 @@
import axios from 'axios'
import util from 'util'
import { get_verify_by_instance,loginIdm,getMenu,checkPageNoEncryption } from 'api/process'
import { getUserInfoByAuthCode,getIftappCodeByWelinkCode } from 'api/phoneWeLink'
import { getTokenToWeLink } from 'api/phoneWeLink'
import { ssoLoginUrlDev,ssoLogoutUrlDev,ssoLoginUrl,webLoginType,devWebUrl } from '@/sysConfig'
import HWH5 from '../../api/hwh5-cloudonline.js';
@@ -105,40 +105,20 @@
console.log(data)
if(data){
let code = data.code
console.log(code)
getIftappCodeByWelinkCode({
getTokenToWeLink({
code: code,
name: encodeURIComponent("standards regulations"),
name: encodeURIComponent("standards"+"-"+"regulations"),
type:"",
corpCode:"",
}, {
_this: this
}).then(res => {
console.log(res)
if(res.data){
getUserInfoByAuthCode({
code: code,
}).then(res => {
console.log(res)
if(res.data){
let userName = res.data.username;
if(userName !== undefined && userName !== ""){
checkPageNoEncryption({
username: userName
}, {
_this: this
}).then(res => {
if (res.ok) {
this.loginNew(res)
} else {
if(res.respCode && res.respCode === 'r0011'){
this.logout()
}
}
})
}else {
// window.location.href = ssoLogoutUrlDev
}
}else {
this.logout()
}
})
if (res.ok) {
this.loginNew(res)
} else {
if(res.respCode && res.respCode === 'r0011'){
this.logout()
}
}
})
}
src/pages/personal/pages/my-questions/components/answerItem.vue
+4 -1
View File
@@ -108,7 +108,10 @@ export default {
this.$http.postData('lawss/Reply/insertReply',{ ...this.form },{
_this: this
}, res => {
if(res.merge === '添加成功'){
this.form.reply = ''
this.fileList = []
}
}, e => {
})
src/pages/personal/pages/my-questions/components/questionItemInfo.vue
+7 -4
View File
@@ -10,20 +10,20 @@
</div>
</div>
<div class="row">
<div class="item">
<div class="item" @click="clickButtonTo">
<div style="cursor: pointer;">附件：
<span style="color: #409EFF">{{answer.appendixName}}</span>
</div>
</div>
</div>
<div class="row" style="float: right; margin-right: 10px">
<div class="row" style="float: left;">
<div class="item">
<div>{{answer.answerer}}
<span>{{answer.replyTime}}</span>
</div>
</div>
</div>
<div>
<div style="float: right; margin-top: 20px">
<el-checkbox v-if="answer.checkedShow" @change="answerChang" v-model="answer.checked">归档</el-checkbox>
</div>
</div>
@@ -43,7 +43,10 @@ export default {
}
},
methods:{
answerChang(val){
//点击预览
clickButtonTo() {
const attId = this.answer.appendixId
this.$preview(attId)
},
},
watch:{
src/pages/personal/pages/my-questions/index.vue
+11 -5
View File
@@ -320,7 +320,7 @@
<template slot="label">
<questions-item :question="question"></questions-item>
</template>
<div>
<div class="ansBox">
<template v-for="(item, index) in answerList">
<div class="clearfix">
<div class="answer-box" >
@@ -380,7 +380,7 @@
<template slot="label">
<questions-item :question="question"></questions-item>
</template>
<div>
<div class="ansBox">
<template v-for="(item, index) in answerList">
<div class="clearfix">
<div class="answer-box" >
@@ -440,7 +440,7 @@
<template slot="label">
<questions-item :question="question"></questions-item>
</template>
<div>
<div class="ansBox">
<template v-for="(item, index) in answerList">
<div class="clearfix">
<div class="answer-box" >
@@ -500,7 +500,7 @@
<template slot="label">
<questions-item :question="question"></questions-item>
</template>
<div>
<div class="ansBox">
<template v-for="(item, index) in answerList">
<div class="clearfix">
<div class="answer-box" >
@@ -1373,6 +1373,7 @@ export default {
this.handleSelectForm.standCode = this.handleSelectForm.lawNumber
},
addList() {
this.handleSelectForm.lawNumber = ''
this.handleSelectForm.dataSource = this.standType
this.handleSelectForm.standType = this.standType
this.searchLawBtn()
@@ -1587,6 +1588,7 @@ export default {
},
//提问按钮
queBtn(){
this.fileList = []
this.questionForm = {
pubQue : '',//公共问题
classification: 'INLAND', //标准类型
@@ -1843,6 +1845,10 @@ export default {
text-align: left;
height: auto;
}
.ansBox{
height: calc(~ '100% - 190px');
overflow: auto;
}
.answer-box{
height: auto;
width: auto;
@@ -1858,7 +1864,7 @@ export default {
//border-top: 1px solid #cccccc;
}
/deep/.el-upload-dragger{
width: 450px !important;
width: 495px !important;
}
.el-input{
width: 90%;
src/pages/regulatoryRepository/standQA/components/questionItemInfo.vue
+8 -3
View File
@@ -10,13 +10,13 @@
</div>
</div>
<div class="row">
<div class="item">
<div class="item" @click="clickButtonTo">
<div style="cursor: pointer;">附件：
<span style="color: #409EFF">{{answer.appendixName}}</span>
<span style="color: #409EFF" >{{answer.appendixName}}</span>
</div>
</div>
</div>
<div class="row" style="float: right; margin-right: 10px">
<div class="row" style="float: left; ">
<div class="item">
<div>{{answer.answerer}}
<span>{{answer.replyTime}}</span>
@@ -36,6 +36,11 @@ export default {
}
},
methods:{
//点击预览
clickButtonTo() {
const attId = this.answer.appendixId
this.$preview(attId)
},
},
watch:{
answer: {
src/pages/regulatoryRepository/standQA/index.vue
+3 -1
View File
@@ -847,6 +847,7 @@ export default {
this.handleSelectForm.standCode = this.handleSelectForm.lawNumber
},
addList() {
this.handleSelectForm.lawNumber = ''
this.handleSelectForm.dataSource = this.standType
this.handleSelectForm.standType = this.standType
this.searchLawBtn()
@@ -1004,6 +1005,7 @@ export default {
},
//提问按钮
queBtn(){
this.fileList = []
this.questionForm = {
pubQue : '',//公共问题
classification: 'INLAND', //标准类型
@@ -1242,7 +1244,7 @@ export default {
//border-top: 1px solid #cccccc;
}
/deep/.el-upload-dragger{
width: 450px !important;
width: 490px !important;
}
.el-input{
width: 90%;