Merge branch 'master' into shibei_master

 Conflicts:

	src/router/index.js

	src/views/pages/index.vue

.env.production

@@ -1,4 +1,4 @@
 NODE_ENV=production
-VUE_APP_API_SERVER =  https://epmet-cloud.elinkservice.cn/api
+VUE_APP_API_SERVER =  https://epdc-shibei.elinkservice.cn/api
 VUE_APP_NODE_ENV=prod
 VUE_APP_PUBLIC_PATH=epmet-oper

.env.production.uat

@@ -1,5 +1,5 @@
 NODE_ENV=production
-# VUE_APP_API_SERVER =  http://120.27.18.76/api
-VUE_APP_API_SERVER =  https://epmet-test.elinkservice.cn/api
+VUE_APP_API_SERVER =  http://120.27.18.76/api
+# VUE_APP_API_SERVER =  https://epmet-test.elinkservice.cn/api
 VUE_APP_NODE_ENV=prod:uat
 VUE_APP_PUBLIC_PATH=epmet-oper

public/index.html

@@ -67,7 +67,7 @@
               <!– 生产环境 –>
               <% if (process.env.VUE_APP_NODE_ENV==='prod' ) { %>
                 <script>
-                  window.SITE_CONFIG['apiURL'] = 'https://epmet-cloud.elinkservice.cn/api'
+                  window.SITE_CONFIG['apiURL'] = 'https://epdc-shibei.elinkservice.cn/api'
                 </script>
                 <% } %>-->
 

src/assets/scss/modules/searchNew.scss

