From a8478617cdc13a288ace8e37a72eacdd1d1e812a Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Wed, 22 Mar 2023 23:01:22 +0800
Subject: [PATCH 01/16] =?UTF-8?q?fix:=20bug#10763=E3=80=8110750=E3=80=8110?=
 =?UTF-8?q?732=E3=80=8110686?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  4 +-
 src/components/Layout/BasicLayoutPage.vue     |  5 ++
 src/components/ValueItem/index.vue            |  2 +-
 src/router/menu.ts                            |  2 +-
 src/utils/request.ts                          |  5 +-
 .../DashBoard/components/TimeSelect.vue       |  3 +-
 .../iot-card/CardManagement/Detail/index.vue  |  5 ++
 src/views/iot-card/CardManagement/Save.vue    |  4 +-
 src/views/iot-card/CardManagement/index.vue   | 18 +++++-
 src/views/iot-card/Home/index.vue             | 22 +++----
 src/views/iot-card/Platform/Detail/index.vue  |  1 +
 src/views/iot-card/Platform/index.vue         |  2 +-
 src/views/iot-card/components/TimeSelect.vue  | 47 +++++++--------
 .../Scene/Save/Device/AddModal.vue            |  2 +-
 .../Scene/Save/Device/DeviceList.vue          |  2 +-
 .../Scene/Save/Device/InvokeFunction.vue      | 29 ++++++++--
 .../rule-engine/Scene/Save/Device/Product.vue |  2 +-
 .../rule-engine/Scene/Save/Timer/AddModal.vue | 19 +++---
 .../rule-engine/Scene/Save/Timer/Title.vue    | 58 +++++++++++++++++++
 .../rule-engine/Scene/Save/Timer/index.vue    |  4 +-
 .../Scene/Save/action/Device/Product.vue      |  2 +-
 .../Save/action/Device/actions/index.vue      | 22 ++++++-
 .../Save/action/Device/device/Device.vue      |  2 +-
 .../components/FunctionCall/FunctionCall.vue  |  1 +
 .../Save/components/Timer/WhenOption.vue      |  2 +
 .../Scene/Save/components/Timer/index.vue     | 36 +++++++-----
 src/views/rule-engine/Scene/Save/index.vue    |  3 +
 src/views/rule-engine/Scene/Save/style.less   |  3 +
 src/views/system/Department/device/index.vue  | 18 +++---
 src/views/system/Department/product/index.vue | 10 ++--
 src/views/system/User/index.vue               | 19 +++++-
 yarn.lock                                     |  4 +-
 32 files changed, 255 insertions(+), 103 deletions(-)
 create mode 100644 src/views/rule-engine/Scene/Save/Timer/Title.vue
 create mode 100644 src/views/rule-engine/Scene/Save/style.less

diff --git a/src/App.vue b/src/App.vue
index b61b8ee9..815d1240 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,8 @@
 <template>
   <ConfigProvider :locale='zhCN'>
-    <router-view />
+    <keep-alive>
+      <router-view />
+    </keep-alive>
   </ConfigProvider>
 </template>
 
diff --git a/src/components/Layout/BasicLayoutPage.vue b/src/components/Layout/BasicLayoutPage.vue
index 7a7ca687..1119f7f6 100644
--- a/src/components/Layout/BasicLayoutPage.vue
+++ b/src/components/Layout/BasicLayoutPage.vue
@@ -6,6 +6,7 @@
         v-model:selectedKeys="state.selectedKeys"
         :pure="state.pure"
         :breadcrumb="{ routes: breadcrumb }"
+        @back='routerBack'
     >
         <template #breadcrumbRender="slotProps">
             <a
@@ -70,6 +71,10 @@ const state = reactive<StateType>({
     selectedKeys: [],
 });
 
