From 7ce105c332651f36ef00ca8472bd0582d66a746b Mon Sep 17 00:00:00 2001
From: baoliang <j2eer@163.com>
Date: Wed, 21 Oct 2020 21:37:19 +0800
Subject: [PATCH] add message

---
 dashboard/models.py                           |  10 +-
 polls/models.py                               |   5 +-
 polls/templates/polls/media_statistics.html   | 178 +-----------------
 polls/templates/polls/monitor_statistics.html |   2 +-
 polls/views/__pycache__/media.cpython-38.pyc  | Bin 6251 -> 6225 bytes
 .../views/__pycache__/monitor.cpython-38.pyc  | Bin 3254 -> 3186 bytes
 polls/views/__pycache__/notice.cpython-38.pyc | Bin 4244 -> 4273 bytes
 polls/views/__pycache__/task.cpython-38.pyc   | Bin 3883 -> 3879 bytes
 polls/views/media.py                          |  10 +-
 polls/views/monitor.py                        |  11 +-
 polls/views/notice.py                         |   2 +
 polls/views/task.py                           |   4 +-
 12 files changed, 27 insertions(+), 195 deletions(-)

diff --git a/dashboard/models.py b/dashboard/models.py
index d6d4bfd..63eb3b2 100644
--- a/dashboard/models.py
+++ b/dashboard/models.py
@@ -130,6 +130,9 @@ class Organization(models.Model):
     def __str__(self):
         return self.name
 
+    def is_direct(self):
+        return self.province != '' and self.cities == ''
+
 
 # 扩展用户表
 class Userprofile(models.Model):
@@ -166,9 +169,12 @@ class Userprofile(models.Model):
     def level1_admin(cls):
         return Userprofile.objects.filter(organization__level__level=1)
 
-
     def __str__(self):
-        return self.user.username+":"+self.name
+        if self.is_leve1:
+            return '省级管理员%s' % (self.name,)
+        elif self.is_level2:
+            return '市级管理员%s' % (self.name,)
+        return self.name
 
 
 def create_user_profile(sender, instance, created, **kwargs):
diff --git a/polls/models.py b/polls/models.py
index bd73def..ee242eb 100644
--- a/polls/models.py
+++ b/polls/models.py
@@ -45,6 +45,7 @@ class Notice(models.Model):
     type = models.IntegerField(
         'category', choices=NOTICE_TYPE_CHOICES, default=0)
     content = models.CharField('内容', max_length=256, null=False)
+    group_id = models.CharField('group_id', max_length=256, null=True, blank=True)
     app = models.CharField('app', max_length=256, null=True, blank=True)
     model = models.CharField('model', max_length=256, null=True, blank=True)
     field = models.CharField('field', max_length=256, null=True, blank=True)
@@ -67,8 +68,8 @@ class Notice(models.Model):
         return now <= self.timeouted
 
     @classmethod
-    def create_normal_notice(cls, user_id, content):
-        return Notice.objects.create(user_id=user_id, content=content)
+    def create_normal_notice(cls, user_id, content, group_id):
+        return Notice.objects.create(user_id=user_id, content=content, group_id=group_id)
 
     @classmethod
     def create_reply_notice(cls, user_id, content, app, model, field, record_id, record_pass_value, record_reject_value):
diff --git a/polls/templates/polls/media_statistics.html b/polls/templates/polls/media_statistics.html
index ac5ac5e..e9ea97e 100644
--- a/polls/templates/polls/media_statistics.html
+++ b/polls/templates/polls/media_statistics.html
@@ -17,90 +17,7 @@
 <script src="{% static 'polls/js/echarts.min.js' %}"></script>
 <script type="text/javascript">
     var myChart = echarts.init(document.getElementById('chart1'));