@@ -0,0 +1,272 @@
+@import "../c/config";
+@import "../c/function";
+/deep/ .el-table th {
+    color: #ffffff !important;
+    background-color: #0082fb !important;
+}
+.m-info {
+    padding: 0;
+    .wrap {
+        background-image: url(~@/assets/img/shequ/shequ-bg.jpg);
+        background-size: cover;
+        border-radius: 10px;
+        padding: 30px 40px;
+        .logo {
+            margin-bottom: 30px;
+            img {
+                display: block;
+                margin: 0 auto;
+            }
+        }
+        .search-title {
+            font-size: 24px;
+            font-family: PingFang SC;
+            font-weight: bold;
+            color: #333333;
+            margin: 30px 0 20px 0;
+        }
+        .search {
+            margin: 20px 0 80px 0;
+            width: 750px;
+            height: 53px;
+            border: 2px solid #0082fb;
+            border-radius: 8px;
+            display: flex;
+            align-items: center;
+            background-color: #fff;
+
+            .input {
+                position: relative;
+                .select-show {
+                    border: none;
+                    display: block;
+                    font-size: 16px;
+                    width: 90px;
+                    line-height: 32px;
+                    text-align: center;
+                    color: #0082fb;
+                    cursor: default;
+                }
+
+                input {
+                    margin-left: 20px;
+                    width: 500px;
+                    border: none;
+                    line-height: 24px;
+                    font-size: 18px;
+                    font-family: PingFang SC;
+                    font-weight: 400;
+                    color: #333;
+                    background-color: transparent;
+                }
+
+                .close-btn {
+                    position: absolute;
+                    right: 0;
+                    top: 0;
+                    bottom: 0;
+                    margin: auto 0;
+                    width: 30px;
+                    height: 30px;
+                    background-color: #eee;
+                    border-radius: 100%;
+                    cursor: pointer;
+
+                    img {
+                        display: block;
+                        margin: 8px auto;
+                        width: 14px;
+                        height: 14px;
+                        opacity: 0.3;
+                    }
+                }
+            }
+
+            .btn {
+                margin-left: auto;
+                width: 120px;
+                line-height: 49px;
+                background: #0082fb;
+                border-radius: 0px 6 px 6 px 0px;
+                font-size: 22px;
+                text-align: center;
+                font-family: PingFang SC;
+                font-weight: 500;
+                color: #ffffff;
+                cursor: pointer;
+            }
+        }
+        .header {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            margin-bottom: 20px;
+
+            .headline {
+                font-size: 24px;
+                font-family: PingFang SC;
+                font-weight: bold;
+                color: #333333;
+            }
+            .notice {
+                width: 85%;
+                line-height: 24px;
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+
+                .notice-btn {
+                    width: 50px;
+                    background-color: #3e8ef7;
+                    color: #fff;
+                    text-align: center;
+                    border-radius: 4px;
+                    cursor: pointer;
+                }
+                .notice-list {
+                    // @include toe;
+                    width: calc(100% - 70px);
+                    // height: 24px;
+                    // overflow: hidden;
+                    a {
+                        margin-right: 20px;
+                        cursor: pointer;
+                        color: #999;
+                        &:hover {
+                            color: #3e8ef7;
+                        }
+                    }
+                }
+            }
+        }
+
+        .cnt {
+            display: flex;
+            .chart {
+                width: 520px;
+            }
+            .tb {
+                width: calc(100% - 520px);
+            }
+        }
+    }
+}
+.m-panel {
+    background-color: #fff;
+    border-radius: 10px;
+    padding: 30px 40px;
+
+    .operate {
+        text-align: right;
+    }
+}
+.m-list {
+    .list-title {
+        margin-bottom: 20px;
+        font-size: 24px;
+        font-family: PingFang SC;
+        font-weight: bold;
+        color: #333333;
+    }
+
+    .list-title2 {
+        margin-bottom: 10px;
+        font-size: 16px;
+        font-family: PingFang SC;
+        font-weight: bold;
+        color: #333333;
+    }
+
+    .list {
+        display: flex;
+        flex-wrap: wrap;
+
+        .item {
+            position: relative;
+            margin-right: 46px;
+            margin-bottom: 20px;
+            width: 80px;
+            text-align: center;
+            cursor: pointer;
+
+            .corner-mark {
+                position: absolute;
+                top: -4px;
+                right: -4px;
+                color: #ccc;
+                font-size: 20px;
+                z-index: 1;
+                &.z-on {
+                    color: #0082fb;
+                }
+            }
+
+            .icon {
+                position: relative;
+                display: block;
+                margin: 0 auto;
+                width: 78px;
+                height: 78px;
+
+                &::before {
+                    content: "";
+                    position: absolute;
+                    z-index: 0;
+                    display: block;
+                    top: 0;
+                    left: 0;
+                    right: 0;
+                    bottom: 0;
+                    margin: auto;
+                    width: 64px;
+                    height: 64px;
+                    border-radius: 10px;
+                    background-color: #ffffff;
+                }
+
+                img {
+                    position: relative;
+                    width: 78px;
+                    height: 78px;
+                    object-fit: cover;
+                }
+
+                .icon-svg {
+                    position: relative;
+                    display: block;
+                    margin: auto;
+                    width: 78px;
+                    height: 78px;
+                    object-fit: cover;
+                }
+            }
+            p {
+                margin: 0;
+                line-height: 24px;
+                font-size: 16px;
+                font-family: PingFang SC;
+                font-weight: 400;
+                color: #333333;
+            }
+        }
+    }
+}
+
+.m-tb {
+    margin-bottom: 20px;
+}
+
+.m-crumbs {
+    padding: 10px 30px 0;
+    font-size: 16px;
+    a {
+        color: #666;
+        &:hover {
+            color: #094bea;
+        }
+        cursor: pointer;
+    }
+    span {
+        color: #094bea;
+    }
+}

src/router/index.js

