2023-8-25

src/system/IOT/equipmentMag/detail/index.vue

@@ -7,11 +7,7 @@
       :tabs="['详情信息','物模型','检查项','日志','关联阀门','关联网关','告警配置','告警记录']" 
       ownertable="user" 
       :delParam="{id:'20230616134502',content:{w_deviceid:router.currentRoute.value.query.id}}" 
-<<<<<<< HEAD
-      :disable="!utils.hasPermission('delete')"
-=======
       :disable="!utils.hasPermission('delete') || isDisabled"
->>>>>>> xiaoqin
       >
       <template #operation>
         <Edit :disabled="isDisabled || !utils.hasPermission('update')" :data="userData" @onSuccess="mianData"></Edit>
@@ -25,11 +21,7 @@
           :paramData="[{key:'isused',value:userData.isused ? 0 : 1}]"
           :message="userData.isused ? '确定禁用当前设备吗?' : '确定启用当起设备吗?'"
           @onSuccess="mianData"
-<<<<<<< HEAD
-          :disabled="!utils.hasPermission('use')"
-=======
           :disabled="isDisabled || !utils.hasPermission('use')"
->>>>>>> xiaoqin
         />
         <a-button @click="goControl" type="primary">设备控制</a-button>
       </template>

src/system/IOT/productManage/detail/index.vue

@@ -7,9 +7,10 @@
       :tabs="['详情信息','物模型','告警配置']" 
       ownertable="user" 
       :delParam="{id:'20230815135002',content:{w_productid:router.currentRoute.value.query.id}}"
+      :disable="!utils.hasPermission('delete') || isDisabled"
       >
       <template #operation>
-        <Edit :disabled="utils.isDisabled(userData.isedit,[0]) && !utils.hasPermission('update')" :data="userData" @onSuccess="mianData"></Edit>
+        <Edit :disabled="utils.isDisabled(userData.isedit,[0]) && !utils.hasPermission('update') || isDisabled" :data="userData" @onSuccess="mianData"></Edit>
         <customBtn
           :btnName="userData.isused ? '禁用' : '启用'"
           idName="20230609160002"
@@ -20,6 +21,7 @@
           :paramData="[{key:'isused',value:userData.isused ? 0 : 1}]"
           :message="userData.isused ? '确定禁用当前产品吗?' : '确定启用当起产品吗?'"
           @onSuccess="mianData"
+          :disabled="!utils.hasPermission('use') || isDisabled"
         />
       </template>
       <template #tab0>