Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_app into V0.0.2

src/api/protection.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询【请填写功能名称】列表
 export function list(query) {
   return request({
-    url: '/core/resumption/protection/page',
+    url: '/core/resumption/protectionstatus/page',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function list(query) {
 // 更新状态
 export function updateStatus(id, status) {
   return request({
-    url: `/core/resumption/protection/updatestatus/${id}/${status}`,
+    url: `/core/resumption/protectionstatus/updatestatus/${id}/${status}`,
     method: 'post'
   })
 }
@@ -20,7 +20,7 @@ export function updateStatus(id, status) {
 // 查询【请填写功能名称】详细
 export function get(id) {
   return request({
-    url: "/core/resumption/protection/" + id,
+    url: "/core/resumption/protectionstatus/" + id,
     method: "get",
   });
 }
@@ -30,7 +30,7 @@ export function history(query) {
   // query.startTime=new Date().toLocaleString()
   // delete query.updateTime;
   return request({
-    url: `/core/resumption/protection/log/page`,
+    url: `/core/resumption/protectionstatus/log/page`,
     method: "get",
     params:query
   });

src/views/menu/protection/components/item.vue

@@ -3,10 +3,10 @@
     <div class="top flex flex-row items-center justify-between">
       <label style="width: 70%">{{ data.name }}</label>
       <label style="width: 30%; text-align: right">
-        <van-button size="mini" type="primary" @click="updateStatus(data, '1')" v-if="data.status != '1'"
+        <van-button size="mini" type="primary" @click="updateStatus(data, '1')" v-if="data.status != '1' && data.orgId==this.orgId"
           >布防</van-button
         >
-        <van-button size="mini" type="primary" @click="updateStatus(data, '0')" v-if="data.status != '0'"
+        <van-button size="mini" type="primary" @click="updateStatus(data, '0')" v-if="data.status != '0' && data.orgId==this.orgId"
           >撤防</van-button
         >
       </label>
@@ -22,6 +22,7 @@
   </div>
 </template>
 <script>
+import { mapGetters } from 'vuex'
 import { getLabel } from '@/utils/optionEx.js'
 import * as api from '@/api/protection.js'
 import { Dialog } from 'vant'
@@ -31,7 +32,9 @@ export default {
   data() {
     return {}
   },
-  computed: {},
+  computed: {
+    ...mapGetters(['orgName', 'orgId'])
+  },
   watch: {},
   props: {
     data: {},