-    var posList = [
-        'left', 'right', 'top', 'bottom',
-        'inside',
-        'insideTop', 'insideLeft', 'insideRight', 'insideBottom',
-        'insideTopLeft', 'insideTopRight', 'insideBottomLeft', 'insideBottomRight'
-    ];
-
-    myChart.configParameters = {
-        rotate: {
-            min: -90,
-            max: 90
-        },
-        align: {
-            options: {
-                left: 'left',
-                center: 'center',
-                right: 'right'
-            }
-        },
-        verticalAlign: {
-            options: {
-                top: 'top',
-                middle: 'middle',
-                bottom: 'bottom'
-            }
-        },
-        position: {
-            options: echarts.util.reduce(posList, function (map, pos) {
-                map[pos] = pos;
-                return map;
-            }, {})
-        },
-        distance: {
-            min: 0,
-            max: 100
-        }
-    };
-
-    myChart.config = {
-        rotate: 90,
-        align: 'left',
-        verticalAlign: 'middle',
-        position: 'insideBottom',
-        distance: 15,
-        onChange: function () {
-            var labelOption = {
-                normal: {
-                    rotate: myChart.config.rotate,
-                    align: myChart.config.align,
-                    verticalAlign: myChart.config.verticalAlign,
-                    position: myChart.config.position,
-                    distance: myChart.config.distance
-                }
-            };
-            myChart.setOption({
-                series: [{
-                    label: labelOption
-                }, {
-                    label: labelOption
-                }, {
-                    label: labelOption
-                }, {
-                    label: labelOption
-                }]
-            });
-        }
-    };
-
-
-    var labelOption = {
-        show: true,
-        position: myChart.config.position,
-        distance: myChart.config.distance,
-        align: myChart.config.align,
-        verticalAlign: myChart.config.verticalAlign,
-        rotate: myChart.config.rotate,
-        formatter: '{c}  {name|{a}}',
-        fontSize: 8,
-        rich: {
-            name: {
-                textBorderColor: '#fff'
-            }
-        }
-    };
+    
     var option = {
         title: {
             text: '全省政务新媒体更新次数（逐月）',
@@ -137,31 +54,26 @@
                 name: '微信',
                 type: 'bar',
                 barGap: 0,
-                label: labelOption,
                 data: [320, 332, 301, 334, 390]
             },
             {
                 name: '微博',
                 type: 'bar',
-                label: labelOption,
                 data: [220, 182, 191, 234, 290]
             },
             {
                 name: '头条',
                 type: 'bar',
-                label: labelOption,
                 data: [150, 232, 201, 154, 190]
             },
             {
                 name: '抖音',
                 type: 'bar',
-                label: labelOption,
                 data: [98, 77, 101, 99, 40]
             },
             {
                 name: '其他',
                 type: 'bar',
-                label: labelOption,
                 data: [25, 32, 46, 20, 8]
             }
         ]
@@ -170,90 +82,7 @@
 
 
     var myChart2 = echarts.init(document.getElementById('chart2'));
-    var posList = [
-        'left', 'right', 'top', 'bottom',
-        'inside',
-        'insideTop', 'insideLeft', 'insideRight', 'insideBottom',
-        'insideTopLeft', 'insideTopRight', 'insideBottomLeft', 'insideBottomRight'
-    ];
 
