Merge branch 'master' of http://git_xt.git.topm.win:8080/wenhongquan/VisualInspection

VisualInspection/js/constant/constant.js

@@ -1,104 +1,87 @@
 var page_size=10;
-var p_cur = 1; //页号
-var p_pages; //总页码
-var p_totalRecords;
+// var p_cur = 1; //页号
+// var p_pages; //总页码
+// var p_totalRecords;
+var curTable;
+var curDatas;
 function queryConstant(){
-    p_cur = 1;
+    // p_cur = 1;
     getConstant();
 }
 function getConstant(){
+    // var data = {
+    //     "flag_name": $("#keywords").val()
+    // }
+    // var pager = $('.datatable').mytable.getPager();
+    // if(!p_cur) p_cur = 1;
+    // getConstantList("/constant/getConstantByName/"+p_cur+"/"+page_size, data, function(data) {
+    //     // p_pages=data.pages;
+    //     // p_totalRecords=data.total;
+    //     curDatas=data.list;
+    //     updateTable(data);
+    //     //pager();
+    // }, function(error) {
+    //     alert(error);
+    // });
+    updateTable();
+}
+
+function updateTable(){
     var data = {
         "flag_name": $("#keywords").val()
     }
-    getConstantList("/constant/getConstantByName/"+p_cur+"/"+page_size, data, function(data) {
-        p_pages=data.pages;
-        p_totalRecords=data.total;
-        updateTable(data.list);
-        pager();
-    }, function(error) {
-        alert(error);
-    });
-}
-
-function updateTable(tableData){
+    // var tableData=data.list;
     var cols = [
                 {width: 80, text: '序号', type: 'number', flex: false, field: 'num'},
-                {width: 80, text: '代码编号', type: 'date', flex: false, field: 'code_flag'},
-                {width: 80, text: '代码名称', type: 'string', flex: true, field: 'code_name'},
+                {width: 80, text: '字典值', type: 'date', flex: false, field: 'code_value'},
+                {width: 80, text: '字典名称', type: 'string', flex: true, field: 'code_name'},
                 {width: 80, text: '有效标志', type: 'date', flex: false, field: 'valid'},
                 {width: 80, text: '代码标识', type: 'string', flex: true, field: 'code_flag'},
                 {width: 160, text: '标识名称', type: 'date', flex: false, field: 'flag_name'},
                 {width: 80, text: '备注', type: 'string', flex: true, field: 'remark'},
-                {width: 160, text: '操作', type: 'string', flex: true, field: 'id'}
+                {width: 160, text: '操作', type: 'string', flex: true, field: 'id',
+                    oper:[
+                        {func:'showEditConstant',text:'修改',icon_class:'icon-edit'},
+                        {func:'deleteConstant',text:'删除',icon_class:'icon-remove-circle'}
+                    ]
+                }
             ];
-    var rowData = formatTableData(tableData, cols);
-    clearTable(cols);
-    // 使用data参数更新数据：
-    $('.datatable').datatable('load',  {
-            cols: cols,
-            rows:rowData
-            // [
-            //     {checked: false, data: [1, '1','上行','1','DIRECTION','方向','未稽查','<a href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i> 修改</a><a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
-            //     {checked: false, data: [2, '2','下行','1','DIRECTION','方向','未稽查','<a href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i> 修改</a><a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']},
-            //     // 更多数据
-            // ]
-        }
-    );
-}
-function clearTable(cols){
-     $('.datatable').datatable( {
-        checkable:false,
-        sortable:false,
-        data: {
-            cols: cols,
-            rows:[]
-        }
-    });
-}
-function formatTableData(data,cols){
-    var rows = [];
-    // rows.push({checked: false, data: [1, '1','上行','1','DIRECTION','方向','未稽查','<a href="#" data-toggle="modal" data-target="#myModal"><i class="icon icon-edit"></i> 修改</a><a href="#"><i class="icon icon-remove-circle"></i> 删除</a>']});
-    for(var i=0;i<data.length;i++){
-        data[i].num=(p_cur-1)*10+i+1;
-        rows.push(genRow(data[i],cols));
+    
+    var pager = {
+        page_size:10
     }
-    return rows;
+    $('.datatable').mytable({'cols':cols,
+                            // 'tableData':tableData,
+                            'url':"/constant/getConstantByName/",
+                            'param':data,
+                            'pager':pager}
+                            );
 }
 
-function genRow(obj,cols){
-    var row = {checked: false, data:null};
-    var dArr=[];
-    for(var i=0;i<cols.length;i++){
-        if(cols[i].text=='操作') {
-            var str='<a href="#" data-toggle="modal" onclick="editConstant('+obj[cols[i].field]+')"><i class="icon icon-edit"></i> 修改</a><a href="#" onclick="deleteConstant('+obj[cols[i].field]+')"><i class="icon icon-remove-circle"></i> 删除</a>';
-            dArr.push(str);
-        }else{
-            dArr.push(obj[cols[i].field]);
-        }
-    }
-    row.data=dArr;
-    return row;
+function showAddConstant(){
+    $('#formModal').modal('toggle');
+    $('#code_flag').val('');
+    $('#flag_name').val('');
+    $('#code_value').val('');
+    $('#code_name').val('');
+    $('#sort_no').val('');
+    $('#remark').val('');
+    $("#valid").attr('checked','true');
+    $("#operation-btn").unbind("click").click(function(){
+        addConstant();
+    });
 }
-function pager(){
-  
-    kkpager.generPageHtml({
-        pno : p_cur,
-        total : p_pages,
-        totalRecords : p_totalRecords,
-        mode : 'click',
-        click : function(n){
-            p_cur = n;
-            this.selectPage(p_cur);
-            getConstant();//调用获取数据方法
-            return false;
-        }
-    },true);
-}   
 
 function addConstant(){
+    addOrUpdateConstant("/constant/add/");
+}
+
+var cur_id;
+function addOrUpdateConstant(url){
     var valid=1;
     if(!$("#valid").is(':checked')) valid=0;
     var param ={
+        'id':cur_id,
         'code_flag':$('#code_flag').val(),
         'flag_name':$('#flag_name').val(),
         'code_value':Number($('#code_value').val()),
@@ -107,14 +90,67 @@ function addConstant(){
         'remark':$('#remark').val(),
         'valid':valid
     };
-    addConstant_service("/constant/add/", param, function(data) {
-        alert(data);
-        $('#addModal').modal('toggle');
+    addConstant_service(url, param, function(data) {
+        queryConstant();
+        layer.msg(data, {
+            time: 2000//2s后自动关闭
+        });
+        $('#formModal').modal('toggle');
     }, function(error) {
         alert(error);
     });
 }
 
-function editConstant(id){
+function showEditConstant(id){
+    cur_id='';
+    $('#formModal').modal('toggle');
+    var curDatas = $('.datatable').mytable('getTableData');
+    var rowData;
+    for(var i=0;i<curDatas.length;i++){
+        if(id==curDatas[i].id){
+            rowData = curDatas[i];
+            break;            
+        }
+    }
+    if(rowData) {
+        cur_id = rowData.id;
+        $('#code_flag').val(rowData.code_flag);
+        $('#flag_name').val(rowData.flag_name);
+        $('#code_value').val(rowData.code_value);
+        $('#code_name').val(rowData.code_name);
+        $('#sort_no').val(rowData.sort_no);
+        $('#remark').val(rowData.remark);
+        if(rowData.valid==1){
+            $("#valid").attr('checked','true');
+        }else{
+            $("#valid").attr('checked','false');
+        }
+        
+        $("#operation-btn").unbind("click").click(function(){
+            updateConstant();
+        });
+    }
+}
+
+function updateConstant(){
+    addOrUpdateConstant("/constant/update/");
+}
 
+function deleteConstant(id){
+    //询问框
+    layer.confirm('确定删除记录？', {
+        btn: ['删除','取消'] //按钮
+    }, function(){
+        var param ={"id":id};
+        deleteConstant_service("/constant/delete/", param, function(data) {
+            queryConstant();//重新加载表格数据
+            layer.msg(data, {
+                time: 2000//20s后自动关闭
+            });
+        }, function(error) {
+            alert(error);
+        });
+    }, function(index){  
+        layer.close(index);
+    });
 }

VisualInspection/js/lib/mytable.js

@@ -0,0 +1,170 @@
+(function($) {
+    'use strict';
+
+    var con;
+    var options;
+    var curDatas;
+    var element;
+    var obj;
+    /**
+     * Datatable class
+     * 
+     * @param object element           DOM element or jquery element
+     * @param object options           Datatable options
+     */
+    var mytable = function(element, options) {
+        this.element = element;
+        this.options = options;
+        this.pager = options.pager;
+        this.con = $(element);
+        this.obj = this;
+        $(element).html('');
+        $(element).append('<div class="row"><div id="my_table" data-checkable="true" data-sortable="true"></div></div>'
+                           + '<div id="kkpager" class="row" style="text-align:center"></div>');
+        this.getRemoteData(element,options,this);
+        return this;       
+    };
+
+
+    // default options
+    mytable.DEFAULTS = {
+        container:"",
+        pages:'',
+        curr:'',
+        groups:'',
+        first:1,
+        last:1,
+        prev:1,
+        next:1,
+        jump:null
+    };
+
+    // Get options
+    mytable.prototype = {
+        getRemoteData:function(element,options,obj){
+            if(!element) element = this.element;
+            if(!options) options = this.options;
+            var url = options.url;
+            var p_cur = 1;
+            var pager = options.pager;
+            this.getServerData(p_cur, options, element, obj);
+        },
+        getRemoteData1:function(p_cur){
+            this.getServerData(p_cur, this.options, this.element, this.obj);
+        },
+        getServerData:function(p_cur, options, element, obj){
+            var url = options.url;
+            var pager = options.pager;
+            var page_size = pager.page_size;
+            var param = options.param;
+            // var obj = this.obj;
+            common_post_service(url+"/"+p_cur+"/"+page_size, param, function(data) {
+                // $(element).html("");
+                element.tt_data=data.list;
+                options.tableData=data.list;
+                obj.setTable(data.list,element, options,p_cur); 
+                if(obj.options.pager){
+                    options.pager = {
+                        page_size:10,
+                        p_cur : data.pageNum, //页号
+                        p_pages:data.pages, //总页码
+                        p_totalRecords:data.total
+                        // 'cb':'getRemoteData
+                    }   
+                    obj.setPager();
+                }
+            }, function(error) {
+                alert(error);
+            });
+        },
+        setTable:function(datas, element, options,p_cur) {
+            var cols = options.cols;
+            var tableData = datas;
+            // var pager = options.pager;
+            clearTable(cols);
+            var rowData = formatTableData(tableData, cols, p_cur);
+
+            // 使用data参数更新数据：
+            $('#my_table').datatable('load',{
+                    cols: cols,
+                    rows:rowData
+                }
+            );
+            function formatTableData(data,cols,p_cur){
+                var rows = [];
+                for(var i=0;i<data.length;i++){
+                    data[i].num=(p_cur-1)*10+i+1;
+                    rows.push(genRow(data[i],cols));
+                }
+                return rows;
+            }
+
+            function genRow(obj,cols){
+                var row = {checked: false, data:null};
+                var dArr=[];
+                for(var i=0;i<cols.length;i++){
+                    if(cols[i].oper!=null) {
+                        var oper = cols[i].oper;
+                        var operStr="";
+                        for(var j=0;j<oper.length;j++){
+                            operStr+='<a href="#" onclick="'+oper[j].func+'('+obj[cols[i].field]+')"><i class="icon icon-edit"></i>'+oper[j].text+'</a> ';
+                        }
+                        dArr.push(operStr);
+                    }else{
+                        dArr.push(obj[cols[i].field]);
+                    }
+                }
+                row.data=dArr;
+                return row;
+            }
+            function clearTable(cols){
+                $('#my_table').datatable( {
+                    checkable:false,
+                    sortable:false,
+                    data: {
+                        cols: cols,
+                        rows:[]
+                    }
+                });
+            }
+        },
+        setPager:function(data) {
+            var pager = this.options.pager;
+            var p_cur = pager.p_cur;
+            var p_pages = pager.p_pages;
+            var p_totalRecords = pager.p_totalRecords;
+            var obj=this;
+            kkpager.generPageHtml({
+                pno : p_cur,
+                total : p_pages,
+                totalRecords : p_totalRecords,
+                mode : 'click',
+                click : function(n){
+                    obj.options.pager.p_cur = n;
+                    this.selectPage(n);
+                    obj.getRemoteData1(n);//调用获取数据方法
+                    return false;
+                }
+            },true);
+        }
+    };
+
+    $.fn.mytable = function(options) {
+        if (typeof options == 'string') {
+            switch (options) {
+                case 'getTableData': 
+                    return this[0].tt_data; 
+            }
+         }   else{
+        return this.each(function() {
+            // var $this = $(this);
+                new mytable(this,options);
+            //  $(this).attr('tableData',mytable.tableData);
+            });
+        }
+    };
+
+
+    $.fn.mytable.Constructor = mytable;
+}(jQuery));
+

VisualInspection/js/util/service.js

@@ -126,4 +126,31 @@ function addConstant_service(url, param, success, fail) {
     }, function(error) {
         fail("网络错误");
     });
+}
+function deleteConstant_service(url, param, success, fail) {   
+    var url = base_server_url + url;
+    ajaxPost(url, param, function(response) {
+        var data = response;
+        if (data.result_code == 0) {
+            success(data.result_desc)
+        } else {
+            fail(data.result_desc);
+        }
+    }, function(error) {
+        fail("网络错误");
+    });
+}
+
+function common_post_service(url, param, success, fail) {   
+    var url = base_server_url + url;
+    ajaxPost(url, param, function(response) {
+        var data = response;
+        if (data.result_code == 0) {
+            success(data.result_data)
+        } else {
+            fail(data.result_desc);
+        }
+    }, function(error) {
+        fail("网络错误");
+    });
 }

VisualInspection/node_modules/zui/dist/lib/mytable/mytable.js

@@ -0,0 +1,170 @@
+(function($) {
+    'use strict';
+
+    var con;
+    var options;
+    var curDatas;
+    var element;
+    var obj;
+    /**
+     * Datatable class
+     * 
+     * @param object element           DOM element or jquery element
+     * @param object options           Datatable options
+     */
+    var mytable = function(element, options) {
+        this.element = element;
+        this.options = options;
+        this.pager = options.pager;
+        this.con = $(element);
+        this.obj = this;
+        $(element).html('');
+        $(element).append('<div class="row"><div id="my_table" data-checkable="true" data-sortable="true"></div></div>'
+                           + '<div id="kkpager" class="row" style="text-align:center"></div>');
+        this.getRemoteData(element,options,this);
+        return this;       
+    };
+
+
+    // default options
+    mytable.DEFAULTS = {
+        container:"",
+        pages:'',
+        curr:'',
+        groups:'',
+        first:1,
+        last:1,
+        prev:1,
+        next:1,
+        jump:null
+    };
+
+    // Get options
+    mytable.prototype = {
+        getRemoteData:function(element,options,obj){
+            if(!element) element = this.element;
+            if(!options) options = this.options;
+            var url = options.url;
+            var p_cur = 1;
+            var pager = options.pager;
+            this.getServerData(p_cur, options, element, obj);
+        },
+        getRemoteData1:function(p_cur){
+            this.getServerData(p_cur, this.options, this.element, this.obj);
+        },
+        getServerData:function(p_cur, options, element, obj){
+            var url = options.url;
+            var pager = options.pager;
+            var page_size = pager.page_size;
+            var param = options.param;
+            // var obj = this.obj;
+            common_post_service(url+"/"+p_cur+"/"+page_size, param, function(data) {
+                // $(element).html("");
+                element.tt_data=data.list;
+                options.tableData=data.list;
+                obj.setTable(data.list,element, options,p_cur); 
+                if(obj.options.pager){
+                    options.pager = {
+                        page_size:10,
+                        p_cur : data.pageNum, //页号
+                        p_pages:data.pages, //总页码
+                        p_totalRecords:data.total
+                        // 'cb':'getRemoteData
+                    }   
+                    obj.setPager();
+                }
+            }, function(error) {
+                alert(error);
+            });
+        },
+        setTable:function(datas, element, options,p_cur) {
+            var cols = options.cols;
+            var tableData = datas;
+            // var pager = options.pager;
+            clearTable(cols);
+            var rowData = formatTableData(tableData, cols, p_cur);
+
+            // 使用data参数更新数据：
+            $('#my_table').datatable('load',{
+                    cols: cols,
+                    rows:rowData
+                }
+            );
+            function formatTableData(data,cols,p_cur){
+                var rows = [];
+                for(var i=0;i<data.length;i++){
+                    data[i].num=(p_cur-1)*10+i+1;
+                    rows.push(genRow(data[i],cols));
+                }
+                return rows;
+            }
+
+            function genRow(obj,cols){
+                var row = {checked: false, data:null};
+                var dArr=[];
+                for(var i=0;i<cols.length;i++){
+                    if(cols[i].oper!=null) {
+                        var oper = cols[i].oper;
+                        var operStr="";
+                        for(var j=0;j<oper.length;j++){
+                            operStr+='<a href="#" onclick="'+oper[j].func+'('+obj[cols[i].field]+')"><i class="icon icon-edit"></i>'+oper[j].text+'</a> ';
+                        }
+                        dArr.push(operStr);
+                    }else{
+                        dArr.push(obj[cols[i].field]);
+                    }
+                }
+                row.data=dArr;
+                return row;
+            }
+            function clearTable(cols){
+                $('#my_table').datatable( {
+                    checkable:false,
+                    sortable:false,
+                    data: {
+                        cols: cols,
+                        rows:[]
+                    }
+                });
+            }
+        },
+        setPager:function(data) {
+            var pager = this.options.pager;
+            var p_cur = pager.p_cur;
+            var p_pages = pager.p_pages;
+            var p_totalRecords = pager.p_totalRecords;
+            var obj=this;
+            kkpager.generPageHtml({
+                pno : p_cur,
+                total : p_pages,
+                totalRecords : p_totalRecords,
+                mode : 'click',
+                click : function(n){
+                    obj.options.pager.p_cur = n;
+                    this.selectPage(n);
+                    obj.getRemoteData1(n);//调用获取数据方法
+                    return false;
+                }
+            },true);
+        }
+    };
+
+    $.fn.mytable = function(options) {
+        if (typeof options == 'string') {
+            switch (options) {
+                case 'getTableData': 
+                    return this[0].tt_data; 
+            }
+         }   else{
+        return this.each(function() {
+            // var $this = $(this);
+                new mytable(this,options);
+            //  $(this).attr('tableData',mytable.tableData);
+            });
+        }
+    };
+
+
+    $.fn.mytable.Constructor = mytable;
+}(jQuery));
+

VisualInspection/view/common/commonscriptlink.html

@@ -4,6 +4,8 @@
 <script src="/node_modules/zui/dist/js/zui.min.js"></script>
 <script src="/node_modules/zui/dist/lib/datetimepicker/datetimepicker.min.js"></script>
 <script src="/node_modules/zui/dist/lib/datatable/zui.datatable.min.js"></script>
+<!--<script src="/node_modules/zui/dist/lib/mytable/mytable.js"></script>  -->
+<script src="/js/lib/mytable.js"></script>
 <script src="/node_modules/moment/min/moment.min.js"></script>
 <script src="/node_modules/moment/locale/zh-cn.js"></script>
 <script src="/node_modules/blueimp-md5/js/md5.min.js"></script>

VisualInspection/view/constant/constant.html

@@ -1,48 +1,48 @@
+ 
 <!--<script src="/js/constant/constant.js"></script>   -->
-<div class="container-fluid ">
-    <div class="row">
-        <div class="col-xs-3">
-            <div class="input-group">
-                <span class="input-group-addon">关键词</span>
-                <input class="form-control form-focus" id="keywords" autofocus type="text" placeholder="请输入关键词">
+    <div class="container-fluid ">
+        <div class="row">
+            <div class="col-xs-3">
+                <div class="input-group">
+                    <span class="input-group-addon">关键词</span>
+                    <input class="form-control form-focus" id="keywords" autofocus type="text" placeholder="请输入关键词">
+                </div>
             </div>
-        </div>
-
-        <div class="col-xs-3">
-            <div class="input-group">
-                <button class="btn btn-primary " type="button" onclick="queryConstant()">查询</button>
+            
+            <div class="col-xs-3">
+                 <div class="input-group">
+                    <button class="btn btn-primary " type="button" onclick="queryConstant()">查询</button>
+                 </div>
+            </div>
+            <div style="float:right;">
+                <button class="btn btn-success" type="button" onclick="showAddConstant()"><i class="icon icon-plus-sign"></i> 添加</button>
             </div>
         </div>
-        <div style="float:right;">
-            <button class="btn btn-success" type="button" data-toggle="modal" data-target="#addModal"><i class="icon icon-plus-sign"></i> 添加</button>
-        </div>
-    </div>
-    <br>
-
-    <div class="row">
-        <!-- 使用一个div来显示数据表格 -->
-        <div class="datatable" data-checkable="true" data-sortable="true"></div </div>
-        <div id="kkpager" class="row" style="text-align:center">
-
+        <br>
+        <div class="datatable"></div>
+        <!--<div class="row">
+            <div class="datatable" data-checkable="true" data-sortable="true"></div 
         </div>
+        <div id="kkpager" class="row" style="text-align:center">           
+        </div>-->
     </div>
     <!-- 对话框HTML -->
-    <div class="modal fade" id="addModal">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">关闭</span></button>
-                    <h4 class="modal-title">添加常量</h4>
-                </div>
-                <div class="modal-body">
-                    <link rel="import" href="/view/constant/add.html?__inline">
-                </div>
-            </div>
-        </div>
+    <div class="modal fade" id="formModal">
+    <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">关闭</span></button>
+        <h4 class="modal-title">添加常量</h4>
+      </div>
+      <div class="modal-body">
+        <link rel="import" href="/view/constant/form.html?__inline">
+      </div>
+    </div>
+    </div>
     </div>
 
-    <script>
-        $(document).ready(function() {
-            getConstant();
-        });
-    </script>
+<script>
+    $(document).ready(function() {
+        getConstant();
+    });
+</script>

VisualInspection/view/constant/add.html → VisualInspection/view/constant/form.html

@@ -1,54 +1,56 @@
-<div class="container-fluid ">
-        <form class="form-horizontal">
-            <div class="form-group">
-                <label for="exampleInputAccount4" class="col-sm-2">字典标识</label>
-                <div class="col-md-6 col-sm-10">
-                <input type="text" 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">
-                <input type="text" class="form-control" id="flag_name" placeholder="标识名称">
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="exampleInputPassword4" class="col-sm-2">字典值</label>
-                <div class="col-md-6 col-sm-10">
-                <input type="text" class="form-control" id="code_value" placeholder="字典值">
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="exampleInputPassword4" class="col-sm-2">字典名称</label>
-                <div class="col-md-6 col-sm-10">
-                <input type="text" class="form-control" id="code_name" placeholder="字典名称">
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="exampleInputPassword4" class="col-sm-2">排序号</label>
-                <div class="col-md-6 col-sm-10">
-                <input type="text" class="form-control" id="sort_no" placeholder="排序号">
-                </div>
-            </div>
-             <div class="form-group">
-                <label for="exampleInputPassword4" class="col-sm-2">备注</label>
-                <div class="col-md-6 col-sm-10">
-                <input type="text" class="form-control" id="remark" placeholder="标识名称">
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="col-sm-offset-2 col-sm-10">
-                <div class="checkbox">
-                    <label>
-                    <input type="checkbox" id="valid" checked="checked">有效
-                    </label>
-                </div>
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="col-sm-offset-2 col-sm-10">
-                <button type="button" class="btn btn-default" onclick="addConstant()">保存</button>
-                </div>
-            </div>
-            </form>
-    </div>
+<div class="container-fluid ">
+        <form class="form-horizontal">
+            <div class="form-group">
+            </div>
+            <div class="form-group">
+                <label for="exampleInputAccount4" class="col-sm-2">字典标识</label>
+                <div class="col-md-6 col-sm-10">
+                <input type="text" 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">
+                <input type="text" class="form-control" id="flag_name" placeholder="标识名称">
+                </div>
+            </div>
+            <div class="form-group">
+                <label for="exampleInputPassword4" class="col-sm-2">字典值</label>
+                <div class="col-md-6 col-sm-10">
+                <input type="text" class="form-control" id="code_value" placeholder="字典值">
+                </div>
+            </div>
+            <div class="form-group">
+                <label for="exampleInputPassword4" class="col-sm-2">字典名称</label>
+                <div class="col-md-6 col-sm-10">
+                <input type="text" class="form-control" id="code_name" placeholder="字典名称">
+                </div>
+            </div>
+            <div class="form-group">
+                <label for="exampleInputPassword4" class="col-sm-2">排序号</label>
+                <div class="col-md-6 col-sm-10">
+                <input type="text" class="form-control" id="sort_no" placeholder="排序号">
+                </div>
+            </div>
+             <div class="form-group">
+                <label for="exampleInputPassword4" class="col-sm-2">备注</label>
+                <div class="col-md-6 col-sm-10">
+                <input type="text" class="form-control" id="remark" placeholder="标识名称">
+                </div>
+            </div>
+            <div class="form-group">
+                <div class="col-sm-offset-2 col-sm-10">
+                <div class="checkbox">
+                    <label>
+                    <input type="checkbox" id="valid" checked="checked">有效
+                    </label>
+                </div>
+                </div>
+            </div>
+            <div class="form-group">
+                <div class="col-sm-offset-2 col-sm-10">
+                <button id="operation-btn" type="button" class="btn btn-default">保存</button>
+                </div>
+            </div>
+            </form>
+    </div>

VisualInspection/view/constant/update.html

@@ -1,55 +0,0 @@
-
-    <div class="container-fluid ">
-        <form class="form-horizontal">
-            <div class="form-group">
-                <label for="exampleInputAccount4" class="col-sm-2">字典标识</label>
-                <div class="col-md-6 col-sm-10">
-                <input type="text" class="form-control" id="flag_name" placeholder="字典标识">
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="exampleInputPassword4" class="col-sm-2">标识名称</label>
-                <div class="col-md-6 col-sm-10">
-                <input type="text" class="form-control" id="exampleInputPassword4" placeholder="标识名称">
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="exampleInputPassword4" class="col-sm-2">字典值</label>
-                <div class="col-md-6 col-sm-10">
-                <input type="text" class="form-control" id="exampleInputPassword4" placeholder="字典值">
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="exampleInputPassword4" class="col-sm-2">字典名称</label>
-                <div class="col-md-6 col-sm-10">
-                <input type="text" class="form-control" id="exampleInputPassword4" placeholder="字典名称">
-                </div>
-            </div>
-            <div class="form-group">
-                <label for="exampleInputPassword4" class="col-sm-2">排序号</label>
-                <div class="col-md-6 col-sm-10">
-                <input type="text" class="form-control" id="exampleInputPassword4" placeholder="排序号">
-                </div>
-            </div>
-             <div class="form-group">
-                <label for="exampleInputPassword4" class="col-sm-2">备注</label>
-                <div class="col-md-6 col-sm-10">
-                <input type="text" class="form-control" id="exampleInputPassword4" placeholder="标识名称">
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="col-sm-offset-2 col-sm-10">
-                <div class="checkbox">
-                    <label>
-                    <input type="checkbox">有效
-                    </label>
-                </div>
-                </div>
-            </div>
-            <div class="form-group">
-                <div class="col-sm-offset-2 col-sm-10">
-                <button type="submit" class="btn btn-default">保存</button>
-                </div>
-            </div>
-            </form>
-    </div>

VisualInspection/view/mytask/check.html

@@ -120,7 +120,7 @@
                 <h4 class="modal-title">添加常量</h4>
             </div>
             <div class="modal-body">
-                <link rel="import" href="/view/constant/add.html?__inline">
+                <link rel="import" href="/view/constant/form.html?__inline">
             </div>
         </div>
     </div>

VisualInspection/view/mytask/dispatched.html

@@ -54,7 +54,7 @@
         <h4 class="modal-title">添加常量</h4>
       </div>
       <div class="modal-body">
-        <link rel="import" href="/view/constant/add.html?__inline">
+        <link rel="import" href="/view/constant/form.html?__inline">
       </div>
     </div>
     </div>

VisualInspection/view/mytask/undispatched.html

@@ -57,7 +57,7 @@
         <h4 class="modal-title">添加常量</h4>
       </div>
       <div class="modal-body">
-        <link rel="import" href="/view/constant/add.html?__inline">
+        <link rel="import" href="/view/constant/form.html?__inline">
       </div>
     </div>
     </div>

VisualInspection/view/mytask/unexamined.html

@@ -54,7 +54,7 @@
         <h4 class="modal-title">添加常量</h4>
       </div>
       <div class="modal-body">
-        <link rel="import" href="/view/constant/add.html?__inline">
+        <link rel="import" href="/view/constant/form.html?__inline">
       </div>
     </div>
     </div>

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/ConstantController.java

@@ -53,6 +53,9 @@ public class ConstantController extends BaseController {
      */
     @RequestMapping(value = "/update")
     public String update(@RequestBody Constant constant){
+    	if(constant.getId()==null){
+    		throw new BusinessException(20002);
+    	}
     	constantService.update(constant);
     	return super.returnSuccessResult("修改成功");
     }