From 11b09e42886178147e34b17318df4f0aa0971ddc Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Thu, 7 Nov 2019 14:16:02 +0800
Subject: [PATCH] cdjhkf

---
 safesite/templates/equipmentfigure.html |   1 +
 safesite/templates/examfigure.html      | 268 ------------------------
 safesite/templates/trainfigure.html     |   2 +
 safesite/urls.py                        |   2 +-
 safesite/views.py                       |  13 +-
 5 files changed, 11 insertions(+), 275 deletions(-)
 create mode 100644 safesite/templates/equipmentfigure.html
 delete mode 100644 safesite/templates/examfigure.html

diff --git a/safesite/templates/equipmentfigure.html b/safesite/templates/equipmentfigure.html
new file mode 100644
index 00000000..98f380eb
--- /dev/null
+++ b/safesite/templates/equipmentfigure.html
@@ -0,0 +1 @@
+<div>正在完成</div>
\ No newline at end of file
diff --git a/safesite/templates/examfigure.html b/safesite/templates/examfigure.html
deleted file mode 100644
index ca280e04..00000000
--- a/safesite/templates/examfigure.html
+++ /dev/null
@@ -1,268 +0,0 @@
-
-<script>
-    var now = new Date();
-    $(function () {
-        year = now.getFullYear();
-        month = now.getMonth() + 1;
-        for (var i = 0; i < 5; i++) {
-            $('#year').append('<option value="' + (year - i) + '">' + (year - i) + '</option>');
-            $('#years').append('<option value="' + (year - i) + '">' + (year - i) + '</option>');
-        }
-        $.get('api/tool?a=servertime', function (res) {
-            $('#year').combobox().combobox('setValue', res.year);
-            $('#years').combobox().combobox('setValue', res.year);
-            $('#month').combobox().combobox('setValue', res.month);
-            behaviorDate();
-            trainstatistical();
-        })
-
-    });
-   
-    function gcpmsearch() {
-        var querydata = $('#fxrpms').serializeJSON();
-        $('#fxrpmtable').datagrid('load', querydata);
-    }
-   //培训分析柱形图
-    function behaviorDate() {
-        var y = $("#year").val();
-        var gcChart = echarts.init(document.getElementById("piecontainer"));
-
-        gcChart.setOption(option = {
-            title: {
-                text: '培训数量趋势图',
-                x: 'left'
-            },
-            tooltip: {
-                trigger: 'axis',
-                axisPointer: {            // 坐标轴指示器，坐标轴触发有效
-                    type: 'shadow'        // 默认为直线，可选为：'line' | 'shadow'
-                }
-            },
-            legend: {
-                
-                data: []
-            },
-            xAxis: {
-                type: 'category',
-                data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月','8月','9月','10月','11月','12月']
-
-            },
-            yAxis: {
-                type: 'value'
-            },
-            toolbox: {
-                show: true,
-                feature: {
-                    mark: { show: true },
-                    dataView: { show: true, readOnly: false },
-                    restore: { show: true },
-                    saveAsImage: { show: true }
-                }
-            },
-            grid: {
-                left: '3%',
-                right: '4%',
-                bottom: '3%',
-                containLabel: true
-            },
-            
-           
-        });
-        gcChart.showLoading();
-        $.ajax({
-            type: "get",
-            async: true,            //异步请求（同步请求将会锁住浏览器，用户其他操作必须等待请求完成才可以执行）
-            url: "api/examtj?a=trainfig&year=" + y,   //请求发送
-            dataType: "json",        //返回数据形式为json
-            success: function (data) {
-                //请求成功时执行该函数内容，data即为服务器返回的json对象
-                console.log(data);
-                if (data) {
-                    gcChart.hideLoading();    //隐藏加载动画
-                    gcChart.setOption({
-                        legend: { data: data.key },
-                        series: [{
-                            name: '公司级',
-                            type: 'bar',
-                            stack: '总量',
-                            label: {
-                                normal: {
-                                    show: true,
-                                    position: 'insideRight'
-                                }
-                            },
-                            data: data.companylevel
-                        },
-                            {
-                                name: '车间/工段级',
-                                type: 'bar',
-                                stack: '总量',
-                                label: {
-                                    normal: {
-                                        show: true,
-                                        position: 'insideRight'
-                                    }
-                                },
-                                data: data.workshoplevel
-                            },
-                            {
-                                name: '班组级',
-                                type: 'bar',
-                                stack: '总量',
-                                label: {
-                                    normal: {
-                                        show: true,
-                                        position: 'insideRight'
-                                    }
-                                },
-                                data: data.teamlevel
-                            },
-                            {
-                                name: '部门分厂级',
-                                type: 'bar',
-                                stack: '总量',
-                                label: {
-                                    normal: {
-                                        show: true,
-                                        position: 'insideRight'
-                                    }
-                                },
-                                data: data.departmentlevel 
-                            }]
-                    }
-                    );
-
-                }
-            },
-            error: function (errorMsg) {
-                gcChart.hideLoading();
-            }
-        });
-
-    }
-    //培训分析扇形图
-    function trainstatistical() {
-        var y = $("#year").val();
-        var m = $("#month").val();
-        var gcChart = echarts.init(document.getElementById("piecontainer2"));
-
-        gcChart.setOption(option = {
-            title: {
-                text: '培训类型分布',
-                x: 'left'
-            },
-            tooltip: {
-                trigger: 'item',
-                formatter: "{a} <br/>{b} : {c} ({d}%)"
-            },
-            legend: {
-                orient: 'vertical',
-                x: 'left',
-                y: 'bottom',
-                data: []
-            },
-            toolbox: {
-                show: true,
-                feature: {
-                    mark: { show: true },
-                    dataView: { show: true, readOnly: false },
-                    restore: { show: true },
-                    saveAsImage: { show: true }
-                }
-            },
-            calculable: true,
-           
-        });
-        gcChart.showLoading();
-        $.ajax({
-            type: "get",
-            async: true,            //异步请求（同步请求将会锁住浏览器，用户其他操作必须等待请求完成才可以执行）
-            url: "api/examtj?a=traintype&year=" + y + "&month=" + m,   //请求发送
-            dataType: "json",        //返回数据形式为json
-            success: function (data) {
-                //请求成功时执行该函数内容，data即为服务器返回的json对象
-                console.log(data)
-                if (data) {
-                    gcChart.hideLoading();    //隐藏加载动画
-                    gcChart.setOption({
-                        legend: {
-                            orient: 'vertical',
-                            left: 'left',
-                            data: ['日常培训', '相关方培训', '在岗人员培训'] },
-                        series: [{
-                            name: '培训类型',
-                            type: 'pie',
-                            radius: '55%',
-                            center: ['50%', '60%'],
-                            data: [
-                                { value: data.daily, name: '日常培训' },
-                                { value: data.related, name: '相关方培训' },
-                                { value: data.jobuser, name: '在岗人员培训' }
-                            ],
-                            itemStyle: {
-                                emphasis: {
-                                    shadowBlur: 10,
-                                    shadowOffsetX: 0,
-                                    shadowColor: 'rgba(0, 0, 0, 0.5)'
-                                }
-                            }
-                        }]
-                    }
-                    );
-
-                }
-            },
-            error: function (errorMsg) {
-                gcChart.hideLoading();
-            }
-        });
-    }
-
-    function funTypeChange() {
-        behaviorDate();//
-    }
-    function funTypeChange2() {
-        trainstatistical();//
-    }
-
-</script>
-
-
-<div class="border" id="desktop" style="margin: 10px 10px 0 10px; background: #fff; overflow: auto;">
-   
-    <div style="width:100%">
-        <div style="width:80%;margin:auto">
-            <select class="txtInput select3" id="year" name="year" style="width:100px;"></select><label>年</label>
-           
-            <button class="btn btn-info" onclick="funTypeChange()">&nbsp;查询</button>
-
-            <div id="piecontainer" style="height:400px;width:100%">
-
-            </div>
-        </div>
-        <div style="width:80%;margin:auto">
-            
-            <select class="txtInput select3" id="month" name="month" style="width:100px;">
-                <option value="1">1月</option>
-                <option value="2">2月</option>
-                <option value="3">3月</option>
-                <option value="4">4月</option>
-                <option value="5">5月</option>
-                <option value="6">6月</option>
-                <option value="7">7月</option>
-                <option value="8">8月</option>
-                <option value="9">9月</option>
-                <option value="10">10月</option>
-                <option value="11">11月</option>
-                <option value="12">12月</option>
-            </select>
-            <button class="btn btn-info" onclick="funTypeChange2()">&nbsp;查询</button>
-
-            <div id="piecontainer2" style="height:400px;width:100%">
-
-            </div>
-        </div>
-    </div>
-</div>
-
-
diff --git a/safesite/templates/trainfigure.html b/safesite/templates/trainfigure.html
index 4f601349..d5a4bd3f 100644
--- a/safesite/templates/trainfigure.html
+++ b/safesite/templates/trainfigure.html
@@ -310,6 +310,8 @@
 
                     <div>
                         <label>发现部门</label><input id="sfxbm2" name="fxbm" style="width:180px;height:22px" />
