修改回收站必填和websorket

jnpf-java-boot/jnpf-web/src/layout/components/NavbarRight.vue

@@ -161,7 +161,7 @@ export default {
     }
   },
   created() {
-    this.initWebSocket()
+    //this.initWebSocket()
     this.initNotify()
   },
   methods: {

jnpf-java-boot/jnpf-web/src/views/enterpriserecyclestation/form.vue

@@ -526,7 +526,7 @@
                   class="table-actions"
                   @click="addrecyclestationhousingestateList()"
                 >
-                  <el-button type="text" icon="el-icon-plus">添加</el-button> 
+                  <el-button type="text" icon="el-icon-plus">添加</el-button>
                 </div> -->
 
                 <div class="table-actions" @click="choice()">
@@ -697,6 +697,13 @@ export default {
             trigger: "blur",
           },
         ],
+        shortName: [
+          {
+            required: true,
+            message: "请输入",
+            trigger: "blur",
+          },
+        ],
         managementModel: [
           {
             required: true,
@@ -704,6 +711,20 @@ export default {
             trigger: "change",
           },
         ],
+        stationImg: [
+          {
+            required: true,
+            message: "请至少选择一个",
+            trigger: "change",
+          },
+        ],
+        enterpriseId: [
+          {
+            required: true,
+            message: "请至少选择一个",
+            trigger: "change",
+          },
+        ],
         city: [
           {
             required: true,
@@ -1075,6 +1096,9 @@ export default {
         this.dataForm.enterpriseId = this.userInfo.organizeIdList;
       }
       this.dataForm.firstContactPerson = this.userInfo.userId;
+      if(this.$store.getters.userInfo.organizeId && this.$store.getters.userInfo.organizeId != null){
+        this.dataForm.enterpriseId = this.$store.getters.userInfo.organizeId;
+      }
     },
     // 表单提交
     dataFormSubmit(type) {