+const routerBack = () => {
+  router.go(-1)
+}
+
 const findRouteMeta = (code: string) => {
   let meta = []
   let menuItem: any = menu.menus[code]
diff --git a/src/components/ValueItem/index.vue b/src/components/ValueItem/index.vue
index eb05c733..216eea2b 100644
--- a/src/components/ValueItem/index.vue
+++ b/src/components/ValueItem/index.vue
@@ -194,7 +194,7 @@ const timeChange = (e: any) => {
 }
 
 const inputChange = (e: any) => {
-  emit('change', e.target ? e.target.value : e)
+  emit('change', e && e.target ? e.target.value : e)
 }
 
 const dateChange = (e: any) => {
diff --git a/src/router/menu.ts b/src/router/menu.ts
index 93c61abc..823178a7 100644
--- a/src/router/menu.ts
+++ b/src/router/menu.ts
@@ -51,7 +51,7 @@ export const AccountMenu = {
 export default [
     { path: '/*', redirect: '/'},
     {
-        path: '/login',
+        path: LoginPath,
         component: () => import('@/views/user/Login/index.vue')
     },
     {
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 2d56eed9..0cf20b9a 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -155,10 +155,11 @@ const errorHandler = (error: any) => {
             Notification.error({
                 key: '401',
                 message: 'Unauthorized',
-                description: 'Authorization verification failed'
+                description: '用户未登录'
             })
             setTimeout(() => {
-                router.replace({
+                debugger
+                router.push({
                     path: LoginPath
                 })
             }, 0)
diff --git a/src/views/device/DashBoard/components/TimeSelect.vue b/src/views/device/DashBoard/components/TimeSelect.vue
index bae04380..a55c28d2 100644
--- a/src/views/device/DashBoard/components/TimeSelect.vue
+++ b/src/views/device/DashBoard/components/TimeSelect.vue
@@ -19,6 +19,7 @@
             format="YYYY-MM-DD HH:mm:ss"
             valueFormat="YYYY-MM-DD HH:mm:ss"
             style="margin-left: 12px"
+            :show-time="{ format: 'HH:mm:ss' }"
             @change="rangeChange"
             v-model:value="rangeVal"
             :allowClear="false"
@@ -110,5 +111,5 @@ const handleBtnChange = (val: string) => {
     });
 };
 handleBtnChange(radioValue.value);
-watch(() => radioValue.value, { deep: true, immediate: true });
+// watch(() => radioValue.value, { deep: true, immediate: true });
 </script>
diff --git a/src/views/iot-card/CardManagement/Detail/index.vue b/src/views/iot-card/CardManagement/Detail/index.vue
index eb97b3b8..4ca3b42d 100644
--- a/src/views/iot-card/CardManagement/Detail/index.vue
+++ b/src/views/iot-card/CardManagement/Detail/index.vue
@@ -237,6 +237,11 @@ const getData = (
     return new Promise((resolve) => {
         queryFlow(start, end, {
             orderBy: 'date',
+            terms: [{
+              column : "cardId",
+              termType: "eq",
+              value: route.params.id
+            }]
         }).then((resp: any) => {
             if (resp.status === 200) {
                 const sortArray = resp.result.sort(
diff --git a/src/views/iot-card/CardManagement/Save.vue b/src/views/iot-card/CardManagement/Save.vue
index 0847419a..bd3ecf76 100644
--- a/src/views/iot-card/CardManagement/Save.vue
+++ b/src/views/iot-card/CardManagement/Save.vue
@@ -232,8 +232,8 @@ const handleOk = () => {
             btnLoading.value = true;
             const resp =
                 props.type === 'add'
-                    ? await add(toRaw(modelRef))
-                    : await edit(toRaw(modelRef));
+                    ? await add(toRaw(modelRef)).catch(err => err)
+                    : await edit(toRaw(modelRef)).catch(err => err);
             btnLoading.value = false;
             if (resp.status === 200) {
                 message.success('操作成功')
diff --git a/src/views/iot-card/CardManagement/index.vue b/src/views/iot-card/CardManagement/index.vue
index 50425bcd..8762639a 100644
--- a/src/views/iot-card/CardManagement/index.vue
+++ b/src/views/iot-card/CardManagement/index.vue
@@ -457,6 +457,7 @@ const columns = [
         width: 200,
         search: {
             type: 'string',
+            defaultTermType: 'eq'
         },
     },
     {
@@ -466,6 +467,9 @@ const columns = [
         ellipsis: true,
         scopedSlots: true,
         width: 200,
+        search: {
+          type: 'string'
+        }
     },
     {
         title: '平台对接',
@@ -571,7 +575,8 @@ const columns = [
                 { label: '正常', value: 'using' },
                 { label: '未激活', value: 'toBeActivated' },
                 { label: '停机', value: 'deactivate' },
-            ],
+                { label: '其它', value: 'using,toBeActivated,deactivate' },
+            ]
         },
     },
     {
@@ -737,7 +742,16 @@ const getActions = (
 };
 
 const handleSearch = (e: any) => {
-    params.value = e;
+    const newParams = (e?.terms as any[])?.map(item1 => {
+      item1.terms = item1.terms.map((item2: any) => {
+        if (['cardStateType'].includes(item2.column)) {
+          item2.termType = 'nin'
+        }
+        return item2
+      })
+      return item1
+    })
+    params.value = { terms: newParams || [] };
 };
 
 const onSelectChange = (keys: string[], rows: []) => {
diff --git a/src/views/iot-card/Home/index.vue b/src/views/iot-card/Home/index.vue
index 739a84a1..2f561d60 100644
--- a/src/views/iot-card/Home/index.vue
+++ b/src/views/iot-card/Home/index.vue
@@ -87,7 +87,7 @@
     </page-container>
 </template>
 
-<script setup lang="ts">
+<script setup lang="ts" name='IotCardHome'>
 import { getImage } from '@/utils/comm';
 import Guide from '../components/Guide.vue';
 import moment from 'moment';
@@ -113,14 +113,14 @@ const menuHasPermission = useMenuStore().hasPermission;
 const btnHasPermission = usePermissionStore().hasPermission;
 
 // 菜单权限
-const dashBoardUrl = menuHasPermission('/iot-card/Dashboard');
-const platformUrl = menuHasPermission('/iot-card/Platform/Detail');
-const recordUrl = menuHasPermission('/iot-card/Record');
-const cardUrl = menuHasPermission('/iot-card/CardManagement');
+const dashBoardUrl = menuHasPermission('iot-card/Dashboard');
+const platformUrl = menuHasPermission('iot-card/Platform/Detail');
+const recordUrl = menuHasPermission('iot-card/Record');
+const cardUrl = menuHasPermission('iot-card/CardManagement');
 
 // 按钮权限
-const paltformPermission = btnHasPermission(`/iot-card/Platform:add`);
-const cardPermission = btnHasPermission(`/iot-card/CardManagement:add`);
+const paltformPermission = btnHasPermission(`iot-card/Platform:add`);
+const cardPermission = btnHasPermission(`iot-card/CardManagement:add`);
 
 const Image = {
     1: getImage('/home/1.png'),
@@ -179,23 +179,19 @@ const pieChartData = ref<any[]>([
 ]);
 
 const jumpPage = (data: GuideItemProps) => {
+  console.log(data.auth)
     if (!data.auth){
         message.warning('暂无权限，请联系管理员');
         return
     }
     if (data.key === 'EQUIPMENT') {
-        menuStory.jumpPage(data.url, { id: 'add' });
+        menuStory.jumpPage(data.url, { id: ':id'});
     } else {
         menuStory.jumpPage(data.url);
     }
 };
 
 const jumpDashboard = () => {
-    // if (dashBoardUrl) {
-    //     router.push(`${dashBoardUrl}`);
-    // } else {
-    //     message.warning('暂无权限，请联系管理员');
-    // }
     menuStory.jumpPage('iot-card/Dashboard');
 };
 
diff --git a/src/views/iot-card/Platform/Detail/index.vue b/src/views/iot-card/Platform/Detail/index.vue
index 66ba1ff3..579c7379 100644
--- a/src/views/iot-card/Platform/Detail/index.vue
+++ b/src/views/iot-card/Platform/Detail/index.vue
@@ -204,6 +204,7 @@ const rules = {
 };
 
 const getDetail = async () => {
+    console.log(route.params)
     if (route.params.id === ':id') return;
     const resp: any = await queryById(route.params.id);
     if (resp.status === 200) {
diff --git a/src/views/iot-card/Platform/index.vue b/src/views/iot-card/Platform/index.vue
index aa8c2ce5..86c52371 100644
--- a/src/views/iot-card/Platform/index.vue
+++ b/src/views/iot-card/Platform/index.vue
@@ -238,7 +238,7 @@ const handleSearch = (e: any) => {
  * 新增
  */
 const handleAdd = () => {
-    menuStory.jumpPage('iot-card/Platform/Detail', { id: 'add' })
+    menuStory.jumpPage('iot-card/Platform/Detail', { id: ':id' })
 };
 </script>
 
diff --git a/src/views/iot-card/components/TimeSelect.vue b/src/views/iot-card/components/TimeSelect.vue
index de656b5e..6e785fff 100644
--- a/src/views/iot-card/components/TimeSelect.vue
+++ b/src/views/iot-card/components/TimeSelect.vue
@@ -16,8 +16,9 @@
             </j-radio-button>
         </j-radio-group>
         <j-range-picker
-            format="YYYY-MM-DD"
-            valueFormat="YYYY-MM-DD"
+            format="YYYY-MM-DD HH:mm:ss"
+            valueFormat="YYYY-MM-DD HH:mm:ss"
+            :show-time="{ format: 'HH:mm:ss' }"
             style="margin-left: 12px"
             @change="rangeChange"
             v-model:value="rangeVal"
@@ -28,7 +29,7 @@
 </template>
 
 <script setup lang="ts">
-import moment from 'moment';
+import dayjs from 'dayjs';
 import { PropType } from 'vue';
 
 interface BtnOptions {
@@ -70,38 +71,37 @@ const rangeVal = ref<[string, string]>();
 const rangeChange = (val: any) => {
     radioValue.value = undefined;
     emit('change', {
-        start: moment(val[0]).valueOf(),
-        end: moment(val[1]).valueOf(),
+        start: dayjs(val[0]).valueOf(),
+        end: dayjs(val[1]).valueOf(),
         type: undefined,
     });
 };
 
-const getTimeByType = (type: string) => {
+const getTimeByType = (type?: string) => {
     switch (type) {
         case 'hour':
-            return moment().subtract(1, 'hours').valueOf();
+            return dayjs().subtract(1, 'hours').valueOf();
         case 'week':
-            return moment().subtract(6, 'days').valueOf();
+            return dayjs().subtract(6, 'days').valueOf();
         case 'month':
-            return moment().subtract(29, 'days').valueOf();
+            return dayjs().subtract(29, 'days').valueOf();
         case 'year':
-            return moment().subtract(365, 'days').valueOf();
+            return dayjs().subtract(365, 'days').valueOf();
         default:
-            return moment().startOf('day').valueOf();
+            return dayjs().startOf('day').valueOf();
     }
 };
 
-const handleBtnChange = (val: string) => {
-    radioValue.value = val;
-    let endTime = moment(new Date()).valueOf();
+const handleBtnChange = (val?: string) => {
+    let endTime = dayjs(new Date()).valueOf();
     let startTime = getTimeByType(val);
     if (val === 'yesterday') {
-        startTime = moment().subtract(1, 'days').startOf('day').valueOf();
-        endTime = moment().subtract(1, 'days').endOf('day').valueOf();
+        startTime = dayjs().subtract(1, 'days').startOf('day').valueOf();
+        endTime = dayjs().subtract(1, 'days').endOf('day').valueOf();
     }
     rangeVal.value = [
-        moment(startTime).format('YYYY-MM-DD'),
-        moment(endTime).format('YYYY-MM-DD'),
+      dayjs(startTime).format('YYYY-MM-DD HH:mm:ss'),
+      dayjs(endTime).format('YYYY-MM-DD HH:mm:ss'),
     ];
     emit('change', {
         start: startTime,
@@ -110,11 +110,8 @@ const handleBtnChange = (val: string) => {
     });
 };
 
-watch(
-    () => radioValue.value,
-    (val) => {
-        handleBtnChange(val);
-    },
-    { deep: true, immediate: true },
-);
+nextTick(() => {
+  handleBtnChange(radioValue.value)
+})
+
 </script>
diff --git a/src/views/rule-engine/Scene/Save/Device/AddModal.vue b/src/views/rule-engine/Scene/Save/Device/AddModal.vue
index 7566f936..9f06c747 100644
--- a/src/views/rule-engine/Scene/Save/Device/AddModal.vue
+++ b/src/views/rule-engine/Scene/Save/Device/AddModal.vue
@@ -3,7 +3,7 @@
     title='触发规则'
     visible
     :width='820'
-    @click='save'
+    @ok='save'
     @cancel='cancel'
     :maskClosable="false"
   >
diff --git a/src/views/rule-engine/Scene/Save/Device/DeviceList.vue b/src/views/rule-engine/Scene/Save/Device/DeviceList.vue
index 28b61408..b3d493a7 100644
--- a/src/views/rule-engine/Scene/Save/Device/DeviceList.vue
+++ b/src/views/rule-engine/Scene/Save/Device/DeviceList.vue
@@ -3,7 +3,7 @@
     :columns="columns"
     type='simple'
     @search="handleSearch"
-    class='search'
+    class="scene-search"
     target="scene-triggrt-device-device"
   />
   <j-divider style='margin: 0' />
diff --git a/src/views/rule-engine/Scene/Save/Device/InvokeFunction.vue b/src/views/rule-engine/Scene/Save/Device/InvokeFunction.vue
index 4e0aaa39..0973539b 100644
--- a/src/views/rule-engine/Scene/Save/Device/InvokeFunction.vue
+++ b/src/views/rule-engine/Scene/Save/Device/InvokeFunction.vue
@@ -22,11 +22,16 @@
         <j-form-item>定时调用所选功能</j-form-item>
       </j-col>
       <j-col :span='24'>
+        <j-form-item
+          name='functionData'
+          :rules="rules"
+        >
         <FunctionCall
-          :value='_value'
+          v-model:value='formModel.functionData'
           :data='functionData'
           @change='callDataChange'
         />
+        </j-form-item>
       </j-col>
     </j-row>
   </j-form>
@@ -66,9 +71,9 @@ const props = defineProps({
 const emit = defineEmits<Emit>()
 const invokeForm = ref()
 const formModel = reactive({
-  functionId: props.functionId
+  functionId: props.functionId,
+  functionData: props.functionParameters
 })
-const _value = ref<any[]>(props.functionParameters)
 
 /**
  * 获取当前选择功能属性
@@ -94,13 +99,29 @@ const functionData = computed(() => {
   return arrCache
 })
 
+const rules = [{
+  validator(_: string, value: any) {
+    if (!value?.length && functionData.value.length) {
+      return Promise.reject('请输入功能值')
+    } else {
+      let hasValue = value.find((item: { name: string, value: any}) => !item.value)
+      if (hasValue) {
+        const functionItem = functionData.value.find((item: any) => item.id === hasValue.name)
+        return Promise.reject(functionItem?.name ? `请输入${functionItem?.name}值` : '请输入功能值')
+      }
+    }
+    return Promise.resolve();
+  }
+}]
+
 const onSelect = (v: string, item: any) => {
+  formModel.functionData = []
   emit('update:action', `执行${item.name}`)
   emit('update:functionId', v)
+  emit('update:functionParameters', [])
 }
 
 const callDataChange = (v: any[]) => {
-  _value.value = v
   emit('update:functionParameters', v)
 }
 
diff --git a/src/views/rule-engine/Scene/Save/Device/Product.vue b/src/views/rule-engine/Scene/Save/Device/Product.vue
index 73c2a386..b8b42a27 100644
--- a/src/views/rule-engine/Scene/Save/Device/Product.vue
+++ b/src/views/rule-engine/Scene/Save/Device/Product.vue
@@ -3,7 +3,7 @@
     :columns="columns"
     type='simple'
     @search="handleSearch"
-    class='search'
+    class="scene-search"
     target="scene-triggrt-device-device"
   />
   <j-divider style='margin: 0' />
diff --git a/src/views/rule-engine/Scene/Save/Timer/AddModal.vue b/src/views/rule-engine/Scene/Save/Timer/AddModal.vue
index db8b21a9..cf5afd85 100644
--- a/src/views/rule-engine/Scene/Save/Timer/AddModal.vue
+++ b/src/views/rule-engine/Scene/Save/Timer/AddModal.vue
@@ -3,7 +3,7 @@
       title='触发规则'
       visible
       :width='820'
-      @click='save'
+      @ok='save'
       @cancel='cancel'
   >
     <Timer
@@ -15,17 +15,16 @@
 <script setup lang="ts" name="timerAddModel">
 import Timer from '../components/Timer'
 import type { OperationTimer } from '@/views/rule-engine/Scene/typings'
-import {nextTick, PropType} from "vue";
-import {TriggerDevice} from "@/views/rule-engine/Scene/typings";
+import { PropType} from "vue";
 import {handleTimerOptions} from "@/views/rule-engine/Scene/Save/components/Timer/util";
 
 type Emit = {
   (e: 'cancel'): void
-  (e: 'save', data: TriggerDevice, options: Record<string, any>): void
+  (e: 'save', data: OperationTimer, options: Record<string, any>): void
 }
 
 const props = defineProps({
-  timer: {
+  value: {
     type: Object as PropType<OperationTimer>,
     default: () => ({})
   }
@@ -39,14 +38,14 @@ interface AddModelType {
 }
 
 const addModel = reactive<AddModelType>({
-  timer: props.timer
+  timer: props.value
 })
 
 const save = async () => {
   const timerData = await timerRef.value?.validateFields()
   if (timerData) {
-    const options = handleTimerOptions(timerData)
-    emit("save", timerData, options)
+    const options = handleTimerOptions(addModel.timer)
+    emit("save", addModel.timer, options)
   }
 }
 
@@ -54,8 +53,8 @@ const cancel = () => {
   emit("cancel")
 }
 
-nextTick(() => {
-  Object.assign(addModel, props.timer)
+watchEffect(() => {
+  addModel.timer = props.value
 })
 
 </script>
diff --git a/src/views/rule-engine/Scene/Save/Timer/Title.vue b/src/views/rule-engine/Scene/Save/Timer/Title.vue
new file mode 100644
index 00000000..b37d035c
--- /dev/null
+++ b/src/views/rule-engine/Scene/Save/Timer/Title.vue
@@ -0,0 +1,58 @@
+<template>
+  <div :class='["trigger-options-content", isAdd ? "is-add" : ""]'>
+    <span v-if='!isAdd'> 点击配置定时触发 </span>
+    <template v-else>
+      <div class='center-item'>
+        <AIcon v-if='options.selectorIcon' :type='options.selectorIcon' class='icon-padding-right' />
+        <span class='trigger-options-name'>
+            <Ellipsis style='max-width: 310px'>
+              {{ options.name }}
+            </Ellipsis>
+        </span>
+        <span v-if='options.extraName'>{{ options.extraName }}</span>
+      </div>
+      <div v-if='options.when'>
+        <span className='trigger-options-when'>{{ options.when }}</span>
+      </div>
+      <div v-if='options.time'>
+        <span className='trigger-options-time'>{{ options.time }}</span>
+      </div>
+      <div v-if='options.extraTime'>
+        <span className='trigger-options-extraTime'>{{ options.extraTime }}</span>
+      </div>
+    </template>
+  </div>
+</template>
+
+<script setup lang='ts' name='TimerTitle'>
+
+const props = defineProps({
+  options: {
+    type: Object,
+    default: () => ({})
+  }
+})
+
+const isAdd = computed(() => {
+  console.log(props.options, Object.keys(props.options).length)
+  return !!Object.keys(props.options).length
+})
+
+</script>
+
+<style scoped lang='less'>
+.trigger-options-content {
+  display: inline-flex;
+  gap: 16px;
+
+  .center-item {
+    display: flex;
+    align-items: center;
+  }
+
+  .icon-padding-right {
+    padding-right: 4px;
+  }
+
+}
+</style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/Timer/index.vue b/src/views/rule-engine/Scene/Save/Timer/index.vue
index 6d750bb6..30edd897 100644
--- a/src/views/rule-engine/Scene/Save/Timer/index.vue
+++ b/src/views/rule-engine/Scene/Save/Timer/index.vue
@@ -29,8 +29,7 @@
         v-if="visible"
         @cancel='visible = false'
         @save="save"
-        :value="data.trigger.device"
-        :options="data.options.trigger"
+        :value="data.trigger.timer"
       />
     </div>
 </template>
@@ -41,6 +40,7 @@ import { storeToRefs } from 'pinia';
 import Action from '../action/index.vue';
 import AddModel from './AddModal.vue'
 import AddButton from '../components/AddButton.vue'
+import Title from './Title.vue'
 import type { OperationTimer, BranchesThen } from '@/views/rule-engine/Scene/typings'
 
 const sceneStore = useSceneStore();
diff --git a/src/views/rule-engine/Scene/Save/action/Device/Product.vue b/src/views/rule-engine/Scene/Save/action/Device/Product.vue
index a487395f..a59386ad 100644
--- a/src/views/rule-engine/Scene/Save/action/Device/Product.vue
+++ b/src/views/rule-engine/Scene/Save/action/Device/Product.vue
@@ -3,7 +3,7 @@
         :columns="columns"
         type="simple"
         @search="handleSearch"
-        class="search"
+        class="scene-search"
         target="scene-trigger-device-product"
     />
     <j-divider style="margin: 0" />
diff --git a/src/views/rule-engine/Scene/Save/action/Device/actions/index.vue b/src/views/rule-engine/Scene/Save/action/Device/actions/index.vue
index ff7cdbb5..f935083e 100644
--- a/src/views/rule-engine/Scene/Save/action/Device/actions/index.vue
+++ b/src/views/rule-engine/Scene/Save/action/Device/actions/index.vue
@@ -22,6 +22,7 @@
                         showSearch
                         placeholder="请选择功能"
                         v-model:value="modelRef.message.functionId"
+                        @select='functionSelect'
                     >
                         <j-select-option
                             v-for="item in metadata?.functions || []"
@@ -34,7 +35,7 @@
                 <j-form-item
                     v-if="modelRef.message.functionId"
                     :name="['message', 'inputs']"
-                    :rules="[{ required: true, message: '请输入功能值' }]"
+                    :rules="functionRules"
                 >
                     <EditTable
                         :functions="functions"
@@ -138,6 +139,25 @@ const modelRef = reactive({
     },
 });
 
+const functionSelect = () => {
+  modelRef.message.inputs = []
+}
+
+const functionRules = [{
+  validator(_: string, value: any) {
+    if (!value?.length && functions.value.length) {
+      return Promise.reject('请输入功能值')
+    } else {
+      const hasValue = value.find((item: { name: string, value: any}) => !item.value)
+      if (hasValue) {
+        const functionItem = functions.value.find((item: any) => item.id === hasValue.name)
+        return Promise.reject(functionItem?.name ? `请输入${functionItem.name}值` : '请输入功能值')
+      }
+    }
+    return Promise.resolve();
+  }
+}]
+
 const metadata = ref<{
     functions: any[];
     properties: any[];
diff --git a/src/views/rule-engine/Scene/Save/action/Device/device/Device.vue b/src/views/rule-engine/Scene/Save/action/Device/device/Device.vue
index b5d35ad2..d3a07b0e 100644
--- a/src/views/rule-engine/Scene/Save/action/Device/device/Device.vue
+++ b/src/views/rule-engine/Scene/Save/action/Device/device/Device.vue
@@ -3,7 +3,7 @@
         :columns="columns"
         type="simple"
         @search="handleSearch"
-        class="search"
+        class="scene-search"
         target="scene-trigger-device-device"
     />
     <j-divider style="margin: 0" />
diff --git a/src/views/rule-engine/Scene/Save/components/FunctionCall/FunctionCall.vue b/src/views/rule-engine/Scene/Save/components/FunctionCall/FunctionCall.vue
index 25a9270a..1dda6f53 100644
--- a/src/views/rule-engine/Scene/Save/components/FunctionCall/FunctionCall.vue
+++ b/src/views/rule-engine/Scene/Save/components/FunctionCall/FunctionCall.vue
@@ -101,6 +101,7 @@ const valueChange = debounce(() => {
   const _value = dataSource.value.map(item => ({
     name: item.id, value: item.value
   }))
+  console.log(_value)
   emit('change', _value)
   emit('update:value', _value)
 }, 500)
diff --git a/src/views/rule-engine/Scene/Save/components/Timer/WhenOption.vue b/src/views/rule-engine/Scene/Save/components/Timer/WhenOption.vue
index 345f3fb1..3e7782a1 100644
--- a/src/views/rule-engine/Scene/Save/components/Timer/WhenOption.vue
+++ b/src/views/rule-engine/Scene/Save/components/Timer/WhenOption.vue
@@ -17,6 +17,7 @@ import { numberToString } from './util'
 
 type Emit = {
   (e: 'update:value', data: Array<number>):void
+  (e: 'change', data: Array<number>):void
 }
 
 const props = defineProps({
@@ -48,6 +49,7 @@ const change = (number: number) => {
   }
   rowKeys.value = [..._keys.values()]
   emit('update:value', rowKeys.value)
+  emit('change', rowKeys.value)
 }
 
 const allActive = computed(() => {
diff --git a/src/views/rule-engine/Scene/Save/components/Timer/index.vue b/src/views/rule-engine/Scene/Save/components/Timer/index.vue
index 84eb7e26..7b902b18 100644
--- a/src/views/rule-engine/Scene/Save/components/Timer/index.vue
+++ b/src/views/rule-engine/Scene/Save/components/Timer/index.vue
@@ -15,6 +15,7 @@
         ]'
         option-type='button'
         button-style='solid'
+        @change='updateValue'
       />
     </j-form-item>
     <j-form-item v-if='showCron' name='cron' :rules="[
@@ -32,11 +33,11 @@
         }
       }
     ]">
-      <j-input placeholder='corn表达式' v-model:value='formModel.cron' />
+      <j-input placeholder='corn表达式' v-model:value='formModel.cron' @change='updateValue' />
     </j-form-item>
     <template v-else>
       <j-form-item name='when'>
-        <WhenOption v-model:value='formModel.when' :type='formModel.trigger' />
+        <WhenOption v-model:value='formModel.when' :type='formModel.trigger' @change='updateValue' />
       </j-form-item>
       <j-form-item name='mod'>
         <j-radio-group
@@ -47,13 +48,19 @@
         ]'
           option-type='button'
           button-style='solid'
+          @change='updateValue'
         />
       </j-form-item>
     </template>
     <j-space v-if='showOnce' style='display: flex;gap: 24px'>
       <j-form-item :name="['once', 'time']">
-        <j-time-picker valueFormat='HH:mm:ss' v-model:value='formModel.once.time' style='width: 100%'
-                       format='HH:mm:ss' />
+        <j-time-picker
+          valueFormat='HH:mm:ss'
+          v-model:value='formModel.once.time'
+          style='width: 100%'
+          format='HH:mm:ss'
+          @change='updateValue'
+        />
       </j-form-item>
       <j-form-item> 执行一次</j-form-item>
     </j-space>
@@ -68,6 +75,7 @@
           @change='(v) => {
                   formModel.period.from = v[0]
                   formModel.period.to = v[1]
+                  updateValue()
               }'
         />
       </j-form-item>
@@ -83,6 +91,7 @@
           :min='1'
           :max='59'
           v-model:value='formModel.period.every'
+          @change='updateValue'
         >
           <template #addonAfter>
             <j-select
@@ -92,6 +101,7 @@
                 { label: "分", value: "minutes" },
                 { label: "小时", value: "hours" },
               ]'
+              @select='updateValue'
             />
           </template>
         </j-input-number>
@@ -103,7 +113,7 @@
 
 <script setup lang='ts' name='Timer'>
 import type { PropType } from 'vue'
-import moment from 'moment'
+import dayjs from 'dayjs'
 import WhenOption from './WhenOption.vue'
 import { cloneDeep } from 'lodash-es'
 import type { OperationTimer } from '../../../typings'
@@ -131,23 +141,21 @@ const emit = defineEmits<Emit>()
 
 const formModel = reactive<OperationTimer>({
   trigger: 'week',
-  when: [],
+  when: props.value.when || [],
   mod: 'period',
   cron: undefined,
   once: {
-    time: moment(new Date()).format('HH:mm:ss')
+    time: dayjs(new Date()).format('HH:mm:ss')
   },
   period: {
-    from: moment(new Date()).startOf('day').format('HH:mm:ss'),
-    to: moment(new Date()).endOf('day').format('HH:mm:ss'),
+    from: dayjs(new Date()).startOf('day').format('HH:mm:ss'),
+    to: dayjs(new Date()).endOf('day').format('HH:mm:ss'),
     every: 1,
     unit: 'seconds'
   }
 })
 const timerForm = ref()
 
-Object.assign(formModel, props.value)
-
 const showCron = computed(() => {
   return formModel.trigger === 'cron'
 })
@@ -160,7 +168,7 @@ const showPeriod = computed(() => {
   return formModel.trigger !== 'cron' && formModel.mod === 'period'
 })
 
-watch(() => formModel, () => {
+const updateValue = () => {
   const cloneValue = cloneDeep(formModel)
   if (cloneValue.trigger === 'cron') {
     delete cloneValue.when
@@ -174,7 +182,7 @@ watch(() => formModel, () => {
     delete cloneValue.period
   }
   emit('update:value', cloneValue)
-}, { deep: true })
+}
 
 defineExpose({
   validateFields: () => new Promise(async (resolve)  => {
@@ -182,6 +190,8 @@ defineExpose({
     resolve(data)
   })
 })
+Object.assign(formModel, props.value)
+formModel.when = props.value.when || []
 
 </script>
 
diff --git a/src/views/rule-engine/Scene/Save/index.vue b/src/views/rule-engine/Scene/Save/index.vue
index d66d8a7c..12d93a3c 100644
--- a/src/views/rule-engine/Scene/Save/index.vue
+++ b/src/views/rule-engine/Scene/Save/index.vue
@@ -114,4 +114,7 @@ onUnmounted(() => {
     }
   }
 }
+</style>
+<style lang='less'>
+@import "./style.less";
 </style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/style.less b/src/views/rule-engine/Scene/Save/style.less
new file mode 100644
index 00000000..27da287d
--- /dev/null
+++ b/src/views/rule-engine/Scene/Save/style.less
@@ -0,0 +1,3 @@
+.scene-search {
+  padding: 24px 0 0 0;
+}
\ No newline at end of file
diff --git a/src/views/system/Department/device/index.vue b/src/views/system/Department/device/index.vue
index 1d1f076e..4ca49771 100644
--- a/src/views/system/Department/device/index.vue
+++ b/src/views/system/Department/device/index.vue
@@ -70,7 +70,7 @@
                     :status="slotProps.state?.value"
                     :statusText="slotProps.state?.text"
                     :statusNames="{
-                        online: 'success',
+                        online: 'processing',
                         offline: 'error',
                         notActive: 'warning',
                     }"
@@ -147,7 +147,7 @@
                     :status="slotProps.state.value"
                     :text="slotProps.state.text"
                     :statusNames="{
-                        online: 'success',
+                        online: 'processing',
                         offline: 'error',
                         notActive: 'warning',
                     }"
@@ -247,6 +247,9 @@ const columns = [
         search: {
             rename: 'productId$product-info',
             type: 'select',
+            handleValue(value: string) {
+              return `id is ${value}`
+            },
             options: () =>
                 new Promise((resolve) => {
                     const params = {
@@ -288,14 +291,9 @@ const columns = [
         search: {
             type: 'select',
             options: [
-                {
-                    label: '正常',
-                    value: 1,
-                },
-                {
-                    label: '禁用',
-                    value: 0,
-                },
+              { label: '禁用', value: 'notActive' },
+              { label: '离线', value: 'offline' },
+              { label: '在线', value: 'online' },
             ],
         },
         scopedSlots: true,
diff --git a/src/views/system/Department/product/index.vue b/src/views/system/Department/product/index.vue
index 9537f7ff..0a113a4c 100644
--- a/src/views/system/Department/product/index.vue
+++ b/src/views/system/Department/product/index.vue
@@ -68,9 +68,8 @@
                     :status="slotProps.state?.value"
                     :statusText="slotProps.state?.text"
                     :statusNames="{
-                        online: 'success',
-                        offline: 'error',
-                        notActive: 'warning',
+                        1: 'processing',
+                        0: 'error',
                     }"
                 >
                     <template #img>
@@ -172,9 +171,8 @@
                     :status="slotProps.state.value"
                     :text="slotProps.state.text"
                     :statusNames="{
-                        online: 'success',
-                        offline: 'error',
-                        notActive: 'warning',
+                        1: 'processing',
+                        0: 'error',
                     }"
                 ></BadgeStatus>
             </template>
diff --git a/src/views/system/User/index.vue b/src/views/system/User/index.vue
index 8fe8b0a6..2283af2d 100644
--- a/src/views/system/User/index.vue
+++ b/src/views/system/User/index.vue
@@ -4,7 +4,7 @@
             <pro-search
                 :columns="columns"
                 target="category"
-                @search="(params:any)=>queryParams = {...params}"
+                @search="handleParams"
             />
 
             <j-pro-table
@@ -262,6 +262,23 @@ type dictType = {
     name: string;
 };
 type modalType = '' | 'add' | 'edit' | 'reset';
+
+const handleParams = (params: any)=> {
+
+  const newParams = (params?.terms as any[])?.map(item1 => {
+    item1.terms = item1.terms.map((item2: any) => {
+      if (['telephone', 'email'].includes(item2.column)) {
+        return {
+          column: 'id$user-detail',
+          value: [item2]
+        }
+      }
+      return item2
+    })
+    return item1
+  })
+  queryParams.value = { terms: newParams || [] }
+}
 </script>
 
 <style lang="less" scoped>
diff --git a/yarn.lock b/yarn.lock
index 6167c435..90d450e5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3700,8 +3700,8 @@ jetlinks-store@^0.0.3:
 
 jetlinks-ui-components@^1.0.5:
   version "1.0.5"
-  resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#682711e0f69c141fff2c256db61a060c82539611"
-  integrity sha512-rQxD/YlE+XSAG7BWIcFTtKrCQJXk5o+TUgejyuUT/baBThJB6xYt1k2dQEdXyiwpukYen5FzaoLpelSD9SUegw==
+  resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#77bd58156212d793fdebe41fc8864eeed5db7182"
+  integrity sha512-VXuCMJlMV/bbmBhPtBzY/BUBIvGebQbguLPE06xps79i5Pjq46+HBW8VPsJ9MwvyMhYkhzPlQJu9Ft7v5uo+yA==
   dependencies:
     "@vueuse/core" "^9.12.0"
     ant-design-vue "^3.2.15"

From 5600e49b87c0e689bab9eb8a8d6544f382355006 Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Thu, 23 Mar 2023 09:31:29 +0800
Subject: [PATCH 02/16] =?UTF-8?q?fix:=20bug#10787=E3=80=8110786?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  9 +++++---
 .../rule-engine/Scene/Save/Manual/index.vue   | 19 +++++++++++++++--
 .../rule-engine/Scene/Save/Timer/AddModal.vue |  6 +++---
 .../rule-engine/Scene/Save/Timer/index.vue    | 21 +++++++++++++++++--
 .../Save/components/Timer/WhenOption.vue      |  4 +++-
 .../Scene/Save/components/TriggerWay.vue      | 19 ++++++++++++++---
 src/views/rule-engine/Scene/index.vue         |  2 +-
 vite.config.ts                                |  4 ++--
 8 files changed, 67 insertions(+), 17 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 815d1240..1206b11a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,8 +1,11 @@
 <template>
   <ConfigProvider :locale='zhCN'>
-    <keep-alive>
-      <router-view />
-    </keep-alive>
+<!--    <router-view v-slot="{ Component }">-->
+<!--      <keep-alive>-->
+<!--        <component :is="Component" />-->
+<!--      </keep-alive>-->
+<!--    </router-view>-->
+    <router-view />
   </ConfigProvider>
 </template>
 
diff --git a/src/views/rule-engine/Scene/Save/Manual/index.vue b/src/views/rule-engine/Scene/Save/Manual/index.vue
index 4885ced5..98677d24 100644
--- a/src/views/rule-engine/Scene/Save/Manual/index.vue
+++ b/src/views/rule-engine/Scene/Save/Manual/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class='actions-branches-item'>
+  <div class='manual actions-branches-item'>
     <j-form-item
       :rules="actionRules"
       :name="['branches', 0, 'then']"
@@ -32,6 +32,21 @@ const actionRules = [{
 
 </script>
 
-<style scoped>
+<style scoped lang='less'>
+@minWidth: 75%;
 
+.manual {
+  &.actions-branches-item {
+    width: 100%;
+  }
+}
+
+
+@media (min-width: 1600px) {
+  .manual {
+    &.actions-branches-item {
+      width: @minWidth;
+    }
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/Timer/AddModal.vue b/src/views/rule-engine/Scene/Save/Timer/AddModal.vue
index cf5afd85..82631c0f 100644
--- a/src/views/rule-engine/Scene/Save/Timer/AddModal.vue
+++ b/src/views/rule-engine/Scene/Save/Timer/AddModal.vue
@@ -53,9 +53,9 @@ const cancel = () => {
   emit("cancel")
 }
 
-watchEffect(() => {
-  addModel.timer = props.value
-})
+// watchEffect(() => {
+//   addModel.timer = props.value
+// })
 
 </script>
 
diff --git a/src/views/rule-engine/Scene/Save/Timer/index.vue b/src/views/rule-engine/Scene/Save/Timer/index.vue
index 30edd897..81d29554 100644
--- a/src/views/rule-engine/Scene/Save/Timer/index.vue
+++ b/src/views/rule-engine/Scene/Save/Timer/index.vue
@@ -2,7 +2,7 @@
     <div class='timer'>
       <j-form-item
         :rules="rules"
-        name="timer"
+        :name="['trigger', 'timer']"
       >
         <template #label>
           <TitleComponent data='触发规则' style='font-size: 14px;' />
@@ -49,6 +49,7 @@ const visible = ref(false)
 
 const rules = [{
   validator(_: any, v: any) {
+    console.log(v)
     if (!v) {
       return Promise.reject(new Error('请配置定时触发规则'));
     }
@@ -85,5 +86,21 @@ const save = (_data: OperationTimer, options: Record<string, any>) => {
 }
 </script>
 
-<style scoped>
+<style scoped lang='less'>
+@minWidth: 75%;
+
+.timer {
+  .actions-branches-item {
+    width: 100%;
+  }
+}
+
+
+@media (min-width: 1600px) {
+  .timer {
+    .actions-branches-item {
+      width: @minWidth;
+    }
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/components/Timer/WhenOption.vue b/src/views/rule-engine/Scene/Save/components/Timer/WhenOption.vue
index 3e7782a1..f1adc12b 100644
--- a/src/views/rule-engine/Scene/Save/components/Timer/WhenOption.vue
+++ b/src/views/rule-engine/Scene/Save/components/Timer/WhenOption.vue
@@ -59,7 +59,9 @@ const allActive = computed(() => {
 watch(() => props.type, () => {
   const isMonth = props.type === 'month'
   const day = isMonth ? 31 : 7
-  change(0)
+  if (!props.value.length) {
+    change(0)
+  }
   timeOptions.value = new Array(day)
     .fill(1)
     .map((_, index) => {
diff --git a/src/views/rule-engine/Scene/Save/components/TriggerWay.vue b/src/views/rule-engine/Scene/Save/components/TriggerWay.vue
index 9f5401cc..a079509b 100644
--- a/src/views/rule-engine/Scene/Save/components/TriggerWay.vue
+++ b/src/views/rule-engine/Scene/Save/components/TriggerWay.vue
@@ -57,15 +57,17 @@ const classNames = computed(() => {
 })
 
 const handleClick = (type: string) => {
-  emit('update:modelValue', type)
+  if (!props.disabled) {
+    emit('update:modelValue', type)
+  }
 }
 
 </script>
 
 <style scoped lang='less'>
-// @import 'ant-design-vue/es/style/themes/default.less';
 
-.scene-trigger-way-warp {display: flex;
+.scene-trigger-way-warp {
+  display: flex;
   flex-wrap: wrap;
   gap: 16px 24px;
   width: 100%;
@@ -115,5 +117,16 @@ const handleClick = (type: string) => {
       }
     }
   }
+
+  &.disabled {
+    color: rgba(#000, .8);
+    .way-item-image {
+      opacity: 0.6;
+    }
+
+    .trigger-way-item {
+      cursor: not-allowed;
+    }
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/index.vue b/src/views/rule-engine/Scene/index.vue
index 535e7bf4..92f38c15 100644
--- a/src/views/rule-engine/Scene/index.vue
+++ b/src/views/rule-engine/Scene/index.vue
@@ -300,7 +300,7 @@ const getActions = (
     ];
     if (data.triggerType === 'manual') {
         const _item: ActionsType = {
-            key: 'trigger',
+            key: 'tigger',
             text: '手动触发',
             disabled: data.state?.value === 'disable',
             tooltip: {
diff --git a/vite.config.ts b/vite.config.ts
index 3686a5bf..baf145c2 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -92,8 +92,8 @@ export default defineConfig(({ mode}) => {
               [env.VITE_APP_BASE_API]: {
                   // target: 'http://192.168.33.22:8800',
                   // target: 'http://192.168.32.244:8881',
-                //   target: 'http://120.77.179.54:8844', // 120测试
-                  target: 'http://192.168.33.46:8844', // 本地开发环境
+                  target: 'http://120.77.179.54:8844', // 120测试
+                //   target: 'http://192.168.33.46:8844', // 本地开发环境
                   ws: 'ws://192.168.33.46:8844',
                   changeOrigin: true,
                   rewrite: (path) => path.replace(/^\/api/, '')

From 30c1619f061e9edd7d588551b62f1ea0315a234f Mon Sep 17 00:00:00 2001
From: leiqiaochu <leiqiaochu@aossci.com>
Date: Thu, 23 Mar 2023 10:32:42 +0800
Subject: [PATCH 03/16] fix: bug#10769 10765 10760 10459

---
 src/api/device/product.ts                     |   2 +-
 src/views/device/DashBoard/index.vue          |   2 +-
 .../Instance/Detail/ChildDevice/index.vue     |   4 +
 .../Product/Detail/DeviceAccess/index.vue     | 109 ++++++------------
 src/views/device/Product/index.vue            |   2 +-
 src/views/rule-engine/Instance/index.vue      |  14 +--
 6 files changed, 47 insertions(+), 86 deletions(-)

diff --git a/src/api/device/product.ts b/src/api/device/product.ts
index b366b94a..df3741d5 100644
--- a/src/api/device/product.ts
+++ b/src/api/device/product.ts
@@ -194,4 +194,4 @@ export const getMetadataConfig = (params: {
     id: string;
     dataType: string;
   };
-}) => server.get<Record<any, any>[]>(`/device/product/${params.deviceId}/config-metadata/${params.metadata.type}/${params.metadata.id}/${params.metadata.dataType}`)
\ No newline at end of file
+}) => server.get<Record<any, any>[]>(`/device/product/${params.deviceId}/config-metadata/${params.metadata.type}/${params.metadata.id}/${params.metadata.dataType}`)
diff --git a/src/views/device/DashBoard/index.vue b/src/views/device/DashBoard/index.vue
index bdd884d9..457a1466 100644
--- a/src/views/device/DashBoard/index.vue
+++ b/src/views/device/DashBoard/index.vue
@@ -364,7 +364,7 @@ const setDevMesChartOption = (
         grid: {
             top: '2%',
             bottom: '5%',
-            left: maxY > 100000 ? '90px' : '60px',
+            left: maxY > 100000 ? '50px' : '70px',
             right: '50px',
         },
         series: [
diff --git a/src/views/device/Instance/Detail/ChildDevice/index.vue b/src/views/device/Instance/Detail/ChildDevice/index.vue
index d723385f..c39b0489 100644
--- a/src/views/device/Instance/Detail/ChildDevice/index.vue
+++ b/src/views/device/Instance/Detail/ChildDevice/index.vue
@@ -147,6 +147,10 @@ const columns = [
         dataIndex: 'id',
         key: 'id',
         ellipsis: true,
+        search:{
+            type:'string',
+            defaultTermType: 'eq'
+        }
     },
     {
         title: '设备名称',
diff --git a/src/views/device/Product/Detail/DeviceAccess/index.vue b/src/views/device/Product/Detail/DeviceAccess/index.vue
index e2806143..42f4bb65 100644
--- a/src/views/device/Product/Detail/DeviceAccess/index.vue
+++ b/src/views/device/Product/Detail/DeviceAccess/index.vue
@@ -568,7 +568,17 @@ const query = reactive({
 });
 const param = ref<Record<string, any>>({
     pageSize: 4,
-    terms: [],
+    terms: [
+        {
+            terms: [
+                {
+                    column: 'channel',
+                    termType: 'nin',
+                    value: 'plugin',
+                },
+            ],
+        },
+    ],
 });
 const queryParams = ref<Record<string, any>>({});
 /**
@@ -669,49 +679,6 @@ const driver1 = new Driver({
     },
 });
 
-/**
- * 表格列表
- */
-// const columnsMQTT: any[] = [
-//     {
-//         title: '分组',
-//         dataIndex: 'group',
-//         key: 'group',
-//         ellipsis: true,
-//         width: 100,
-//         // customCell: (record: any, index: number) => {
-//         //     const list =
-//         //         (config?.routes || []).sort((a: any, b: any) => a - b) || [];
-//         //     const arr = list.filter((res: any) => {
-//         //         // 这里gpsNumber是我需要判断的字段名（相同就合并）
-//         //         return res?.group == record?.group;
-//         //     });
-//         //     if (index == 0 || list[index - 1]?.group != record?.group) {
-//         //         return { rowSpan: arr.length };
-//         //     } else {
-//         //         return { rowSpan: 0 };
-//         //     }
-//         // },
-//     },
-//     {
-//         title: 'topic',
-//         dataIndex: 'topic',
-//         key: 'topic',
-//     },
-//     {
-//         title: '上下行',
-//         dataIndex: 'stream',
-//         key: 'stream',
-//         ellipsis: true,
-//         align: 'center',
-//         width: 100,
-//     },
-//     {
-//         title: '说明',
-//         dataIndex: 'description',
-//         key: 'description',
-//     },
-// ];
 let columnsMQTT = ref(<TableColumnType>[]);
 const ColumnsMQTT = [
     {
@@ -760,38 +727,6 @@ const ColumnsHTTP = [
         // scopedSlots: { customRender: 'description' },
     },
 ];
-// const columnsHTTP: any[] = [
-//     {
-//         title: '分组',
-//         dataIndex: 'group',
-//         key: 'group',
-//         ellipsis: true,
-//         width: 100,
-//         // customCell: (record: any, index: number) => {
-//         //     const list =
-//         //         (config?.routes || []).sort((a: any, b: any) => a - b) || [];
-//         //     const arr = list.filter((res: any) => {
-//         //         // 这里gpsNumber是我需要判断的字段名（相同就合并）
-//         //         return res?.group == record?.group;
-//         //     });
-//         //     if (index == 0 || list[index - 1]?.group != record?.group) {
-//         //         return { rowSpan: arr.length };
-//         //     } else {
-//         //         return { rowSpan: 0 };
-//         //     }
-//         // },
-//     },
-//     {
-//         title: '示例',
-//         dataIndex: 'example',
-//         key: 'example',
-//     },
-//     {
-//         title: '说明',
-//         dataIndex: 'description',
-//         key: 'description',
-//     },
-// ];
 /**
  * 获取上下行数据
  */
@@ -892,6 +827,28 @@ const submitData = async () => {
             accessProvider: current.value?.provider,
             messageProtocol: current.value?.protocol,
         };
+        // getConfigView(current.value?.protocol, current.value?.transport).then(
+        //     (resp: any) => {
+        //         metadata.value = (resp?.result[0] as ConfigMetadata) || {
+        //             properties: [],
+        //         };
+        //         // 流传输模式 初始为udp模式
+        //         if (metadata.value?.properties) {
+        //             metadata.value?.properties.forEach((item) => {
+        //                 if (
+        //                     item.name === '流传输模式' &&
+        //                     (!productStore.current?.configuration ||
+        //                         !productStore.current?.configuration.hasOwnProperty(
+        //                             item.name,
+        //                         ))
+        //                 ) {
+        //                     formData.data[item.name] =
+        //                         item.type.expands?.defaultValue;
+        //                 }
+        //             });
+        //         }
+        //     },
+        // );
         const metatdata = JSON.parse(productStore.current?.metadata || '{}');
         if (!productStore.current?.metadata) {
             const response = await getConfigView(
diff --git a/src/views/device/Product/index.vue b/src/views/device/Product/index.vue
index 694a55c0..9e341269 100644
--- a/src/views/device/Product/index.vue
+++ b/src/views/device/Product/index.vue
@@ -563,7 +563,7 @@ const query = reactive({
             },
         },
         {
-            title: '所属部门',
+            title: '所属组织',
             key: 'id$dim-assets',
             dataIndex: 'id$dim-assets',
             search: {
diff --git a/src/views/rule-engine/Instance/index.vue b/src/views/rule-engine/Instance/index.vue
index 1a8a5c46..ffa3b192 100644
--- a/src/views/rule-engine/Instance/index.vue
+++ b/src/views/rule-engine/Instance/index.vue
@@ -38,7 +38,7 @@
                         :statusText="slotProps.state?.text"
                         @click="openRuleEditor"
                         :statusNames="{
-                            started: 'success',
+                            started: 'processing',
                             disable: 'error',
                         }"
                     >
@@ -88,17 +88,17 @@
                     </CardBox>
                 </template>
                 <template #state="slotProps">
-                    <j-badge
+                    <BadgeStatus
                         :text="
                             slotProps.state?.value === 'started'
                                 ? '正常'
                                 : '禁用'
                         "
-                        :status="
-                            slotProps.state?.value === 'started'
-                                ? 'success'
-                                : 'error'
-                        "
+                        :status="slotProps.state?.value"
+                        :statusNames="{
+                            started: 'processing',
+                            disable: 'error',
+                        }"
                     />
                 </template>
                 <template #action="slotProps">

From f8cad6d7b1ed618f733b376e16e18de6d95a4b01 Mon Sep 17 00:00:00 2001
From: 100011797 <2642441182@qq.com>
Date: Thu, 23 Mar 2023 10:36:22 +0800
Subject: [PATCH 04/16] =?UTF-8?q?fix:=20=E8=AF=A6=E6=83=85=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Layout/BasicLayoutPage.vue  |   2 +-
 src/views/device/Instance/Detail/index.vue | 288 ++++++++++-----------
 2 files changed, 142 insertions(+), 148 deletions(-)

diff --git a/src/components/Layout/BasicLayoutPage.vue b/src/components/Layout/BasicLayoutPage.vue
index 1119f7f6..71ebdcc8 100644
--- a/src/components/Layout/BasicLayoutPage.vue
+++ b/src/components/Layout/BasicLayoutPage.vue
@@ -6,7 +6,7 @@
         v-model:selectedKeys="state.selectedKeys"
         :pure="state.pure"
         :breadcrumb="{ routes: breadcrumb }"
-        @back='routerBack'
+        @backClick='routerBack'
     >
         <template #breadcrumbRender="slotProps">
             <a
diff --git a/src/views/device/Instance/Detail/index.vue b/src/views/device/Instance/Detail/index.vue
index 0df755d7..081b6b96 100644
--- a/src/views/device/Instance/Detail/index.vue
+++ b/src/views/device/Instance/Detail/index.vue
@@ -1,101 +1,91 @@
 <template>
     <page-container
         :tabList="list"
+        :showBack="true"
         :tabActiveKey="instanceStore.tabActiveKey"
         @tabChange="onTabChange"
     >
         <template #title>
-            <div>
-                <div style="display: flex; align-items: center">
-                    <!-- <j-button @click="onBack" size="small">返回</j-button> -->
-                    <div style="font-size: 24px">
-                        {{ instanceStore.current?.name }}
-                    </div>
-                    <j-divider type="vertical" />
-                    <j-space>
-                        <span
-                            style="font-size: 14px; color: rgba(0, 0, 0, 0.85)"
-                        >
-                            状态：
-                            <j-badge
-                                :status="
-                                    statusMap.get(
-                                        instanceStore.current?.state?.value,
-                                    )
-                                "
-                            />
-                            {{ instanceStore.current?.state?.text }}
-                        </span>
-                        <PermissionButton
-                            v-if="
-                                instanceStore.current?.state?.value ===
-                                'notActive'
-                            "
-                            type="link"
-                            style="margin-top: -5px; padding: 0 20px"
-                            :popConfirm="{
-                                title: '确认启用设备',
-                                onConfirm: handleAction,
-                            }"
-                            hasPermission="device/Instance:action"
-                        >
-                            启用设备
-                        </PermissionButton>
-                        <PermissionButton
-                            v-if="
-                                instanceStore.current?.state?.value === 'online'
-                            "
-                            type="link"
-                            style="margin-top: -5px; padding: 0 20px"
-                            :popConfirm="{
-                                title: '确认断开连接？',
-                                onConfirm: handleDisconnect,
-                            }"
-                            hasPermission="device/Instance:action"
-                        >
-                            断开连接
-                        </PermissionButton>
-                        <j-tooltip
-                            v-if="
-                                instanceStore.current?.accessProvider ===
-                                    'child-device' &&
-                                instanceStore.current?.state?.value ===
-                                    'offline'
-                            "
-                            :title="
-                                instanceStore.current?.features?.find(
-                                    (item) => item?.id === 'selfManageState',
+            <div style="display: flex; align-items: center">
+                {{ instanceStore.current?.name }}
+                <j-divider type="vertical" />
+                <j-space>
+                    <span style="font-size: 14px; color: rgba(0, 0, 0, 0.85)">
+                        状态：
+                        <j-badge
+                            :status="
+                                statusMap.get(
+                                    instanceStore.current?.state?.value,
                                 )
-                                    ? '该设备的在线状态与父设备(网关设备)保持一致'
-                                    : '该设备在线状态由设备自身运行状态决定，不继承父设备（网关设备）的在线状态'
                             "
-                        >
-                            <AIcon
-                                type="QuestionCircleOutlined"
-                                style="font-size: 14px"
-                            />
-                        </j-tooltip>
-                    </j-space>
-                </div>
-                <div style="padding-top: 24px">
-                    <j-descriptions size="small" :column="4">
-                        <j-descriptions-item label="ID">{{
-                            instanceStore.current?.id
-                        }}</j-descriptions-item>
-                        <j-descriptions-item label="所属产品">
-                            <PermissionButton
-                                type="link"
-                                style="margin-top: -5px; padding: 0"
-                                @click="jumpProduct"
-                                hasPermission="device/Product:view"
-                            >
-                                {{ instanceStore.current?.productName }}
-                            </PermissionButton>
-                        </j-descriptions-item>
-                    </j-descriptions>
-                </div>
+                        />
+                        {{ instanceStore.current?.state?.text }}
+                    </span>
+                    <PermissionButton
+                        v-if="
+                            instanceStore.current?.state?.value === 'notActive'
+                        "
+                        type="link"
+                        style="margin-top: -5px; padding: 0 20px"
+                        :popConfirm="{
+                            title: '确认启用设备',
+                            onConfirm: handleAction,
+                        }"
+                        hasPermission="device/Instance:action"
+                    >
+                        启用设备
+                    </PermissionButton>
+                    <PermissionButton
+                        v-if="instanceStore.current?.state?.value === 'online'"
+                        type="link"
+                        style="margin-top: -5px; padding: 0 20px"
+                        :popConfirm="{
+                            title: '确认断开连接？',
+                            onConfirm: handleDisconnect,
+                        }"
+                        hasPermission="device/Instance:action"
+                    >
+                        断开连接
+                    </PermissionButton>
+                    <j-tooltip
+                        v-if="
+                            instanceStore.current?.accessProvider ===
+                                'child-device' &&
+                            instanceStore.current?.state?.value === 'offline'
+                        "
+                        :title="
+                            instanceStore.current?.features?.find(
+                                (item) => item?.id === 'selfManageState',
+                            )
+                                ? '该设备的在线状态与父设备(网关设备)保持一致'
+                                : '该设备在线状态由设备自身运行状态决定，不继承父设备（网关设备）的在线状态'
+                        "
+                    >
+                        <AIcon
+                            type="QuestionCircleOutlined"
+                            style="font-size: 14px"
+                        />
+                    </j-tooltip>
+                </j-space>
             </div>
         </template>
+        <template #content>
+            <j-descriptions size="small" :column="4">
+                <j-descriptions-item label="ID">{{
+                    instanceStore.current?.id
+                }}</j-descriptions-item>
+                <j-descriptions-item label="所属产品">
+                    <PermissionButton
+                        type="link"
+                        style="margin-top: -5px; padding: 0"
+                        @click="jumpProduct"
+                        hasPermission="device/Product:view"
+                    >
+                        {{ instanceStore.current?.productName }}
+                    </PermissionButton>
+                </j-descriptions-item>
+            </j-descriptions>
+        </template>
         <template #extra>
             <img
                 @click="handleRefresh"
@@ -142,7 +132,7 @@ statusMap.set('notActive', 'warning');
 
 const statusRef = ref();
 
-const list = ref([
+const initList = [
     {
         key: 'Info',
         tab: '实例信息',
@@ -163,7 +153,9 @@ const list = ref([
         key: 'Log',
         tab: '日志管理',
     },
-]);
+];
+
+const list = ref([...initList]);
 
 const tabs = {
     Info,
@@ -191,64 +183,7 @@ const getStatus = (id: string) => {
     });
 };
 
-watch(
-    () => route.params?.id,
-    (newId) => {
-        if (newId) {
-            instanceStore.refresh(String(newId));
-            getStatus(String(newId));
-            instanceStore.tabActiveKey = 'Info'
-        }
-    },
-    { immediate: true, deep: true },
-);
-
-onMounted(() => {
-    instanceStore.tabActiveKey = history.state?.params?.tab || 'Info';
-});
-
-// const onBack = () => {
-//     menuStory.jumpPage('device/Instance');
-// };
-
-const onTabChange = (e: string) => {
-    instanceStore.tabActiveKey = e;
-};
-
-const handleAction = async () => {
-    if (instanceStore.current?.id) {
-        const resp = await _deploy(instanceStore.current?.id);
-        if (resp.status === 200) {
-            message.success('操作成功！');
-            instanceStore.refresh(instanceStore.current?.id);
-        }
-    }
-};
-
-const handleDisconnect = async () => {
-    if (instanceStore.current?.id) {
-        const resp = await _disconnect(instanceStore.current?.id);
-        if (resp.status === 200) {
-            message.success('操作成功！');
-            instanceStore.refresh(instanceStore.current?.id);
-        }
-    }
-};
-
-const handleRefresh = async () => {
-    if (instanceStore.current?.id) {
-        await instanceStore.refresh(instanceStore.current?.id);
-        message.success('操作成功');
-    }
-};
-
-const jumpProduct = () => {
-    menuStory.jumpPage('device/Product/Detail', {
-        id: instanceStore.current?.productId,
-    });
-};
-
-watchEffect(() => {
+const getDetail = () => {
     const keys = list.value.map((i) => i.key);
     if (
         instanceStore.current?.protocol &&
@@ -309,8 +244,67 @@ watchEffect(() => {
             tab: '边缘端映射',
         });
     }
+};
+
+watch(
+    () => route.params?.id,
+    async (newId) => {
+        if (newId) {
+            await instanceStore.refresh(String(newId));
+            getStatus(String(newId));
+            list.value = [...initList];
+            getDetail();
+            instanceStore.tabActiveKey = 'Info';
+        }
+    },
+    { immediate: true, deep: true },
+);
+
+onMounted(() => {
+    instanceStore.tabActiveKey = history.state?.params?.tab || 'Info';
 });
 
+const onBack = () => {
+    menuStory.jumpPage('device/Instance');
+};
+
+const onTabChange = (e: string) => {
+    instanceStore.tabActiveKey = e;
+};
+
+const handleAction = async () => {
+    if (instanceStore.current?.id) {
+        const resp = await _deploy(instanceStore.current?.id);
+        if (resp.status === 200) {
+            message.success('操作成功！');
+            instanceStore.refresh(instanceStore.current?.id);
+        }
+    }
+};
+
+const handleDisconnect = async () => {
+    if (instanceStore.current?.id) {
+        const resp = await _disconnect(instanceStore.current?.id);
+        if (resp.status === 200) {
+            message.success('操作成功！');
+            instanceStore.refresh(instanceStore.current?.id);
+        }
+    }
+};
+
+const handleRefresh = async () => {
+    if (instanceStore.current?.id) {
+        await instanceStore.refresh(instanceStore.current?.id);
+        message.success('操作成功');
+    }
+};
+
+const jumpProduct = () => {
+    menuStory.jumpPage('device/Product/Detail', {
+        id: instanceStore.current?.productId,
+    });
+};
+
 onUnmounted(() => {
     statusRef.value && statusRef.value.unsubscribe();
 });

From e278ae3ebc13e58dfd9bff7c37c44aa68f790230 Mon Sep 17 00:00:00 2001
From: wangshuaiswim <shuai-1991@qq.com>
Date: Thu, 23 Mar 2023 11:38:27 +0800
Subject: [PATCH 05/16] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=89=A9?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8BBUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/components/Metadata/Base/index.vue |  5 +++--
 .../device/components/Metadata/Cat/index.vue  | 19 +++++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/views/device/components/Metadata/Base/index.vue b/src/views/device/components/Metadata/Base/index.vue
index f6a4a2fe..2de332eb 100644
--- a/src/views/device/components/Metadata/Base/index.vue
+++ b/src/views/device/components/Metadata/Base/index.vue
@@ -196,11 +196,12 @@ const resetMetadata = async () => {
   // }
   const { id } = route.params
   if (target === 'device') {
-    instanceStore.refresh(id as string)
+    await instanceStore.refresh(id as string)
   } else {
-    productStore.refresh(id as string)
+    await productStore.getDetail(id as string)
   }
   metadataStore.set('importMetadata', true)
+  
 };
 
 const removeItem = async (record: MetadataItem) => {
diff --git a/src/views/device/components/Metadata/Cat/index.vue b/src/views/device/components/Metadata/Cat/index.vue
index 994cce45..9ff7c0bd 100644
--- a/src/views/device/components/Metadata/Cat/index.vue
+++ b/src/views/device/components/Metadata/Cat/index.vue
@@ -61,12 +61,15 @@ const close = () => {
 
 const instanceStore = useInstanceStore()
 const productStore = useProductStore()
-const metadataMap = {
-  product: productStore.current?.metadata as string,
-  device: instanceStore.current?.metadata as string,
-};
-const metadata = metadataMap[props.type];
-const value = ref(metadata)
+const metadata = computed(() => {
+  const metadataMap = {
+    product: productStore.current?.metadata as string,
+    device: instanceStore.current?.metadata as string,
+  };
+  return metadataMap[props.type];
+})
+// const metadata = metadataMap[props.type];
+const value = ref(metadata.value)
 const handleExport = async () => {
   try {
     downloadObject(
@@ -86,14 +89,14 @@ const handleConvertMetadata = (key: Key) => {
   if (key === 'alink') {
     value.value = '';
     if (metadata) {
-      convertMetadata('to', 'alink', JSON.parse(metadata)).then(res => {
+      convertMetadata('to', 'alink', JSON.parse(metadata.value)).then(res => {
         if (res.status === 200) {
           value.value = JSON.stringify(res.result)
         }
       });
     }
   } else {
-    value.value = metadata;
+    value.value = metadata.value;
   }
 };
 

From 0e09858d3802b98de1021a0ea070048f9cd40e39 Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Thu, 23 Mar 2023 11:47:58 +0800
Subject: [PATCH 06/16] =?UTF-8?q?fix:=20bug#10706=E3=80=8110678?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/AddDeviceOrProductDialog.vue   |  8 +++-
 .../components/EditDepartmentDialog.vue       | 45 ++++++++++++-------
 src/views/system/Department/device/index.vue  |  2 +-
 3 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/src/views/system/Department/components/AddDeviceOrProductDialog.vue b/src/views/system/Department/components/AddDeviceOrProductDialog.vue
index 6481f03e..6fbea17b 100644
--- a/src/views/system/Department/components/AddDeviceOrProductDialog.vue
+++ b/src/views/system/Department/components/AddDeviceOrProductDialog.vue
@@ -259,8 +259,10 @@ const table: any = {
     // 选中
     onSelectChange: (row: any) => {
         // 若该项的可选权限中没有分享权限，则不支持任何操作
-        if (!row.permissionList.find((item: any) => item.value === 'share'))
+        if (!row.permissionList.find((item: any) => item.value === 'share')) {
+            message.warning('该资产不支持共享');
             return;
+        }
         const selectedRowKeys = table._selectedRowKeys.value;
         const index = selectedRowKeys.indexOf(row.id);
 
@@ -330,7 +332,9 @@ const table: any = {
                         resolve({
                             code: 200,
                             result: {
-                                data: data.sort((a, b) => a.createTime - b.createTime),
+                                data: data.sort(
+                                    (a, b) => a.createTime - b.createTime,
+                                ),
                                 pageIndex,
                                 pageSize,
                                 total,
diff --git a/src/views/system/Department/components/EditDepartmentDialog.vue b/src/views/system/Department/components/EditDepartmentDialog.vue
index ea145c5c..d6b6f0a4 100644
--- a/src/views/system/Department/components/EditDepartmentDialog.vue
+++ b/src/views/system/Department/components/EditDepartmentDialog.vue
@@ -18,6 +18,7 @@
                     placeholder="请选择上级组织"
                     :tree-data="treeData"
                     :field-names="{ value: 'id' }"
+                    @change="handleTreeSelectChange"
                 >
                     <template #title="{ name }"> {{ name }} </template>
                 </j-tree-select>
@@ -60,6 +61,21 @@ import {
     updateDepartment_api,
 } from '@/api/system/department';
 
+type treeType = {
+    id: string;
+    parentId?: string;
+    name: string;
+    sortIndex: string | number;
+    children?: treeType[];
+    disabled?: boolean;
+};
+type formType = {
+    id?: string;
+    parentId?: string;
+    name: string;
+    sortIndex: string | number;
+};
+
 const emits = defineEmits(['refresh', 'update:visible']);
 const props = defineProps<{
     treeData: any[];
@@ -91,8 +107,8 @@ const treeData = computed(() => {
 });
 /**
  * 在给定的树中通过id匹配
- * @param node 
- * @param id 
+ * @param node
+ * @param id
  */
 const findItemById = (node: treeType[], id: string): treeType | null => {
     let result = null;
@@ -107,7 +123,7 @@ const findItemById = (node: treeType[], id: string): treeType | null => {
 };
 /**
  * 将此树下的所有节点禁用
- * @param treeNode 
+ * @param treeNode
  */
 const filterTree = (treeNode: treeType[]) => {
     if (treeNode.length < 1) return;
@@ -160,18 +176,15 @@ const form = reactive({
 });
 form.init();
 
-type treeType = {
-    id: string;
-    parentId?: string;
-    name: string;
-    sortIndex: string | number;
-    children?: treeType[];
-    disabled?: boolean;
-};
-type formType = {
-    id?: string;
-    parentId?: string;
-    name: string;
-    sortIndex: string | number;
+/**
+ * 上级组织选择改变
+ */
+const handleTreeSelectChange = () => {
+    // 上级组织
+    const parent = treeData.value.find((f: any) => f.id === form.data.parentId);
+    // 当前编辑的组织排序, 为选择上级组织的最大排序+1, 如上级组织没有自组织, 则默认为1
+    form.data.sortIndex = parent?.children
+        ? parent.children[parent.children.length - 1].sortIndex + 1
+        : 1;
 };
 </script>
diff --git a/src/views/system/Department/device/index.vue b/src/views/system/Department/device/index.vue
index 1d1f076e..7769eb1b 100644
--- a/src/views/system/Department/device/index.vue
+++ b/src/views/system/Department/device/index.vue
@@ -520,7 +520,7 @@ const dialogs = reactive({
 });
 
 table.init();
-nextTick(() => {
+watchEffect(() => {
     props.bindBool && table.clickAdd();
     emits('update:bindBool', false);
 });

From 73351235cef5b9c006f3ccb34c94007b1774425d Mon Sep 17 00:00:00 2001
From: 100011797 <2642441182@qq.com>
Date: Thu, 23 Mar 2023 15:08:36 +0800
Subject: [PATCH 07/16] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/Instance/index.vue      |  4 +++
 src/views/edge/Device/index.vue          | 40 ++++++++++++------------
 src/views/edge/Resource/Issue/Result.vue |  4 +--
 src/views/edge/Resource/Issue/index.vue  |  3 +-
 4 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/src/views/device/Instance/index.vue b/src/views/device/Instance/index.vue
index 30270b39..2d3b82b7 100644
--- a/src/views/device/Instance/index.vue
+++ b/src/views/device/Instance/index.vue
@@ -328,6 +328,7 @@ const columns = [
         title: 'ID',
         dataIndex: 'id',
         key: 'id',
+        ellipsis: true,
         search: {
             type: 'string',
             defaultTermType: 'eq',
@@ -337,6 +338,7 @@ const columns = [
         title: '设备名称',
         dataIndex: 'name',
         key: 'name',
+        ellipsis: true,
         search: {
             type: 'string',
             first: true,
@@ -346,6 +348,7 @@ const columns = [
         title: '产品名称',
         dataIndex: 'productName',
         key: 'productName',
+        ellipsis: true,
         search: {
             type: 'select',
             rename: 'productId',
@@ -367,6 +370,7 @@ const columns = [
         dataIndex: 'createTime',
         key: 'createTime',
         scopedSlots: true,
+        width: 200,
         search: {
             type: 'date',
         },
diff --git a/src/views/edge/Device/index.vue b/src/views/edge/Device/index.vue
index 9d9bc8cb..116442f4 100644
--- a/src/views/edge/Device/index.vue
+++ b/src/views/edge/Device/index.vue
@@ -267,26 +267,26 @@ const columns = [
                 }),
         },
     },
-    {
-        key: 'productId$product-info',
-        dataIndex: 'productId$product-info',
-        title: '接入方式',
-        hideInTable: true,
-        search: {
-            type: 'select',
-            options: () =>
-                new Promise((resolve) => {
-                    queryGatewayList({}).then((resp: any) => {
-                        resolve(
-                            resp.result.map((item: any) => ({
-                                label: item.name,
-                                value: `accessId is ${item.id}`,
-                            })),
-                        );
-                    });
-                }),
-        },
-    },
+    // {
+    //     key: 'productId$product-info',
+    //     dataIndex: 'productId$product-info',
+    //     title: '接入方式',
+    //     hideInTable: true,
+    //     search: {
+    //         type: 'select',
+    //         options: () =>
+    //             new Promise((resolve) => {
+    //                 queryGatewayList({}).then((resp: any) => {
+    //                     resolve(
+    //                         resp.result.map((item: any) => ({
+    //                             label: item.name,
+    //                             value: `accessId is ${item.id}`,
+    //                         })),
+    //                     );
+    //                 });
+    //             }),
+    //     },
+    // },
     {
         dataIndex: 'deviceType',
         title: '设备类型',
diff --git a/src/views/edge/Resource/Issue/Result.vue b/src/views/edge/Resource/Issue/Result.vue
index 52589e13..339ddb2d 100644
--- a/src/views/edge/Resource/Issue/Result.vue
+++ b/src/views/edge/Resource/Issue/Result.vue
@@ -20,7 +20,7 @@
             <j-col :span="8">已下发数量：{{ countErr + count }}</j-col>
         </j-row>
         <div v-if="!flag">
-            <j-textarea :rows="20" :value="JSON.stringify(errMessage)" />
+            <j-textarea :rows="10" :value="JSON.stringify(errMessage)" />
         </div>
     </j-modal>
 </template>
@@ -86,7 +86,7 @@ const getData = () => {
             et += 1;
             countErr.value = et;
             flag.value = false;
-            if (errMessages.length <= 5) {
+            if (errMessages.length < 5) {
                 errMessages.push({ ...res });
                 errMessage.value = [...errMessages];
             }
diff --git a/src/views/edge/Resource/Issue/index.vue b/src/views/edge/Resource/Issue/index.vue
index 5bab28ac..b12f7554 100644
--- a/src/views/edge/Resource/Issue/index.vue
+++ b/src/views/edge/Resource/Issue/index.vue
@@ -169,7 +169,8 @@ const onCancel = () => {
 
 <style lang="less" scoped>
 .search {
-    padding: 0 0 0 24px;
+    padding: 0px;
+    margin: 0px;
 }
 .alert {
     height: 40px;

From 83284569aa663571275ec8189be6945c44825dad Mon Sep 17 00:00:00 2001
From: leiqiaochu <leiqiaochu@aossci.com>
Date: Thu, 23 Mar 2023 15:21:33 +0800
Subject: [PATCH 08/16] fix: bug#9308

---
 src/utils/menu.ts                             | 11 +++---
 .../Product/Detail/DeviceAccess/index.vue     |  8 ++++-
 src/views/device/Product/Detail/index.vue     | 34 +++++++++----------
 src/views/device/Product/Save/index.vue       |  2 +-
 .../Alarm/Log/{SolveLog => Record}/index.vue  | 31 +++++------------
 .../Alarm/Log/TabComponent/indev.vue          | 12 +++----
 6 files changed, 45 insertions(+), 53 deletions(-)
 rename src/views/rule-engine/Alarm/Log/{SolveLog => Record}/index.vue (83%)

diff --git a/src/utils/menu.ts b/src/utils/menu.ts
index 74fb9892..2a08cba4 100644
--- a/src/utils/menu.ts
+++ b/src/utils/menu.ts
@@ -148,6 +148,9 @@ const extraRouteObj = {
   'edge/Device': {
     children: [{ code: 'Remote', name: '远程控制' }],
   },
+  'rule-engine/Alarm/Log': {
+    children: [{ code: 'Record', name: '处理记录' }]
+  }
 };
 
 
@@ -206,7 +209,7 @@ const findDetailRoutes = (routes: any[]): any[] => {
 export const findCodeRoute = (asyncRouterMap: any[]) => {
   const routeMeta = {}
 
-  function getDetail( code: string, url: string) {
+  function getDetail(code: string, url: string) {
     const detail = findDetailRouteItem(code, url)
     if (!detail) return
     routeMeta[(detail as MenuItem).code] = {
@@ -217,7 +220,7 @@ export const findCodeRoute = (asyncRouterMap: any[]) => {
     }
   }
 
-  function findChildren (data: any[], code: string = '') {
+  function findChildren(data: any[], code: string = '') {
     data.forEach(route => {
       routeMeta[route.code] = {
         path: route.url || route.path,
@@ -254,7 +257,7 @@ export const findCodeRoute = (asyncRouterMap: any[]) => {
   return routeMeta
 }
 
-export function filterAsyncRouter(asyncRouterMap: any, parentCode = '', level = 1): { menusData: any, silderMenus: any} {
+export function filterAsyncRouter(asyncRouterMap: any, parentCode = '', level = 1): { menusData: any, silderMenus: any } {
   const _asyncRouterMap = cloneDeep(asyncRouterMap)
   const menusData: any[] = []
   const silderMenus: any[] = []
@@ -270,7 +273,7 @@ export function filterAsyncRouter(asyncRouterMap: any, parentCode = '', level =
       },
     }
 
-    const silder = {..._route}
+    const silder = { ..._route }
 
     // 查看是否有隐藏子路由
     route.children = findChildrenRoute(route.code, route.url, route.children)
diff --git a/src/views/device/Product/Detail/DeviceAccess/index.vue b/src/views/device/Product/Detail/DeviceAccess/index.vue
index 42f4bb65..fa7b465c 100644
--- a/src/views/device/Product/Detail/DeviceAccess/index.vue
+++ b/src/views/device/Product/Detail/DeviceAccess/index.vue
@@ -33,7 +33,7 @@
                                 "
                             >
                                 <j-button
-                                    style="margin: 0 0 0 20px"
+                                    class="changeBtn"
                                     size="small"
                                     :disabled="
                                         productStore.current?.count &&
@@ -1085,4 +1085,10 @@ nextTick(() => {
     font-weight: 400;
     font-size: 12px;
 }
+.changeBtn{
+    margin: 0 0 0 20px;
+    color: #315EFB;
+    background: #ffffff;
+    border: 1px solid #315EFB
+}
 </style>
diff --git a/src/views/device/Product/Detail/index.vue b/src/views/device/Product/Detail/index.vue
index 1622bd3f..49aa107b 100644
--- a/src/views/device/Product/Detail/index.vue
+++ b/src/views/device/Product/Detail/index.vue
@@ -1,7 +1,6 @@
 <template>
     <page-container
         :tabList="list"
-        @back="onBack"
         :tabActiveKey="productStore.tabActiveKey"
         @tabChange="onTabChange"
         showBack="true"
@@ -51,7 +50,17 @@
             </div>
             <div style="padding-top: 10px">
                 <j-descriptions size="small" :column="4">
-                    <j-descriptions-item label="设备数量"
+                    <j-descriptions-item
+                        label="设备数量"
+                        :labelStyle="{
+                            fontSize: '14px',
+                            opacity: 0.55,
+                        }"
+                        :contentStyle="{
+                            fontSize: '14px',
+                            color: '#092EE7',
+                            cursor: 'pointer',
+                        }"
                         ><span @click="jumpDevice">{{
                             productStore.current?.count
                                 ? productStore.current?.count
@@ -62,18 +71,6 @@
             </div>
         </template>
         <template #extra>
-            <!-- <j-popconfirm
-                    title="确认应用配置"
-                    @confirm="handleCofig"
-                    okText="确定"
-                    cancelText="取消"
-                >
-                    <j-button
-                        :disabled="productStore.current.state === 0"
-                        type="primary"
-                        >应用配置</j-button
-                    >
-                </j-popconfirm> -->
             <PermissionButton
                 type="primary"
                 :popConfirm="{
@@ -172,7 +169,9 @@ watch(
         getProtocol();
     },
 );
-const onBack = () => {};
+const onBack = () => {
+    history.back();
+};
 
 const onTabChange = (e: string) => {
     productStore.tabActiveKey = e;
@@ -250,7 +249,7 @@ const getProtocol = async () => {
                         tab: '数据解析',
                     },
                 ];
-            }else{
+            } else {
                 list.value = [
                     {
                         key: 'Info',
@@ -264,7 +263,8 @@ const getProtocol = async () => {
                     {
                         key: 'Device',
                         tab: '设备接入',
-                    },]
+                    },
+                ];
             }
         }
     }
diff --git a/src/views/device/Product/Save/index.vue b/src/views/device/Product/Save/index.vue
index 719add6b..8a3a33aa 100644
--- a/src/views/device/Product/Save/index.vue
+++ b/src/views/device/Product/Save/index.vue
@@ -84,7 +84,7 @@
                     >
                         <template #title="item">
                             <span>{{ item.title }}</span>
-                            <a-tooltip :title="item"
+                            <a-tooltip :title="item.option.tooltip"
                                 ><AIcon
                                     type="QuestionCircleOutlined"
                                     style="margin-left: 2px"
diff --git a/src/views/rule-engine/Alarm/Log/SolveLog/index.vue b/src/views/rule-engine/Alarm/Log/Record/index.vue
similarity index 83%
rename from src/views/rule-engine/Alarm/Log/SolveLog/index.vue
rename to src/views/rule-engine/Alarm/Log/Record/index.vue
index 616eec16..48e91259 100644
--- a/src/views/rule-engine/Alarm/Log/SolveLog/index.vue
+++ b/src/views/rule-engine/Alarm/Log/Record/index.vue
@@ -1,13 +1,5 @@
 <template>
-    <j-modal
-        visible
-        title="处理记录"
-        :width="1200"
-        cancelText="取消"
-        okText="确定"
-        @ok="clsoeModal"
-        @cancel="clsoeModal"
-    >
+    <page-container>
         <pro-search
             :columns="columns"
             target="bind-channel"
@@ -30,7 +22,7 @@
                 <span>
                     {{
                         dayjs(slotsProps.handleTime).format(
-                            'YYYY-MM-DD HH:mm:ss'
+                            'YYYY-MM-DD HH:mm:ss',
                         )
                     }}
                 </span>
@@ -41,29 +33,25 @@
             <template #alarmTime="slotProps">
                 <span>
                     {{
-                        dayjs(slotProps.alarmTime).format(
-                            'YYYY-MM-DD HH:mm:ss',
-                        )
+                        dayjs(slotProps.alarmTime).format('YYYY-MM-DD HH:mm:ss')
                     }}
                 </span>
             </template>
         </JProTable>
-    </j-modal>
+    </page-container>
 </template>
 
 <script lang="ts" setup>
 import { queryHandleHistory } from '@/api/rule-engine/log';
 import dayjs from 'dayjs';
-const props = defineProps({
-    data: {
-        type: Object,
-    },
-});
+import { useRoute } from 'vue-router';
+const route = useRoute();
+const id = route.query?.id;
 const terms = [
     {
         column: 'alarmRecordId',
         termType: 'eq',
-        value: props.data.id,
+        value: id,
         type: 'and',
     },
 ];
@@ -119,9 +107,6 @@ const emit = defineEmits(['closeLog']);
 /**
  * 关闭弹窗
  */
-const clsoeModal = () => {
-    emit('closeLog');
-};
 
 const handleSearch = (e: any) => {
     params.value = e;
diff --git a/src/views/rule-engine/Alarm/Log/TabComponent/indev.vue b/src/views/rule-engine/Alarm/Log/TabComponent/indev.vue
index 840e9056..6e710503 100644
--- a/src/views/rule-engine/Alarm/Log/TabComponent/indev.vue
+++ b/src/views/rule-engine/Alarm/Log/TabComponent/indev.vue
@@ -136,11 +136,6 @@
             v-if="data.solveVisible"
             @closeSolve="closeSolve"
         />
-        <SolveLog
-            :data="data.current"
-            v-if="data.logVisible"
-            @closeLog="closeLog"
-        />
     </div>
 </template>
 
@@ -412,8 +407,11 @@ const getActions = (
             },
             icon: 'FileTextOutlined',
             onClick: () => {
-                data.value.current = currentData;
-                data.value.logVisible = true;
+                menuStory.jumpPage(
+                    'rule-engine/Alarm/Log/Record',
+                    {},
+                    { id: currentData.id },
+                );
             },
         },
     ];

From dead9c5b46afa1175c1ab9b65790157f288f1b25 Mon Sep 17 00:00:00 2001
From: 100011797 <2642441182@qq.com>
Date: Thu, 23 Mar 2023 15:27:59 +0800
Subject: [PATCH 09/16] =?UTF-8?q?fix:=20=E8=BF=90=E8=A1=8C=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=92=AD=E6=94=BE=E7=BB=84=E4=BB=B6=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/Instance/Detail/Running/Property/ValueDetail.vue     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/device/Instance/Detail/Running/Property/ValueDetail.vue b/src/views/device/Instance/Detail/Running/Property/ValueDetail.vue
index 51e4bbeb..0c8539da 100644
--- a/src/views/device/Instance/Detail/Running/Property/ValueDetail.vue
+++ b/src/views/device/Instance/Detail/Running/Property/ValueDetail.vue
@@ -13,6 +13,7 @@
             <j-image :src="value?.formatValue" />
         </template>
         <template v-else-if="['.flv', '.m3u8', '.mp4'].includes(type)">
+            <LivePlayer :url="value?.formatValue" autoplay />
         </template>
         <template v-else>
             <JsonViewer
@@ -25,6 +26,7 @@
 
 <script lang="ts" setup>
 import JsonViewer from 'vue-json-viewer';
+import LivePlayer from '@/components/Player/index.vue';
 
 const _data = defineProps({
     type: {

From 0e56cadb129ff4c13855fef06013fe69af467476 Mon Sep 17 00:00:00 2001
From: 100011797 <2642441182@qq.com>
Date: Thu, 23 Mar 2023 15:35:57 +0800
Subject: [PATCH 10/16] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E8=AE=BE=E5=A4=87=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/Instance/Detail/EdgeMap/index.vue | 8 ++++----
 src/views/device/Instance/Process/index.vue        | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/views/device/Instance/Detail/EdgeMap/index.vue b/src/views/device/Instance/Detail/EdgeMap/index.vue
index 4d680514..97d24fed 100644
--- a/src/views/device/Instance/Detail/EdgeMap/index.vue
+++ b/src/views/device/Instance/Detail/EdgeMap/index.vue
@@ -162,7 +162,7 @@ import {
 } from '@/api/device/instance';
 import MSelect from './MSelect.vue';
 import PatchMapping from './PatchMapping.vue';
-import { message } from 'ant-design-vue/es';
+import { onlyMessage } from '@/utils/comm';
 
 const columns = [
     {
@@ -280,7 +280,7 @@ const unbind = async (id: string) => {
             },
         );
         if (resp.status === 200) {
-            message.success('操作成功！');
+            onlyMessage('操作成功！', 'success');
             handleSearch();
         }
     }
@@ -313,7 +313,7 @@ const onSave = () => {
                     submitData,
                 );
                 if (resp.status === 200) {
-                    message.success('操作成功！');
+                    onlyMessage('操作成功！', 'success');
                     handleSearch();
                 }
             }
@@ -342,7 +342,7 @@ const onAction = async (record: any) => {
         submitData,
     );
     if (resp.status === 200) {
-        message.success('操作成功！');
+        onlyMessage('操作成功！', 'success');
         handleSearch();
     }
 };
diff --git a/src/views/device/Instance/Process/index.vue b/src/views/device/Instance/Process/index.vue
index 1f203be8..64fe7266 100644
--- a/src/views/device/Instance/Process/index.vue
+++ b/src/views/device/Instance/Process/index.vue
@@ -13,7 +13,7 @@
             </div>
             <div v-else>
                 <p>{{ type === 'active' ? '启用' : '同步' }}成功：{{ count }}条</p>
-                <p v-if="type === 'active'">启用失败：{{ errCount }}条<j-tooltip title="实例信息页面中的配置项未完善"><AIcon type="QuestionCircleOutlined" /></j-tooltip></p>
+                <p v-if="type === 'active'">启用失败：{{ errCount }}条<j-tooltip title="实例信息页面中的配置项未完善"><AIcon style="margin-left: 5px" type="QuestionCircleOutlined" /></j-tooltip></p>
             </div>
         </div>
         <template #footer>
@@ -56,13 +56,13 @@ const getData = (api: string) => {
     source.value = _source;
     _source.onmessage = (e: any) => {
         const res = JSON.parse(e.data);
-        // console.log(res)
         switch (props.type) {
             case 'active':
                 if (res.success) {
                     _source.close();
                     dt += res.total;
                     count.value = dt;
+                    flag.value = false;
                 } else {
                     if (res.source) {
                         errCount.value = 1
@@ -76,6 +76,7 @@ const getData = (api: string) => {
             case 'sync':
                 dt += res;
                 count.value = dt;
+                flag.value = false;
                 break;
             default:
                 break;

From b4734056d8782f6b115af13b627c9e3fdc7a8386 Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Thu, 23 Mar 2023 15:36:31 +0800
Subject: [PATCH 11/16] fix: bug#10609-1

---
 src/store/department.ts                       | 26 ++++++++++++++++++
 .../components/AddDeviceOrProductDialog.vue   | 27 +++++++++++++++++++
 src/views/system/Department/device/index.vue  | 17 +++++++-----
 3 files changed, 64 insertions(+), 6 deletions(-)
 create mode 100644 src/store/department.ts

diff --git a/src/store/department.ts b/src/store/department.ts
new file mode 100644
index 00000000..3bcbbb9b
--- /dev/null
+++ b/src/store/department.ts
@@ -0,0 +1,26 @@
+
+import { defineStore } from "pinia";
+
+type DepartmentStateType = {
+    productId: string;
+    optType: string | undefined;
+}
+
+export const useDepartmentStore = defineStore({
+    id: 'department',
+    state: (): DepartmentStateType => ({
+        productId: '',
+        // 设备资产分配弹窗操作类型: 
+        // 1. optType === 'handle': 手动点击资产分配按钮; 
+        // 2. optType === ': 产品资产分配后, 自动弹出设备资产分配
+        optType: ''
+    }),
+    actions: {
+        setProductId(value: string) {
+            this.productId = value
+        },
+        setType(value: string | undefined) {
+            this.optType = value
+        }
+    }
+})
\ No newline at end of file
diff --git a/src/views/system/Department/components/AddDeviceOrProductDialog.vue b/src/views/system/Department/components/AddDeviceOrProductDialog.vue
index 6fbea17b..c82bc814 100644
--- a/src/views/system/Department/components/AddDeviceOrProductDialog.vue
+++ b/src/views/system/Department/components/AddDeviceOrProductDialog.vue
@@ -143,6 +143,9 @@ import {
 } from '@/api/system/department';
 import { message } from 'jetlinks-ui-components';
 import { dictType } from '../typing';
+import { useDepartmentStore } from '@/store/department';
+
+const departmentStore = useDepartmentStore();
 
 const emits = defineEmits(['confirm', 'update:visible']);
 const props = defineProps<{
@@ -154,6 +157,9 @@ const props = defineProps<{
 }>();
 // 弹窗相关
 const loading = ref(false);
+// 资产咨询次数, 产品分配后自动进入的设备资产, 第一次需要带上产品id查询
+const queryCount = ref(0);
+
 const confirm = () => {
     if (table.selectedRows.length < 1) {
         return message.warning('请先勾选数据');
@@ -167,6 +173,11 @@ const confirm = () => {
         permission: item.selectPermissions,
     }));
 
+    if (params.length === 1) {
+        // 只选择一个产品资产分配时, 分配之后, 进入设备资产分配需查出对应产品下的设备
+        departmentStore.setProductId(params[0].assetIdList[0]);
+    }
+
     loading.value = true;
     bindDeviceOrProductList_api(props.assetType, params)
         .then(() => {
@@ -398,6 +409,7 @@ const table: any = {
         }),
     // 整理参数并获取数据
     requestFun: async (oParams: any) => {
+        queryCount.value += 1;
         if (props.parentId) {
             const terms = [
                 {
@@ -415,9 +427,24 @@ const table: any = {
                                 ],
                             },
                         },
+                        {
+                            column: 'productId$product-info',
+                            type: 'and',
+                            value: `id is ${departmentStore.productId}`,
+                        },
                     ],
                 },
             ];
+
+            if (
+                props.assetType !== 'device' ||
+                !departmentStore.productId ||
+                queryCount.value > 1 ||
+                departmentStore.optType === 'handle'
+            ) {
+                // 非设备|产品id不存在|有其他查询操作(queryCount+1)|设备页面手动点击资产分配, 均删除产品带入的id
+                terms[0].terms.pop();
+            }
             if (oParams.terms && oParams.terms.length > 0)
                 terms.unshift({ terms: oParams.terms });
             const params = {
diff --git a/src/views/system/Department/device/index.vue b/src/views/system/Department/device/index.vue
index 212960c1..d4e70dc4 100644
--- a/src/views/system/Department/device/index.vue
+++ b/src/views/system/Department/device/index.vue
@@ -22,7 +22,7 @@
                     <PermissionButton
                         :hasPermission="`${permission}:assert`"
                         type="primary"
-                        @click="table.clickAdd"
+                        @click="table.clickAdd('handle')"
                     >
                         <AIcon type="PlusOutlined" />资产分配
                     </PermissionButton>
@@ -211,6 +211,9 @@ import { intersection } from 'lodash-es';
 
 import type { dictType, optionsType } from '../typing';
 import { message } from 'jetlinks-ui-components';
+import { useDepartmentStore } from '@/store/department';
+
+const departmentStore = useDepartmentStore();
 
 const permission = 'system/Department';
 
@@ -248,7 +251,7 @@ const columns = [
             rename: 'productId$product-info',
             type: 'select',
             handleValue(value: string) {
-              return `id is ${value}`
+                return `id is ${value}`;
             },
             options: () =>
                 new Promise((resolve) => {
@@ -291,9 +294,9 @@ const columns = [
         search: {
             type: 'select',
             options: [
-              { label: '禁用', value: 'notActive' },
-              { label: '离线', value: 'offline' },
-              { label: '在线', value: 'online' },
+                { label: '禁用', value: 'notActive' },
+                { label: '离线', value: 'offline' },
+                { label: '在线', value: 'online' },
             ],
         },
         scopedSlots: true,
@@ -465,7 +468,9 @@ const table = {
             };
         }
     },
-    clickAdd: () => {
+    clickAdd: (type?: string) => {
+        // 设备资产分配弹窗操作类型: type = 'handle': 手动点击资产分配按钮, !type产品资产分配后, 自动弹出设备资产分配
+        departmentStore.setType(type)
         dialogs.addShow = true;
     },
     clickEdit: (row?: any) => {

From 8c97f0e441fd8511c805dd302ea826b045889dc7 Mon Sep 17 00:00:00 2001
From: 100011797 <2642441182@qq.com>
Date: Thu, 23 Mar 2023 15:44:58 +0800
Subject: [PATCH 12/16] =?UTF-8?q?fix:=20=E6=89=B9=E9=87=8F=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BatchDropdown/index.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/components/BatchDropdown/index.vue b/src/components/BatchDropdown/index.vue
index 90368bbf..928bed9a 100644
--- a/src/components/BatchDropdown/index.vue
+++ b/src/components/BatchDropdown/index.vue
@@ -75,11 +75,9 @@ const handleMenuClick = (e: any) => {
     if(!(val?.popConfirm || val?.onClick)){
         emits('update:isCheck', true);
         emits('change', true);
-    }
-    if (val?.popConfirm) {
-        visible.value = false;
-    } else {
         visible.value = true;
+    } else {
+        visible.value = false;
     }
     _item.value = (val || {}) as any;
 };

From cb91ec58acc98edc396cf2777ac5d063c1821685 Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Thu, 23 Mar 2023 15:44:31 +0800
Subject: [PATCH 13/16] =?UTF-8?q?fix:=20bug#10787=E3=80=8110786?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Layout/BasicLayoutPage.vue   |  2 +-
 src/store/scene.ts                          |  2 +-
 src/utils/request.ts                        | 14 +++++++-------
 src/views/iot-card/CardManagement/index.vue |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/components/Layout/BasicLayoutPage.vue b/src/components/Layout/BasicLayoutPage.vue
index 71ebdcc8..598fa6e5 100644
--- a/src/components/Layout/BasicLayoutPage.vue
+++ b/src/components/Layout/BasicLayoutPage.vue
@@ -15,7 +15,7 @@
             >
               {{ slotProps.route.breadcrumbName }}
             </a>
-            <span v-else style='cursor: pointer' >{{ slotProps.route.breadcrumbName }}</span>
+            <span v-else style='cursor: default' >{{ slotProps.route.breadcrumbName }}</span>
         </template>
         <template #rightContentRender>
             <div class="right-content">
diff --git a/src/store/scene.ts b/src/store/scene.ts
index b58ab447..efc423a9 100644
--- a/src/store/scene.ts
+++ b/src/store/scene.ts
@@ -109,7 +109,7 @@ export const useSceneStore = defineStore('scene', () => {
         ...result,
         trigger: result.trigger || {},
         branches: cloneDeep(assignmentKey(branches)),
-        options: result.options ? {...defaultOptions, ...result.options } : defaultOptions,
+        options: result.options ? {...cloneDeep(defaultOptions), ...result.options } : cloneDeep(defaultOptions),
       }
     }
   }
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 0cf20b9a..5c260845 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -158,10 +158,7 @@ const errorHandler = (error: any) => {
                 description: '用户未登录'
             })
             setTimeout(() => {
-                debugger
-                router.push({
-                    path: LoginPath
-                })
+                location.href = `/#${LoginPath}`
             }, 0)
         }
     } else if (error.response === undefined) {
@@ -180,10 +177,13 @@ request.interceptors.request.use(config => {
     const token = LocalStore.get(TOKEN_KEY)
     // const token = store.$state.tokenAlias
     if (!token) {
+        // setTimeout(() => {
+        //     router.replace({
+        //         path: LoginPath
+        //     })
+        // }, 0)
         setTimeout(() => {
-            router.replace({
-                path: LoginPath
-            })
+            location.href = `/#${LoginPath}`
         }, 0)
         return config
     }
diff --git a/src/views/iot-card/CardManagement/index.vue b/src/views/iot-card/CardManagement/index.vue
index 8762639a..a6117f7e 100644
--- a/src/views/iot-card/CardManagement/index.vue
+++ b/src/views/iot-card/CardManagement/index.vue
@@ -572,7 +572,7 @@ const columns = [
         search: {
             type: 'select',
             options: [
-                { label: '正常', value: 'using' },
+                { label: '激活', value: 'using' },
                 { label: '未激活', value: 'toBeActivated' },
                 { label: '停机', value: 'deactivate' },
                 { label: '其它', value: 'using,toBeActivated,deactivate' },

From 1a91967f02316edb74e4e338d0c086bb24dc94b7 Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Thu, 23 Mar 2023 15:45:30 +0800
Subject: [PATCH 14/16] =?UTF-8?q?update:=20=E6=9B=B4=E6=96=B0=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yarn.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 90d450e5..0e53dbfb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3700,8 +3700,8 @@ jetlinks-store@^0.0.3:
 
 jetlinks-ui-components@^1.0.5:
   version "1.0.5"
-  resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#77bd58156212d793fdebe41fc8864eeed5db7182"
-  integrity sha512-VXuCMJlMV/bbmBhPtBzY/BUBIvGebQbguLPE06xps79i5Pjq46+HBW8VPsJ9MwvyMhYkhzPlQJu9Ft7v5uo+yA==
+  resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#f2e62df4054e513df39e3355592d95e356438328"
+  integrity sha512-vfQ8g8nEJueDkHCVcg9WeWDDjnPklyigbobB1CQArfHLd5O4x6vLFWvF69k0yqytCvIOXB13CzhLtMnv68pC5w==
   dependencies:
     "@vueuse/core" "^9.12.0"
     ant-design-vue "^3.2.15"

From 9c9ee029e686413337125b87710e6035c0782cbb Mon Sep 17 00:00:00 2001
From: JiangQiming <291854119@qq.com>
Date: Thu, 23 Mar 2023 16:46:02 +0800
Subject: [PATCH 15/16] =?UTF-8?q?fix:=20bug#10773=E3=80=8110772=E3=80=8110?=
 =?UTF-8?q?829=E3=80=8110826?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Platforms/Api/components/ApiTest.vue      | 11 ++++++---
 .../Platforms/Api/components/ChooseApi.vue    | 23 ++++++++++++-------
 .../system/Role/Detail/Permiss/index.vue      | 16 ++++++++-----
 3 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/src/views/system/Platforms/Api/components/ApiTest.vue b/src/views/system/Platforms/Api/components/ApiTest.vue
index df1d8124..14afd101 100644
--- a/src/views/system/Platforms/Api/components/ApiTest.vue
+++ b/src/views/system/Platforms/Api/components/ApiTest.vue
@@ -19,6 +19,7 @@
                             :dataSource="paramsTable"
                             :pagination="false"
                             size="small"
+                            bordered
                         >
                             <template #bodyCell="{ column, record, index }">
                                 <template v-if="column.key === 'name'">
@@ -65,8 +66,7 @@
                                 </template>
                                 <template v-else-if="column.key === 'action'">
                                     <PermissionButton
-                                        type="link"
-                                        :hasPermission="`{permission}:delete`"
+                                        type="text"
                                         :popConfirm="{
                                             title: `确定删除`,
                                             onConfirm: () =>
@@ -88,8 +88,9 @@
                         style="text-align: center"
                     />
                     <j-button
+                        type="dashed"
                         @click="requestBody.addRow"
-                        style="width: 100%; text-align: center"
+                        style="width: 100%; text-align: center; margin-top: 5px;"
                     >
                         <AIcon type="PlusOutlined" />新增
                     </j-button>
@@ -305,11 +306,15 @@ type requestObj = {
                 }
             }
             .table {
+                margin-bottom: 22px;
                 :deep(.ant-table-cell) {
                     padding: 0 8px;
                     height: 56px;
                 }
             }
+            :deep(.ant-form-item) {
+                margin-bottom: 0;
+            }
         }
     }
 }
diff --git a/src/views/system/Platforms/Api/components/ChooseApi.vue b/src/views/system/Platforms/Api/components/ChooseApi.vue
index be147aa1..e6783527 100644
--- a/src/views/system/Platforms/Api/components/ChooseApi.vue
+++ b/src/views/system/Platforms/Api/components/ChooseApi.vue
@@ -79,7 +79,7 @@ const rowSelection = {
     },
     selectedRowKeys: ref<string[]>([]),
 };
-const save = () => {
+const save = async () => {
     const keys = props.selectedRowKeys;
 
     const removeKeys = props.sourceKeys.filter((key) => !keys.includes(key));
@@ -87,13 +87,20 @@ const save = () => {
 
     if (props.mode === 'api') {
         // 此时是api配置
-        removeKeys.length &&
-            delOperations_api(removeKeys)
-                .finally(() => addOperations_api(addKeys))
-                .then(() => {
-                    message.success('操作成功');
-                    emits('refresh')
-                });
+        // removeKeys.length &&
+        //     delOperations_api(removeKeys)
+        //         .finally(() => addOperations_api(addKeys))
+        //         .then(() => {
+        //             message.success('操作成功');
+        //             emits('refresh');
+        //         });
+        // fix: bug#10829
+        removeKeys.length && (await delOperations_api(removeKeys));
+        const res = await addOperations_api(addKeys);
+        if (res.success) {
+            message.success('操作成功');
+            emits('refresh');
+        }
     } else if (props.mode === 'appManger') {
         const removeItems = removeKeys.map((key) => ({
             id: key,
diff --git a/src/views/system/Role/Detail/Permiss/index.vue b/src/views/system/Role/Detail/Permiss/index.vue
index 8c1fe792..21898ba0 100644
--- a/src/views/system/Role/Detail/Permiss/index.vue
+++ b/src/views/system/Role/Detail/Permiss/index.vue
@@ -78,12 +78,16 @@ const form = reactive({
         });
     },
     clickSave: () => {
-        const updateRole = updateRole_api(form.data);
-        const updateTree = updatePrimissTree_api(roleId, { menus: form.menus });
+        formRef.value?.validate().then(() => {
+            const updateRole = updateRole_api(form.data);
+            const updateTree = updatePrimissTree_api(roleId, {
+                menus: form.menus,
+            });
 
-        Promise.all([updateRole, updateTree]).then((resp) => {
-            message.success('操作成功');
-            router.push('/system/Role');
+            Promise.all([updateRole, updateTree]).then((resp) => {
+                message.success('操作成功');
+                router.push('/system/Role');
+            });
         });
     },
 });
@@ -123,7 +127,7 @@ form.getForm();
             :deep(.ant-form-item-required) {
                 padding-right: 12px;
 
-                &::before{
+                &::before {
                     right: 0;
                 }
             }

From 0e26f1e6386defb260532eade825e3e2a8576119 Mon Sep 17 00:00:00 2001
From: leiqiaochu <leiqiaochu@aossci.com>
Date: Thu, 23 Mar 2023 17:03:03 +0800
Subject: [PATCH 16/16] =?UTF-8?q?fix:=20=E6=A0=B7=E5=BC=8F=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/Product/Detail/index.vue     |  2 ++
 src/views/init-home/Basic/index.vue           |  4 ++--
 src/views/init-home/Role/index.vue            |  1 +
 .../Alarm/Configuration/Save/Base/index.vue   |  8 ++++++--
 .../Alarm/Log/TabComponent/indev.vue          | 20 ++++++++++++++-----
 5 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/views/device/Product/Detail/index.vue b/src/views/device/Product/Detail/index.vue
index 49aa107b..cd9630d1 100644
--- a/src/views/device/Product/Detail/index.vue
+++ b/src/views/device/Product/Detail/index.vue
@@ -48,6 +48,8 @@
                     </div>
                 </div>
             </div>
+        </template>
+        <template #content>
             <div style="padding-top: 10px">
                 <j-descriptions size="small" :column="4">
                     <j-descriptions-item
diff --git a/src/views/init-home/Basic/index.vue b/src/views/init-home/Basic/index.vue
index cf956505..3f511712 100644
--- a/src/views/init-home/Basic/index.vue
+++ b/src/views/init-home/Basic/index.vue
@@ -2,7 +2,7 @@
 <template>
     <j-form layout="vertical" :model="form" ref="formBasicRef">
         <j-row :span="24" :gutter="24">
-            <j-col :span="10">
+            <j-col :span="12">
                 <j-form-item
                     label="系统名称"
                     name="title"
@@ -193,7 +193,7 @@
                     </j-col>
                 </j-row>
             </j-col>
-            <j-col :span="14">
+            <j-col :span="12">
                 <j-form-item label="登录背景图">
                     <div class="upload-image-warp-back">
                         <div class="upload-image-border-back">
diff --git a/src/views/init-home/Role/index.vue b/src/views/init-home/Role/index.vue
index a69d476b..bcb0553b 100644
--- a/src/views/init-home/Role/index.vue
+++ b/src/views/init-home/Role/index.vue
@@ -183,6 +183,7 @@ defineExpose({
                 flex: 1 1 auto;
                 font-weight: 700;
                 font-size: 16px;
+                text-align: center;
             }
         }
         .role-item-content {
diff --git a/src/views/rule-engine/Alarm/Configuration/Save/Base/index.vue b/src/views/rule-engine/Alarm/Configuration/Save/Base/index.vue
index 6a5a3385..7eb8acbd 100644
--- a/src/views/rule-engine/Alarm/Configuration/Save/Base/index.vue
+++ b/src/views/rule-engine/Alarm/Configuration/Save/Base/index.vue
@@ -20,7 +20,7 @@
                 </j-col>
             </j-row>
             <j-form-item label="级别" name="level">
-                <j-radio-group v-model:value="form.level">
+                <j-radio-group v-model:value="form.level" class="levelSelect">
                     <j-radio-button
                         v-for="(item, index) in levelOption"
                         :key="index"
@@ -199,7 +199,11 @@ queryData();
 <style lang="less" scoped>
 .ant-radio-button-wrapper {
     margin: 10px 15px 0 0;
-    width: 125px;
+    width: 20%;
     height: 100%;
 }
+.levelSelect{
+    display: flex;
+    width: 100%;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/rule-engine/Alarm/Log/TabComponent/indev.vue b/src/views/rule-engine/Alarm/Log/TabComponent/indev.vue
index 6e710503..821d38d7 100644
--- a/src/views/rule-engine/Alarm/Log/TabComponent/indev.vue
+++ b/src/views/rule-engine/Alarm/Log/TabComponent/indev.vue
@@ -62,8 +62,8 @@
                             </span>
                         </Ellipsis>
                         <j-row :gutter="24">
-                            <j-col :span="8">
-                                <div class="content-des-title">
+                            <j-col :span="8" class="content-left">
+                                <div class="content-left-title">
                                     {{ titleMap.get(slotProps.targetType) }}
                                 </div>
                                 <Ellipsis
@@ -73,7 +73,7 @@
                                 >
                             </j-col>
                             <j-col :span="8">
-                                <div class="content-des-title">
+                                <div class="content-right-title">
                                     最近告警时间
                                 </div>
                                 <Ellipsis
@@ -87,7 +87,7 @@
                                 >
                             </j-col>
                             <j-col :span="8">
-                                <div class="content-des-title">状态</div>
+                                <div class="content-right-title">状态</div>
                                 <BadgeStatus
                                     :status="slotProps.state.value"
                                     :statusName="{
@@ -287,7 +287,7 @@ const orgCol = [
     },
 ];
 
-let params = ref({
+let params:any = ref({
     sorts: [{ name: 'alarmTime', order: 'desc' }],
     terms: [],
 });
@@ -432,4 +432,14 @@ const closeLog = () => {
 };
 </script>
 <style lang="less" scoped>
+.content-left{
+    border-right: .2px solid rgba(0,0,0,0.2);
+}
+.content-right-title{
+    color: #666;
+    font-size: 12px
+}
+.content-left-title{
+    font-size: 18px
+}
 </style>