Merge branch 'master' of http://192.168.1.218:3000/lianghanqiang/saber-community into master

public/index.html

@@ -16,17 +16,20 @@
   <link rel="stylesheet" href="<%= BASE_URL %>cdn/iconfont/avue/iconfont.css">
   <link rel="stylesheet" href="<%= BASE_URL %>cdn/iconfont/saber/iconfont.css">
   <link rel="stylesheet" href="<%= BASE_URL %>cdn/avue/2.7.8/index.css">
+  <link rel="icon" href="<%= BASE_URL %>favicon.png">
+  <link rel="stylesheet" href="//at.alicdn.com/t/font_2204151_xo638r0axs.css" />
   <script src="<%= BASE_URL %>cdn/xlsx/FileSaver.min.js"></script>
   <script src="<%= BASE_URL %>cdn/xlsx/xlsx.full.min.js"></script>
-  <link rel="icon" href="<%= BASE_URL %>favicon.png">
-
   <script src="<%= BASE_URL %>cdn/elevator/zlplayer.min.js"></script>
-
-
+  <script src="http://libs.baidu.com/jquery/2.1.4/jquery.min.js"></script>
+  <script src="https://cdn.staticfile.org/echarts/4.3.0/echarts.min.js"></script>
+  <script src="js/china.js"></script>
+  <script src="https://cdn.staticfile.org/flv.js/1.5.0/flv.js"></script>
+  <script src="<%= BASE_URL %>cdn/elevator/zlplayer.min.js"></script>
   <script type="text/javascript" src="https://webapi.amap.com/maps?v=2.0&key=cbb265e2a60bbbc04a52eec4eecdeb12&plugin=AMap.PolygonEditor,AMap.Driving"></script>
   <script src="https://webapi.amap.com/ui/1.1/main.js?v=1.0.11"></script>
   <script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script>
-  <title>Saber企业级开发平台</title>
+  <title>宁夏数字社区平台</title>
   <style>
     html,
     body,
@@ -102,10 +105,10 @@
         初次加载资源可能需要较多时间 请耐心等待
       </div>
     </div>
-    <div class="avue-home__footer">
+    <!-- <div class="avue-home__footer">
       <a href="https://bladex.vip" target="_blank">
         https://bladex.vip </a>
-    </div>
+    </div> -->
   </div>
 </div>
 <!-- built files will be auto injected -->

src/components/home-page/topMenu.vue

@@ -1,7 +1,7 @@
 <template>
-  <div>
-    <div class="wel__title">
-        <i class="el-icon-discover" style="color: #25f3e6;"></i>
+  <div v-if="permission.screen_service">
+    <div class="wel__title" >
+        <i class="iconfont iconshujudaping" style="margin-right: 10px;color: #25f3e6;"></i>
         大屏服务
     </div>
    <!-- <el-row :gutter="20">
@@ -12,42 +12,42 @@
       </el-col>
     </el-row> -->
     <el-row :gutter="20">
-      <el-col :span="4" @click.native="jumpToBigData('/bigScreen')">
+      <el-col :span="4" v-if="permission.data_service" @click.native="jumpToBigData('smartCommunity')">
         <div class="wel__topMenu" style="background:linear-gradient(to right,#4b94b4,#335791)">
           数据服务
         </div>
       </el-col>
