Merge branch 'master' of http://git_xt.jsxt.jsjtyxt.com/wenhongquan/VisualInspection

* 'master' of http://git_xt.jsxt.jsjtyxt.com/wenhongquan/VisualInspection:
  修改JIRA的bug

VisualInspection/js/lib/mytable.js

@@ -186,7 +186,7 @@ String.prototype.replaceAll = function(s1, s2) {
                         var oper = cols[i].oper;
                         var operStr = "";
                         for (var j = 0; j < oper.length; j++) {
-                            operStr += '<a href="javascript:void(0)" onclick="' + oper[j].func + '(' + obj[cols[i].field] + ',' + obj[cols[i].field_other] + ')"><i class="icon ' + oper[j].icon_class + '"></i>&nbsp;' + oper[j].text + ' </a>&nbsp;';
+                            operStr += '<a href="javascript:void(0)" onclick="' + oper[j].func + '(' + obj[cols[i].field] + ',' + obj[cols[i].field_other] + ')"><i class="icon ' + oper[j].icon_class + '"></i>' + oper[j].text + ' </a>&nbsp;';
                         }
                         dArr.push(operStr);
                     } else {

VisualInspection/js/lib/treeSelect.js

@@ -43,6 +43,7 @@ var TreeSelect = (function() {
         self.element = ele;
         self.input = input;
         self.panel = panel;
+        self.selectCb = options.callback;
         ele.css({
             'position': 'relative'
         });
@@ -101,6 +102,7 @@ var TreeSelect = (function() {
                         self.value = treeNode[self.options.valueKey];
                         self.text = treeNode.name;
                         self.close();
+                        if(self.selectCb) self.selectCb(treeNode.name);
                         // }
                     }
                 }

VisualInspection/js/mytask/check.js

@@ -25,7 +25,7 @@ function initCheck() {
 
 
     $("#tabcontent").css("height", ($("#video_content").height() - 80) + "px");
-
+    $("#score_datatable").css("height", ($("#video_content").height() - 120) + "px");
     if (ISCLIENT) {
         event = document.createEvent('MessageEvent');
         var origin = window.location.protocol + '//' + window.location.host;
@@ -336,20 +336,20 @@ function queryCheckScores() {
         // alert("ff");
     var cols = [
         { width: 40, text: '序号', type: 'number', flex: true, colClass: 'text-center', field: 'num' },
-        { width: 160, text: '评分记录', type: 'string', flex: true, sort: 'down', field: 'content' },
-        { width: 50, text: '分数', type: 'string', flex: true, colClass: '', field: 'check_item_score' },
+        { width: 100, text: '评分记录', type: 'string', flex: true, sort: 'down', field: 'content' },
+        { width: 40, text: '分数', type: 'string', flex: true, colClass: '', field: 'check_item_score' },
         { width: 100, text: '备注', type: 'string', flex: true, colClass: '', field: 'remark' },
         { width: 55, text: '考核人', type: 'string', flex: true, colClass: '', field: 'checked_person_name' },
         // {width: 80, text: '图片', type: 'imagedd', flex: true, colClass: '',field: 'pics'},
         {
-            width: 110,
+            width: 150,
             text: '操作',
             type: 'string',
             flex: true,
             field: 'id',
             oper: [
                 { func: 'showEditCheckScore', text: '修改', icon_class: 'icon-edit' },
-                { func: 'showEditPic', text: '修改图片', icon_class: 'icon-edit' },
+                { func: 'showEditPic', text: '图片', icon_class: 'icon-edit' },
                 { func: 'deleteCheckScore', text: '删除', icon_class: 'icon-remove-circle' }
             ]
         }

VisualInspection/js/mytask/task_list.js

@@ -65,7 +65,7 @@ function initQueryParams() {
     if(page_params && page_params.status) {
         cur_status = page_params.status;
     }
-    if(cur_status==4){
+    if(hasRole(ROLE_JICHA_ADMIN) && cur_status==4){
         $("#dispatchPatchBtn").show(); 
     }
     if(cur_status==5){
@@ -222,12 +222,12 @@ function dispatchTaskPatch(){
         "dispatch_ids":$('#task_list_table').mytable('getTableCheckedIds')
     }
     // console.log("放假啦:"+param.dispatch_ids);
-    // if(!param.dispatch_ids || param.dispatch_ids.length==0){
-    //     layer.msg('请选择下发任务！', {
-    //         time: 2000//20s后自动关闭
-    //     });
-    //     return;
-    // }
+    if(!param.dispatch_ids || param.dispatch_ids.length==0){
+        layer.msg('请选择下发任务！', {
+            time: 2000//20s后自动关闭
+        });
+        return;
+    }
     layer.confirm('确定下发选中任务？', {
         btn: ['确定','取消'] //按钮
     }, function(){

VisualInspection/js/role/addpermision.js

@@ -3,7 +3,7 @@ var resource_selectinput;
 var permisiontemp;
 function loadPermisionData(nodedata) {
     var pnode = nodedata;
-    resetform()
+    resetform();
 
     if (edittype == "add") {
         $("#dept_name").val("")
@@ -58,6 +58,10 @@ function setPermison(){
 function addpermision(){
 
     var per_name = $("#permission_name").val();
+    if(!per_name){
+        layer.alert("权限名称不能为空！");
+        return;
+    }
     var per_des = $("#permission_des").val();
 
     var per_pid = permission_selectinput.value;
@@ -94,8 +98,10 @@ function getbuttonData() {
         data: [],
         valueKey: "id",
         placeholder: "选择资源",
-        selectvalue: null
+        selectvalue: null,
+        callback:initPerName
     });
+    initTextChangeEvent();
 }
 
 function getmumdata() {
@@ -118,13 +124,16 @@ function getmumdata() {
             data: mumdata,
             valueKey: "id",
             placeholder: "选择资源",
-            selectvalue: permisiontemp==null?null:permisiontemp.resourceid
+            selectvalue: permisiontemp==null?null:permisiontemp.resourceid,
+            callback:initPerName
         });
-
     }, function (error) {
-
+        
     });
 
+    function initPerName(name){
+        if(!$("#permission_name").val()) $("#permission_name").val(name);
+    }
 
     function addobj(data) {
         var zdata = [];

VisualInspection/js/user/addUser.js

@@ -10,7 +10,6 @@ function loadUserData(nodedata) {
     if (edittype == "add") {
         $("#dept_name").val("")
     }
-
     if (role_selectinput == null) {
         role_selectinput = $('#user_role_select').comboTree({
             source: roles,
@@ -58,7 +57,7 @@ function resetform() {
     $("#user_position").val("")
     $("#user_idno").val("")
     $("#user_email").val("")
-
+    $("#user_role_select").val("")
     $("#user_img_add").removeClass("hide");
     $("#user_img_pre").addClass("hide");
 
@@ -158,16 +157,31 @@ function addUser() {
         "truename": usertruename,
         "roleids": userroles
     }
-
-    if (userpassword != null && typeof (userpassword) != "undefined") {
+    if(!parm.roleids) {
+        layer.msg('用户角色不能为空！', {
+            time: 2000, //20s后自动关闭
+        });
+        return;
+    }
+    if (userpassword != "" && userpassword != null && typeof (userpassword) != "undefined") {
         parm["password"] = userpassword;
+    }else{
+        layer.msg('密码不能为空！', {
+            time: 2000, //20s后自动关闭
+        });
+        return;
     }
     if (usermobile != null && typeof (usermobile) != "undefined") {
         parm["mobile"] = usermobile;
         parm["phone"] = usermobile;
     }
-    if (username != null && typeof (username) != "undefined") {
+    if (username != "" && username != null && typeof (username) != "undefined") {
         parm["username"] = username;
+    }else{
+        layer.msg('账号不能为空！', {
+            time: 2000, //20s后自动关闭
+        });
+        return;
     }
     if (userworkno != null && typeof (userworkno) != "undefined") {
         parm["workno"] = userworkno;
@@ -204,12 +218,14 @@ function addUser() {
     UserAdd(parm, function (data) {
         layer.msg('添加成功！', {
             time: 2000, //20s后自动关闭
-        }, function () {
-            $('#addUserModal').modal('hide')
-            updateUser(dept_selectinput.value)
+        }, function(data) { 
+            $('#addUserModal').modal('hide');
+            updateUser(dept_selectinput.value);           
         });
     }, function (error) {
-
+        layer.msg('添加失败！输入参数不正确！', {
+            time: 2000, //20s后自动关闭
+        });
     });
 
 

VisualInspection/js/user/userManager.js

@@ -144,13 +144,15 @@
          if (this.name == "user_delete") {
              var offset = "auto";
 
-             var user = UserMap.get(parseInt(this.id));
+             var userId = this.id;
+             var user = UserMap.get(parseInt(userId));
+             
              layer.confirm('您确定要删除 "' + user.truename + '" ？', {
                  offset: offset,
                  shade: 0,
                  btn: ['确定'] //按钮
              }, function() {
-                 UserDelete({ "id": this.id }, function(data) {
+                 UserDelete({ "id": userId }, function(data) {
                          layer.msg('用户删除成功！', {
                              time: 2000, //20s后自动关闭
                          }, function() {

VisualInspection/view/appeal_management/appealDetail.html

@@ -5,7 +5,7 @@
         <div class="form-group">
             <label class="col-md-2">申诉原因：</label>
             <div class="col-md-10">
-                <textarea class="col-md-12" id="add_appeal_reason" style="height:200px;"></textarea>
+                <textarea class="col-md-12" id="add_appeal_reason" style="height:200px;" maxlength="2000"></textarea>
             </div>
         </div>
         <div class="form-group">
@@ -24,6 +24,16 @@
     $('#uploaderExample').uploader({
         autoUpload: true,            // 当选择文件后立即自动进行上传操作
         url: base_image_server_url +'fileServer/file/upload',  // 文件上传提交地址
+        filters:{
+            mime_types: [
+                {title: '图片', extensions: 'jpg,gif,png'},
+                {title: '图标', extensions: 'ico'},
+                {title: '视频', extensions: 'mp4,avi'},
+                {title: '文档', extensions: 'doc,docx'}
+            ],
+            // 不允许上传重复文件
+            prevent_duplicates: true
+        },
         onFileUploaded: function(file, responseObject){
             var datas = eval('('+responseObject.response+')');
             file_src += datas.result_data.path+",";
@@ -42,6 +52,10 @@
         layer.alert("原因不能为空！");
         return;
     }
+    if($("#add_appeal_reason").val() && $("#add_appeal_reason").val().length>2000){
+        layer.alert("原因长度不能超过2000字！");
+        return;
+    }
     var param = {
         "task_id": $.checkTask.id,
         "appeal_reason": $("#add_appeal_reason").val(),

VisualInspection/view/mytask/check.html

@@ -102,7 +102,7 @@
 
         </div>
         <div class="col-sm-6">
-            <div id="score_datatable" style="height:350px;" data-checkable="true" data-sortable="true"></div>
+            <div id="score_datatable" style="height:250px;overflow:auto;" data-checkable="true" data-sortable="true"></div>
             <div class="row">
                 <div id="dashboard" class="dashboard dashboard-draggable" data-height="300">
 

VisualInspection/view/role/addpermision.html

@@ -11,45 +11,42 @@
 <div class="container-fluid ">
     <form class="form-horizontal">
         <div class="form-group">
-            <label for="exampleInputAccount4" class="col-sm-2">名称：</label>
+            <label for="exampleInputPassword4" class="col-sm-2">资源类型：</label>
             <div class="col-md-6 col-sm-10">
-                <input type="text" id="permission_name" class="form-control" id="code_flag" placeholder="名称">
+                <select class="form-control" id="resourcetype">
+                    <option value="1">菜单</option>
+                    <option value="2">按钮</option>
+                 </select>
             </div>
         </div>
-
         <div class="form-group">
-            <label for="exampleInputAccount4" class="col-sm-2">描述：</label>
+            <label for="exampleInputPassword4" class="col-sm-2">资源：</label>
             <div class="col-md-6 col-sm-10">
-                <input type="text" id="permission_des" class="form-control" id="code_flag" placeholder="描述">
+                <div id="resource_select">资源</div>
             </div>
         </div>
 
         <div class="form-group">
-            <label for="exampleInputPassword4" class="col-sm-2">父权限：</label>
+            <label for="exampleInputAccount4" class="col-sm-2">名称：</label>
             <div class="col-md-6 col-sm-10">
-                <div id="permision_select">父权限</div>
+                <input type="text" id="permission_name" class="form-control" id="code_flag" placeholder="名称">
             </div>
         </div>
+
         <div class="form-group">
-            <label for="exampleInputPassword4" class="col-sm-2">资源类型：</label>
+            <label for="exampleInputAccount4" class="col-sm-2">描述：</label>
             <div class="col-md-6 col-sm-10">
-                <select class="form-control" id="resourcetype">
-                    <option value="1">菜单</option>
-                    <option value="2">按钮</option>
-                 </select>
+                <input type="text" id="permission_des" class="form-control" id="code_flag" placeholder="描述">
             </div>
         </div>
 
-
-
-
         <div class="form-group">
-            <label for="exampleInputPassword4" class="col-sm-2">资源：</label>
+            <label for="exampleInputPassword4" class="col-sm-2">父权限：</label>
             <div class="col-md-6 col-sm-10">
-                <div id="resource_select">资源</div>
+                <div id="permision_select">父权限</div>
             </div>
         </div>
-
+        
         <div class="form-group">
             <div class="col-sm-offset-2 col-sm-10">
                 <button type="button" id="permision_add_btn" class="btn btn-default" >添加</button>

VisualInspection/view/user/addUser.html

@@ -12,43 +12,43 @@
 <div class="container-fluid ">
     <form class="form-horizontal">
         <div class="form-group" style="margin-bottom:0">
-            <div class="col-md-8">
+            <div class="col-md-8" style="padding:0px;">
                 <div class="form-group">
-                    <label for="exampleInputAccount4" class="col-sm-3 ll">账号：</label>
+                    <label for="exampleInputAccount4" class="col-sm-3 ll required">账号：</label>
                     <div class="col-md-9 col-sm-9">
-                        <input type="text" id="user_name" class="form-control" placeholder="账号">
+                        <input type="text" id="user_name" class="form-control" placeholder="账号" maxlength="20">
                     </div>
                 </div>
                 <div class="form-group">
                     <label for="exampleInputAccount4" class="col-sm-3 ll">真实姓名：</label>
                     <div class="col-md-9 col-sm-9">
-                        <input type="text" id="user_true_name" class="form-control" placeholder="真实姓名">
+                        <input type="text" id="user_true_name" class="form-control" placeholder="真实姓名" maxlength="20">
                     </div>
                 </div>
                 <div class="form-group">
                     <label for="exampleInputAccount4" class="col-sm-3 ll">工号：</label>
                     <div class="col-md-9 col-sm-9">
-                        <input type="text" id="user_workno" class="form-control" placeholder="工号">
+                        <input type="text" id="user_workno" class="form-control" placeholder="工号" maxlength="20">
                     </div>
                 </div>
 
                 <div class="form-group">
-                    <label for="exampleInputAccount4" class="col-sm-3 ll">密码：</label>
+                    <label for="exampleInputAccount4" class="col-sm-3 ll required">密码：</label>
                     <div class="col-md-9 col-sm-9">
-                        <input type="text" id="user_password" class="form-control" placeholder="密码">
+                        <input type="text" id="user_password" class="form-control" placeholder="密码" maxlength="20">
                     </div>
                 </div>
                 <div class="form-group">
-                    <label for="exampleInputAccount4" class="col-sm-3 ll">确定密码：</label>
+                    <label for="exampleInputAccount4" class="col-sm-3 ll required">确定密码：</label>
                     <div class="col-md-9 col-sm-9">
-                        <input type="text" id="user_confirm_password" class="form-control" placeholder="确认密码">
+                        <input type="text" id="user_confirm_password" class="form-control" placeholder="确认密码" maxlength="20">
                     </div>
                 </div>
 
 
 
             </div>
-            <div class="col-md-4" >
+            <div class="col-md-4" style="padding:0px;">
                 <div class="row hide" id="user_img_pre">
                     <section class='up-section fl loading' id="user_img_pre2">
                     </section>
@@ -77,41 +77,41 @@
 
 
         <div class="form-group">
-            <label for="exampleInputPassword4" class="col-sm-2 ll lll">用户角色：</label>
-            <div class="col-md-10 col-sm-10 cc">
+            <label for="exampleInputPassword4" class="col-sm-3 ll required">用户角色： </label>
+            <div class="col-md-10 col-sm-10">
                 <input type="text" id="user_role_select" class="form-control" placeholder="请选择角色">
 
             </div>
         </div>
         <div class="form-group">
-            <label for="exampleInputPassword4" class="col-sm-2  ll lll">组织机构：</label>
-            <div class="col-md-10 col-sm-10 cc">
+            <label for="exampleInputPassword4" class="col-sm-3  ll required">组织机构： </label>
+            <div class="col-md-10 col-sm-10">
                 <div id="user_dept_select">选择部门</div>
 
             </div>
         </div>
         <div class="form-group">
-            <label for="exampleInputAccount4" class="col-sm-2  ll lll">手机：</label>
-            <div class="col-md-10 col-sm-10 cc">
-                <input type="text" id="user_mobile" class="form-control" placeholder="手机号">
+            <label for="exampleInputAccount4" class="col-sm-2  ll">手机：</label>
+            <div class="col-md-10 col-sm-10">
+                <input type="text" id="user_mobile" class="form-control" placeholder="手机号" maxlength="11">
             </div>
         </div>
         <div class="form-group">
-            <label for="exampleInputAccount4" class="col-sm-2  ll lll">职位：</label>
-            <div class="col-md-10 col-sm-10 cc">
+            <label for="exampleInputAccount4" class="col-sm-2  ll">职位：</label>
+            <div class="col-md-10 col-sm-10">
                 <input type="text" id="user_position" class="form-control" placeholder="职位">
             </div>
         </div>
         <div class="form-group">
-            <label for="exampleInputAccount4" class="col-sm-2  ll lll">身份证：</label>
-            <div class="col-md-10 col-sm-10 cc">
-                <input type="text" id="user_idno" class="form-control" placeholder="身份证">
+            <label for="exampleInputAccount4" class="col-sm-2  ll">身份证：</label>
+            <div class="col-md-10 col-sm-10">
+                <input type="text" id="user_idno" class="form-control" placeholder="身份证" maxlength="18">
             </div>
         </div>
         <div class="form-group">
-            <label for="exampleInputAccount4" class="col-sm-2  ll lll">邮箱：</label>
-            <div class="col-md-10 col-sm-10 cc">
-                <input type="text" id="user_email" class="form-control" placeholder="邮箱">
+            <label for="exampleInputAccount4" class="col-sm-2  ll">邮箱：</label>
+            <div class="col-md-10 col-sm-10">
+                <input type="text" id="user_email" class="form-control" placeholder="邮箱" maxlength="50">
             </div>
         </div>