站点功能

src/mixins/judgeType.js

@@ -616,6 +616,11 @@ export default {
 				    return '优惠券'
 			    default:
 		    }
+	    },
+	    specialSymbol(str) {
+        	// 验证是否包含特殊字符，包含则返回true
+		    let p = /[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘'，。、]/im;
+		    return p.test(str);
 	    }
     }
 }

src/port/site/site.js

+import {get, post, put, deletes} from '@/request/http'
+
+export function addSite(data) {
+	const url = process.env.VUE_APP_BASE_API8+'/site/info';
+	return post(url, data)
+}
+
+export function editSite(data) {
+	const url = process.env.VUE_APP_BASE_API8+'/site/info';
+	return put(url, data)
+}
+
+export function delSite(data) {
+	const url = process.env.VUE_APP_BASE_API8+'/site/info';
+	return deletes(url, data)
+}

src/router/index.js

@@ -16,6 +16,24 @@ export const currencyRoutes = [{
             import ( /* webpackChunkName: "login" */ '@/views/login/index.vue'),
         hidden: true
     },
+	{
+		path: '/Real',
+		component: () =>
+			import('@/views/components/newReal.vue'),
+		meta: {
+			title: '实名认证'
+		},
+		hidden: true
+	},
+	{
+		path: '/JoiningEnterprise',
+		component: () =>
+			import('@/views/components/newJoiningEnterprise.vue'),
+		meta: {
+			title: '加入企业'
+		},
+		hidden: true
+	},
     {
         path: '/401',
         name: '401',

src/utils/bus.js

+import Vue from 'vue';
+
+// 使用 Event Bus
+const bus = new Vue();
+
+export default bus;
\ No newline at end of file

src/views/configure/enclosure.vue

 <template xmlns="http://www.w3.org/1999/html">
   <el-card class="enclosureItemBox">
+      <el-row>
+          <div class="title-left" style="padding-left: 10px;font-weight: 800;">
+              围栏管理
+          </div>
+      </el-row>
     <div class="mapBox">
       <div
         :style="{
@@ -549,9 +554,9 @@ export default {
           rows: this.size,
         },
         polygonName: this.searchStr,
-        // platformId: this.$store.getters.platformId "61fdff1d455c4ab8a2efc564c245b90d",
+        platformId: this.$store.getters.platformId,
         //TODO 临时使用
-        platformId: "61fdff1d455c4ab8a2efc564c245b90d",
+        // platformId: "61fdff1d455c4ab8a2efc564c245b90d",
       };
       if (!!cityCode) {
         json.cityCode = cityCode;
@@ -571,9 +576,9 @@ export default {
           rows: 999,
         },
         polygonName: this.searchStr,
-        // platformId: this.$store.getters.platformId,
+        platformId: this.$store.getters.platformId,
         //TODO 临时使用
-        platformId: "61fdff1d455c4ab8a2efc564c245b90d",
+        // platformId: "61fdff1d455c4ab8a2efc564c245b90d",
         cityCode: cityCode,
       };
       getAllFenceList(json).then((res) => {
@@ -841,7 +846,8 @@ export default {
         polygonType: this.EnclosureForm.type,
         // platformId: this.$store.getters.platformId,
         //TODO 临时使用
-        platformId: "61fdff1d455c4ab8a2efc564c245b90d",
+        // platformId: "61fdff1d455c4ab8a2efc564c245b90d",
+        platformId: this.$store.getters.platformId,
         polygonAttribute: "1",
         traceId: this.EnclosureForm.traceId,
         polygonTypeValue: this.EnclosureForm.fenceTypeName,
@@ -1047,4 +1053,13 @@ export default {
 .amap-box {
   position: relative;
 }
+.title-left::before {
+    content: '';
+    position: absolute;
+    left: 0;
+    top: 10%;
+    width: 5px;
+    height: 80%;
+    background-color: #0099ff;
+}
 </style>

src/views/configure/site.vue

 <template>
     <el-card type="flex" justify="end">
+        <el-row>
+            <div class="title-left" style="padding-left: 10px;font-weight: 800;">
+                站点管理
+            </div>
+        </el-row>
         <el-form class="form-row">
             <el-row>
                 <el-col :span="8">
@@ -69,11 +74,11 @@
             </el-table-column>
             <el-table-column label="操作" align="center" fixed="right" width="120">
                 <template slot-scope="scope">
-                    <el-button size="small" type="text">
-                        管理
+                    <el-button size="small" type="text" @click="() => $refs.addDialog.showDialog(scope.row)">
+                        编辑
                     </el-button>
-                    <el-button size="small" type="text" style="color: red;">
-                        关闭
+                    <el-button size="small" type="text" style="color: red;" @click="delSite(scope.row.id)">
+                        删除
                     </el-button>
                 </template>
             </el-table-column>
@@ -89,7 +94,7 @@
             </el-pagination>
         </div>
 
-        <addDialog ref="addDialog"></addDialog>
+        <addDialog ref="addDialog" @backInitTable="backInitTable"></addDialog>
     </el-card>
 </template>
 
@@ -98,6 +103,7 @@ import {
     selectHotAreaList,
     getAllprovinceAndCity
 } from "@/port/set-request";
+import {delSite} from "@/port/site/site";
 import Selects from '@/components/Selects'
 import dataSource from "@/libs/screen";
 import JudgeType from "@/mixins/judgeType";
@@ -155,6 +161,34 @@ export default {
         this.initTable();
     },
     methods: {
+        delSite(id) {
+            this.$confirm('是否确认删除', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            })
+            .then(() => {
+                delSite({sId: id})
+                    .then((res) => {
+                        if(res.status === 200) {
+                            this.$message.success('删除成功');
+                            this.initTable();
+                        }else {
+                            this.$message.error(res.msg);
+                        }
+                    })
+                    .catch(() => {
+
+                    })
+            })
+            .catch(() => {
+
+            })
+
+        },
+        backInitTable() {
+            this.initTable();
+        },
         handlechangeList(val) {
             let source = JSON.parse(JSON.stringify(val));
             this.form.siteTypeList = this.filftersFun(source.data);
@@ -226,4 +260,14 @@ export default {
     margin-top: 16px;
     text-align: right;
 }
+
+.title-left::before {
+    content: '';
+    position: absolute;
+    left: 0;
+    top: 10%;
+    width: 5px;
+    height: 80%;
+    background-color: #0099ff;
+}
 </style>

src/views/dashboard/index.vue

@@ -64,7 +64,7 @@
                 </div>
             </el-row>
             <el-row style="padding-top: 10px;">
-                {{ platformForm ? platformForm.org.orgInfo.info : ''}}
+                {{ platformForm ? platformForm.org.orgInfo ? platformForm.org.orgInfo.info : platformForm.org.scode : ''}}
             </el-row>
         </el-card>
 
@@ -317,7 +317,7 @@ export default {
                 imageUrl: j.org.logoUrl,
                 enterpriseDescribe: j.org.orgForShort,
                 address: j.org.address,
-                companyDescribe: j.org.orgInfo.info,
+                companyDescribe: j.org.orgInfo ? j.org.orgInfo.info : j.org.scode,
                 opername: j.org.opername,
                 operIdcard: j.org.operIdcard,
             }

src/views/login/index.vue

@@ -470,9 +470,17 @@ export default {
         // 运营组织商
         async operatorPrivilegesLogin(userId) {
             // 运营组织商信息接口
-            let {data} = await operatorPrivileges(userId)
+            let {data, status} = await operatorPrivileges(userId)
             console.log(data,"看看")
             if(data) {
+                if(status === 205) {
+                    this.$router.push({
+                        path: '/JoiningEnterprise',
+                        query: {
+                            type: 1
+                        }
+                    })
+                }
                 if (data.roleType == 1) {
                     // 品牌方路由
                     this.$store.commit('user/ROLE_TYPE', data.roleType)