-<!--      <el-col :span="4" v-if="permission.fight_service" @click.native="jumpToBigData('fireControl')">-->
-<!--        <div class="wel__topMenu" style="background:linear-gradient(to right,#fdb783,#f86c89)">-->
-<!--          消防服务-->
-<!--        </div>-->
-<!--      </el-col>-->
-<!--      <el-col :span="4" v-if="permission.elderly_care_service"  @click.native="jumpToBigData('smartPension')">-->
-<!--        <div class="wel__topMenu" style="background:linear-gradient(to right,#f38bd6,#f36a97)">-->
-<!--          养老服务-->
-<!--        </div>-->
-<!--      </el-col>-->
-<!--      <el-col :span="4" v-if="permission.police_service" @click.native="jumpToBigData('smartPolice')">-->
-<!--        <div class="wel__topMenu" style="background:linear-gradient(to right,#25e7ab,#0db5e2)">-->
-<!--          公安服务-->
-<!--        </div>-->
-<!--      </el-col>-->
-<!--      <el-col :span="4" v-if="permission.police_service" @click.native="jumpToBigData('operatePlatform')">-->
-<!--        <div class="wel__topMenu" style="background:linear-gradient(to right,#25e7ab,#0db5e2)">-->
-<!--          运营服务-->
-<!--        </div>-->
-<!--      </el-col>-->
+      <el-col :span="4" v-if="permission.fight_service" @click.native="jumpToBigData('fireControl')">
+        <div class="wel__topMenu" style="background:linear-gradient(to right,#fdb783,#f86c89)">
+          消防服务
+        </div>
+      </el-col>
+      <el-col :span="4" v-if="permission.elderly_care_service"  @click.native="jumpToBigData('smartPension')">
+        <div class="wel__topMenu" style="background:linear-gradient(to right,#f38bd6,#f36a97)">
+          养老服务
+        </div>
+      </el-col>
+      <el-col :span="4" v-if="permission.police_service" @click.native="jumpToBigData('smartPolice')">
+        <div class="wel__topMenu" style="background:linear-gradient(to right,#25e7ab,#0db5e2)">
+          公安服务
+        </div>
+      </el-col>
+      <el-col :span="4" v-if="permission.business_service" @click.native="jumpToBigData('operatePlatform')">
+        <div class="wel__topMenu" style="background:linear-gradient(to right,#25e7ab,#0db5e2)">
+          运营服务
+        </div>
+      </el-col>
     </el-row>
   </div>
 </template>
 
 <script>
   import {
-    mapGetters
+    mapGetters,
   } from "vuex";
