'fix:修复bug和场景联动改变'

sqy
1 parent 842d11f3
Showing 9 changed files with 92 additions and 126 deletions
src/locales/lang/zh-CN/sys.ts
src/views/dashboard/workbench/components/GrowCard.vue
src/views/device/localtion/index.vue
src/views/rule/linkedge/SceneLinkAgeDrawer.vue
src/views/rule/linkedge/config.ts
src/views/rule/linkedge/cpns/action.vue
src/views/rule/linkedge/cpns/condition.vue
src/views/rule/linkedge/cpns/trigger.vue
src/views/rule/linkedge/index.vue
--- a/src/locales/lang/zh-CN/sys.ts
View file @0bd52a8
+++ b/src/locales/lang/zh-CN/sys.ts
View file @0bd52a8
@@ -66,8 +66,8 @@ export default {
     signUpFormTitle: '注册',
     forgetFormTitle: '重置密码',
     userNameInFormTitle: '账号登录',
-    signInTitle: '物联网平台',
-    signInDesc: '输入您的个人详细信息开始使用！',
+    signInTitle: '〔 连接世界 · 创造价值 〕',
+    signInDesc: '',
     policy: '我同意xxx隐私政策',
     scanSign: `扫码后点击"确认"，即可完成登录`,
--- a/src/views/dashboard/workbench/components/GrowCard.vue
View file @0bd52a8
+++ b/src/views/dashboard/workbench/components/GrowCard.vue
View file @0bd52a8
@@ -16,22 +16,7 @@
             </div>
             <img src="/src/assets/images/tip.png" style="width: 1.125rem; height: 1.125rem" />
           </div>
-          <div> 设备数(个) </div>
-          <div class="flex" style="align-items: center">
-            <div class="mr-2"
-              >在线
-              <span style="color: #41b883">{{ growCardList?.deviceInfo?.onLine ?? 0 }}</span></div
-            >
-            <div class="mr-2">
-              离线
-              <span style="color: #f5222d">{{ growCardList?.deviceInfo?.offLine ?? 0 }} </span></div
-            >
-
-            <div>
-              未激活
-              <span style="color: #fa8c16">{{ growCardList?.deviceInfo?.inActive ?? 0 }}</span>
-            </div>
-          </div>
+          <div> 设备数 </div>
         </div>
       </div>
       <div class="ml-2 pt-4" style="border-top: 2px solid #f0f2f5">
@@ -66,7 +51,7 @@
             </div>
             <img src="/src/assets/images/tip.png" style="width: 1.125rem; height: 1.125rem" />
           </div>
-          <div> {{ !isAdmin(role) ? `告警数(条)` : '租户总量(个)' }}</div>
+          <div> {{ !isAdmin(role) ? `告警数` : '租户总量' }}</div>
         </div>
       </div>
       <div v-if="!isAdmin(role)" class="ml-2 pt-4" style="border-top: 2px solid #f0f2f5">
@@ -78,59 +63,38 @@
     </Card>
     <Card size="small" class="md:w-1/3 w-full !md:mt-0 !mt-4" style="color: #666">
       <div class="flex" style="height: 100px">
-        <div class="mr-4"
-          ><img
+        <div class="mr-4">
+          <img
             v-if="!isAdmin(role)"
             src="/src/assets/images/msg-count.png"
             style="width: 5.625rem; height: 5.625rem"
-          /><img v-else src="/src/assets/images/kf.png" style="width: 5.625rem; height: 5.625rem" />
+          />
+          <img v-else src="/src/assets/images/kf.png" style="width: 5.625rem; height: 5.625rem" />
         </div>
-        <div v-if="!isAdmin(role)" style="display: flex; align-items: center">
-          <div>
-            <div style="align-items: center">
-              <div style="font-size: 1.625rem; color: #333; font-weight: bold">
-                <CountTo
-                  v-if="growCardList?.messageInfo?.messageCount"
-                  :end-val="growCardList.messageInfo.messageCount"
-                />
-                <CountTo v-else :end-val="0" />
-              </div>
-              消息量(条)
-            </div>
-            <div>
-              <span class="mr-2">数据点</span>
+        <div class="flex-auto">
+          <div class="flex justify-between" style="align-items: center">
+            <div v-if="!isAdmin(role)" style="font-size: 1.625rem; color: #333; font-weight: bold">
               <CountTo
-                style="color: #333; font-weight: bold"
-                v-if="growCardList?.messageInfo?.dataPointsCount"
-                :end-val="growCardList.messageInfo.dataPointsCount"
+                v-if="growCardList?.messageInfo?.messageCount"
+                :end-val="growCardList.messageInfo.messageCount"
               />
-              <CountTo style="color: #333; font-weight: bold" :end-val="0" v-else />
+              <CountTo v-else :end-val="0" />
             </div>
-          </div>
-        </div>
-        <div class="flex-auto" v-else>
-          <div class="flex justify-between" style="align-items: center">
-            <div style="font-size: 1.625rem; color: #333; font-weight: bold">
+            <div style="font-size: 1.625rem; color: #333; font-weight: bold" v-else>
               <CountTo
                 v-if="growCardList?.customerInfo?.sumCount"
                 :end-val="growCardList.customerInfo.sumCount"
               />
-              <CountTo :end-val="0" v-else />
+              <CountTo v-else :end-val="0" />
             </div>
             <img src="/src/assets/images/tip.png" style="width: 1.125rem; height: 1.125rem" />
           </div>
-          <div>客户总量(个)</div>
+          <div> {{ !isAdmin(role) ? `消息数` : '客户总量' }}</div>
         </div>
       </div>
       <div v-if="!isAdmin(role)" class="ml-2 pt-4" style="border-top: 2px solid #f0f2f5">
-        今日新增
-        <span class="ml-4"
-          >消息量 {{ toThousands(growCardList?.messageInfo?.todayMessageAdd) }}</span
-        >
-        <span class="ml-4"
-          >数据点 {{ toThousands(growCardList?.messageInfo?.todayDataPointsAdd) }}</span
-        >
-      </div>
+        今日新增 {{ toThousands(growCardList?.messageInfo?.todayMessageAdd) }}</div
+      >
       <div v-else class="ml-2 pt-4" style="border-top: 2px solid #f0f2f5">
         今日新增 {{ toThousands(growCardList?.customerInfo?.todayAdd) }}</div
       >
--- a/src/views/device/localtion/index.vue
View file @0bd52a8
+++ b/src/views/device/localtion/index.vue
View file @0bd52a8
@@ -229,7 +229,7 @@
           const point = new BMap.Point(longitude, latitude);
           let options = {
             width: 330, // 信息窗口宽度
-            height: 230, // 信息窗口高度
+            height: 0, // 信息窗口高度
           };
           map.centerAndZoom(point, 15);
           map.enableScrollWheelZoom(true);
--- a/src/views/rule/linkedge/SceneLinkAgeDrawer.vue
View file @0bd52a8
+++ b/src/views/rule/linkedge/SceneLinkAgeDrawer.vue
View file @0bd52a8
@@ -3,9 +3,9 @@
     <BasicDrawer
       v-bind="$attrs"
       @register="registerDrawer"
-      showFooter
       @ok="handleSubmit"
       width="50vw"
+      showFooter
       @close="handleClose"
       :title="title"
     >
@@ -24,7 +24,9 @@
             />
           </template>
           <!-- 按钮 -->
-          <a-button type="primary" class="mt-4" @click="addTrigger"> 添加触发器</a-button>
+          <a-button type="primary" class="mt-4" @click="addTrigger" v-if="isView">
+            添加触发器</a-button
+          >
           <!-- 按钮 -->
         </div>
         <!-- 触发器-end -->
@@ -40,7 +42,9 @@
             />
           </template>
           <!-- 按钮 -->
-          <a-button type="primary" class="mt-4" @click="addCondition"> 添加执行条件</a-button>
+          <a-button type="primary" class="mt-4" @click="addCondition" v-if="isView">
+            添加执行条件</a-button
+          >
           <!-- 按钮 -->
         </div>
         <!-- 执行条件-end -->
@@ -58,7 +62,9 @@
           </template>
           <!-- 按钮 -->
-          <a-button type="primary" class="mt-4" @click="addAction"> 添加执行动作</a-button>
+          <a-button type="primary" class="mt-4" @click="addAction" v-if="isView">
+            添加执行动作</a-button
+          >
           <!-- 按钮 -->
         </div>
         <!-- 执行动作-end -->
@@ -100,7 +106,9 @@
         conditionItemRefs: ref([]),
         actionItemRefs: ref([]),
       };
