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

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
396572590@qq.com
2022-06-21 11:46:29 +08:00
parent 854bf6d9d3 7e78df01e3
commit bd109c9dcf
9 changed files with 14641 additions and 32903 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+10954 -29177
View File
File diff suppressed because it is too large Load Diff
src/main.js
+2
View File
@@ -168,6 +168,8 @@ router.beforeEach(function (to, from, next) {
if ((token === null || token === '' ) && toName !== 'Login') {
if(toName !== 'phoneIndex'){
if(toName === 'phoneHome'){
// 手机端 首页 首次进入系统 清除 缓存, 防止 跳转 oa 的页面, 问题追溯 #55852
window.sessionStorage.clear()
next('/loginVerifyPhone')
}else {
if(fromName === 'phoneHome'){
src/pages/personal/pages/my-questions/components/answerItem.vue
+2 -1
View File
@@ -136,7 +136,7 @@ export default {
this.$message.warning(res.message)
fileList.pop()
}
this.importModalshowflagtemp = false
// this.importModalshowflagtemp = false
},
//文件上传前
beforeUpload(file){
@@ -192,6 +192,7 @@ export default {
}, res => {
if(res.respCode === '200'){
this.$emit('emitInsState',true)
this.$message.success('归档成功')
}
}, e => {
})
src/pages/personal/pages/my-questions/components/questionItemInfo.vue
+29 -5
View File
@@ -12,7 +12,9 @@
<div class="row">
<div class="item" @click="clickButtonTo">
<div style="cursor: pointer;">附件：
<span style="color: #409EFF">{{answer.appendixName}}</span>
<div v-if="fileList.length > 0" v-for="(item,index) in fileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 40px;" class="fileClass">
<span style="" @click="clickButtonTo(item.id)" :title="item.name"> {{ item.name }}</span>
</div>
</div>
</div>
</div>
@@ -24,7 +26,7 @@
</div>
</div>
<div style="float: right; margin-top: 20px">
<el-checkbox v-if="answer.checkedShow" @change="answerChang" :disabled="answer.state && answer.state === 'yes'" v-model="answer.checked">归档</el-checkbox>
<el-checkbox v-if="answer.checkedShow && (answer.answerer !== answererNowUserName)" @change="answerChang" :disabled="answer.state && answer.state === 'yes'" v-model="answer.checked">归档</el-checkbox>
</div>
</div>
<!-- <div class="footer-box">-->
@@ -40,16 +42,35 @@ export default {
data(){
return{
checked: '',
answererNowUserId: this.$store.getters.userInfo.userId,
answererNowUserName: this.$store.getters.userInfo.userName,
fileList:[],
}
},
methods:{
assemble(ids,names){
let list= [];
if(ids && ids !== '' && names && names !== ''){
let idArray=ids.split(',');
let nameArray=names.split(',');
for(let i=0; i<idArray.length; i++){
list.push({id:idArray[i],name:nameArray[i]});
}
}
return list;
},
//点击预览
clickButtonTo() {
const attId = this.answer.appendixId
this.$preview(attId)
clickButtonTo(attId) {
// 过滤
if(attId.indexOf("ATT_FILE") !== -1){
this.$preview(attId)
}
},
answerChang(){}
},
mounted () {
this.fileList = this.assemble(this.answer.appendixId,this.answer.appendixName)
},
watch:{
answer: {
immediate: true,
@@ -63,6 +84,9 @@ export default {
</script>
<style lang="less" scoped>
/deep/ .fileClass{
line-height: 22px !important;
}
#answer-item{
width: 100%;
min-width: 130px;
src/pages/personal/pages/my-questions/index.vue
+18 -7
View File
@@ -396,7 +396,7 @@
<loading :loading="dataLoading">正在加载数据</loading>
</div>
<div class="info-answer">
<answer-item @emitInsState="emitInsState"></answer-item>
<answer-item :key="aiKey" :list="answerList" @roleFlagBoo="roleFlagBooFunc" @emitInsState="emitInsState"></answer-item>
</div>
</el-tab-pane>
</template>
@@ -457,7 +457,7 @@
<loading :loading="dataLoading">正在加载数据</loading>
</div>
<div class="info-answer">
<answer-item @emitInsState="emitInsState"></answer-item>
<answer-item :key="aiKey" :list="answerList" @roleFlagBoo="roleFlagBooFunc" @emitInsState="emitInsState"></answer-item>
</div>
</el-tab-pane>
</template>
@@ -520,7 +520,7 @@
<loading :loading="dataLoading">正在加载数据</loading>
</div>
<div class="info-answer">
<answer-item @emitInsState="emitInsState"></answer-item>
<answer-item :key="aiKey" :list="answerList" @roleFlagBoo="roleFlagBooFunc" @emitInsState="emitInsState"></answer-item>
</div>
</el-tab-pane>
</template>
@@ -830,7 +830,7 @@
</el-form>
</div>
<span>相似历史问题：</span>
<div style="height: 200px; width: 80%; margin-left: 80px;">
<div style="height: 200px; width: 80%; margin-left: 80px;overflow-y: auto;">
<div v-for="item in historyList" :key="item.id" @click="historyJump(item)">
<span class="history-item">{{item.problemDescription}}</span>
<span class="history-item">{{item.questionTime}}</span>
@@ -872,7 +872,6 @@
<el-form-item label="标准号/标准名称" class="search-item">
<el-input
v-model="handleSelectForm.lawNumber"
@change="lawNumberSearch"
placeholder="根据标准号/标准名称查找"
clearable
:maxlength="100"></el-input>
@@ -1454,6 +1453,7 @@ export default {
},
//选择标准的查询按钮
searchLawBtn(){
this.lawNumberSearch()
this.lawInfoTableLoading = true
if (this.handleSelectForm.dataSource === 'INLAND'){
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1',this.handleSelectForm,{
@@ -1842,6 +1842,17 @@ export default {
this.activeName = "myQue"
this.activeType = this.standType
this.searchBtn()
this.queSearch()
this.handleSelectForm.lawNumber = ''
this.handleSelectForm.textStatus = ''
this.handleSelectForm.isRelateAccess = ''
this.handleSelectForm.standNumber = ''
this.handleSelectForm.lawsNumber = ''
this.handleSelectForm.standCode = ''
//清空标准名称/政策名称的查询
this.handleSelectForm.lawName = ''
this.handleSelectForm.standName = ''
this.handleSelectForm.numberName = ''
}, e => {
})
@@ -1860,13 +1871,13 @@ export default {
overflow: auto !important;
}
#my-questions{
height: 100%;
height: calc(100vh - 75px);
display: flex;
flex-direction: column;
background: #F5F7FA;
margin-bottom: 10px;
.tab-box{
height: 100%;
height: 93%;
}
.type-tabs {
/deep/.el-tabs__header {
src/pages/phone/domesticDetails.vue
+3614 -3692
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
+1 -1
View File
@@ -220,7 +220,7 @@
align="center"
label="电话">
<template slot-scope="scope">
<el-input v-model="scope.row.tel_phone" placeholder="请填写单位"/>
<el-input v-model="scope.row.tel_phone" placeholder="请填写电话"/>
</template>
</el-table-column>
<el-table-column
src/pages/regulatoryRepository/standQA/index.vue
+18 -19
View File
@@ -408,11 +408,11 @@
<a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" class="table-jump" style="color: #F56C6C"
@click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
scope.row.standNumber
}}-{{ scope.row.standYear }}</a>
}}{{ scope.row.standYear ? '-' + scope.row.standYear : '' }}</a>
<a v-else-if="scope.row.standYear" class="table-jump" style="color: #333333"
@click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
scope.row.standNumber
}}-{{ scope.row.standYear }}</a>
}}{{ scope.row.standYear ? '-' + scope.row.standYear : '' }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump" style="color: #333333">
{{ scope.row.standSortShow }}
{{ scope.row.standNumber }}</a>
@@ -486,19 +486,14 @@
width="150"
>
<template slot-scope="scope">
<a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">{{
scope.row.standSortShow
}} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">{{
scope.row.standSortShow
}} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else-if="scope.row.standYear" style="color: #333333" class="table-jump" @click="handlePreview(scope.row)">{{
scope.row.standSortShow
}} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">{{
scope.row.standSortShow
}}
{{ scope.row.standNumber }}</a>
<a v-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C" class="table-jump" @click="handlePreview(scope.row)">
{{scope.row.standSortShow}} {{ scope.row.standNumber }}{{ scope.row.standYear ? '-' + scope.row.standYear : '' }}</a>
<a v-else-if="textStatusMap[scope.row.textStatus] === '——' " style="color: #409EFF" class="table-jump" @click="handlePreview(scope.row)">
{{ scope.row.standSortShow }} {{ scope.row.standNumber }}{{ scope.row.standYear ? '-' + scope.row.standYear : '' }}</a>
<a v-else-if="scope.row.standYear" style="color: #333333" class="table-jump" @click="handlePreview(scope.row)">
{{ scope.row.standSortShow }} {{ scope.row.standNumber }}{{ scope.row.standYear ? '-' + scope.row.standYear : '' }}</a>
<a v-else style="color: #333333" @click="handlePreview(scope.row)" class="table-jump">
{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
@@ -1033,7 +1028,8 @@ export default {
questionClick(){
sessionStorage.setItem('queId', this.activeQue)
this.$http.get('lawss/AskQuestions/getAskQuestionsByakId',{
id: this.activeQue
id: this.activeQue,
state: 'yes'
},{
_this: this
}, res => {
@@ -1068,6 +1064,7 @@ export default {
questioner: this.$store.getters.userInfo.userId, //提问人
problemDescription: '', //关键词/问题描述
}
this.standSearch2()
},
searchBtn(){
this.questionSerach.classification = this.activeType
@@ -1082,8 +1079,10 @@ export default {
},
//问题查询
queSearch(){
this.$http.get('lawss/AskQuestions/getAskQuestionsByStandardId',{
this.$http.get('lawss/AskQuestions/getAskQuestionsNew',{
standardId: this.activestand,
classification: this.activeName,
problemDescription: this.questionSerach.problemDescription
},{
_this: this
}, res => {
@@ -1256,13 +1255,13 @@ export default {
overflow: auto;
}
#my-questions{
height: 100%;
height: calc(100vh - 75px);
display: flex;
flex-direction: column;
background: #F5F7FA;
margin-bottom: 10px;
.tab-box{
height: 100%;
height: 93%;
}
.type-tabs {
/deep/.el-tabs__header {
src/pages/searchCenter/pages/standardSearch.vue
+3 -1
View File
@@ -267,8 +267,8 @@
<div class="AllBoxTitle">
<span v-html="item.indexType === 'stand' ? '国内标准法规' : (item.indexType === 'FOREIGN' ? '海外标准法规' : (item.indexType === 'laws' ? '国内外政策' : (item.indexType === 'bussstand' ? '企业标准' : (item.indexType === 'items' ? '数据化条目' : '动态&资料'))))" class="typetext"></span>
<span style="cursor:pointer;" class="AllBoxText" v-html="item.title" @click="toPage(item)"></span>
<span @click="checkItems(item)" class="more" style="cursor: pointer; position: absolute; right: 5px;">详情</span>
</div>
<span @click="checkItems(item)" class="more" style="cursor: pointer; position: absolute; right: 0;top: 13px;">详情</span>
<div class="AllBoxContent" v-html="item.textContent"></div>
<div v-if="item.indexType !== 'items' && item.indexType !== 'msgdyinfo'" class="AllTime">
<div style="margin-right: 15px;">发布日期: {{ item.issue_time !== null && item.issue_time !== '' ? dateFormat2(item.issue_time) : '--' }} </div>
@@ -2809,6 +2809,7 @@
height: 29px;
}
.AllBox {
position: relative;
margin-top: 20px;
background-color: #fff;
border-radius: 20px;
@@ -2817,6 +2818,7 @@
margin-bottom: 20px;
}
.AllBoxTitle {
width: 98%;
position: relative;
overflow: hidden;
text-overflow:ellipsis;