Browse Source

websocket使用wss协议,发布任务详情字段修改,分派给其他人的任务不能查看问题修改

luckysheet-xiaowang-Intelligen
mk 9 months ago
parent
commit
5fb72172a2
  1. 2
      .env.preview
  2. 2
      .env.test
  3. 2
      src/views/modules/base/smartExcel/cpts/excel-info.vue
  4. 6
      src/views/modules/base/smartExcel/cpts/excel-summary.vue
  5. 7
      src/views/modules/base/smartExcel/cpts/excel-view.vue

2
.env.preview

@ -1,7 +1,7 @@
NODE_ENV=production NODE_ENV=production
# VUE_APP_API_SERVER = http://120.27.18.76/api # VUE_APP_API_SERVER = http://120.27.18.76/api
VUE_APP_API_SERVER = https://epmet-preview.elinkservice.cn/api VUE_APP_API_SERVER = https://epmet-preview.elinkservice.cn/api
VUE_APP_SOCKET_SERVER = ws://epmet-preview.elinkservice.cn/api VUE_APP_SOCKET_SERVER = wss://epmet-preview.elinkservice.cn/api
VUE_APP_BIPASS_API_SERVER = https://epmet-preview.elinkservice.cn/linkdata/linkdata-gateway/route VUE_APP_BIPASS_API_SERVER = https://epmet-preview.elinkservice.cn/linkdata/linkdata-gateway/route
VUE_APP_NODE_ENV=preview VUE_APP_NODE_ENV=preview
VUE_APP_PUBLIC_PATH=epmet-work-pc VUE_APP_PUBLIC_PATH=epmet-work-pc

2
.env.test

@ -1,6 +1,6 @@
NODE_ENV=test NODE_ENV=test
VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api
VUE_APP_BIPASS_API_SERVER = https://epmet-test.elinkservice.cn/linkdata/linkdata-gateway/route VUE_APP_BIPASS_API_SERVER = https://epmet-test.elinkservice.cn/linkdata/linkdata-gateway/route
VUE_APP_SOCKET_SERVER = ws://epmet-test.elinkservice.cn/api VUE_APP_SOCKET_SERVER = wss://epmet-test.elinkservice.cn/api
VUE_APP_NODE_ENV=test VUE_APP_NODE_ENV=test
VUE_APP_PUBLIC_PATH=epmet-work-pc VUE_APP_PUBLIC_PATH=epmet-work-pc

2
src/views/modules/base/smartExcel/cpts/excel-info.vue

@ -75,7 +75,7 @@
<el-table-column fixed="right" label="汇报情况" align="center"> <el-table-column fixed="right" label="汇报情况" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button @click=" handleInfo(scope.row)" type="text" size="small">{{ scope.row.resolveNum <el-button @click=" handleInfo(scope.row)" type="text" size="small">{{ scope.row.resolveNum
}}/{{ scope.row.taskNum }}/{{ scope.row.totalNum
}}</el-button> }}</el-button>
<el-button @click="handelClickShowSummary(scope.row)" type="text" size="small">查看</el-button> <el-button @click="handelClickShowSummary(scope.row)" type="text" size="small">查看</el-button>
</template> </template>

6
src/views/modules/base/smartExcel/cpts/excel-summary.vue

@ -20,7 +20,7 @@
</div> </div>
</div> </div>
<div v-if="showView"> <div v-if="showView">
<excel-view @close="close" :workbookId="workbookId" :infoObj="infoObj" :pageType="'add'" :sheetTotal="sheetTotal" :mergeObj="mergeObj"></excel-view> <excel-view @close="close" :workbookId="workbookId" :infoObj="infoObj" :pageType="'add'" :sheetTotal="sheetTotal" :mergeObj="mergeObj" :userId="userId"></excel-view>
</div> </div>
</div> </div>
</template> </template>
@ -37,7 +37,8 @@ export default {
workbookId:'', workbookId:'',
sheetTotal:false, sheetTotal:false,
infoObj:{}, infoObj:{},
mergeObj:null//subworkbookIdworkbookId mergeObj:null,//subworkbookIdworkbookId
userId:''
}; };
}, },
created() { created() {
@ -86,6 +87,7 @@ export default {
this.showView = true; this.showView = true;
this.sheetTotal = false this.sheetTotal = false
this.workbookId = val.taskId; this.workbookId = val.taskId;
this.userId = val.userId;
this.infoObj = { id, taskId, taskTitle, taskPeriod, taskType, taskIntroduction}; this.infoObj = { id, taskId, taskTitle, taskPeriod, taskType, taskIntroduction};
this.mergeObj = {subWorkBookId,workBookId } this.mergeObj = {subWorkBookId,workBookId }
}, },

7
src/views/modules/base/smartExcel/cpts/excel-view.vue

@ -80,6 +80,10 @@ export default {
mergeObj:{ mergeObj:{
type:Object, type:Object,
default:()=>{} default:()=>{}
},
userId:{
type:String,
default:''
} }
}, },
computed: { computed: {
@ -105,7 +109,8 @@ export default {
let parm = { let parm = {
taskId: this.workbookId,//Id taskId: this.workbookId,//Id
pageNo: 1, pageNo: 1,
pageSize: 1000 pageSize: 1000,
userId:this.userId
} }
let { data, code, msg } = await requestGet('/actual/base/communityOneTablePeriodPublish/myPageList', parm) let { data, code, msg } = await requestGet('/actual/base/communityOneTablePeriodPublish/myPageList', parm)
if (code === 0) { if (code === 0) {

Loading…
Cancel
Save