@@ -245,8 +245,194 @@ router.beforeEach((to, from, next) => {
   const customerId = localStorage.getItem("customerId");
   console.log("customerId：", customerId);
 
+  window.SITE_CONFIG["menuShujuList"] = [
+    {
+      url: "/visual/plugin/power/organization",
+      name: "动力主轴",
+      id: "5feawfwaefwa577",
+    },
+    {
+      id: "22213213",
+      name: "基础信息",
+      // url: "visual/basicinfo/basicInfoMain",
+      children: [
+        {
+          url: "/visual/basicinfo/basicInfoMain",
+          name: "人房信息统计",
+          id: "5feawfwaefwa5",
+        },
+        {
+          url: "/visual/basicinfo/personCategory/index",
+          name: "人员类别分析",
+          id: "5fwaefwaefawef5",
+        },
+        {
+          url: "/visual/basicinfo/houseStatic/houseStatic",
+          name: "人房概览统计",
+          id: "5fwaefwaefawef6",
+        },
+      ],
+    },
+    {
+      icon: "icon-setting",
+      id: "2",
+      name: "人员图谱",
+      url: "visual/basicinfo/peopleSearch",
+    },
+    {
+      icon: "icon-setting",
+      id: "3",
+      name: "人员预警",
+      url: "visual/warning/index",
+    },
+    {
+      icon: "icon-setting",
+      id: "2221321001",
+      name: "社区党建",
+      // url: "visual/basicinfo/basicInfoMain",
+      children: [
+        {
+          url: "/visual/communityParty/gridParty",
+          name: "网格党建平面图",
+          id: "5feawfwaefwa579",
+        },
+        {
+          url: "/visual/communityParty/party",
+          name: "党员信息统计",
+          id: "5feawfwaefwa578",
+        },
+        {
+          url: "/visual/communityParty/community",
+          name: "联建单位分析",
+          id: "5fwaefwaefawef588",
+        },
+        {
+          url: "/visual/communityParty/elegant",
+          name: "党员风采榜",
+          id: "5fwaefwaefawef589",
+        },
+      ],
+    },
+    {
+      icon: "icon-setting",
+      id: "2221321123",
+      name: "社区服务",
+      // url: "visual/basicinfo/basicInfoMain",
+      children: [
+        {
+          url: "/visual/measure/service",
+          name: "需求服务分析",
+          id: "5feawfwaefwa57",
+        },
+        {
+          url: "/visual/measure/volunteer",
+          name: "志愿服务分析",
+          id: "5fwaefwaefawef58",
+        },
+      ],
+    },
+    {
+      icon: "icon-setting",
+      id: "6",
+      name: "社区治理",
+      children: [
+        {
+          url: "visual/communityGovern/shijianchuli/shijianchulifenxi",
+          name: "事件处理分析",
+          id: "shijianchulifenxi",
+        },
+        // {
+        //   url: "visual/communityGovern/processAnalyze",
+        //   name: "事件处置分析",
+        //   id: "processAnalyze",
+        // },
+        {
+          url: "/visual/communityGovern/shijianfenlei/shijianfenleifenxi",
+          name: "事件分类分析",
+          id: "shijianfenleifenxi",
+        },
+        {
+          url: "/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi",
+          name: "多元服务分析",
+          id: "duoyuanfuwufenxi",
+        },
+        // {
+        //   url: "/visual/communityGovern/typeAnalyze",
+        //   name: "事件分类分析",
+        //   id: "typeAnalyze",
+        // },
+        // {
+        //   url: "/visual/communityGovern/resibuzz",
+        //   name: "居民热议分析",
+        //   id: "resibuzz",
+        // },
+        // {
+        //   url: "/visual/communityGovern/distributionAnalyze",
+        //   name: "事件分布分析",
+        //   id: "distributionAnalyze",
+        // },
+      ],
+    },
+
+    {
+      icon: "icon-setting",
+      id: "2221321fefefaewfa123",
+      name: "初心互助",
+      url: "visual/heart/index",
+      children: [],
+    },
+    {
+      icon: "icon-setting",
+      id: "2221321fefefaewfa122223",
+      name: "疫情防控",
+      url: "",
+      children: [],
+    },
+    {
+      icon: "icon-setting",
+      id: "44rq22222q2222",
+      name: "智慧安防",
+      // url: "visual/basicinfo/basicInfoMain",
+      children: [
+        {
+          url: "https://test-rxs-job.elinkservice.cn/haiqin-ai/aisecurity.html#/monitor-panel",
+          // url: "/visual/ai/index",
+          name: "视频监控",
+          id: "5feawfwa111111efwa57",
+        },
+        /*{
+      url: "/visual/ai/renliu",
+      name: "人流数据",
+      id: "5fwaefwae222112fawef58",
+    },
+    {
+      url: "/visual/ai/cheliu",
+      name: "车流数据",
+      id: "erawerwecsxefwaw",
+    },
+    {
+      url: "/visual/ai/shebei",
+      name: "设备数据",
+      id: "zfzffewaf",
+    },
+    {
+      url: "/visual/ai/gongdan",
+      name: "工单数据",
+      id: "fewafwafewaefddd",
+    },*/
+        {
+          // url: "/visual/ai/yujing",
+          url: "https://test-rxs-job.elinkservice.cn/haiqin-ai/aisecurity.html#/data-analysis",
+          name: "预警分析",
+          id: "545345fdsfs",
+        },
+      ],
+    },
+  ];
+  // fnAddDynamicMenuRoutes2(window.SITE_CONFIG["menuShujuList"]);
+
   http
-    .get("gov/access/menu/navDigitalCommunity?tableName=data_menu")
+    .get("/gov/access/menu/nav?tableName=data_menu")
     .then(({ data: res }) => {
       if (res.code == 10005 || res.code == 10006 || res.code == 10007) {
         // 10005 token为空  10006登陆超时 10007别处登录
@@ -272,7 +458,7 @@ router.beforeEach((to, from, next) => {
     });
 
   http
-    .get("gov/access/menu/navDigitalCommunity")
+    .get("/gov/access/menu/nav")
     .then(({ data: res }) => {
       if (res.code == 10005 || res.code == 10006 || res.code == 10007) {
         // 10005 token为空  10006登陆超时 10007别处登录
@@ -387,10 +573,10 @@ function fnAddDynamicMenuRoutes(menuList = [], routes = []) {
       children: routes,
     },
     {
-      path: "/main/*",
-      redirect: {
-        path: "/main/404",
-      },
+      path: "*",
+      // redirect: {
+      //   name: "404",
+      // },
     },
   ]);
   window.SITE_CONFIG["dynamicMenuRoutes"] = routes;
@@ -461,10 +647,10 @@ function fnAddDynamicMenuRoutes2(menuList = [], routes = []) {
       children: routes,
     },
     {
-      path: "/main-shuju/*",
-      redirect: {
-        path: "/main-shuju/404",
-      },
+      path: "*",
+      // redirect: {
+      //   name: "404",
+      // },
     },
   ]);
   window.SITE_CONFIG["dynamicMenuRoutesShuju"] = routes;

src/views/main-shuju/main-navbar.vue

@@ -2,11 +2,10 @@
   <div>
     <nav v-if="showHeader" class="m-navbar">
       <div class="navbar__header">
-        <h1 class="navbar__brand" @click="$router.push({ name: 'home' })">
-          <a class="navbar__brand-lg" href="javascript:;">{{ customerName }}</a>
-          <a class="navbar__brand-mini" href="javascript:;">{{
-            customerName.slice(0, 2)
-          }}</a>
+        <!-- @click="$router.push({ name: 'home' })" -->
+        <h1 class="navbar__brand">
+          <a class="navbar__brand-lg" href="javascript:;">互联平台</a>
+          <a class="navbar__brand-mini" href="javascript:;">互联</a>
         </h1>
       </div>
       <div class="navbar__body">
@@ -37,9 +36,9 @@
           mode="horizontal"
           class="navbar__menu mr-auto z-div"
         >
-          <el-menu-item index="index" @click="toIndexPage">
+          <!-- <el-menu-item index="index" @click="toIndexPage">
             <span>首页</span>
-          </el-menu-item>
+          </el-menu-item> -->
 
           <template v-for="(menu, idx) in $store.state.mainShuju.menuList">
             <li

src/views/modules/base/community/communityForm.vue

@@ -21,6 +21,7 @@
             <el-select class="item_width_1"
                        v-model="dataForm.gridId"
                        placeholder="请选择"
+                       :disabled="formType=='edit'"
                        clearable>
               <el-option v-for="item in gridList"
                          :key="item.gridId"

src/views/modules/base/community/roomForm.vue

@@ -39,7 +39,7 @@
                     v-model="dataForm.doorName">
           </el-input>
         </el-form-item>
-        <el-form-item v-if="formType != 'detail'" label="房屋编码"
+        <!-- <el-form-item v-if="formType != 'detail'" label="房屋编码"
                       prop="coding"
                       label-width="150px"
                       style="display: block">
@@ -53,8 +53,8 @@
                        type="primary"
                        size="small"
                        @click="handleCode">生成</el-button>
-        </el-form-item>
-        <div v-if="formType === 'detail'">
+        </el-form-item> -->
+        <!-- <div v-if="formType === 'detail'">
           <el-form-item label="房屋编码"
                         prop="houseCode"
                         label-width="150px"
@@ -72,7 +72,7 @@
                :href="dataForm.houseQrcodeUrl"
                target="_blank">下载</a>
           </div>
-        </div>
+        </div> -->
         <!-- <el-form-item label="居住人数"
                       style="display: block"
                       prop="realPerson"
@@ -422,9 +422,9 @@ export default {
         doorName: [
           { required: true, message: '门牌号不能为空', trigger: 'blur' }
         ],
-        coding: [
-          { required: true, message: '房屋编码不能为空', trigger: 'blur' }
-        ],
+        // coding: [
+        //   { required: true, message: '房屋编码不能为空', trigger: 'blur' }
+        // ],
         houseType: [
           { required: true, message: '房屋类型不能为空', trigger: 'blur' }
         ],

src/views/modules/visual/communityGovern/typeAnalyze.vue

@@ -424,6 +424,9 @@ export default {
           this.demand.list = data.list.map((item) => {
             //楼院小组:issue； 项目立项:agency 事件上报:resi_event【也可控制点击查看时里边三个按钮的显示】	
             item.originShow = item.origin === 'issue' ? '楼院小组' : item.origin === 'agency' ? '项目立项' : '事件上报'
+            if (item.origin === 'issue'){
+                item.originShow = item.topicId ? '邻里党群' : '党群议事'
+            }
             //状态:待处理 pending，已结案closed	
             item.statusShow = item.status === 'pending' ? '待处理' : '已结案'
             return [

src/views/modules/workSys/mapConfig.vue

@@ -285,10 +285,10 @@ const vueGis = {
 
       xOffset: 0,
       yOffset: 0,
-      xOffset_customize: 0,
-      yOffset_customize: 0,
-      // xOffset_customize: 0.0051,//市北默认偏移
-      // yOffset_customize: 0.0002,//市北默认偏移
+      // xOffset_customize: 0,
+      // yOffset_customize: 0,
+      xOffset_customize: 0.0051,//市北默认偏移
+      yOffset_customize: 0.0002,//市北默认偏移
 
       longitude: undefined,
       latitude: undefined,

src/views/pages/index.vue

@@ -5,15 +5,15 @@
         <div class="list">
           <div class="item" @click="handleClickItem(1)">
             <img class="logo" src="@/assets/img/index/logo-1.png" alt="" />
-            <!-- 党建引领基层治理互联管理平台 -->
-            <div class="name">数字社区管理平台</div>
+             <!-- 数字社区管理平台 -->
+            <div class="name">党建引领基层治理互联管理平台</div>
             <img src="@/assets/img/index/zhuangshi.png" class="tip" />
           </div>
 
           <div class="item z-on" @click="handleClickItem(2)">
             <img class="logo" src="@/assets/img/index/logo-2.png" alt="" />
-            <!-- 数据分析可视化平台 -->
-            <div class="name">数字社区可视化平台</div>
+             <!-- 数字社区可视化平台 -->
+            <div class="name">数据分析可视化平台</div>
             <img src="@/assets/img/index/zhuangshi.png" class="tip" />
           </div>
         </div>
@@ -21,9 +21,7 @@
       <div class="m-footer">
         <div class="login-footer">
           <p>
-            <a href="http://www.elinkchina.com.cn/" target="_blank">{{
-              $t("login.copyright")
-            }}</a>
+            <a href="http://www.elinkchina.com.cn/" target="_blank">{{ $t('login.copyright') }}</a>
           </p>
         </div>
       </div>
@@ -52,15 +50,6 @@ export default {
   created() {},
   mounted() {},
 
-  beforeRouteEnter(to, from, next) {
-    console.log(from);
-    if (from.name == "login") {
-      next();
-      location.reload();
-    }
-    next();
-  },
-
   methods: {
     handleClickItem(k) {
       if (k == 1) {