-    myChart2.configParameters = {
-        rotate: {
-            min: -90,
-            max: 90
-        },
-        align: {
-            options: {
-                left: 'left',
-                center: 'center',
-                right: 'right'
-            }
-        },
-        verticalAlign: {
-            options: {
-                top: 'top',
-                middle: 'middle',
-                bottom: 'bottom'
-            }
-        },
-        position: {
-            options: echarts.util.reduce(posList, function (map, pos) {
-                map[pos] = pos;
-                return map;
-            }, {})
-        },
-        distance: {
-            min: 0,
-            max: 100
-        }
-    };
-
-    myChart2.config = {
-        rotate: 90,
-        align: 'left',
-        verticalAlign: 'middle',
-        position: 'insideBottom',
-        distance: 15,
-        onChange: function () {
-            var labelOption = {
-                normal: {
-                    rotate: myChart2.config.rotate,
-                    align: myChart2.config.align,
-                    verticalAlign: myChart2.config.verticalAlign,
-                    position: myChart2.config.position,
-                    distance: myChart2.config.distance
-                }
-            };
-            myChart2.setOption({
-                series: [{
-                    label: labelOption
-                }, {
-                    label: labelOption
-                }, {
-                    label: labelOption
-                }, {
-                    label: labelOption
-                }]
-            });
-        }
-    };
-
-
-    var labelOption = {
-        show: true,
-        position: myChart.config.position,
-        distance: myChart.config.distance,
-        align: myChart.config.align,
-        verticalAlign: myChart.config.verticalAlign,
-        rotate: myChart.config.rotate,
-        formatter: '{c}  {name|{a}}',
-        fontSize: 8,
-        rich: {
-            name: {
-                textBorderColor: '#fff'
-            }
-        }
-    };
     var option = {
         title: {
             text: '全省政务新媒体开设数量（逐月）',
@@ -290,31 +119,26 @@
                 name: '微信',
                 type: 'bar',
                 barGap: 0,
-                label: labelOption,
                 data: [40, 80, 44, 36, 78]
             },
             {
                 name: '微博',
                 type: 'bar',
-                label: labelOption,
                 data: [25, 14, 41, 10, 18]
             },
             {
                 name: '头条',
                 type: 'bar',
-                label: labelOption,
                 data: [21, 32, 21, 14, 19]
             },
             {
                 name: '抖音',
                 type: 'bar',
-                label: labelOption,
                 data: [98, 77, 101, 99, 40]
             },
             {
                 name: '其他',
                 type: 'bar',
-                label: labelOption,
                 data: [25, 32, 46, 20, 8]
             }
         ]
