Merge branch 'main' of http://61.139.16.27:26684/zy_oyj/sgxt_web

.gitignore

@@ -1,6 +1,8 @@
 .DS_Store
 node_modules
-/dist
+# dist/
+# build/
+gsxt/
 
 # local env files
 .env.local

src/views/home/components/yjItem.vue

@@ -84,7 +84,7 @@ const changeBG = (str) => {
 
 .orange {
   background: url("~@/assets/images/GroupOrange.png") no-repeat center center;
-  background-size: 100% 100%;  
+  background-size: 100% 100%;
 }
 .yellow {
   background: url("~@/assets/images/GroupYellow.png") no-repeat center center;
@@ -92,7 +92,7 @@ const changeBG = (str) => {
 }
 .blue {
   background: url("~@/assets/images/GroupBlue.png") no-repeat center center;
-  background-size: 100% 100%; 
+  background-size: 100% 100%;
 }
 
-</style>
+</style>

src/views/home/dialog/components/home_yj.vue

@@ -1,8 +1,9 @@
 <template>
   <DialogDragger title="预警详情" top="150px" v-model="props.show" @close="close">
+
     <ul class="warningList" ref="gjyjList">
       <li v-for="item in props.data" :key="item.id">
-        <YjItem :data="item"/> 
+        <YjItem :item="item"/>
       </li>
       <MOSTY.Empty :show="props.data.length <= 0" :imgSize="150"></MOSTY.Empty>
     </ul>

vue.config.js

@@ -4,8 +4,8 @@ function resolve(dir) {
   return path.join(__dirname, dir);
 }
 
-// const serverHost = "http://192.168.1.32:8066"//波哥
-const serverHost = "http://192.168.0.231:8006"//线上
+const serverHost = "http://192.168.8.15:8066"//波哥
+// const serverHost = "http://192.168.0.231:8006"//线上
 // const serverHost = "http://192.168.1.117:8006"//周
 // const serverHost = "http://192.168.1.98:8006"//毛毛
 module.exports = {
@@ -49,8 +49,8 @@ module.exports = {
         changeOrigin: true,
         logLevel: "debug",
         pathRewrite: {
-					"^/chat": "/"
-				}
+          "^/chat": "/"
+        }
       },
     }
   },