-      const title = computed(() => `${isUpdate.value ? '编辑' : '新增'}场景联动`);
+      const title = computed(
+        () => `${isUpdate.value === 3 ? '查看' : isUpdate.value ? '编辑' : '新增'}场景联动`
+      );
       let getTriggerFormValue = ref([]);
       let getConditionFormValue = ref([]);
       let getActionFormValue = ref([]);
@@ -108,6 +116,7 @@
       const isUpdate = ref(false);
       const id = ref(undefined);
       const tenantId = ref(undefined);
+      const isView = ref(true);
       const [registerForm, { resetFields, validate, setFieldsValue }] = useForm({
         labelWidth: 120,
         schemas: formSchema,
@@ -116,6 +125,7 @@
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
         setDrawerProps({ confirmLoading: false });
         isUpdate.value = data.isUpdate;
+
         if (!unref(isUpdate)) {
           resetFields();
           //初始化执行动作
@@ -191,6 +201,10 @@
             });
           });
         }
+        if (unref(isUpdate) === 3) isView.value = false;
+        setDrawerProps({
+          showFooter: isView.value,
+        });
       });
       // 设置设备的options
@@ -298,6 +312,7 @@
         id.value = undefined;
         tenantId.value = undefined;
         organizationId.value = undefined;
+        isView.value = true;
         getTriggerFormValue.value = [];
         getConditionFormValue.value = [];
         getActionFormValue.value = [];
