222

VisualInspection/js/role/permision.js

@@ -46,7 +46,7 @@ $(document).ready(function () {
      $("#permision_add").on("click", function() {
          var nodedata = dept_tree.getSelectedNodes();
          edittype = "add"
-         loadData(nodedata)
+         //loadData(nodedata)
          $('#addModal').modal('show')
      })
 
@@ -54,7 +54,7 @@ $(document).ready(function () {
          //获取选中的节点
          var nodedata = dept_tree.getSelectedNodes();
          if (nodedata.length < 1) {
-             layer.msg('请先选择部门！', {
+             layer.msg('请先权限！', {
                  time: 2000, //20s后自动关闭
              });
              return;

VisualInspection/js/user/addUser.js

@@ -73,6 +73,10 @@ function initUserInfo() {
     $("#user_position").val(usertemp.positionid)
     $("#user_idno").val(usertemp.idno)
     $("#user_email").val(usertemp.email)
+    
+    $("#user_img_pre2").html("")
+    $("#user_img_add").removeClass("hide");
+    $("#user_img_pre").addClass("hide");
     if (typeof (usertemp.pic) != "undefinde" && usertemp.pic != null) {
         $("#user_img_pre").removeClass("hide");
         $("#user_img_add").addClass("hide");

VisualInspection/js/util/video.js

@@ -22,7 +22,7 @@ function queryVideoList(){
         s1 = $.checkTask.end_time.replace(/-/g,"/");
         var endTime = new Date(s1).getTime()/1000;
         // alert(curVideo);
-        var str = curVideo+'|'+startTime+'|'+endTime;
+        var str = 120+'|'+startTime+'|'+endTime;
         callFunc("findvideolist",str);
     }else{
 
@@ -43,7 +43,9 @@ function setProcessValue(maxValue){
 function setCurrentProcessValue(value){
     // alert("ddd"+value);
     // console.log(value);
-    $("#ex1").slider('setValue',value);
+    
+    var vv =maxVV*(value/100)
+    $("#ex1").slider('setValue',parseInt(vv));
 }
 
 function setVideoProcess(value){

VisualInspection/view/role/addpermision.html

@@ -13,14 +13,40 @@
         <div class="form-group">
             <label for="exampleInputAccount4" class="col-sm-2">名称：</label>
             <div class="col-md-6 col-sm-10">
-                <input type="text" id="dept_name" class="form-control" id="code_flag" placeholder="名称">
+                <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">
-                <div id="dept_select">上级部门</div>
+                <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>
+            <div class="col-md-6 col-sm-10">
+                <div id="permission_select">父权限</div>
+            </div>
+        </div>
+           <div class="form-group">
+            <label for="exampleInputPassword4" class="col-sm-2">资源类型：</label>
+            <div class="col-md-6 col-sm-10">
+                 <select class="form-control" id="resourcetype">
+                    <option value="2">按钮</option>
+                    <option value="1">菜单</option>
+                 </select>
+            </div>
+        </div>
+
+
+
+
+        <div class="form-group">
+            <label for="exampleInputPassword4" class="col-sm-2">资源：</label>
+            <div class="col-md-6 col-sm-10">
+                <div id="resource_select">资源</div>
             </div>
         </div>