Merge branch 'dev-online' of http://git.mooctest.com/crowd-2019/crowd-test-service-front into dev-online

src/components/task/Task.vue

@@ -138,17 +138,19 @@
                 </div>
               </el-upload>
               <span>
-              <span v-if="task.endPoint.threePageUrl == null || task.endPoint.threePageUrl == ''">
-                <i class="el-icon-document"></i>暂无文件
-              </span>
-              <span v-if="task.endPoint.threePageUrl != null && task.endPoint.threePageUrl != ''">
-                <a :href="task.endPoint.threePageUrl"><el-link :underline="false" type="primary"><i
-                  class="el-icon-document"></i>下载文档</el-link></a>
-              </span>
+<!--              <span v-if="task.endPoint.threePageUrl == null || task.endPoint.threePageUrl == ''">-->
+<!--                <i class="el-icon-document"></i>暂无文件-->
+<!--              </span>-->
+                <span v-if="task.endPoint.threePageUrl != null && task.endPoint.threePageUrl != ''">
+                  <a :href="task.endPoint.threePageUrl"><el-link :underline="false" type="primary"><i
+                    class="el-icon-document"></i>下载文档</el-link></a>
+                </span>
+
             </span>
+              <span> <a href="http://mooctest-site.oss-cn-shanghai.aliyuncs.com/excel-template.xlsx"><i class="el-icon-document"></i>示例下载</a></span>
             </el-form-item>
 
-            <el-form-item v-if="!isModifyMode && task.resource==0 && needAcceptedPWD && showBD" label="任务接收码" prop="agencyName" style="width: 700px;">
+            <el-form-item v-if="!isModifyMode && task.resource==2 && needAcceptedPWD && showBD" label="任务接收码" prop="agencyName" style="width: 700px;">
               <span>{{task.acceptedPassword}}</span>
             </el-form-item>
 

src/components/task/TaskCreate.vue

@@ -37,7 +37,7 @@
 
         <el-form-item label="任务可见性" prop="resource" style="width:1000px;">
           <el-tabs :tab-position="tabPosition" v-model="task.resource">
-            <el-tab-pane :label="resourceType[0]" name="0">
+            <el-tab-pane v-if="currType.type==0" :label="resourceType[0]" name="0">
               <el-radio-group v-model="task.institution">
                 <el-radio
                   :label="item"
@@ -116,9 +116,10 @@
 
           </el-upload>
           <span v-if="task.endPoint.threePageUrl != null && task.endPoint.threePageUrl != ''">
-                <a :href="task.endPoint.threePageUrl"><el-link :underline="false" type="primary"><i
-                  class="el-icon-document"></i>下载文档</el-link></a>
-              </span>
+            <a :href="task.endPoint.threePageUrl"><el-link :underline="false" type="primary"><i
+              class="el-icon-document"></i>下载文档</el-link></a>
+          </span>
+          <span> <a href="http://mooctest-site.oss-cn-shanghai.aliyuncs.com/excel-template.xlsx"><i class="el-icon-document"></i>示例下载</a></span>
         </el-form-item>
 
         <el-form-item size="small" label="任务截止时间" prop="datetime">