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

合并分支 'dev_20230216' 到 'master'

Browse Source 
Dev 20230216

查看合并请求 laws-foton-slrs/foton-laws-system-front!28
This commit is contained in:
高嵩
2023-03-26 16:43:53 +08:00
parent 27a868ff3f 4c114237a7
commit 9e759dc7bc
24 changed files with 273 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherBussStandardDetails/index.vue
+1
View File
@@ -334,6 +334,7 @@
<el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off" :loading="isSubmit"></el-button>
<el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新记录</el-button>
<el-button class="relation-btn" icon="icon-relation" @click="knowledgeSharing">标准问答</el-button>
<el-button class="relation-btn" icon="icon-relation" @click="knowledgeSharing">标准需求（翻译）申请流程</el-button>
</div>
</div>
</div>
src/pages/details/otherStandardDetails/index.vue
+1
View File
@@ -37,6 +37,7 @@
@click="collectClick()"></el-button>
<el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新记录</el-button>
<el-button class="relation-btn" @click="knowledgeSharing">标准问答</el-button>
<el-button class="relation-btn" @click="">标准需求（翻译）申请流程</el-button>
</div>
</div>
</div>
src/pages/home2/components/todoList/index.vue
+59
View File
@@ -12,6 +12,15 @@
<div style="min-height: 30px">
<span @click="dealWith(item)"
style="line-height: 30px; font-size: 13px;display: inline-block;width: 100%;">{{ getPrcNameFilter(item) }}</span>
<el-button type="primary"
size="small"
class="common-button-primary"
icon="el-icon-check"
@click="handleReceive(item)" v-if="(item.prcType == 25 && item.taskInfo == '技术标准起草') || (item.prcType == 3 && item.taskInfo == '意见反馈') ||
(item.prcType == 9 && item.taskInfo == '解读') || (item.prcType == 6 && item.taskInfo === '合规评估') || (item.prcType == 6 && item.taskInfo == '批准') ||
(item.prcType == 2 && item.taskInfo === '调研结果反馈') || (item.prcType == 8 && item.taskInfo === '合规排查(上传合规举证材料)') ||
(item.prcType == 10 && item.taskInfo === '清单完善1') || (item.prcType == 26 && item.taskInfo === '立项确认') ||
(item.prcType == 'buss3' && item.taskInfo === '复审')? true : false">接受任务</el-button>
<!-- <el-tooltip class="item" effect="dark" :content="getPrcNameFilter(item)" placement="left" v-else>-->
<!-- <span @click="dealWith(item)"-->
<!-- style="line-height: 30px; font-size: 13px;">{{ getPrcNameFilter(item).substring(0, 32) + '...' }}</span>-->
@@ -61,6 +70,44 @@ export default {
toPage() {
this.$router.push(this.path)
},
// 接受按钮
handleReceive(item) {
this.isSubmit = true
// execTask({
// todoId: this.todoId // 当前节点ID
// }).then(res => {
// if (res.sign && res.sign === '0') {
// this.$message.success('接收成功')
// this.$router.push('/processCenter')
// }
// this.isSubmit = false
// })
// if(!this.tableData.standardData[0]){
// this.$message.warning('请先选择企标计划')
// this.isSubmit = false
// return
// }
this.$http.get("lawss/activiti/selectBusProcessNew", {
taskId: item.taskIds,
}, {
_this: this
}, res => {
this.$http.get("lawss/activiti/acceptTack", {
nowEsId: res,
oaFlag: '0',
taskId: item.taskIds,
}, {
_this: this
}, res => {
// if (res.sign && res.sign === '0') {
this.$message.success('接收成功')
this.isSubmit = false
this.showreceive = false
// this.$router.push('/processCenter')
// }
})
})
},
dealWith (row) { // 办理
const prcType = row.prcType
switch(prcType) {
@@ -1943,6 +1990,18 @@ export default {
}
})
}
case '27':
this.$router.push({
name: 'MyQuestions',
query:{
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType,
}
})
break
}
src/pages/personal/pages/my-collection/components/CollectionBreak.vue
+4 -3
View File
@@ -41,16 +41,17 @@
<el-col :span="1"><el-checkbox v-model="item.checked" size="large"></el-checkbox></el-col>
<el-row>
<div @click="detailsLaws(item)" >
<el-col :span="5" :offset="1">
<el-col :span="3" :offset="1">
<i class="el-icon-collection-tag" style="position: relative; left: -15px" />
所属板块：{{ item.collectType === 'STAND_SPLIT' ? '标准拆分' : '标准拆分' }}
</el-col>
<el-col :span="6">
<el-col :span="7">
<el-tooltip class="item" effect="dark" :content="item.collectTitle" placement="top">
<div class="left-contents">标题：{{ item.collectTitle }}</div>
</el-tooltip>
</el-col>
<el-col :span="4" :offset="3"> 创建时间：{{item.creationTime}}</el-col>
<el-col :span="2">状态：{{ item.validFlag == 0 ? '有效' : '无效'}}</el-col>
<el-col :span="3" :offset="3"> 创建时间：{{item.creationTime}}</el-col>
</div>
<el-col :span="4">
<el-button size="mini" style="margin-top: -5px; border: 1px dashed #dcdee2" @click="cancelLaws(item.id)" v-btn-permission="'Z78KR8RS7BSZWT6KF6VC'">{{$t('m.cancelCollection')}}</el-button>
src/pages/personal/pages/my-collection/components/CollectionDynamics.vue
+4 -3
View File
@@ -41,16 +41,17 @@
<el-col :span="1"><el-checkbox v-model="item.checked" size="large"></el-checkbox></el-col>
<el-row>
<div @click="detailsDynamics(item)">
<el-col :span="5" :offset="1">
<el-col :span="3" :offset="1">
<i class="el-icon-collection-tag" style="position: relative; left: -15px" />
所属板块：{{ item.collectType === 'INLAND_MSG' ? '动态信息' : '资料中心' }}
</el-col>
<el-col :span="6">
<el-col :span="7">
<el-tooltip class="item" effect="dark" :content="item.collectTitle" placement="top">
<div class="left-contents">标题：{{ item.collectTitle }}</div>
</el-tooltip>
</el-col>
<el-col :span="4" :offset="3">创建时间：{{getDate(item.creationTime)}}</el-col>
<el-col :span="2">状态：{{ item.validFlag == 0 ? '有效' : '无效'}}</el-col>
<el-col :span="3" :offset="3">创建时间：{{getDate(item.creationTime)}}</el-col>
</div>
<el-col :span="4">
<el-button size="mini" @click="cancelDynamics(item.id)" style="margin-top: -5px; border: 1px dashed #dcdee2" v-btn-permission="'3XZQZVL27Z'">{{$t('m.cancelCollection')}}</el-button>
src/pages/personal/pages/my-collection/components/CollectionLaws.vue
+4 -3
View File
@@ -40,16 +40,17 @@
<el-col :span="1"><el-checkbox v-model="item.checked" size="large"></el-checkbox></el-col>
<el-row>
<div @click="detailsLaws(item)" >
<el-col :span="5" :offset="1">
<el-col :span="3" :offset="1">
<i class="el-icon-collection-tag" style="position: relative; left: -15px" />
所属板块：{{ '国内外政策' }}
</el-col>
<el-col :span="6">
<el-col :span="7">
<el-tooltip class="item" effect="dark" :content="item.collectTitle" placement="top">
<div class="left-contents">标题：{{ item.collectTitle }}</div>
</el-tooltip>
</el-col>
<el-col :span="4" :offset="3"> 创建时间：{{getDate(item.creationTime)}}</el-col>
<el-col :span="2">状态：{{ item.validFlag == 0 ? '有效' : '无效'}}</el-col>
<el-col :span="3" :offset="3"> 创建时间：{{getDate(item.creationTime)}}</el-col>
</div>
<el-col :span="4">
<el-button size="mini" style="margin-top: -5px; border: 1px dashed #dcdee2" @click="cancelLaws(item.id)" v-btn-permission="'015f4508c4c5066b90f23d752b43a9df'">取消收藏</el-button>
src/pages/personal/pages/my-collection/components/CollectionStandard.vue
+5 -4
View File
@@ -49,19 +49,20 @@
<el-col :span="1"><el-checkbox v-model="item.checked" size="large"></el-checkbox></el-col>
<el-row>
<div>
<el-col :span="5" :offset="1" >
<el-col :span="3" :offset="1" >
<i class="el-icon-collection-tag" style="position: relative; left: -15px" />
所属板块：{{ item.collectType === 'INLAND_STAND' ? '国内标准法规' : (item.collectType === 'FOREIGN_STAND' ? '海外标准法规' : '企业标准') }}
</el-col>
<el-col :span="6">
<el-col :span="7">
<el-tooltip class="item" effect="dark" :content="item.collectTitle" placement="top" v-if="item.collectTitle">
<div class="left-contents" @click="getDetail(item)">标题：{{ item.collectTitle }}</div>
<div class="left-contents" @click="getDetail(item)">标题：<span v-html="item.collectTitle"></span></div>
</el-tooltip>
<div v-else>
<div class="left-contents" @click="getDetail(item)">标题：{{ item.collectTitle }}</div>
</div>
</el-col>
<el-col :span="4" :offset="3">创建时间：{{getDate(item.creationTime)}}</el-col>
<el-col :span="2">状态：{{ item.validFlag == 0 ? '有效' : '无效'}}</el-col>
<el-col :span="3" :offset="3">创建时间：{{getDate(item.creationTime)}}</el-col>
</div>
<el-col :span="4">
<!-- v-btn-permission="'e0815e0f82f6b2af3a9b232cb916bdf8'"-->
src/pages/personal/pages/my-questions/components/answerItem.vue
+58 -17
View File
@@ -68,6 +68,26 @@
<div class="el-upload__text">点击或拖拽上传文件</div>
</el-upload>
</el-dialog>
<!--归档弹窗 -->
<el-dialog
title="问题归档"
:visible.sync="dialogVisible"
width="650px"
:before-close="handleClose">
<div>
<el-form ref="queForm" :rules="queRules" class="label-input-form" label-width="80px" :model="questionForm">
<div v-for="(item,index) in queList" :key="index">
<el-form-item label="回答" prop="problemDescription" class="serch-form-item">
<el-input v-model="item.reply"></el-input>
</el-form-item>
</div>
</el-form>
</div>
<span slot="footer" class="dialog-footer">
<el-button class="common-button-default" size="mini" @click="dialogVisible = false">取 消</el-button>
<el-button class="common-button-primary" size="mini" type="primary" :loading="submitBtnLoading" @click="queSubmit">提 交</el-button>
</span>
</el-dialog>
</div>
</template>
@@ -84,10 +104,18 @@ export default {
return{
roleFlag: false,
nodeList: [],
flag:'',
mergeSelectList: [],
// 上传地址
actionPath: 'api/att/attFile/uploadNew',
importModalshowflagtemp: false,
submitBtnLoading: false,
dialogVisible: false,
queList:[],
queRules:{},
questionForm:{
problemDescription: '', //回答
},
fileList: [],
form:{
reply: '',
@@ -116,6 +144,12 @@ export default {
this.$http.postData('lawss/Reply/insertReply',{ ...this.form },{
_this: this
}, res => {
this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(this.form),
taskId: this.$route.query.taskIds,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
});
if(res.respCode === '200'){
this.form.reply = ''
this.fileList = []
@@ -178,28 +212,35 @@ export default {
}
})
},
handleClose(){
this.queList = []
this.dialogVisible = false
},
queSubmit(){
console.log(this.queList);
let queList = JSON.stringify(this.queList)
this.$emit('emitInsState',false)
this.$http.postData('lawss/Reply/updateReply',queList,
{
_this: this
}, res => {
if(res.respCode === '200'){
this.$emit('emitInsState',true)
}
}, e => {
})
},
//问题归档
queArchive(){
let list = []
console.log(this.mergeSelectList);
this.mergeSelectList = this.mergeSelectList.filter ( item => item.state !== 'yes' && item.checked);
for (let i = 0; i < this.mergeSelectList.length; i++) {
if(this.mergeSelectList[i].checked){
list.push(this.mergeSelectList[i].id)
this.queList.push(this.mergeSelectList[i])
}
}
if(this.mergeSelectList && this.mergeSelectList.length > 0){
this.$emit('emitInsState',false)
let listId = list.join(',')
this.$http.post('lawss/Reply/updateReply', {
id: listId,
},{
_this: this
}, res => {
if(res.respCode === '200'){
this.$emit('emitInsState',true)
}
}, e => {
})
if(this.queList && this.queList.length > 0){
this.dialogVisible = true
}else {
this.$message.warning('请选择归档内容')
}
@@ -209,8 +250,8 @@ export default {
this.$emit('roleFlagBoo',true)
},
},
mounted () {
this.mergeSelectList = this.list
created () {
this.mergeSelectList = JSON.parse(JSON.stringify(this.list))
},
};
</script>
src/pages/personal/pages/my-questions/components/questionItemInfo.vue
+1 -1
View File
@@ -58,7 +58,7 @@ export default {
institutionId: this.$store.getters.userInfo.institutionId,
answererNowUserId: this.$store.getters.userInfo.userId,
answererNowUserName: this.$store.getters.userInfo.userName,
fileList:[],
// fileList:[],
}
},
methods:{
src/pages/personal/pages/my-questions/index.vue
+41
View File
@@ -823,6 +823,12 @@
</div>
<el-button v-else size="mini" style="margin-left: 30px;" type="primary" @click="addList">选择标准</el-button>
</el-form-item>
<el-form-item label="标准号" class="serch-form-item">
{{ questionForm.standSortShow }} {{questionForm.standNumber }}-{{ questionForm.standYear }}
</el-form-item>
<el-form-item label="标准名称" class="serch-form-item">
{{questionForm.standardName}}
</el-form-item>
<el-form-item label="问题" prop="problemDescription" class="serch-form-item">
<el-input v-model="questionForm.problemDescription" @input="changeInput"></el-input>
</el-form-item>
@@ -1331,10 +1337,17 @@ export default {
answerList: [],
standList: [],
questionsList: [],
prcName:'',
taskIds:'',
standMap: new Map()
}
},
mounted(){
if(this.$route.query){
var index = this.$route.query.prcName.indexOf('-(')
this.prcName = this.$route.query.prcName.substring(0,index)
this.taskIds = this.$route.query.taskIds
}
this.standSearch()
// 查询各下拉框数据
this.$http.get("sys/dictype/getDicTypeListCode", "", {
@@ -1478,6 +1491,9 @@ export default {
this.handleSelectTableList[0].standSortShow + this.handleSelectTableList[0].standNumber
}
this.questionForm.standardName = this.handleSelectTableList[0].standName
this.questionForm.standSortShow = this.handleSelectTableList[0].standSortShow
this.questionForm.standYear = this.handleSelectTableList[0].standYear
this.questionForm.standNumber = this.handleSelectTableList[0].standNumber
this.questionForm.standardId = this.handleSelectTableList[0].id
this.standModel = false
}else{
@@ -1824,6 +1840,10 @@ export default {
},
//查询提问标准
standSearch(){
if(this.$route.query){
this.questionSerach.standardEncdoing = this.prcName
}
console.log(this.questionSerach)
this.$http.get('lawss/AskQuestions/getAskQuestionsDetails',{ ...this.questionSerach },{
_this: this
}, res =>{
@@ -1933,6 +1953,27 @@ export default {
this.handleSelectForm.lawName = ''
this.handleSelectForm.standName = ''
this.handleSelectForm.numberName = ''
this.$http.post('lawss/activiti/startProcessRollBack',{
json: JSON.stringify(res.data),
type: '27',
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
},
{
_this: this
}, val => {
this.$http.post('lawss/activiti/completeTask',{
taskIds: val.data,
userId : this.$store.getters.userInfo.userId,
json: JSON.stringify(res.data),
},
{
_this: this
}, res => {
}, e => {
})
}, e => {
})
}, e => {
this.submitBtnLoading = false
})
src/pages/processCenter/pages/components/ProcessFooter.vue
+1 -1
View File
@@ -104,7 +104,7 @@
icon="el-icon-check"
@click="handleReceive"
:loading="submitLoading"
v-if="showReceive"
v-if="showReceive"
>接收任务</el-button>
<el-button
type="danger"
src/pages/processCenter/pages/components/ProcessMixin.vue
+5 -1
View File
@@ -111,7 +111,11 @@ export default {
{
label: "企标制修订立项",
value: "26"
}
},
{
label: "问答流程",
value: "27"
}
],
formDisableFlag: false,
pickerOptions: {
src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
+1 -1
View File
@@ -118,7 +118,7 @@
</process-title>
<div class="tableTitle">
<div class="tableButton">
<el-button :disabled="disabledXX" plain class="common-button-primary" size="mini" @click="addList">添加</el-button>
<el-button :disabled="disabledXX" type="primary" size="mini" @click="addList">添加</el-button>
<el-button :disabled="disabledXX" plain class="common-button-primary" size="mini" @click="deleteList">批量删除</el-button>
</div>
</div>
src/pages/processCenter/pages/creatProcess/bzpg/step5.vue
+1 -1
View File
@@ -900,7 +900,7 @@ export default {
return
})
if(submitFlag === 0 ){
this.$message.warning('请至少对一条信息进行评估')
this.$message.warning('请对所有信息进行评估')
}else{
this.handlePrice()
if(this.comFlag > 0) {
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+16 -7
View File
@@ -1957,6 +1957,11 @@
this.checkIsOnly()
}
},
'form.standName' : {
handler: function() {
this.checkIsOnly()
}
},
'form.standNumber' : {
handler: function() {
this.checkIsOnly()
@@ -2129,34 +2134,36 @@
}
if (this.form.standInData === '0') {
standType = 'INLAND'
if(this.form.standSort && this.form.standNumber && this.form.standYear){
if(this.form.standSort && this.form.standNumber && this.form.standYear && this.form.standName){
this.$http.get('sarStandardsInfo/sar-standards-info/checkIsOnly', {
standType: standType,
standSort: this.form.standSort,
standName: this.form.standName,
standNumber: this.form.standNumber,
standYear: this.form.standYear,
}, {
_this: this
}, res => {
if (!res.ok) {
this.$message.warning('标准号重复')
this.$message.warning(res.message)
return
}
})
}
} else {
standType = 'FOREIGN'
if(this.form.standSort && this.form.standNumber){
if(this.form.standSort && this.form.standNumber && this.form.standName){
this.$http.get('sarStandardsInfo/sar-standards-info/checkIsOnly', {
standType: standType,
standSort: this.form.standSort,
standName: this.form.standName,
standNumber: this.form.standNumber,
standYear: this.form.standYear,
}, {
_this: this
}, res => {
if (!res.ok) {
this.$message.warning('标准号重复')
this.$message.warning(res.message)
return
}
})
@@ -2492,6 +2499,7 @@
handleProcessStandardNext(status) {
this.submitType = status
switch (status) {
// 新增
case 1:
this.gdType = '新增'
@@ -2500,8 +2508,8 @@
this.standardDrawer = false
this.verifySarStandard = true
// this.clearFormData(this.form)
this.clearFormData()
this.clearFileListData()
// this.clearFormData()
// this.clearFileListData()
break
// 带入（确认）
case 2:
@@ -3680,6 +3688,7 @@
this.$http.get('sarStandardsInfo/sar-standards-info/checkIsOnly', {
standType: standType,
standSort: this.form.standSort,
standName: this.form.standName,
standNumber: this.form.standNumber,
standYear: this.form.standYear,
}, {
@@ -3741,7 +3750,7 @@
}
})
} else {
this.$message.warning('标准号重复')
this.$message.warning(res.message)
return
}
})
src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
+1 -1
View File
@@ -448,7 +448,7 @@
}
})
} else {
this.$message.warning('请输入反馈意见')
this.$message.warning('请输审批意见')
}
},
src/pages/processCenter/pages/creatProcess/qbfs/step5.vue
+1 -1
View File
@@ -678,7 +678,7 @@ export default {
}, e => {
});
}else {
this.$message.warning('请检查基础信息表单是否填写完整')
this.$message.warning('请填写审批意见')
}
})
},
src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
-1
View File
@@ -3461,7 +3461,6 @@
_this: this
}, res => {
if (res.data === true) {
console.log(1);
this.showreceive = true
} else {
this.showreceive = false
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+12
View File
@@ -2227,6 +2227,18 @@ export default {
})
}
break
case '27':
this.$router.push({
name: 'MyQuestions',
query:{
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType,
}
})
}
},
...mapMutations(['setProcess', 'setHandleInfo']),
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+9 -29
View File
@@ -233,13 +233,12 @@
<!-- @click="addModal"-->
<!-- v-btn-permission="'RKK25EG2WD'"-->
<!-- ><i class="el-icon-plus"></i>新增</el-button>-->
<!-- <el-button-->
<!-- class="common-button-default in-button"-->
<!-- round-->
<!-- :loading="searching"-->
<!-- @click="addImportModal(1)"-->
<!-- v-btn-permission="'SKNTPDKZFF'"-->
<!-- ><i class="iconfont">&#xe6de;</i>导入</el-button>-->
<el-button
class="common-button-default in-button"
size="mini"
:loading="searching"
@click="addImportModal(1)"
><i class="iconfont">&#xe6de;</i>导入</el-button>
<el-button
class="common-button-default export-button"
size="mini"
@@ -4465,28 +4464,9 @@ export default {
},
// 点击导入标准
addImportModal(flag) {
this.getMenu().then(boolean => {
if (boolean) {
// this.$refs.importfile.clearFiles()
if (flag === 1) {
let menuId = this.selectSarMenu.id
if (menuId == null || menuId === '') {
this.$message({
showClose: true,
message: '请选择标准导入的目录',
type: 'error'
})
} else {
this.importModalshowflag = true
this.showUploadlist = true
this.importExcelUrl = '/api/lawss/sarBussionessStand/importZipSarBussionessStand?menuId=' + menuId
}
} else {
this.importModalshowflag = true
this.importExcelUrl = '/api/lawss/sarBussStandItems/importSarBussStandItemsList?standId=' + this.standItemSearch.standId
}
}
})
this.importModalshowflag = true
this.showUploadlist = true
this.importExcelUrl = '/api/lawss/sarBussionessStand/importSarBussionessStandFile'
},
// 二级菜单新建，编辑，删除
clickDropMenu(name, treeNode) {
src/pages/regulatoryRepository/standQA/index.vue
+9
View File
@@ -102,6 +102,12 @@
</div>
<el-button v-else size="mini" style="margin-left: 30px;" type="primary" @click="addList">选择标准</el-button>
</el-form-item>
<el-form-item label="标准号" class="serch-form-item">
{{ questionForm.standSortShow }} {{questionForm.standNumber }}-{{ questionForm.standYear }}
</el-form-item>
<el-form-item label="标准名称" class="serch-form-item">
{{questionForm.standardName}}
</el-form-item>
<el-form-item label="问题" prop="problemDescription" class="serch-form-item">
<el-input v-model="questionForm.problemDescription" @input="changeInput"></el-input>
</el-form-item>
@@ -795,6 +801,9 @@ export default {
this.handleSelectTableList[0].standSortShow + this.handleSelectTableList[0].standNumber
}
this.questionForm.standardName = this.handleSelectTableList[0].standName
this.questionForm.standSortShow = this.handleSelectTableList[0].standSortShow
this.questionForm.standYear = this.handleSelectTableList[0].standYear
this.questionForm.standNumber = this.handleSelectTableList[0].standNumber
this.questionForm.standardId = this.handleSelectTableList[0].id
this.standModel = false
}else{
src/pages/searchCenter/pages/standardSearch.vue
+4
View File
@@ -29,6 +29,10 @@
<router-link v-if="externalStatus !== 'external'" to="/home2" class="router-link1">
<div>首页</div>
</router-link>
<!-- <button>标准翻译申请流程</button>-->
<a class="router-link1" style="margin-left: 10px;">
标准需求（翻译）申请流程
</a>
</div>
<div class="search-content__wrap">
<!-- 检索条件 -->
src/router/index.js
+9
View File
@@ -1508,6 +1508,15 @@ const routes = [
title: '标准调研流程'
}
},
// {
// path: '/bzxqfyStep1',
// name: 'bzxqfyStep1',
// component: () => import('@/pages/processCenter/pages/creatProcess/bzxqfy/step1.vue'),
// meta: {
// requireAuth: true,
// title: '标准翻译流程'
// }
// },
{
path: '/ZQYJAddFileDetails',
name: 'ZQYJAddFileDetails',
src/sysConfig/index.js
+26 -27
View File
@@ -1,30 +1,29 @@
/**
* @description: 通用配置
* @author: chenxiaoxi
* @date: 2018-09-04 17:47:46
*/
/*** @description: 通用配置
* @author: chenxiaoxi
* @date: 2018-09-04 17:47:46
*/
// 服务器地址
// const devIp = '39.98.140.126'
// const devInterfacePORT = '10005'
// const devIp = '192.168.10.6'
// const devInterfacePORT = '4202'
// const devIp = '192.168.1.42'
// const devInterfacePORT = '9999'
const devIp = '10.10.10.46'
const devInterfacePORT = '4202'
// // const devIp = '10.0.3.10'
// const devIp = 'localhost'
// const devInterfacePORT = '10086'
// const devIp = '62.234.136.153'
// const devInterfacePORT = '8033'
const devIp = '10.19.11.243'
const devInterfacePORT = '4304'
// 配置 idm 认证
const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri='
const ssoLogout = 'http://sso.foton.com.cn/logout?service='
// 配置 前端服务
const devWebUrl = 'https://srms.foton.com.cn/#/'
const devWebUrl = 'http://62.234.136.153:8038/#/'
// webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录)
const webLoginType = 'idm'
const webLoginType = 'dev'
// 配置onlyOffice 前端服务
const onlyOfficeUrl = 'http://10.100.5.116:8088'
// 配置 kkFileView 前端服务
const kkFileViewUrl = 'https://srms.foton.com.cn/preview'
// const onlyOfficeUrl = 'http://127.0.0.1:8080'
const onlyOfficeUrl = 'http://10.10.10.46:8889'
// 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
@@ -48,10 +47,12 @@ const processPort = '17210'
*****************************************************************/
// 生产环境配置
// const prodIp = '62.234.136.153'
// const prodInterfacePORT = '8033'
const prodIp = 'srms.foton.com.cn'
const prodInterfacePORT = ''
// const prodIp = '39.98.140.126'
// const prodInterfacePORT = '4201'
const prodIp = '10.10.10.46'
const prodInterfacePORT = '4202'
// const prodIp = 'slrs.foton.com.cn'
// const prodInterfacePORT = ''
// 判断环境
const serverIP = process.env.NODE_ENV === 'production' ? prodIp : devIp
@@ -59,16 +60,14 @@ const interfacePORT = process.env.NODE_ENV === 'production' ? prodInterfacePORT
const CLOUD_RES_INTERFACE_PORT = process.env.NODE_ENV === 'production' ? DEV_CLOUD_RES_INTERFACE_PORT : DEV_CLOUD_RES_INTERFACE_PORT
module.exports = {
baseUrl: 'https://' + serverIP + ':' + interfacePORT,
baseUrl: 'http://' + serverIP + ':' + interfacePORT,
webLoginType: webLoginType,
ssoLoginUrlDev: ssoLogin + devWebUrl,
ssoLogoutUrlDev: ssoLogout + devWebUrl,
ssoLoginUrl: ssoLogin,
onlyOfficeUrl: onlyOfficeUrl,
kkFileViewUrl: kkFileViewUrl,
devWebUrl: devWebUrl,
serverUrl: 'https://' + serverIP, // 服务器IP地址
interfaceUrl: 'https://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址,
serverUrl: 'http://' + serverIP, // 服务器IP地址
interfaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址,
cloudResInterFaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/busApi/', // 云端资源库服务器端接口访问地址,
simpleUploadPath: 'api/' + simpleFilePath, // 单文件上传地址
multipleUploadPath: 'api/' + multipleFilePath, // 多文件上传地址
@@ -78,4 +77,4 @@ module.exports = {
enterprise: enterprise, // GQ广汽 SJZX数据中心
theme: theme, // 主题
processInterfaceURL: `http://${serverIP}:${processPort}/bat-wkflow`
}
}