MSI\liwei 7 лет назад
Родитель
Сommit
f97299cbc9
2 измененных файлов с 54 добавлено и 10 удалено
  1. 8 3
      VisualInspection/js/lib/mytable.js
  2. 46 7
      VisualInspection/qzd/js/task/new.js

+ 8 - 3
VisualInspection/js/lib/mytable.js

@@ -149,6 +149,7 @@ String.prototype.replaceAll = function(s1, s2) {
 
                     } else if (cols[i].type == "imagedd") {
                         var pics = obj[cols[i].field];
+                        console.log(pics);
                         var picStr = '';
                         var num = uuid();
                         if (pics) {
@@ -218,9 +219,13 @@ String.prototype.replaceAll = function(s1, s2) {
                             }
                         }
                         // picStr += '<a href="javascript:void(0)" class="btn-table" onclick=""><i class="icon ' +' text-center' + '"></i>' + "继续上传" + ' </a>';
-                        picStr +="<button onclick='openUpload()' style='width:80%;background-color:#2196F3;color:white'>继续上传</button>"
-                        picStr +="<input id='fileupload' type='file' style='display:none'></input>"
-                        dArr.push(picStr);
+                        //picStr +="<button onclick='openUpload()' style='width:80%;background-color:#2196F3;color:white'>继续上传</button>"
+                      //  picStr +="<input id='fileupload' type='file' style='display:none'></input>"
+                      picStr +='<div id="uploaderExample_'+obj.id+'" class="uploader">'
+                              +'<div class="file-list" data-drag-placeholder="请拖拽文件到此处" style=""></div>';
+                      picStr +='<button onclick="setRecordId(\''+obj.id+'\',\''+pics+'\')" type="button" class="btn btn-primary uploader-btn-browse" style="float:left;"><i class="icon icon-cloud-upload"></i> 选择文件</button>';
+                              +'</div>'; 
+                      dArr.push(picStr);
                     }
                      else if (cols[i].oper != null) {
                         var oper = cols[i].oper;

+ 46 - 7
VisualInspection/qzd/js/task/new.js

@@ -2,7 +2,9 @@ var cur_status;
 var cur_page;
 var is_save;
 var updateid = null;
-var user = $.zui.store.get("user")
+var user = $.zui.store.get("user");
+var recordId = '';
+var recordVideos = '';
 $("#fileupload").change(function() {
     UpladFile();
 });
@@ -11,7 +13,7 @@ function initTaskPage() {
     initQueryParams();
     initTableRowBtn();
     queryTask();
-    // getRecord();
+    getRecord();
 }
 
 function initQueryParams() {
@@ -89,14 +91,14 @@ function queryTask() {
         { width: 160, text: '出勤人员', type: 'string', flex: true, sort: 'down', colClass: 'text-center', field: 'userNames' },
         // {width: 120, text: '状态', type: 'string', flex: true, colClass: '',field: 'check_status_name'}
     ];
-   // user.roles[0].id = 20;
+    user.roles[0].id = 16;
     if (user.roles[0].id == 20 || user.roles[0].id == 21) {
         var colFunc = { width: 160, text: '操作', type: 'string', flex: true, field: 'id', colClass: 'text-center' };
         colFunc.oper = $.zui.store.get("task_table_btn_1");
         cols.push(colFunc);
         $("#saveButton").show();
     } else if (user.roles[0].id == 16 || user.roles[0].id == 17) {
-        var colFunc = { width: 160, text: '操作', type: 'imagebutton', flex: true, field: 'pics', colClass: 'text-center' };
+        var colFunc = { width: 160, text: '操作', type: 'imagebutton', flex: true, field: 'videos', colClass: 'text-center' };
         colFunc.oper = $.zui.store.get("task_table_btn_1");
         cols.push(colFunc);
     }
@@ -138,6 +140,7 @@ function openUpload() {
 
 
 function UpladFile() {
+    alert(11);
     // var FileController = base_image_server_url +'fileServer/file/upload';// 接收上传文件的后台地址
     // FormData 对象
     // var form = new FormData();
@@ -219,14 +222,50 @@ function resert() {
 }
 
 function getRecord() {
+    var t = getTimeByMonth(GV("#start_time"));
     var data = {
-        // "startTime": new Date(getMomentTimeFormat(t.starttime)),
-        // "endTime":new Date(getMomentTimeFormat(t.endtime)),
+        "startTime": getMomentTimeFormat(t.starttime),
+        "endTime": getMomentTimeFormat(t.endtime),
         "dept": $("#deptlist").val(),
         // "check_status": cur_status
-
     };
     post_common_service('q/record/getall/0/0', data, function(redata) {
         console.log(redata);
+       for(var index in redata.records){
+           var obj = redata.records[index];
+        var file_src = recordVideos;
+        $("#uploaderExample_"+obj.id).uploader({
+            autoUpload: true, // 当选择文件后立即自动进行上传操作
+            url: base_image_server_url + 'fileServer/file/upload', // 文件上传提交地址
+            filters: {
+                mime_types: [ {
+                    title: '视频',
+                    extensions: 'mp4,avi'
+                }],
+                // 不允许上传重复文件
+                prevent_duplicates: true
+            },
+            onFileUploaded: function(file, responseObject) {
+                var datas = eval('(' + responseObject.response + ')');
+                file_src += ","+datas.result_data.path;
+                var data = {
+                    "videos": file_src,
+                    "id" : recordId
+                };
+                post_common_service('q/record/update', data, function(redata) {
+                    queryTask();
+                });
+            },
+            onFilesRemoved: function(files) {
+                // alert(files);
+            }
+        });
+       }
     });
+
+}
+
+function setRecordId(id,videos){
+    recordVideos = videos;
+   recordId = id;
 }