@@ -334,6 +349,8 @@
         skipUnwrap,
         handleSubmit,
         handleClose,
+
+        isView,
       };
     },
   });
--- a/src/views/rule/linkedge/config.ts
View file @0bd52a8
+++ b/src/views/rule/linkedge/config.ts
View file @0bd52a8
@@ -140,6 +140,11 @@ export const columns: BasicColumn[] = [
     width: 200,
   },
   {
+    title: '创建者',
+    dataIndex: 'creatorName',
+    width: 200,
+  },
+  {
     title: '创建时间',
     dataIndex: 'createTime',
     width: 180,
@@ -242,7 +247,7 @@ export const useTriggerDrawerSchema: FormSchema[] = [
         // { label: '手动触发', value: 'HAND_ACT' },
       ],
     },
-    colProps: { span: 12 },
+    colProps: { span: 8 },
   },
   {
     field: 'entityId',
@@ -253,7 +258,7 @@ export const useTriggerDrawerSchema: FormSchema[] = [
     },
     ifShow: ({ values }) => isDevice(values.triggerType),
     colProps: {
-      span: 12,
+      span: 8,
     },
   },
   {
@@ -266,18 +271,18 @@ export const useTriggerDrawerSchema: FormSchema[] = [
     },
     ifShow: ({ values }) => isDevice(values.triggerType),
     dynamicDisabled: ({ values }) => !values.entityId,
-    colProps: { span: 12 },
+    colProps: { span: 8 },
   },
   {
     field: 'type2',
     label: '',
-    component: 'Select',
+    component: 'AutoComplete',
     componentProps: {
       placeholder: '请选择属性',
     },
     ifShow: ({ values }) => isDevice(values.triggerType),
     dynamicDisabled: ({ values }) => !values.type1,
-    colProps: { span: 12 },
+    colProps: { span: 8 },
   },
   {
     field: 'operation',
@@ -295,7 +300,7 @@ export const useTriggerDrawerSchema: FormSchema[] = [
     },
     show: ({ values }) => isDevice(values.triggerType),
     dynamicDisabled: ({ values }) => !values.type2,
-    colProps: { span: 12 },
+    colProps: { span: 8 },
   },
   {
     field: 'value',
@@ -308,7 +313,7 @@ export const useTriggerDrawerSchema: FormSchema[] = [
     show: ({ values }) => isDevice(values.triggerType),
     dynamicDisabled: ({ values }) => !values.operation,
     colProps: {
-      span: 12,
+      span: 8,
     },
   },
   {
@@ -339,7 +344,7 @@ export const useConditionDrawerSchema: FormSchema[] = [
         // { label: '时间范围', value: 'SCHEDULE_TRIGGER' },
       ],
     },
-    colProps: { span: 12 },
+    colProps: { span: 8 },
   },
   {
     field: 'entityId',
@@ -352,19 +357,19 @@ export const useConditionDrawerSchema: FormSchema[] = [
     },
     ifShow: ({ values }) => isDevice(values.triggerType),
     colProps: {
-      span: 12,
+      span: 8,
     },
   },
   {
     field: 'type',
     label: '',
-    component: 'Select',
+    component: 'AutoComplete',
     componentProps: {
       placeholder: '请选择属性',
     },
     ifShow: ({ values }) => isDevice(values.triggerType),
     dynamicDisabled: ({ values }) => !values.entityId,
-    colProps: { span: 12 },
+    colProps: { span: 8 },
   },
   {
     field: 'operation',
@@ -382,7 +387,7 @@ export const useConditionDrawerSchema: FormSchema[] = [
     },
     show: ({ values }) => isDevice(values.triggerType),
     dynamicDisabled: ({ values }) => !values.type,
-    colProps: { span: 12 },
+    colProps: { span: 8 },
   },
   {
     field: 'value',
@@ -395,7 +400,7 @@ export const useConditionDrawerSchema: FormSchema[] = [
     show: ({ values }) => isDevice(values.triggerType),
     dynamicDisabled: ({ values }) => !values.operation,
     colProps: {
-      span: 12,
+      span: 8,
     },
   },
   // {
@@ -466,7 +471,7 @@ export const useActionDrawerSchema: FormSchema[] = [
     slot: 'doContext',
     show: ({ values }) => isDeviceOut(values.outTarget),
     colProps: {
-      span: 12,
+      span: 24,
     },
   },
   // {
--- a/src/views/rule/linkedge/cpns/action.vue
View file @0bd52a8
+++ b/src/views/rule/linkedge/cpns/action.vue
View file @0bd52a8
 <template>
-  <CollapseContainer style="background-color: #eeeeee" :title="`执行动作 ${actionIndex + 1}`">
+  <CollapseContainer style="background-color: #f8f9fa" :title="`执行动作 ${actionIndex + 1}`">
     <template #action>
       <Tooltip title="移除" v-if="actionData.length > 1">
         <Icon
--- a/src/views/rule/linkedge/cpns/condition.vue
View file @0bd52a8
+++ b/src/views/rule/linkedge/cpns/condition.vue
View file @0bd52a8
 <template>
-  <CollapseContainer style="background-color: #eeeeee" :title="`执行条件 ${conditionIndex + 1}`">
+  <CollapseContainer style="background-color: #f8f9fa" :title="`执行条件 ${conditionIndex + 1}`">
     <template #action>
       <Tooltip title="移除">
         <Icon
--- a/src/views/rule/linkedge/cpns/trigger.vue
View file @0bd52a8
+++ b/src/views/rule/linkedge/cpns/trigger.vue
View file @0bd52a8
 <template>
   <div>
-    <CollapseContainer style="background-color: #eee" :title="`触发器 ${triggerIndex + 1}`">
+    <CollapseContainer style="background-color: #f8f9fa" :title="`触发器 ${triggerIndex + 1}`">
       <template #action>
         <Tooltip title="移除">
           <Icon
--- a/src/views/rule/linkedge/index.vue
View file @0bd52a8
+++ b/src/views/rule/linkedge/index.vue
View file @0bd52a8
@@ -2,15 +2,8 @@
   <div>
     <BasicTable @register="registerTable">
       <template #toolbar>
-        <a-button v-if="isTenant || isCustomer || isPlatform" type="primary" @click="handleAdd">
-          新增场景联动
-        </a-button>
-        <a-button
-          v-if="isTenant || isCustomer || isPlatform"
-          color="error"
-          @click="handleDeleteOrBatchDelete(null)"
-          :disabled="hasBatchDelete"
-        >
+        <a-button type="primary" @click="handleAdd"> 新增场景联动 </a-button>
+        <a-button color="error" @click="handleDeleteOrBatchDelete(null)" :disabled="hasBatchDelete">
           批量删除
         </a-button>
       </template>
@@ -18,16 +11,22 @@
         <TableAction
           :actions="[
             {
+              label: '查看',
+              icon: 'ant-design:eye-outlined',
+              ifShow: record.creator !== userId,
+              onClick: handleView.bind(null, record),
+            },
+            {
               label: '编辑',
               icon: 'clarity:note-edit-line',
               onClick: handleEdit.bind(null, record),
-              ifShow: isTenant || isCustomer || isPlatform,
+              ifShow: record.creator === userId,
             },
             {
               label: '删除',
               icon: 'ant-design:delete-outlined',
               color: 'error',
-              ifShow: isTenant || isCustomer || isPlatform,
+              ifShow: record.creator === userId,
               popConfirm: {
                 title: '是否确认删除',
                 confirm: handleDeleteOrBatchDelete.bind(null, record),
@@ -45,32 +44,30 @@
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, ref, computed } from 'vue';
+  import { defineComponent, ref } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { useDrawer } from '/@/components/Drawer';
   import { screenLinkPageGetApi, screenLinkPageDeleteApi } from '/@/api/ruleengine/ruleengineApi';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
-  import { RoleEnum } from '/@/enums/roleEnum';
-  import { useUserStore } from '/@/store/modules/user';
+
   import { columns, searchFormSchema } from './config';
+  import { USER_INFO_KEY } from '/@/enums/cacheEnum';
+  import { getAuthCache } from '/@/utils/auth';
+  import { authBtn } from '/@/enums/roleEnum';
   import SceneLinkAgeDrawer from './SceneLinkAgeDrawer.vue';
   export default defineComponent({
     name: 'LinkEdge',
     components: { BasicTable, SceneLinkAgeDrawer, TableAction },
-
     setup() {
-      const userStore = useUserStore();
-      const isTenant = computed(() => userStore.getRoleList.includes(RoleEnum.TENANT_ADMIN));
-      const isCustomer = computed(() => userStore.getRoleList.includes(RoleEnum.CUSTOMER_USER));
-      const isSysadmin = computed(() => userStore.getRoleList.includes(RoleEnum.SYS_ADMIN));
-      const isPlatform = computed(() => userStore.getRoleList.includes(RoleEnum.PLATFORM_ADMIN));
       const sceneLinkAgeDrawerRef: any = ref(null);
       const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
         screenLinkPageDeleteApi,
         handleSuccess
       );
-
+      const userInfo: any = getAuthCache(USER_INFO_KEY);
+      const userId = userInfo.userId;
+      const role: string = userInfo.roles[0];
       const [registerDrawer, { openDrawer }] = useDrawer();
       const [registerTable, { reload }] = useTable({
         title: '场景联动列表',
@@ -106,14 +103,16 @@
           isUpdate: true,
         });
       }
+      function handleView(record: Recordable) {
+        openDrawer(true, {
+          record,
+          isUpdate: 3,
+        });
+      }
       function handleSuccess() {
         reload();
       }
       return {
-        isPlatform,
-        isSysadmin,
-        isCustomer,
-        isTenant,
         sceneLinkAgeDrawerRef,
         registerTable,
         registerDrawer,
@@ -122,30 +121,11 @@
         handleSuccess,
         hasBatchDelete,
         handleDeleteOrBatchDelete,
+        handleView,
+        authBtn,
+        role,
+        userId,
       };
     },
   });
 </script>
-
-<!-- <script setup lang="ts">
-  import { ref, onMounted } from 'vue';
-  const refList = ref([]);
-  const list = ref(['张三', '李四', '王五', '赵牛']);
-  onMounted(() => {
-    console.log(refList.value);
-  });
-  let flag = 0;
-  const add = () => {
-    refList.value = [];
-    list.value.push(`哈哈${flag++}`);
-    console.log(refList.value);
-  };
-</script>
-<template>
-  <div>
-    <template v-for="item in list" :key="item">
-      <div :ref="(el) => refList.push(el)">{{ item }}</div>
-    </template>
-    <a-button @click="add" type="primary" class="ml-4 mt-4">添加元素</a-button>
-  </div>
-</template> -->