-  import {getUserInfo} from "../../util/util.js"
-  import {getList} from "../../api/community/agency.js"
-  import {getList as getResList} from "../../api/community/residential.js"
+  import {getUserInfo} from "@/util/util.js"
+  import {getList} from "@/api/community/agency.js"
+  import {getList as getResList} from "@/api/community/residential.js"
   export default{
 
     data(){
@@ -133,23 +133,24 @@
         })
       },
       jumpToBigData(path) {
-        // if(path=="smartCommunity"){
-        //   if(getUserInfo()){
-        //     localStorage.setItem("agencies1",JSON.stringify(this.GardenDataList))
-        //     path = 'index2'
-        //   }else{
-        //     let orgInfo = this.$store.getters.orgInfo
-        //     if(orgInfo.deptType=="5"){
-        //       //社区
-        //       localStorage.setItem("agencies1",JSON.stringify(this.GardenDataList))
-        //       path = 'index2'
-        //     }else if(orgInfo.deptType=="6"||orgInfo.deptType=="1"||orgInfo.deptType=="4"){
-        //       //小区
-        //       localStorage.setItem("agencies2",JSON.stringify(this.ResDataList))
-        //       path = 'index3'
-        //     }
-        //   }
-        // }
+        if(path=="smartCommunity"){
+          if(getUserInfo()){
+            localStorage.setItem("agencies1",JSON.stringify(this.GardenDataList))
+            path = 'index2'
+          }else{
+            let orgInfo = this.$store.getters.orgInfo
+            if(orgInfo.deptType=="5"){
+              //社区
+              localStorage.setItem("agencies1",JSON.stringify(this.GardenDataList))
+              path = 'index2'
+            }else if(orgInfo.deptType=="6"||orgInfo.deptType=="1"||orgInfo.deptType=="4"){
+              //小区
+              localStorage.setItem("agencies2",JSON.stringify(this.ResDataList))
+              path = 'index3'
+            }
+          }
+        }
+
         this.$router.push({
           path: path
         })
@@ -159,16 +160,7 @@
 </script>
 
 <style lang="scss" scoped >
-.my-top-menu{
-  width: 100%;
-  height: 100%;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  flex-direction: row;
-  padding: 2px 20px;
-  overflow-x: scroll;
-}
+
   .wel{
       &__title {
         font-size: 16px;

src/config/iconList.js

@@ -1,73 +1,72 @@
-export default [
-  {
-    label: "通用图标",
-    list: [
-      "iconfont iconicon_roundadd",
-      "iconfont iconicon_compile",
-      "iconfont iconicon_glass",
-      "iconfont iconicon_roundclose",
-      "iconfont iconicon_roundreduce",
-      "iconfont iconicon_delete",
-      "iconfont iconicon_shakehands",
-      "iconfont iconicon_task_done",
-      "iconfont iconicon_voipphone",
-      "iconfont iconicon_safety",
-      "iconfont iconicon_work",
-      "iconfont iconicon_study",
-      "iconfont iconicon_task",
-      "iconfont iconicon_subordinate",
-      "iconfont iconicon_star",
-      "iconfont iconicon_setting",
-      "iconfont iconicon_sms",
-      "iconfont iconicon_share",
-      "iconfont iconicon_secret",
-      "iconfont iconicon_scan_namecard",
-      "iconfont iconicon_principal",
-      "iconfont iconicon_group",
-      "iconfont iconicon_send",
-      "iconfont iconicon_scan",
-      "iconfont iconicon_search",
-      "iconfont iconicon_refresh",
-      "iconfont iconicon_savememo",
-      "iconfont iconicon_QRcode",
-      "iconfont iconicon_im_keyboard",
-      "iconfont iconicon_redpacket",
-      "iconfont iconicon_photo",
-      "iconfont iconicon_qq",
-      "iconfont iconicon_wechat",
-      "iconfont iconicon_phone",
-      "iconfont iconicon_namecard",
-      "iconfont iconicon_notice",
-      "iconfont iconicon_next_arrow",
-      "iconfont iconicon_left",
-      "iconfont iconicon_more",
-      "iconfont iconicon_details",
-      "iconfont iconicon_message",
-      "iconfont iconicon_mobilephone",
-      "iconfont iconicon_im_voice",
-      "iconfont iconicon_GPS",
-      "iconfont iconicon_ding",
-      "iconfont iconicon_exchange",
-      "iconfont iconicon_cspace",
-      "iconfont iconicon_doc",
-      "iconfont iconicon_dispose",
-      "iconfont iconicon_discovery",
-      "iconfont iconicon_community_line",
-      "iconfont iconicon_cloud_history",
-      "iconfont iconicon_coinpurse_line",
-      "iconfont iconicon_airplay",
-      "iconfont iconicon_at",
-      "iconfont iconicon_addressbook",
-      "iconfont iconicon_boss",
-      "iconfont iconicon_addperson",
-      "iconfont iconicon_affiliations_li",
-      "iconfont iconicon_addmessage",
-      "iconfont iconicon_addresslist",
-      "iconfont iconicon_add",
-      "iconfont icongithub",
-      "iconfont icongitee2",
-    ]
-  },
+export default [{
+  label: "通用图标",
+  list: [
+    "iconfont iconicon_roundadd",
+    "iconfont iconicon_compile",
+    "iconfont iconicon_glass",
+    "iconfont iconicon_roundclose",
+    "iconfont iconicon_roundreduce",
+    "iconfont iconicon_delete",
+    "iconfont iconicon_shakehands",
+    "iconfont iconicon_task_done",
+    "iconfont iconicon_voipphone",
+    "iconfont iconicon_safety",
+    "iconfont iconicon_work",
+    "iconfont iconicon_study",
+    "iconfont iconicon_task",
+    "iconfont iconicon_subordinate",
+    "iconfont iconicon_star",
+    "iconfont iconicon_setting",
+    "iconfont iconicon_sms",
+    "iconfont iconicon_share",
+    "iconfont iconicon_secret",
+    "iconfont iconicon_scan_namecard",
+    "iconfont iconicon_principal",
+    "iconfont iconicon_group",
+    "iconfont iconicon_send",
+    "iconfont iconicon_scan",
+    "iconfont iconicon_search",
+    "iconfont iconicon_refresh",
+    "iconfont iconicon_savememo",
+    "iconfont iconicon_QRcode",
+    "iconfont iconicon_im_keyboard",
+    "iconfont iconicon_redpacket",
+    "iconfont iconicon_photo",
+    "iconfont iconicon_qq",
+    "iconfont iconicon_wechat",
+    "iconfont iconicon_phone",
+    "iconfont iconicon_namecard",
+    "iconfont iconicon_notice",
+    "iconfont iconicon_next_arrow",
+    "iconfont iconicon_left",
+    "iconfont iconicon_more",
+    "iconfont iconicon_details",
+    "iconfont iconicon_message",
+    "iconfont iconicon_mobilephone",
+    "iconfont iconicon_im_voice",
+    "iconfont iconicon_GPS",
+    "iconfont iconicon_ding",
+    "iconfont iconicon_exchange",
+    "iconfont iconicon_cspace",
+    "iconfont iconicon_doc",
+    "iconfont iconicon_dispose",
+    "iconfont iconicon_discovery",
+    "iconfont iconicon_community_line",
+    "iconfont iconicon_cloud_history",
+    "iconfont iconicon_coinpurse_line",
+    "iconfont iconicon_airplay",
+    "iconfont iconicon_at",
+    "iconfont iconicon_addressbook",
+    "iconfont iconicon_boss",
+    "iconfont iconicon_addperson",
+    "iconfont iconicon_affiliations_li",
+    "iconfont iconicon_addmessage",
+    "iconfont iconicon_addresslist",
+    "iconfont iconicon_add",
+    "iconfont icongithub",
+    "iconfont icongitee2",
+  ]
+},
   {
     label: "系统图标",
     list: [
@@ -114,5 +113,123 @@ export default [
       "iconfont icon-iframe",
       "iconfont icon-huanyingye",
     ]
+  },
+  {
+    label: "其它图标",
+    list: [
+      "iconfont yc-grid-shebei",
+      "iconfont yc-grid-cheliang-",
+      "iconfont yc-grid-cheliangguanli1",
+      "iconfont yc-grid-shequ",
+      "iconfont yc-grid-diandongche01",
+      "iconfont yc-grid-iconset0272",
+      "iconfont yc-grid-wuyebaoxiu",
+      "iconfont yc-grid-gaojing",
+      "iconfont yc-grid-terminal",
+      "iconfont yc-grid-shenhe-copy",
+      "iconfont yc-grid-tingchewei",
+      "iconfont yc-grid-xingweifenxi",
+      "iconfont yc-grid-biaoshilei_renlianzhuapai",
+      "iconfont yc-grid-shipinjiankong",
+      "iconfont yc-grid-shenhe",
+      "iconfont yc-grid-renyuandanganguanli",
+      "iconfont yc-grid-xiaoqu",
+      "iconfont yc-grid-manhole-cover",
+      "iconfont yc-grid-shebeiliebiao",
+      "iconfont yc-grid-ludeng",
+      "iconfont yc-grid-xunchaguanli",
+      "iconfont yc-grid-zhongduanguanli",
+      "iconfont yc-grid-cheliangjiankong",
+      "iconfont yc-grid-renyuandangan",
+      "iconfont yc-grid-xunchatongji",
+      "iconfont yc-grid-zhongduancanshuguanli",
+      "iconfont yc-grid-drxx19",
+      "iconfont yc-grid-laoren",
+      "iconfont yc-grid-xiaofangshuan",
+      "iconfont yc-grid-tree-round-key-person",
+      "iconfont yc-grid-lajitong",
+      "iconfont yc-grid-lvhuaxiaoqu",
+      "iconfont yc-grid-tonghangzheng",
+      "iconfont yc-grid-zhinengshebei",
+      "iconfont yc-grid-zhinengshebei1",
+      "iconfont yc-grid-tingchewei1",
+      "iconfont yc-grid-tongji",
+      "iconfont yc-grid-shangbaowenti",
+      "iconfont yc-grid-zhinengludeng",
+      "iconfont yc-grid-jianzhuanquangongchengicons-",
+      "iconfont yc-grid-gaojing1",
+      "iconfont yc-grid-zhuapaixiangji",
+      "iconfont yc-grid-app_icons--",
+      "iconfont yc-grid-jiankong",
+      "iconfont yc-grid-zhinengshebei2",
+      "iconfont yc-grid-tongji1",
+      "iconfont yc-grid-liebiao",
+      "iconfont yc-grid-menci",
+      "iconfont yc-grid-zhinengshebei3",
+      "iconfont yc-grid-shenqing",
+      "iconfont yc-grid-shenqing1",
+      "iconfont yc-grid-icon-tongji",
+      "iconfont yc-grid-wuyejiaofei",
+      "iconfont yc-grid-shenqing2",
+      "iconfont yc-grid-weibiaoti-_huaban",
+      "iconfont yc-grid-geli",
+      "iconfont yc-grid-che",
+      "iconfont yc-grid-richangxuncha",
+      "iconfont yc-grid-zhongduanguanli1",
+      "iconfont yc-grid-gonggao",
+      "iconfont yc-grid-gonganxiaofang",
+      "iconfont yc-grid-dibudaohanglan-",
+      "iconfont yc-grid-renyuanpeizhi",
+      "iconfont yc-grid-menci-",
+      "iconfont yc-grid-wulianwangditushangtubiao_huabanfuben",
+      "iconfont yc-grid-IOTtubiao_huabanfuben",
+      "iconfont yc-grid-Home_icon_chepaiquer-copy",
+      "iconfont yc-grid-NMStubiao-",
+      "iconfont yc-grid-zhongduanshang",
+      "iconfont yc-grid-xiaofanghuopao",
+      "iconfont yc-grid-peizhitubiaosvg-",
+      "iconfont yc-grid-peizhitubiaosvg-1",
+      "iconfont yc-grid-guangbo",
+      "iconfont yc-grid-renyuan",
+      "iconfont yc-grid-laba",
+      "iconfont yc-grid-yiqingtianbao",
+      "iconfont yc-grid-geli1",
+      "iconfont yc-grid-tingchewei2",
+      "iconfont yc-grid-huanjingjiancha",
+      "iconfont yc-grid-meiqiganyingqibeifen",
+      "iconfont yc-grid-xgyq",
+      "iconfont yc-grid-shenqing3",
+      "iconfont yc-grid-zhongduanliebiao",
+      "iconfont yc-grid-zhinengyangan",
+      "iconfont yc-grid-menci1",
+      "iconfont yc-grid-chepaishibie",
+      "iconfont yc-grid-chepaishibie1",
+      "iconfont yc-grid-liudongrenyuan",
+      "iconfont yc-grid-gupiao",
+      "iconfont yc-grid-fangjianshu",
+      "iconfont yc-grid-gaojing2",
+      "iconfont yc-grid-loudongguanli",
+      "iconfont yc-grid-loudongguanli1",
+      "iconfont yc-grid-huanjingjiankong",
+      "iconfont yc-grid-cheliangguanli",
+      "iconfont yc-grid-tingchewei3",
+      "iconfont yc-grid-shebei",
+      "iconfont yc-grid-shebei1",
+      "iconfont yc-grid-_yanglaofuyou",
+      "iconfont yc-grid-yuangongguanli",
+      "iconfont yc-grid-ranqijianceqi",
+      "iconfont yc-grid-chongdianzhuang",
+      "iconfont yc-grid-chongdianzhuang1",
+      "iconfont yc-grid-cewenqiang",
+      "iconfont yc-grid-007-temperature",
+      "iconfont yc-grid-ranqibaojingqi",
+      "iconfont yc-grid-xitongmoxingchajian",
+      "iconfont yc-grid-chongdianzhuang2",
+      "iconfont yc-grid-cewen",
+      "iconfont yc-grid-chongdianzhuang3",
+      "iconfont yc-grid-dici",
+      "iconfont yc-grid-approach",
+      "iconfont yc-grid-exit",
+    ]
   }
 ]

src/styles/iconfont.scss

@@ -0,0 +1 @@
+@import url('//at.alicdn.com/t/font_2230795_kjs2sqv1fsh.css');