+                        <label>起始时间</label><input id="sqssj" name="qssj" class="easyui-datebox" style="width:180px;height:22px" />
+                        <label>结束时间</label><input id="sjssj" name="jssj" class="easyui-datebox" style="width:180px;height:22px" />
                         <a onclick="fxrpmsearch()" class='easyui-linkbutton' iconCls='fa-search' plain=true>查询</a>
                         <a onclick="fxrpmexport()" class='easyui-linkbutton' iconCls='fa-upload' plain=true>导出</a>
                     </div>
diff --git a/safesite/urls.py b/safesite/urls.py
index 37caa876..0730db2b 100644
--- a/safesite/urls.py
+++ b/safesite/urls.py
@@ -90,7 +90,7 @@ urlpatterns = [
     path('html/examhistory/<int:id>/',views.examhistory),
     path('html/riskact/chose',views.riskactchose),
     path('html/trainfig',views.trainfigure),
-    path('html/examfig',views.examfigure),
+    path('html/equipmentfig',views.equipmentfigure),
     #html页面
     
 
diff --git a/safesite/views.py b/safesite/views.py
index d3ad63b3..c3de2af4 100644
--- a/safesite/views.py
+++ b/safesite/views.py
@@ -250,8 +250,8 @@ def bhrhtml(req):
     return render(req,'behavior.html')
 def trainfigure(req):
     return render(req,'trainfigure.html')
-def examfigure(req):
-    return render(req,'examfigure.html')
+def equipmentfigure(req):
+    return render(req,'equipmentfigure.html')
 
 
 def check_login(func):
@@ -6122,7 +6122,10 @@ def trainfg(req):
         return JsonResponse({'code':1,'companylevel':companylevel,'workshoplevel':workshoplevel,'teamlevel':teamlevel,'departmentlevel':departmentlevel})
     elif a=='trainuser':
         a = Trainuser.objects.filter(participant__usecomp__partid=companyid)
-       
+        if req.GET.get('qssj'):
+            a = a.filter(train__submittime__gte=req.GET.get('qssj'))
+        if req.GET.get('jssj'):
+            a = a.filter(train__submittime__lte=req.GET.get('jssj'))
         if req.GET.get('fxbm'):
             fxbm = req.GET.get('fxbm')
             parts = Partment.objects.filter(partlink__contains=',' + fxbm + ',')|Partment.objects.filter(partid=fxbm)
@@ -6142,6 +6145,4 @@ def trainfg(req):
                  dickeyname=i.dickeyname
                  traintypelist.append({'value':count,'name':dickeyname})
         return HttpResponse(json.dumps({'code':1,'data':{'traintypelist':list(traintypelist)}}), content_type='application/json')
-     
-
-  
\ No newline at end of file
+ 
\ No newline at end of file