antissoft / antissoft.dati.admin

Commit 57b2d5ecc0c89f4bb8c72bc96daf0bfd871bcbc9

Authored by yangzhi
2 parents ea34a1f7 6cfbac65

Merge branch 'develop_interview' of 39.98.150.180:antissoft/antissoft.dati.admin… 

… into develop_interview
Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
src/views/user/userlist.vue
  View file @57b2d5e
@@ -247,8 +247,8 @@ @@ -247,8 +247,8 @@
247 <el-table-column property="Achievement" label="成绩" sortable></el-table-column> 247 <el-table-column property="Achievement" label="成绩" sortable></el-table-column>
248 <el-table-column label="操作"> 248 <el-table-column label="操作">
249 <template slot-scope="scope"> 249 <template slot-scope="scope">
250 - <el-button type="success" @click="handleWatchLive(scope.row)">观看直播</el-button>  
251 - <el-button type="primary" @click="handleAnswerDetail(scope.row)">答题详情</el-button> 250 + <el-button type="success" :disabled="scope.row.IsOver || scope.row.AnswerId <=0" @click="handleWatchLive(scope.row)">观看直播</el-button>
  251 + <el-button type="primary" :disabled="!scope.row.IsOver" @click="handleAnswerDetail(scope.row)">答题详情</el-button>
252 </template> 252 </template>
253 </el-table-column> 253 </el-table-column>
254 </el-table> 254 </el-table>
vue.config.js
  View file @57b2d5e
@@ -38,8 +38,8 @@ module.exports = { @@ -38,8 +38,8 @@ module.exports = {
38 }, 38 },
39 proxy: { 39 proxy: {
40 '/development': { 40 '/development': {
41 - target: `http://admin.7-stars.com.cn/`, //后台服务地址  
42 - // target:'http://localhost:8877', 41 + // target: `http://admin.7-stars.com.cn/`, //后台服务地址
  42 + target:'http://localhost:8877',
43 // target:'http://localhost:8009', 43 // target:'http://localhost:8009',
44 changeOrigin: true, 44 changeOrigin: true,
45 pathRewrite: { 45 pathRewrite: {