diff --git a/polls/templates/polls/monitor_statistics.html b/polls/templates/polls/monitor_statistics.html
index f8564a9..a629d7f 100644
--- a/polls/templates/polls/monitor_statistics.html
+++ b/polls/templates/polls/monitor_statistics.html
@@ -69,7 +69,7 @@
     },
     legend: {
         top: '15%',
-        data: ['兰州市', '兰州新区', '嘉峪关市', '金昌市', '白银市', '天水市', '武威市', '张掖市', '平谅市', '酒泉市', '庆阳市', '定西市', '陇南市', '临夏回族自治州','甘南藏族自治州']
+        data: ['兰州市', '兰州新区', '嘉峪关市', '金昌市', '白银市', '天水市', '武威市', '张掖市', '平凉市', '酒泉市', '庆阳市', '定西市', '陇南市', '临夏回族自治州','甘南藏族自治州']
     },
     series: [
         {
diff --git a/polls/views/__pycache__/media.cpython-38.pyc b/polls/views/__pycache__/media.cpython-38.pyc
index 507844a6e1b1fcb2fb8c419d3ebdf9cff72964b5..c7989a3e7e8caf9896c7c7a0ee11fd83c8927e90 100644
GIT binary patch
delta 1349
zcmb7^%TE(Q9LIM`+uc64w6xs<r94{{qlg#;<yC>;8<B?zD3;Q#$O;6e+k}v98pBPZ
z(TqnA?a?FYNe`MBJsA%sp6Wj!@#0Cn82$aGMTr-~HvQ~(elzo%*_rRmmyQn|^0X}5
z1$eeY4`aa{xzkKW3Q_Y5lKrN8a#eXD<1$<$!d!c%QVkpAHc^C(TleOCMx`cbe#5Os
z47=KDI5od|NIjgFi13K4zgZoE-U>u3v_PI5AV*s{hsm@qv8?qaNwWcQlXSD^Vn6V^
z*b6)<b%(lP&a?^<L3AKG0qI5ndms&xYW7}QW5c$4WPrW3y(4z^*j~fwHA@wAqVU>2
zX0jH|tMQd2^UF<27xa8ail()@v<D<TgXm+I<<0I>C>@B?2pggoVMX*KB*Y+~D5jEn
zT-PZbWk2N*nPNd#G&F_P(^ze#$y9n-r(+noikM{^u5FSim@Cty4QD~GBia%BW`f05
z1kW|YqMi_Y<+fyJG3G<~0i!ekYzxvG7;z$QB7%s6d`D?vTd><LL^I;=_%STb1K6;q
zwP^rLe8O>1MaxQ3U5b~#4yzW}eb1eSB*+8->^&|JxU9qQPc0WbRV~Dx^XI`sR9C$$
z>aEGPXKbpk>^!?(n+qB?&7{?V>->gQRSZ$9Qv+&s*?B{&<7$l|#vq;x<OL$=)wvL~
zv1s++L&=c1m;ax!b}wUg{mG(`aqtusxrV#|33@V4-L@rUWH2~RMOK4-0_a9ibzGUW
zCeR_!j$E@L=LtU+A91pVg|`;97EtxjLe#>b8n{wGDO^QBHG(=OYONrfc+dhvSkz|F
z4tTfp3AzNQ(xQq_O<QDAXp68<&e}#g39HGyP}&jhC~gF9s~+~%9de;vcP)T4?lAk|
z3!jLBC>^OGRA&LZW<Zg2?c4VmtUHQ0&UV~hGRxxrp6ownJBZJUwxv`|U82c^UK)KA
zljEgC&mqtw^gM!_?*gie2<}RL7Gn4zbe;v2aQ`KgM-YGPNUvaV3{aF-;;Zq+Bu&wA
sj9o*N&LFA<wxKLK?8HhW{=+N7&weRV>Dpkyz-Pw<HcTLr%vC-28<P7OU;qFB

delta 1319
zcmb7^%TE(Q9LIM`_tD3eLLW;Dl~<|O7_AZ&9|$Tz@eK$jAVOsdvPz@VB{8@S5-uiQ
zNXCN)5A974CTe3$Jb2L?Uc8z90X|~lNfIw6{(e(b<fLu()6dLKe>1!Loqd=3lG2BC
z-7Uc<;k!LP{8ZoNB*#nL&X;82yH!)DElPQx?dy@oQu%5cw}}~;B4H`-w}OR`U2RHc
z*!I&l+f5U;*9_CmbW2eq(lWX6Cffu5H=wu5tSgfLs*=Pi3Y2l&aPwQrE3(S>tMjCT
z@6ZhXR!yv#TZ;?ZTWNdd5^xzG?>+o*=LKKVx=4h-)~+jMXEr^X;q9(P(#4;<R*07`
zx+8)Cr&h(zm!7%LIAqobf98tb9Nq)+h?E`Iud;oh>;R&Zck1(GFMk}2MGj$yhUf;A
z)m+9(TNY!-_*Xqf`ncEE9m8sD7*8uKlbgF{v2)ndj~L}MzPp5$R(*3MiL<c_i0z1V
zGh!33NUV&F@SQa={=_eD8^yjLA_VAV1~6IAE@F=tF@~r|i1oJry<XOaXIc^Ch!(`3
zc_y%#hRKr6U8rJJm%+;NY=+LH*De81P4ZhcSDL0kCkf!!#|Pqp<0u?C=HTz#(Ne5d
zBVIE^16Li(gx#b;z9SG>NabBL1euD8Ou4Q4LWAux9cB#j6t)#=*s2+$bu_Y;sh;cr
zjoRvX*j5WhQ6iF6SJ(t&WU~<xrrDav>A%#h$C?WwsQ0I(yhjwNDl`=(DAAGkTCOE2
zuS0loF*<EHD1k@8V!|9|Gx#QOPoc%ui$qi^<8p0Tj8@H7utpf6nsKluVPP;sSR2^R
zW}ykt7GW|>A=6fH5B$atN|pwDOQz}r#}XNok_o=zjSjORxUu5dS00W?ka+MSMj}CY
z|0}_Dp>-k@gotfB*k>6qmjtZsnD@c>=EFFo7J(0s9RYlH0?K6fx`>SMA0b1n<Y<&1
z4t4l9WKYDde?#ngv7)Gb3=Q8o>^MSf6$}kKfe=wViFOJhGCF~lhH2xSr%|^eekYTi
z#U}2rvNoH}rl&J3#|E%(5K-B4Xp{U>c-rG73em(D-vl8SwtR44E5M2I$#WhDQ^XYi
HW{mv=zjYpr

diff --git a/polls/views/__pycache__/monitor.cpython-38.pyc b/polls/views/__pycache__/monitor.cpython-38.pyc
index 5ef1c90659fe87e0d1ac982be078493cc93cb3e8..77aeed7008c979f2f9c8dc3eee814e9b0832f98f 100644
GIT binary patch
delta 660
zcmZ{gy=xRf7{+I2Z@<59?~)wRL{yMX;@zo@g_YV0qG%`QnGIo0av`%L67nu7BIyzW
zZ()<-u2VZfECfLzwT+#H=zk#o0pd*bq6x{sJkR^i{GOR%-Zp-Y`S*O^A#!Y<-tK6x
zeMh4YaZLL(e!X<S$?OIxT@ipQ-2)e_1%v;>@A?R)m2uqD&f;y|i--H3+TWqPCy5I>
zUAZbM_+CqoWxoAoUJ2s_hVeU+Nwrf#Kato|#QOF;DFd)>k_QuI2tnV3P=sJX*dQA;
zW4mlXDcNBwUq#f92c(RoSEa|&6X{i%Pax@=nFrC3-|u~h5A^|5hrOr)$wDx}2q1tY
zi*_p;+Fg>y_}o~-OXh&q@w52|uUYFxB0rc{@uStGHT+>sT6MYblJF@UwHN6Nd}d$K
zBNnk5ey~R+a#%;GhLcX6&fq(zg_(2y@;P<h)PYRP>PxgVm*w3~A-W<jL_S+^xmqwO
zgz=_~-fCWy_0gC&n~T*B@Aek*-u%=5BCS8Sxo6tP#e${fUM`k-htCyH76lvxDR1K&
hcPpJxcg-kiDrqTcEBW{A{c0K?dpGR+j5-xHe*+KTpLPHM

delta 815
zcmb_Y&1(}u9G#i$cXpHgXhQ=<y{H76G>QHPdK3k<cwAyOgiYJsWOgELnYC(;QmD*L
zdT2pG!Gm5rd-mW}=)wOX1x4^se;b?nfu$E`nD?9a=Dqnkn0r^YmMqIa(3U<t@Snc5
zj2zw&bGeVzJE_46+!$euxDn`Ol;(lwGtP=U58UK=t}QFunA!qM4OtD$Eh3)Cmz?Rk
zd9?mm45Ui&I+J?1rw1zZlbl~C&i70?#Yt!noEIH3xWeR9y`M90jtpLkvFvTyT;s(u
z8sUKKkUe<MHW_?l&aS(MQX8rV)qy$#)$O9x<KC_sSlpiaC%nL&KX{S5Q_f~N3T&=&
zg%`LNI6KlPcN<mQ8$$&?T8xz8e1+_nV%lv*;YN#vape1b8s872b_YK5i}D<o#547t
zBKK(+G4Wk}sLVi=dg75*!?WUzc2+Ba@Cwld@kv|3uf;X}@}_|`Y!jQ5FgcX4a;Oju
z6b=8>-T$Ubu;={I-V(Maoz{>z&~G)*XZKt<hAPbV?bS{Yw)}*_TN4(xlLXX+03br^
zVyrKU7si>|BJjVXW;<l-K5a$IVbopwE!GfY<7WL|k-};mg)F8%?Ign$mL7*NZHj(=
gt8y+or<OrIgGL6;41QgEGOLOU=2iVJ!G@HLA7h`jk^lez

diff --git a/polls/views/__pycache__/notice.cpython-38.pyc b/polls/views/__pycache__/notice.cpython-38.pyc
index 1778a7f7d3eb9cdb1d852861feb87c4908d5a9af..3eea7172c8f9ba6e799a1e6078d1b8b0ae04341f 100644
GIT binary patch
delta 347
zcmbQDxKWWWl$V!_0SHPgC&bH&Z{$0{##l4ikV|~>J2pi|xyb_Twv1Af{n(ed<#E+8
zWeL@=rAXQ^09nEdL{g*{GS)DsNQ3#JaK4NULkV+=EKr7R4pTE@I72W43qy%mHrE8k
zqO!?49P&V8eK@A8+~P<t$}cU5&rB&20Xm>a6iD1+FD*z(EJ;l%5(Dxy#V7ye$QE#g
z$rdSrSZ<SxIU^WdCZFN7=Hp@FVibVFBLB_8T%t?@9w0@YAi@hocu%(Asbup3F?}a*
z=P_f<oBWQ)mN9m-4zB_uW58rzz91=dEg;2VAR>J7PCh%B=D&Q3jJ=cP`L!A2Cwuch
a;PwZphy@Yxlg$Kzxz(8%nHYIwK_mdsvrW+e

delta 313
zcmdm}I7N{!l$V!_0SKzOy5sMOZR9(_##k`fk4t>=J2pi|p~(X5wu};!{n(dS)i7lV
zEf7wTT*z3%oFZkz0OX6n`O-EFCCn)@KpD0<OwEkp48aU63?-u3ToV|JvL;(_$TP}L
zj^LOsRU`tmsz?+_++r^+NJ%V7O(_xs@-)RJ3v*_3gCvTSK!oe$KF$b6r^(Mbt$DZ@
z1)#9VZ?gfHD3gFYNQnoC@B|TFlS6qb*}OqapUGEv%-C{(%wm(tj{J&~4SB^GV>Wy8
zDljtoPtM{CVsxME$Ro@a3Q`<4`5K=cOrI3LB4hVt8-8uZxXBs(54in6Dq=uH+~i<^
PU~W|=MkYocSr7>TvnfRS

diff --git a/polls/views/__pycache__/task.cpython-38.pyc b/polls/views/__pycache__/task.cpython-38.pyc
index d9b1afd3a50f5ea93d800c76876ac36ff147488a..43d23af1a5d52633a3fc312edd2b2b9357357158 100644
GIT binary patch
delta 125
zcmZ22w_J`ll$V!_0SL-1C&a(p$h(n+v0!o_r}X4oEPq}7Y6VI}vbeHDYXnk+dl_p5
zYXn^wVohp=O2mMoY(P;Fpr~+)Xbn@1aF%!)lNduSbBV+P$r_<7sT$@Qfh@j-%#)?q
YuCtf`ZP@&q&4`Jak5Ou~0q1X40EC<&cK`qY

delta 126
zcmZ23w_1)jl$V!_0SMlTbjQEi$h(n+F>mvJ770dYpIU(uku0t((Hemi;a<jC!5Tpq
zhFGIop%O8mC>u~z1Sl$;B3i?gC0-+(C7#A4#!$;#BC$ZSMkq_FhIt{=WEr;WTvkBC
apHErwtYiD;?`%d)%mR#Jn{_yUvjPB!ZX=xl

diff --git a/polls/views/media.py b/polls/views/media.py
index 9406e6d..adc45ec 100644
--- a/polls/views/media.py
+++ b/polls/views/media.py
@@ -79,13 +79,13 @@ def create_media(request):
     if o.directly == '省直部门':
         admins = Userprofile.level1_admin()
         for a in admins:
-            content = '用户%s创建了新媒体，请审核' % (profile.name,)
+            content = '%s创建了新媒体，请审核' % (profile,)
             Notice.create_reply_notice(
                 a.user.id, content, 'dashboard', model_name, 'status', instance.id, '3', '0')
     else:
         admins = Userprofile.level2_admin(instance.organization.cities)
         for a in admins:
-            content = '用户%s创建了新媒体，请审核' % (profile.name,)
+            content = '%s创建了新媒体，请审核' % (profile,)
             Notice.create_reply_notice(
                 a.user.id, content, 'dashboard', model_name, 'status', instance.id, '2', '0')
 
@@ -222,12 +222,12 @@ def delete_media(request):
         instance = Qita.objects.get(pk=media_id)
         result['media_id'] = instance.qitaid
 
-    if o.directly == '省直部门':
+    if o.is_direct():
         instance.status = 5
         instance.save()
         managers = Userprofile.level1_admin()
         for a in managers:
-            content = '用户%s申请注销新媒体，请审核' % (profile.name,)
+            content = '%s申请注销新媒体，请审核' % (profile,)
             Notice.create_reply_notice(
                 a.user.id, content, 'dashboard', model_name, 'status', instance.id, '0', '3')
     else:
@@ -235,7 +235,7 @@ def delete_media(request):
         instance.save()
         managers = Userprofile.level2_admin(instance.organization.cities)
         for a in managers:
-            content = '用户%s申请注销新媒体，请审核' % (profile.name,)
+            content = '%s申请注销新媒体，请审核' % (profile,)
             Notice.create_reply_notice(
                 a.user.id, content, 'dashboard', model_name, 'status', instance.id, '5', '3')
 
diff --git a/polls/views/monitor.py b/polls/views/monitor.py
index 5f02232..6840cb3 100644
--- a/polls/views/monitor.py
+++ b/polls/views/monitor.py
@@ -44,9 +44,7 @@ def monitor_statistics(request):
     q = Weixin.objects.exclude(organization__cities='').values('organization__cities').order_by(
         'organization__cities').annotate(num_media=Count('organization__cities'))
     for row in q:
-        print(row)
         code = row['organization__cities']
-        print(code)
         compartment = COMPARTMENTS[code]
         if code in results:
             nums = results[compartment]
@@ -54,7 +52,7 @@ def monitor_statistics(request):
         else:
             results[compartment] = [row['num_media']]
 
-    q = Weibo.objects.exclude(organization__province='', organization__cities='').values('organization__cities').order_by(
+    q = Weibo.objects.exclude(organization__cities='').values('organization__cities').order_by(
         'organization__cities').annotate(num_media=Count('organization__cities'))
     for row in q:
         code = row['organization__cities']
@@ -65,7 +63,7 @@ def monitor_statistics(request):
         else:
             results[compartment] = [row['num_media']]
 
-    q = Toutiao.objects.exclude(organization__province='', organization__cities='').values('organization__cities').order_by(
+    q = Toutiao.objects.exclude(organization__cities='').values('organization__cities').order_by(
         'organization__cities').annotate(num_media=Count('organization__cities'))
     for row in q:
         code = row['organization__cities']
@@ -76,7 +74,7 @@ def monitor_statistics(request):
         else:
             results[compartment] = [row['num_media']]
 
-    q = Douyin.objects.exclude(organization__province='', organization__cities='').values('organization__cities').order_by(
+    q = Douyin.objects.exclude(organization__cities='').values('organization__cities').order_by(
         'organization__cities').annotate(num_media=Count('organization__cities'))
     for row in q:
         code = row['organization__cities']
@@ -87,7 +85,7 @@ def monitor_statistics(request):
         else:
             results[compartment] = [row['num_media']]
 
-    q = Qita.objects.exclude(organization__province='', organization__cities='').values('organization__cities').order_by(
+    q = Qita.objects.exclude(organization__cities='').values('organization__cities').order_by(
         'organization__cities').annotate(num_media=Count('organization__cities'))
     for row in q:
         code = row['organization__cities']
@@ -97,6 +95,7 @@ def monitor_statistics(request):
             nums.append(row['num_media'])
         else:
             results[compartment] = [row['num_media']]
+    
 
     chart2_data = []
     for k in results:
diff --git a/polls/views/notice.py b/polls/views/notice.py
index 4375358..845a28a 100644
--- a/polls/views/notice.py
+++ b/polls/views/notice.py
@@ -98,6 +98,8 @@ def detail_notice(request, notice_id):
                 detail['type'] = 'qita'
             results['media'] = detail
             detail['status'] = m.status
+        else:
+            detail['group_id'] = notice.group_id
         results['added'] = notice.added.strftime("%Y-%m-%d %H:%M:%S")
         results['updated'] = notice.updated.strftime("%Y-%m-%d %H:%M:%S")
         return JsonResponse({'status': 'success', 'message': results})
diff --git a/polls/views/task.py b/polls/views/task.py
index a4b1876..6771733 100644
--- a/polls/views/task.py
+++ b/polls/views/task.py
@@ -71,8 +71,8 @@ def create_task(request):
         users = Group_user.objects.filter(group=group)
         for u in users:
             g = Group.objects.get(id=group)
-            content = '用户%s在群组“%s”发布了任务，请查收消息' % (profile.name, g.name)
-            Notice.create_normal_notice(u.user_id, content)
+            content = '%s在群组“%s”发布了任务，请查收消息' % (profile, g.name)
+            Notice.create_normal_notice(u.user_id, content, group.id)
     return JsonResponse({'status': 'success'})