bug修改

config/index.js

@@ -12,16 +12,16 @@ module.exports = {
         assetsPublicPath: '/',
         proxyTable: {
             '/api': {
-                target: 'http://127.0.0.1:9990',
+                // target: 'http://127.0.0.1:9990',
-                // target: 'http://60.255.186.185:9024/api',
+                target: 'http://60.255.186.185:9024/api',
                 changeOrigin: true,
                 pathRewrite: {
                     '^/api': ''
                 }
             },
             '/localImage': {
-                // target: 'http://60.255.186.185:9024/',
+                target: 'http://60.255.186.185:9024/',
-                target: 'http://127.0.0.1:9990/',
+                // target: 'http://127.0.0.1:9990/',
                 changeOrigin: true,
             },
             '/socket.io': {

src/views/screen/components/MainTitle.vue

@@ -147,6 +147,22 @@
                 </div>
             </div>
         </Modal>
+        <common-modal
+            v-model="appState"
+            :title="currentMenu.menuName"
+            width="600"
+        >
+            <div style="width: 100%; display: flex; flex-wrap: wrap">
+                <div
+                    class="menu-item"
+                    @click="toMenu(item)"
+                    v-for="(item, index) in currentMenu.children"
+                    :key="index"
+                >
+                    <span>{{ item.menuItem }}</span>
+                </div>
+            </div>
+        </common-modal>
     </div>
     <!--   主标题 结束     -->
 </template>
@@ -154,10 +170,11 @@
 <script>
 import weatherIcon from "@/common/weatherIcon";
 import { Swiper, SwiperSlide } from "vue-awesome-swiper";
+import CommonModal from "@/views/common-components/common-modal.vue";
 
 export default {
     name: "MainTitle",
-    components: { Swiper, SwiperSlide },
+    components: { Swiper, SwiperSlide, CommonModal },
     props: {
         title: {
             type: String,
@@ -176,6 +193,8 @@ export default {
         let self = this;
         return {
             weatherData: {},
+            appState: false,
+            currentMenu: {},
             nowDateStr: "",
             interVal: null,
             interValWeather: null,
@@ -227,10 +246,30 @@ export default {
                         {
                             meumItem: "人流预警",
                             isShowTwon: true,
+                            children: [
+                                {
+                                    menuItem: "人流1",
+                                    areaCode: "",
+                                },
+                                {
+                                    menuItem: "人流2",
+                                    areaCode: "",
+                                },
+                            ],
                         },
                         {
                             meumItem: "车流预警",
                             isShowTwon: true,
+                            children: [
+                                {
+                                    menuItem: "车流1",
+                                    areaCode: "",
+                                },
+                                {
+                                    menuItem: "车流2",
+                                    areaCode: "",
+                                },
+                            ],
                         },
                         {
                             meumItem: "视频结构化",
@@ -293,7 +332,7 @@ export default {
                 {
                     meumName: "媒体融合",
                     children: [
-                    {
+                        {
                             meumItem: "媒体融合",
                             routerPath: "/new-media",
                         },
@@ -499,26 +538,33 @@ export default {
                 switch (item.meumItem) {
                     case "镇级":
                         this.currentType = "town";
+                        this.townModal = true;
                         break;
                     case "村级":
                         this.currentType = "village";
+                        this.townModal = true;
                         break;
                     case "乡村治理":
                         this.currentType = "governance";
+                        this.townModal = true;
                         break;
                     case "网格管理":
                         this.currentType = "grid";
+                        this.townModal = true;
                         break;
                     case "人流预警":
                         this.currentType = "person";
+                        this.currentMenu = item;
+                        this.appState = true;
                         break;
                     case "车流预警":
                         this.currentType = "car";
+                        this.currentMenu = item;
+                        this.appState = true;
                         break;
                     default:
                         break;
                 }
-                this.townModal = true;
             } else {
                 this.$message.info("正在建设中......");
             }
@@ -545,7 +591,7 @@ export default {
                 },
             });
         },
-        toScreenPage (item) {
+        toScreenPage(item) {
             if (this.currentType == "town") {
                 this.$message.info("请选择试点镇-李庄镇");
                 return;
@@ -558,7 +604,7 @@ export default {
                         areaCode: item.areaCode,
                     },
                 });
-                return
+                return;
             }
             if (this.currentType == "car") {
                 this.$router.push({
@@ -568,7 +614,7 @@ export default {
                         areaCode: item.areaCode,
                     },
                 });
-                return
+                return;
             }
             if (item.areaName != "高桥村") {
                 this.$message.info("除高桥村,其余尚未建设！");
@@ -659,12 +705,54 @@ export default {
                 name: "login",
             });
         },
+        toMenu(item) {
+            switch (this.currentType) {
+                case "person":
+                    this.$router.push({
+                        path: "/person-warring",
+                        query: {
+                            areaName: item.menuItem,
+                            areaCode: item.areaCode,
+                        },
+                    });
+                    break;
+                case "car":
+                    this.$router.push({
+                        path: "/car-warring",
+                        query: {
+                            areaName: item.menuItem,
+                            areaCode: item.areaCode,
+                        },
+                    });
+                    break;
+                default:
+                    break;
+            }
+        },
     },
 };
 </script>
 
 <style lang="less" scoped>
 @import url("../../../styles/fonts/font.less");
+.menu-item {
+    cursor: pointer;
+    width: 100px;
+    height: 67px;
+    background: url("../../../assets/largeScreen/enter-box.png") no-repeat;
+    background-size: 100% 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    margin: 0 20px 20px 0;
+    span {
+        font-family: YouSheBiaoTiHei;
+        font-weight: 500;
+        font-size: 16px;
+        color: #ffffff;
+    }
+}
 .Main-title {
     height: 100px;
     width: 1920px;
@@ -870,12 +958,16 @@ export default {
 
 /deep/ .ivu-dropdown-item-selected,
 .ivu-dropdown-item-selected:hover {
-    background-color: linear-gradient(180deg,
+    background-color: linear-gradient(
-    rgba(29, 47, 63, 0.48) 0%,
+            180deg,
-    rgba(99, 155, 193, 0.64) 100%),
+            rgba(29, 47, 63, 0.48) 0%,
-    radial-gradient(87.4% 100% at 48.49% 100%,
+            rgba(99, 155, 193, 0.64) 100%
-    #e4f9ff 0%,
+        ),
-    rgba(0, 87, 115, 0) 100%) !important;
+        radial-gradient(
+            87.4% 100% at 48.49% 100%,
+            #e4f9ff 0%,
+            rgba(0, 87, 115, 0) 100%
+        ) !important;
 }
 
 .turntable {

src/views/screen/county-screen.vue

@@ -249,7 +249,6 @@ import { Swiper, SwiperSlide } from "vue-awesome-swiper";
 import * as echarts from "echarts";
 import { echartsFocus, echartsClear } from "@/utils/autoEcharts";
 import CommonModal from "@/views/common-components/common-modal.vue";
-import axios from "axios";
 
 export default {
     name: "CountyScreen",
@@ -424,19 +423,19 @@ export default {
                     children: [
                         {
                             menuItem: "视听资源",
-                            url: "http://60.255.185.166:9030/county-file/#/Login",
+                            url: "http://60.255.186.185:9024/cp-stzy/#/",
                         },
                         {
                             menuItem: "数据管理",
-                            url: "http://60.255.185.166:9030/county-file/#/Login",
+                            url: "http://60.255.186.185:9024/cp-web/#/",
                         },
                         {
                             menuItem: "运维运控",
-                            url: "http://60.255.185.166:9030/county-file/#/Login",
+                            url: "http://60.255.186.185:9999",
                         },
                         {
                             menuItem: "动态表单",
-                            url: "http://60.255.185.166:9030/county-file/#/Login",
+                            url: "http://60.255.186.185:9024/cp-form/#/",
                         },
                     ],
                 },
@@ -519,22 +518,22 @@ export default {
             enterList: [
                 {
                     icon: require("@/assets/largeScreen/stzy.png"),
-                    url: "http://60.255.185.166:9030/county-file/#/Login",
+                    url: "http://60.255.186.185:9024/county-file/#/Login",
                     text: "视听资源",
                 },
                 {
                     icon: require("@/assets/largeScreen/sjgl.png"),
-                    url: "http://60.255.185.166:9030/xy-web/",
+                    url: "http://60.255.186.185:9024/xy-web/",
                     text: "数据管理",
                 },
                 {
                     icon: require("@/assets/largeScreen/ywyk.png"),
-                    url: "http://60.255.185.166:9999/login/toLogin",
+                    url: "http://60.255.186.185:9999/login/toLogin",
                     text: "运维运控",
                 },
                 {
                     icon: require("@/assets/largeScreen/dtbd.png"),
-                    url: "http://60.255.185.166:9030/county-form/",
+                    url: "http://60.255.186.185:9024/county-form/",
                     text: "动态表单",
                 },
             ],

src/views/screen/town-screen.vue

@@ -75,7 +75,7 @@
                             v-for="(item, index) in villList"
                             :key="index"
                             @click="jumpVill(item)"
-                            :style="{color: item.areaName == '红岩村' ? 'green' : '#ffffff'}"
+                            :style="{color: item.areaName == '高桥村' ? 'green' : '#ffffff'}"
                         >
                             {{ item.areaName }}
                         </div>
@@ -799,8 +799,8 @@ export default {
                 });
         },
         jumpVill (item) {
-            if (item.areaName != "红岩村") {
+            if (item.areaName != "高桥村") {
-                this.$message.info("除红岩村,其余尚未建设！")
+                this.$message.info("除高桥村,其余尚未建设！")
                 return
             }
             this.$router.push({