修改添加页面

src/main/java/com/mooctest/controller/TaskController.java

@@ -187,10 +187,9 @@ public class TaskController {
     @PostMapping("/addCrowdTask")
     @ResponseBody
     public SimpleResponse addCrowdTask2(@RequestParam("name")String name, @RequestParam("description")String description,
-                                        @RequestParam("time")String time, @RequestParam("type")String type,
                                         @RequestParam("os")String os, @RequestParam("threePage") MultipartFile threePage,
                                         Model model){
-        return taskService.addCrowdTask(name, description, time, type, os, threePage);
+        return taskService.addCrowdTask(name, description, os, threePage);
     }
 
 

src/main/java/com/mooctest/service/TaskService.java

@@ -273,11 +273,11 @@ public class TaskService {
         }
     }
 
-    public SimpleResponse addCrowdTask(String name, String description, String time, String type, String os, MultipartFile threePage){
+    public SimpleResponse addCrowdTask(String name, String description, String os, MultipartFile threePage){
         if(threePage ==null || threePage.isEmpty()) return new SimpleResponse(400,"请提交三级页面");
         String threePageUrl = fileService.uploadFile(threePage);
         try {
-            long flag = createCrowdTest(threePageUrl,threePage.getOriginalFilename(),generatePaperType(type,os),getMaxCaseId()+1,type,description,name);
+            long flag = createCrowdTest(threePageUrl,threePage.getOriginalFilename(),generatePaperType(os),getMaxCaseId()+1,"",description,name);
             return flag!=-1 ?new SimpleResponse(200,"创建成功，id为"+flag):new SimpleResponse(400,"创建失败");
         } catch (Exception e) {
             e.printStackTrace();
@@ -391,16 +391,10 @@ public class TaskService {
     }
 
 
-    private static String generatePaperType(String testType ,  String os){
-        String defaultValue = "\"windows\",\"linux\",\"macos\"";
+    private static String generatePaperType(String os){
         StringBuffer value  = new StringBuffer();
         if(os==null||os.length()==0){
-            if(testType.equals(TaskUtil.TaskType.MOBILE.getTaskType())){
-                value.append("\"Android\",\"ios\"");
-            }else{
-                value.append("\"windows\",\"linux\",\"macos\"");
-            }
-
+            value.append("\"windows\",\"linux\",\"macos\"");
         }else{
             String [] data =  os.split(";");
             for(int i  =0;i<data.length;i++){

src/main/resources/templates/addCrowdTask.html

@@ -75,34 +75,47 @@
                         </div>
                     </div>
                     <!-- text input -->
+
                     <div class="form-group">
-                        <label class="col-sm-2 control-label">操作系统枚举项<br><small>请用分号分割</small></label>
+                        <label class="col-sm-2 control-label">操作系统<small style="color: #777">多选</small></label>
                         <div class="col-sm-4">
-                            <input  onchange="checkNull(event)" class="form-control" id="os" placeholder="请输入os枚举项"/>
+                            <select  class="form-control select2" id="os-multi" multiple="multiple" data-placeholder="选择操作系统"
+                                     style="width: 100%;">
+                                <option>windows</option>
+                                <option>linux</option>
+                                <option>macos</option>
+                                <option>ios</option>
+                                <option>android</option>
+                                <option>uos</option>
+                                <option>飞腾</option>
+                            </select>
                         </div>
+
                     </div>
+
+
                     <!-- Date and time range -->
-                    <div class="form-group">
-                        <label class="col-sm-2 control-label" >任务时间</label>
-                        <div class=" col-sm-5">
-                            <!--                                <div class="input-group-addon">-->
-                            <!--                                    <i class="fa fa-clock-o"></i>-->
-                            <!--                                </div>-->
-                            <input type="text" class="form-control pull-right" id="reservationtime"/>
-                        </div>
-                        <!-- /.input group -->
-                    </div>
+<!--                    <div class="form-group">-->
+<!--                        <label class="col-sm-2 control-label" >任务时间</label>-->
+<!--                        <div class=" col-sm-5">-->
+<!--                            &lt;!&ndash;                                <div class="input-group-addon">&ndash;&gt;-->
+<!--                            &lt;!&ndash;                                    <i class="fa fa-clock-o"></i>&ndash;&gt;-->
+<!--                            &lt;!&ndash;                                </div>&ndash;&gt;-->
+<!--                            <input type="text" class="form-control pull-right" id="reservationtime"/>-->
+<!--                        </div>-->
+<!--                        &lt;!&ndash; /.input group &ndash;&gt;-->
+<!--                    </div>-->
 
                     <!-- select -->
-                    <div class="form-group">
-                        <label class="col-sm-2 control-label" >任务类型</label>
-                        <div class=" col-sm-4">
-                            <select class="form-control" id="testType" >
-                                <option >移动应用</option>
-                                <option >Web应用</option>
-                            </select>
-                        </div>
-                    </div>
+<!--                    <div class="form-group">-->
+<!--                        <label class="col-sm-2 control-label" >任务类型</label>-->
+<!--                        <div class=" col-sm-4">-->
+<!--                            <select class="form-control" id="testType" >-->
+<!--                                <option >移动应用</option>-->
+<!--                                <option >Web应用</option>-->
+<!--                            </select>-->
+<!--                        </div>-->
+<!--                    </div>-->
 
                     <!-- text input -->
 <!--                    <div class="form-group" id="webUrl" style="display: none">-->
@@ -174,7 +187,10 @@
 <script src="/static/AdminLTE/bower_components/bootstrap-notify/dist/bootstrap-notify.min.js"></script>
 <!--<script src="/static/js/app_info.js"></script>-->
 <script type="text/javascript">
+
+    var osChecked;
     $(document).ready(function(){
+        $('.select2').select2()
         $('#crowdSidebar').addClass('active');
         $('#crowdSidebarMenu-addCrowdTask').addClass('active');
         $('#reservationtime').daterangepicker({ timePicker: true, timePickerIncrement: 30, locale: { format: 'MM/DD/YYYY hh:mm A' }})
@@ -191,6 +207,18 @@
     //         $('#webUrl').css('display','none');
     //     }
     // }
+
+    $('#os-multi').change(function(){
+        var o=document.getElementById('os-multi').getElementsByTagName('option');
+        var all="";
+        for(var i=0;i<o.length;i++){
+            if(o[i].selected){
+                all+=o[i].value+";";
+            }
+        }
+        if(o.length>0)all = all.substr(0, all.length - 1);//去掉末尾的分毫
+        osChecked = all;//赋值给隐藏的文本框
+    })
     
     addTask = function(){
         //type  = 0  表示添加
@@ -199,9 +227,7 @@
         var data = new FormData();
         data.append('name',$('#name').val());
         data.append('description',$('#description').val());
-        data.append('time',$('#reservationtime').val());
-        data.append('type',$('#testType').val());
-        data.append('os',$('#os').val());
+        data.append('os',osChecked);
         // data.append('webUrl',$('#webUrl').val());
         // if($('#testType').val() == '移动应用') data.append("apk",document.getElementById('testApplication').files[0])
         // data.append("requirement",document.getElementById('testRequirement').files[0])