From e3c98846068f73391eb9ea509509e70fc58cc602 Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Thu, 30 Mar 2023 09:08:21 +0800
Subject: [PATCH 01/11] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=A7=A6?=
 =?UTF-8?q?=E5=8F=91=E8=A7=84=E5=88=99-=E5=8A=9F=E8=83=BD=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=E9=AA=8C=E8=AF=81=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ValueItem/index.vue                     | 10 +++++-----
 .../Save/components/FunctionCall/FunctionCall.vue      |  3 ---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/components/ValueItem/index.vue b/src/components/ValueItem/index.vue
index 09d33c26..769951c6 100644
--- a/src/components/ValueItem/index.vue
+++ b/src/components/ValueItem/index.vue
@@ -176,8 +176,8 @@ const objectValue = ref<string>('');
 const handleItemModalSubmit = () => {
     myValue.value = objectValue.value.replace(/[\r\n]\s*/g, '');
     modalVis.value = false;
+    emit('update:modelValue', objectValue.value);
     emit('change', objectValue.value)
-    emit('update:modelValue', myValue.value);
 };
 
 // 文件上传
@@ -192,23 +192,23 @@ const handleFileChange = (info: UploadChangeParam<UploadFile<any>>) => {
 };
 
 const selectChange = (e: string, option: any) => {
-  emit('change', e, option)
   emit('update:modelValue', myValue.value);
+  emit('change', e, option)
 }
 
 const timeChange = (e: any) => {
-  emit('change', e)
   emit('update:modelValue', myValue.value);
+  emit('change', e)
 }
 
 const inputChange = (e: any) => {
-  emit('change', e && e.target ? e.target.value : e)
   emit('update:modelValue', myValue.value);
+  emit('change', e && e.target ? e.target.value : e)
 }
 
 const dateChange = (e: any) => {
-  emit('change', e)
   emit('update:modelValue', myValue.value);
+  emit('change', e)
 }
 
 myValue.value = props.modelValue
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 accd5e7b..5436ca4e 100644
--- a/src/views/rule-engine/Scene/Save/components/FunctionCall/FunctionCall.vue
+++ b/src/views/rule-engine/Scene/Save/components/FunctionCall/FunctionCall.vue
@@ -99,14 +99,11 @@ const handleOptions = (record: any) => {
 }
 
 const valueChange = () => {
-  console.log('valueChange', dataSource.value)
   const _value = dataSource.value.map(item => {
-    console.log(item.value)
     return {
       name: item.id, value: item.value
     }
   })
-  console.log('valueChange2', _value)
   emit('update:value', _value)
   emit('change', _value)
 }

From a3cb28ed5be54fab868370c84db6b6e321d3bf3d Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Thu, 30 Mar 2023 09:25:06 +0800
Subject: [PATCH 02/11] fix: bug#11192

---
 src/views/rule-engine/Scene/Save/components/Timer/util.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/rule-engine/Scene/Save/components/Timer/util.ts b/src/views/rule-engine/Scene/Save/components/Timer/util.ts
index c919aa48..23ad9b50 100644
--- a/src/views/rule-engine/Scene/Save/components/Timer/util.ts
+++ b/src/views/rule-engine/Scene/Save/components/Timer/util.ts
@@ -73,7 +73,7 @@ export const handleTimerOptions = (timer: OperationTimer):TimerOption => {
     const whenStrArr = continuousValue(timer.when! || [], timer!.trigger);
     const whenStrArr3 = whenStrArr.splice(0, 3);
     when += whenStrArr3.join('、');
-    when += `等${timer.when!.length}天`;
+    when += `...等${timer.when!.length}天`;
   }
 
   if (timer.once) {

From d3ea02c0f6661768b6b0886cd5aad4d3a6086f96 Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Thu, 30 Mar 2023 11:08:26 +0800
Subject: [PATCH 03/11] =?UTF-8?q?style:=20=E4=BC=98=E5=8C=96=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E7=AE=A1=E7=90=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/Department/components/LeftTree.vue | 117 ++++++++++--------
 src/views/system/Department/index.vue         |  72 ++++++-----
 src/views/system/Department/user/index.vue    |   1 +
 3 files changed, 105 insertions(+), 85 deletions(-)

diff --git a/src/views/system/Department/components/LeftTree.vue b/src/views/system/Department/components/LeftTree.vue
index b5565e0f..e2972961 100644
--- a/src/views/system/Department/components/LeftTree.vue
+++ b/src/views/system/Department/components/LeftTree.vue
@@ -23,58 +23,59 @@
         </div>
 
         <div class="tree">
-            <jTree
-                v-if="treeData.length > 0"
-                :tree-data="treeData"
-                v-model:selected-keys="selectedKeys"
-                v-model:expandedKeys="expandedKeys"
-                :fieldNames="{ key: 'id' }"
-            >
-                <template #title="{ name, data }">
-                    <span>{{ name }}</span>
-                    <span class="func-btns" @click="(e) => e.stopPropagation()">
-                        <PermissionButton
-                            :hasPermission="`${permission}:update`"
-                            type="link"
-                            :tooltip="{
-                                title: '编辑',
-                            }"
-                            @click="openDialog(data)"
-                        >
-                            <AIcon type="EditOutlined" />
-                        </PermissionButton>
-                        <PermissionButton
-                            :hasPermission="`${permission}:add`"
-                            type="link"
-                            :tooltip="{
-                                title: '新增子组织',
-                            }"
-                            @click="
-                                openDialog({
-                                    ...data,
-                                    id: '',
-                                    parentId: data.id,
-                                })
-                            "
-                        >
-                            <AIcon type="PlusCircleOutlined" />
-                        </PermissionButton>
-                        <PermissionButton
-                            type="link"
-                            :hasPermission="`${permission}:delete`"
-                            :tooltip="{ title: '删除' }"
-                            :popConfirm="{
-                                title: `确定要删除吗`,
-                                onConfirm: () => delDepartment(data.id),
-                            }"
-                        >
-                            <AIcon type="DeleteOutlined" />
-                        </PermissionButton>
-                    </span>
-                </template>
-            </jTree>
-            <div class="loading" v-else-if="loading"><j-spin /></div>
-            <j-empty v-else description="暂无数据" />
+          <j-spin :spinning='loading'>
+              <jTree
+                  v-if="treeData.length > 0"
+                  :tree-data="treeData"
+                  v-model:selected-keys="selectedKeys"
+                  v-model:expandedKeys="expandedKeys"
+                  :fieldNames="{ key: 'id' }"
+              >
+                  <template #title="{ name, data }">
+                      <span>{{ name }}</span>
+                      <span class="func-btns" @click="(e) => e.stopPropagation()">
+                          <PermissionButton
+                              :hasPermission="`${permission}:update`"
+                              type="link"
+                              :tooltip="{
+                                  title: '编辑',
+                              }"
+                              @click="openDialog(data)"
+                          >
+                              <AIcon type="EditOutlined" />
+                          </PermissionButton>
+                          <PermissionButton
+                              :hasPermission="`${permission}:add`"
+                              type="link"
+                              :tooltip="{
+                                  title: '新增子组织',
+                              }"
+                              @click="
+                                  openDialog({
+                                      ...data,
+                                      id: '',
+                                      parentId: data.id,
+                                  })
+                              "
+                          >
+                              <AIcon type="PlusCircleOutlined" />
+                          </PermissionButton>
+                          <PermissionButton
+                              type="link"
+                              :hasPermission="`${permission}:delete`"
+                              :tooltip="{ title: '删除' }"
+                              :popConfirm="{
+                                  title: `确定要删除吗`,
+                                  onConfirm: () => delDepartment(data.id),
+                              }"
+                          >
+                              <AIcon type="DeleteOutlined" />
+                          </PermissionButton>
+                      </span>
+                  </template>
+              </jTree>
+              <j-empty v-else description="暂无数据" />
+          </j-spin>
         </div>
         <!-- 编辑弹窗 -->
         <EditDepartmentDialog
@@ -227,6 +228,9 @@ function init() {
 .left-tree-container {
     padding-right: 24px;
     border-right: 1px solid #f0f0f0;
+    display: flex;
+    height: 100%;
+    flex-direction: column;
 
     .add-btn {
         margin: 24px 0;
@@ -262,10 +266,17 @@ function init() {
         }
     }
 
-    .loading {
+
+    .tree {
+      overflow-y: auto;
+      overflow-x: hidden;
+
+      .loading {
         display: flex;
+        width: 100%;
         justify-content: center;
         margin-top: 20px;
+      }
     }
 }
 </style>
diff --git a/src/views/system/Department/index.vue b/src/views/system/Department/index.vue
index 3ebef3e7..7f40433e 100644
--- a/src/views/system/Department/index.vue
+++ b/src/views/system/Department/index.vue
@@ -1,28 +1,30 @@
 <template>
     <page-container>
-        <div class="department-container">
+        <div class="department-warp">
+          <div class='department-container'>
             <div class="left">
-                <LeftTree @change="(id) => (departmentId = id)" />
+              <LeftTree @change="(id) => (departmentId = id)" />
             </div>
             <div class="right">
-                <j-tabs v-model:activeKey="activeKey" destroyInactiveTabPane>
-                    <j-tab-pane key="product" tab="产品">
-                        <Product
-                            :parentId="departmentId"
-                            @open-device-bind="openDeviceBind"
-                        />
-                    </j-tab-pane>
-                    <j-tab-pane key="device" tab="设备">
-                        <Device
-                            :parentId="departmentId"
-                            v-model:bindBool="bindBool"
-                        />
-                    </j-tab-pane>
-                    <j-tab-pane key="user" tab="用户">
-                        <User :parentId="departmentId" />
-                    </j-tab-pane>
-                </j-tabs>
+              <j-tabs v-model:activeKey="activeKey" destroyInactiveTabPane>
+                <j-tab-pane key="product" tab="产品">
+                  <Product
+                    :parentId="departmentId"
+                    @open-device-bind="openDeviceBind"
+                  />
+                </j-tab-pane>
+                <j-tab-pane key="device" tab="设备">
+                  <Device
+                    :parentId="departmentId"
+                    v-model:bindBool="bindBool"
+                  />
+                </j-tab-pane>
+                <j-tab-pane key="user" tab="用户">
+                  <User :parentId="departmentId" />
+                </j-tab-pane>
+              </j-tabs>
             </div>
+          </div>
         </div>
     </page-container>
 </template>
@@ -45,19 +47,25 @@ const openDeviceBind = () => {
 </script>
 
 <style lang="less" scoped>
-.department-container {
-    display: flex;
-    background-color: #fff;
-    padding: 24px;
+.department-warp {
+  background-color: #fff;
+  padding: 24px;
+  .department-container {
+      position: relative;
 
-    .left {
-        flex-basis: 300px;
-    }
-    .right {
-        width: calc(100% - 300px);
-        :deep(.ant-tabs-nav-wrap) {
-            padding-left: 24px;
-        }
-    }
+      .left {
+          position: absolute;
+          height: 100%;
+          width: 300px;
+      }
+
+      .right {
+          width: calc(100% - 316px);
+          margin-left: 316px;
+          :deep(.ant-tabs-nav-wrap) {
+              padding-left: 24px;
+          }
+      }
+  }
 }
 </style>
diff --git a/src/views/system/Department/user/index.vue b/src/views/system/Department/user/index.vue
index a6e459c1..cb79dd88 100644
--- a/src/views/system/Department/user/index.vue
+++ b/src/views/system/Department/user/index.vue
@@ -155,6 +155,7 @@ const handleParams = (params: any) => {
 
 // 表格
 const tableRef = ref<Record<string, any>>({}); // 表格实例
+
 const table = reactive({
     _selectedRowKeys: [] as string[],
 

From 9b7b78fe3334c6da2080cf80040a03aa61654b1c Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Thu, 30 Mar 2023 11:11:41 +0800
Subject: [PATCH 04/11] fix: bug#11191

---
 .../rule-engine/Scene/Save/components/Timer/index.vue | 11 +++++++++++
 1 file changed, 11 insertions(+)

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 c0930d3e..7531a609 100644
--- a/src/views/rule-engine/Scene/Save/components/Timer/index.vue
+++ b/src/views/rule-engine/Scene/Save/components/Timer/index.vue
@@ -215,9 +215,20 @@ defineExpose({
     resolve(data)
   })
 })
+
 Object.assign(formModel, props.value)
 formModel.when = props.value.when || []
 
+watchEffect(() => {
+  if(props.value?.period.unit === 'hours') {
+    unitMax.
+      value = 99999
+  } else {
+    unitMax.value = 99
+  }
+})
+
+
 </script>
 
 <style scoped lang='less'>

From 947f34bed59eb119005465ae40ab380aa68f2ac3 Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Thu, 30 Mar 2023 13:37:31 +0800
Subject: [PATCH 05/11] fix: bug#11218

---
 .../Scene/Save/action/Device/actions/FunctionItem.vue         | 3 +++
 .../Scene/Save/action/Device/actions/WriteProperty.vue        | 3 +++
 .../Scene/Save/components/DropdownButton/Menus.vue            | 4 ++--
 .../Scene/Save/components/ParamsDropdown/index.vue            | 1 +
 .../rule-engine/Scene/Save/components/Terms/ParamsItem.vue    | 4 ++--
 vite.config.ts                                                | 4 ++--
 6 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/views/rule-engine/Scene/Save/action/Device/actions/FunctionItem.vue b/src/views/rule-engine/Scene/Save/action/Device/actions/FunctionItem.vue
index c4b54f15..86516c7d 100644
--- a/src/views/rule-engine/Scene/Save/action/Device/actions/FunctionItem.vue
+++ b/src/views/rule-engine/Scene/Save/action/Device/actions/FunctionItem.vue
@@ -65,10 +65,12 @@ const handleOptions = computed(() => {
             {
                 label: _item.trueText || true,
                 value: _item.trueValue || true,
+                id: _item.trueValue || true,
             },
             {
                 label: _item.falseText || false,
                 value: _item.falseValue || false,
+                id: _item.falseValue || false,
             },
         ];
     }
@@ -77,6 +79,7 @@ const handleOptions = computed(() => {
             return {
                 label: i.text,
                 value: i.value,
+                id: i.value,
             };
         });
     }
diff --git a/src/views/rule-engine/Scene/Save/action/Device/actions/WriteProperty.vue b/src/views/rule-engine/Scene/Save/action/Device/actions/WriteProperty.vue
index e47a0b77..66e79d5f 100644
--- a/src/views/rule-engine/Scene/Save/action/Device/actions/WriteProperty.vue
+++ b/src/views/rule-engine/Scene/Save/action/Device/actions/WriteProperty.vue
@@ -136,10 +136,12 @@ const handleOptions = computed(() => {
             {
                 label: _item.trueText || true,
                 value: _item.trueValue || true,
+                id: _item.trueValue || true,
             },
             {
                 label: _item.falseText || false,
                 value: _item.falseValue || false,
+                id: _item.falseValue || false,
             },
         ];
     }
@@ -148,6 +150,7 @@ const handleOptions = computed(() => {
             return {
                 label: i.text,
                 value: i.value,
+                id: i.value,
             };
         });
     }
diff --git a/src/views/rule-engine/Scene/Save/components/DropdownButton/Menus.vue b/src/views/rule-engine/Scene/Save/components/DropdownButton/Menus.vue
index c8a0429c..caf8b729 100644
--- a/src/views/rule-engine/Scene/Save/components/DropdownButton/Menus.vue
+++ b/src/views/rule-engine/Scene/Save/components/DropdownButton/Menus.vue
@@ -62,7 +62,7 @@ const handleBoolean = (key: string) => {
 const click = (e: any) => {
   const _key = ['true', 'false'].includes(e.key) ? handleBoolean(e.key) : e.key
   const option = getOption(myOptions.value, _key, props.valueName)
-  myValue.value = _key
+  myValue.value = e.key
   emit('update:value', _key)
   emit('click', _key, {
     key: _key,
@@ -71,7 +71,7 @@ const click = (e: any) => {
 }
 
 watch(() => props.value, () => {
-  myValue.value = props.value
+  myValue.value = isBoolean(props.value) ? String(props.value) : props.value
 }, { immediate: true})
 </script>
 
diff --git a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue
index 69b522a8..34042720 100644
--- a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue
+++ b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue
@@ -162,6 +162,7 @@ watchEffect(() => {
   const option = getOption(_options, props.value as string, props.valueName) // 回显label值
   myValue.value = props.value
   mySource.value = props.source
+  console.log(option, _options, props.valueName)
   if (option) {
     label.value = option[props.labelName] || option.name
     treeOpenKeys.value = openKeysByTree(_options, props.value, props.valueName)
diff --git a/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue b/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue
index 5d6663fb..d88a5072 100644
--- a/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue
+++ b/src/views/rule-engine/Scene/Save/components/Terms/ParamsItem.vue
@@ -177,8 +177,8 @@ const handOptionByColumn = (option: any) => {
 
     if (option.dataType === 'boolean') {
       valueOptions.value = option.options?.map((item: any) => ({ ...item, label: item.name, value: item.id})) || [
-        { label: '是', value: true },
-        { label: '否', value: false },
+        { label: '是', value: true, id: true },
+        { label: '否', value: false, id: false },
       ]
     } else if(option.dataType === 'enum') {
       valueOptions.value = option.options?.map((item: any) => ({ ...item, label: item.name, value: item.id})) || []
diff --git a/vite.config.ts b/vite.config.ts
index 1b248650..a55d7960 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 bf4b1d9c13962c337792ab280e87021c34acc297 Mon Sep 17 00:00:00 2001
From: jackhoo_98 <jackhoo_98@foxmail.com>
Date: Thu, 30 Mar 2023 13:46:46 +0800
Subject: [PATCH 06/11] =?UTF-8?q?fix:=20bug#11205=E3=80=8111211?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Collector/Point/Save/SaveModBus.vue       | 16 +++++
 .../DataCollect/Collector/Point/index.vue     | 58 ++++++++++++++-----
 2 files changed, 58 insertions(+), 16 deletions(-)

diff --git a/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue b/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
index e4f552e8..d4962823 100644
--- a/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
+++ b/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
@@ -122,6 +122,21 @@
                     "
                 />
             </j-form-item>
+            <j-form-item
+                label="小数保留位数"
+                :name="['configuration', 'codec', 'configuration', 'scale']"
+            >
+                <j-input-number
+                    style="width: 100%"
+                    placeholder="请输入小数保留位数"
+                    :min="0"
+                    :max="255"
+                    :precision="0"
+                    v-model:value="
+                        formData.configuration.codec.configuration.scale
+                    "
+                />
+            </j-form-item>
             <j-form-item
                 v-if="formData.configuration.function"
                 label="访问类型"
@@ -293,6 +308,7 @@ const formData = ref({
             provider: undefined,
             configuration: {
                 scaleFactor: 1,
+                scale: undefined,
             },
         },
     },
diff --git a/src/views/DataCollect/Collector/Point/index.vue b/src/views/DataCollect/Collector/Point/index.vue
index 638190e5..dc82b06e 100644
--- a/src/views/DataCollect/Collector/Point/index.vue
+++ b/src/views/DataCollect/Collector/Point/index.vue
@@ -169,18 +169,21 @@
                                             <j-ellipsis
                                                 style="max-width: 150px"
                                             >
-                                                {{
-                                                    getParseData(
-                                                        slotProps.id,
-                                                    )[0]
-                                                }}({{
-                                                    getParseData(
-                                                        slotProps.id,
-                                                    )[1]
-                                                }})
+                                                {{ getParseData(slotProps) }}
+                                            </j-ellipsis>
+                                        </div>
+                                        <div
+                                            class="ard-box-content-left-1-title"
+                                            v-else
+                                        >
+                                            <j-ellipsis
+                                                style="max-width: 150px"
+                                            >
+                                                {{
+                                                    getReadParseData(slotProps)
+                                                }}
                                             </j-ellipsis>
                                         </div>
-                                        <span v-else>--</span>
                                         <a
                                             v-if="
                                                 getAccessModes(
@@ -196,7 +199,7 @@
                                                     slotProps,
                                                 ).includes('read')
                                             "
-                                            @click.stop="clickRedo(slotProps)"
+                                            @click.stop="clickRead(slotProps)"
                                             ><AIcon type="RedoOutlined"
                                         /></a>
                                     </div>
@@ -333,6 +336,7 @@ const accessModesOption = ref();
 const _selectedRowKeys = ref<string[]>([]);
 const checkAll = ref(false);
 const spinning = ref(false);
+const ReadIdMap = new Map();
 
 const defaultParams = ref({
     sorts: [{ name: 'id', order: 'desc' }],
@@ -495,9 +499,14 @@ const clickEdit = async (data: object) => {
     visible.writePoint = true;
     current.value = cloneDeep(data);
 };
-const clickRedo = async (data: any) => {
-    const res = await readPoint(data?.collectorId, [data?.id]);
+
+// ReadIdMap
+const clickRead = async (data: any) => {
+    const res: any = await readPoint(data?.collectorId, [data?.id]);
     if (res.status === 200) {
+        const readData: any = res.result[0];
+        const _data = ReadIdMap.get(data?.id);
+        ReadIdMap.set(data?.id, { ..._data, ...readData });
         cancelSelect();
         tableRef.value?.reload();
         onlyMessage('操作成功', 'success');
@@ -526,14 +535,24 @@ const getInterval = (item: Partial<Record<string, any>>) => {
     const { interval } = item.configuration || '';
     return !!interval ? '采集频率' + interval + 'ms' : '';
 };
+
 const getAccessModes = (item: Partial<Record<string, any>>) => {
     return item?.accessModes?.map((i: any) => i?.value);
 };
 
-const getParseData = (id: string) => {
-    const { parseData, dataType } = propertyValue.value.get(id);
+const getParseData = (item: any) => {
+    const { parseData, dataType } = propertyValue.value.get(item.id);
     const data = isNumber(parseData) ? parseData || 0 : parseData;
-    return [data, dataType];
+    const _data = `${data}(${dataType}) `;
+    return _data;
+};
+const getReadParseData = (item: any) => {
+    let _data = '--';
+    if (ReadIdMap.has(item.id)) {
+        const { parseData, dataType } = ReadIdMap.get(item.id);
+        _data = !!parseData ? `${parseData}(${dataType || '-'}) ` : '--';
+    }
+    return _data;
 };
 
 const saveChange = (value: object) => {
@@ -618,6 +637,13 @@ watch(
     (value) => {
         if (value.length !== 0) {
             subscribeProperty(value);
+            value.forEach((item: any) => {
+                item?.accessModes?.forEach((i: any) => {
+                    if (i?.value === 'read') {
+                        ReadIdMap.set(item.id, item);
+                    }
+                });
+            });
         }
         cancelSelect();
         checkAll.value = false;

From 7ab063a790deb92e0aab8d3fc446909c1a6bfff6 Mon Sep 17 00:00:00 2001
From: leiqiaochu <leiqiaochu@aossci.com>
Date: Thu, 30 Mar 2023 14:18:12 +0800
Subject: [PATCH 07/11] =?UTF-8?q?fix:=20bug=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/init-home/index.vue | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/views/init-home/index.vue b/src/views/init-home/index.vue
index 5a921a99..81dde0a8 100644
--- a/src/views/init-home/index.vue
+++ b/src/views/init-home/index.vue
@@ -66,7 +66,7 @@ import Role from './Role/index.vue';
 import Menu from './Menu/index.vue';
 import InitData from './InitData/index.vue';
 import { modalState, formState, logoState } from './data/interface';
-import { saveInit } from '@/api/initHome';
+import { getInit, saveInit } from '@/api/initHome';
 import { BASE_API_PATH, TOKEN_KEY } from '@/utils/variable';
 import { FILE_UPLOAD } from '@/api/comm';
 import { LocalStore } from '@/utils/comm';
@@ -128,6 +128,18 @@ const submitData = async () => {
         }
     }
 };
+/**
+ * 判断是否已有配置
+ */
+const judgeInitSet = async () => {
+    const resp:any = await getInit();
+    if(resp.status === 200 && resp.result.length){
+        window.location.href = '/';
+    }
+}
+onMounted(()=>{
+    judgeInitSet();
+});
 </script>
 <style scoped lang="less">
 .page-container {

From 048d8508a6781cd30df45a5670a30d75590a2c9c Mon Sep 17 00:00:00 2001
From: 100011797 <2642441182@qq.com>
Date: Thu, 30 Mar 2023 14:19:50 +0800
Subject: [PATCH 08/11] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=9C=BA?=
 =?UTF-8?q?=E6=99=AF=E8=81=94=E5=8A=A8=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Save/action/Device/actions/index.vue      | 14 +++---
 .../Scene/Save/action/Device/device/Tag.vue   | 47 ++++++++++---------
 .../Scene/Save/action/Device/index.vue        | 17 ++++---
 .../Scene/Save/action/ListItem/Item.vue       |  3 +-
 4 files changed, 44 insertions(+), 37 deletions(-)

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 f48ed3d6..0ad79958 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
@@ -326,13 +326,13 @@ const onFormSave = () => {
                         ..._data.message,
                     },
                 });
-                emit('change', {
-                    propertiesName:
-                        deviceMessageType.value === 'INVOKE_FUNCTION'
-                            ? _function.value?.name
-                            : _property.value?.name,
-                    propertiesValue: modelRef.propertiesValue,
-                });
+                // emit('change', {
+                //     propertiesName:
+                //         deviceMessageType.value === 'INVOKE_FUNCTION'
+                //             ? _function.value?.name
+                //             : _property.value?.name,
+                //     propertiesValue: modelRef.propertiesValue,
+                // });
             })
             .catch((err: any) => {
                 reject(err);
diff --git a/src/views/rule-engine/Scene/Save/action/Device/device/Tag.vue b/src/views/rule-engine/Scene/Save/action/Device/device/Tag.vue
index da587184..3ff3a12b 100644
--- a/src/views/rule-engine/Scene/Save/action/Device/device/Tag.vue
+++ b/src/views/rule-engine/Scene/Save/action/Device/device/Tag.vue
@@ -120,15 +120,31 @@ const onTypeSelect = (key: any, _index: number) => {
 };
 
 const onTagSelect = (_data: any, _index: number) => {
-    const newList = [...unref(tagList)];
-    const indexType = newList[_index].type;
-    newList.splice(
-        _index,
-        1,
-        handleItem({ ..._data, value: undefined, type: indexType }),
-    );
-    tagList.value = newList;
-    onValueChange()
+    const indexType = tagList.value[_index].type;
+    const _item = handleItem({ ..._data, value: undefined, type: indexType })
+    tagList.value[_index] = _item
+    const newValue = tagList.value.map((item: any) => {
+        return {
+            column: item.id,
+            type: item?.type,
+            value: item?.value,
+        };
+    });
+    emits('update:value', [{ value: newValue, name: '标签' }]);
+    emits('change', [{ value: newValue, name: '标签' }], tagList.value);
+};
+
+const onValueChange = () => {
+    const _data = tagList.value.filter((item) => item?.value !== undefined);
+    const newValue = _data.map((item: any) => {
+        return {
+            column: item.id,
+            type: item?.type,
+            value: item?.value,
+        };
+    });
+    emits('update:value', [{ value: newValue, name: '标签' }]);
+    emits('change', [{ value: newValue, name: '标签' }], _data);
 };
 
 watch(
@@ -170,19 +186,6 @@ watch(
     },
 );
 
-const onValueChange = () => {
-    const _data = tagList.value.filter((item) => !!item?.value);
-    const newValue = _data.map((item: any) => {
-        return {
-            column: item.id,
-            type: item?.type,
-            value: item?.value,
-        };
-    });
-    emits('update:value', [{ value: newValue, name: '标签' }]);
-    emits('change', [{ value: newValue, name: '标签' }], _data);
-};
-
 onMounted(() => {
     if(props.value?.[0]?.value){
         const arr: any[] = []
diff --git a/src/views/rule-engine/Scene/Save/action/Device/index.vue b/src/views/rule-engine/Scene/Save/action/Device/index.vue
index e456eb25..6ddf9adc 100644
--- a/src/views/rule-engine/Scene/Save/action/Device/index.vue
+++ b/src/views/rule-engine/Scene/Save/action/Device/index.vue
@@ -145,10 +145,10 @@ const onSave = (_data: any) => {
         item.upperKey = 'scene.deviceId';
     }
     const _options: any = {
-        name: '-', //设备名称
-        type: '', //类型
-        properties: '', //属性功能
-        propertiesValue: '', //设置功能
+        // name: '-', //设备名称
+        // type: '', //类型
+        // properties: '', //属性功能
+        // propertiesValue: '', //设置功能
         selector: DeviceModel.selector, //选择器标识
         triggerName: data.value.options?.trigger?.name || '触发设备',
         ...DeviceOptions.value,
@@ -165,15 +165,18 @@ const onSave = (_data: any) => {
         _options.propertiesValue =
             (typeof _options?.propertiesValue === 'object'
                 ? JSON.stringify(_options?.propertiesValue)
-                : `${_options?.propertiesValue}`) ||
-            DeviceModel?.selectorValues?.[0]?.value;
+                : _options?.propertiesValue)
     }
-    emit('save', item, _options);
+    emit('save', item, JSON.parse(JSON.stringify(_options)));
 };
 
 const onProductChange = (_val: any, bol: boolean) => {
     if (!bol) {
         DeviceModel.selectorValues = undefined;
+        DeviceModel.deviceId = ''
+        DeviceModel.selector = 'fixed',
+        DeviceModel.upperKey = ''
+        DeviceModel.source = 'fixed'
         const flag = isActionChange(
             JSON.parse(_val.metadata || '{}'),
             DeviceModel?.message,
diff --git a/src/views/rule-engine/Scene/Save/action/ListItem/Item.vue b/src/views/rule-engine/Scene/Save/action/ListItem/Item.vue
index fec18919..3db797eb 100644
--- a/src/views/rule-engine/Scene/Save/action/ListItem/Item.vue
+++ b/src/views/rule-engine/Scene/Save/action/ListItem/Item.vue
@@ -519,9 +519,10 @@ const onType = (_type: string) => {
  */
 const onSave = (data: ActionsType, options: any) => {
   const { key, terms } = _data.value.branches![props.branchesName].then?.[props.thenName].actions?.[props.name]
+  console.log({...props.options, ...options})
   const actionItem: ActionsType = {
     ...data,
-    options,
+    options: {...props.options, ...options},
     key,
     terms
   }

From 04ad3d468984c3931d49aa936bafed22d06f8ff7 Mon Sep 17 00:00:00 2001
From: 100011797 <2642441182@qq.com>
Date: Thu, 30 Mar 2023 14:24:22 +0800
Subject: [PATCH 09/11] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=8C=89?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Scene/Save/action/Device/device/Tag.vue    | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/views/rule-engine/Scene/Save/action/Device/device/Tag.vue b/src/views/rule-engine/Scene/Save/action/Device/device/Tag.vue
index 3ff3a12b..9dbac1a0 100644
--- a/src/views/rule-engine/Scene/Save/action/Device/device/Tag.vue
+++ b/src/views/rule-engine/Scene/Save/action/Device/device/Tag.vue
@@ -123,6 +123,11 @@ const onTagSelect = (_data: any, _index: number) => {
     const indexType = tagList.value[_index].type;
     const _item = handleItem({ ..._data, value: undefined, type: indexType })
     tagList.value[_index] = _item
+    onValueChange()
+};
+
+const onValueChange = () => {
+    // const _data = tagList.value.filter((item) => item?.value !== undefined);
     const newValue = tagList.value.map((item: any) => {
         return {
             column: item.id,
@@ -134,19 +139,6 @@ const onTagSelect = (_data: any, _index: number) => {
     emits('change', [{ value: newValue, name: '标签' }], tagList.value);
 };
 
-const onValueChange = () => {
-    const _data = tagList.value.filter((item) => item?.value !== undefined);
-    const newValue = _data.map((item: any) => {
-        return {
-            column: item.id,
-            type: item?.type,
-            value: item?.value,
-        };
-    });
-    emits('update:value', [{ value: newValue, name: '标签' }]);
-    emits('change', [{ value: newValue, name: '标签' }], _data);
-};
-
 watch(
     () => [props.tagData, props.value],
     ([newTag, newVal]) => {

From 2fbcc606e9a1ffbc3dcf1ddcb1ef4bf44f6471c3 Mon Sep 17 00:00:00 2001
From: jackhoo_98 <jackhoo_98@foxmail.com>
Date: Thu, 30 Mar 2023 15:17:17 +0800
Subject: [PATCH 10/11] =?UTF-8?q?fix:=20=E9=87=87=E9=9B=86=E5=99=A8=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A6=BB=E6=95=A3=E8=BE=93=E5=85=A5=E5=AF=84?=
 =?UTF-8?q?=E5=AD=98=E5=99=A8=E3=80=81=E5=8D=95=E5=8F=8C=E9=AB=98=E4=BD=8E?=
 =?UTF-8?q?=E4=BD=8D=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Collector/Point/Save/SaveModBus.vue       |  5 +-
 .../Collector/Point/Scan/Table.vue            |  3 +
 .../DataCollect/Collector/Tree/Save/index.vue | 56 +++++++++++++++----
 src/views/DataCollect/Collector/data.ts       |  7 ++-
 4 files changed, 58 insertions(+), 13 deletions(-)

diff --git a/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue b/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
index d4962823..6ed17666 100644
--- a/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
+++ b/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
@@ -30,6 +30,7 @@
                     v-model:value="formData.configuration.function"
                     :options="[
                         { label: '01线圈寄存器', value: 'Coils' },
+                        { label: '02离散输入寄存器', value: 'DiscreteInputs' },
                         { label: '03保存寄存器', value: 'HoldingRegisters' },
                         { label: '04输入寄存器', value: 'InputRegisters' },
                     ]"
@@ -147,7 +148,8 @@
                     :showImage="false"
                     v-model:value="formData.accessModes"
                     :options="
-                        formData.configuration.function === 'InputRegisters'
+                        formData.configuration.function === 'InputRegisters' ||
+                        formData.configuration.function === 'DiscreteInputs'
                             ? [{ label: '读', value: 'read' }]
                             : [
                                   { label: '读', value: 'read' },
@@ -289,6 +291,7 @@ const oldPointKey = props.data.pointKey;
 
 const InitAddress = {
     Coils: 1,
+    DiscreteInputs: 10001,
     HoldingRegisters: 40001,
     InputRegisters: 30001,
 };
diff --git a/src/views/DataCollect/Collector/Point/Scan/Table.vue b/src/views/DataCollect/Collector/Point/Scan/Table.vue
index bb6712cd..3c055092 100644
--- a/src/views/DataCollect/Collector/Point/Scan/Table.vue
+++ b/src/views/DataCollect/Collector/Point/Scan/Table.vue
@@ -238,6 +238,9 @@ const filterOption = (input: string, option: any) => {
 
 const clickDelete = (value: string) => {
     emits('change', value);
+    
+    // 删除时需要做同上操作 todo
+
 };
 
 const getTargetData = (index: number, type: string) => {
diff --git a/src/views/DataCollect/Collector/Tree/Save/index.vue b/src/views/DataCollect/Collector/Tree/Save/index.vue
index 8143fd96..01ec25b3 100644
--- a/src/views/DataCollect/Collector/Tree/Save/index.vue
+++ b/src/views/DataCollect/Collector/Tree/Save/index.vue
@@ -73,21 +73,11 @@
                 {{ getTypeTooltip(formData.circuitBreaker.type) }}
             </p>
             <j-form-item
+                label="双字高低位切换"
                 :name="['configuration', 'endian']"
                 v-if="visibleEndian"
                 :rules="LeftTreeRules.endian"
             >
-                <template #label>
-                    <span>
-                        高低位切换
-                        <j-tooltip title="统一配置所有点位的高低位切换">
-                            <AIcon
-                                type="QuestionCircleOutlined"
-                                style="margin-left: 2px"
-                            />
-                        </j-tooltip>
-                    </span>
-                </template>
                 <j-card-select
                     :showImage="false"
                     v-model:value="formData.configuration.endian"
@@ -99,6 +89,41 @@
                     :column="2"
                 />
             </j-form-item>
+            <j-form-item
+                label="单字高低位切换"
+                :name="['configuration', 'endianIn']"
+                v-if="visibleEndian"
+                :rules="LeftTreeRules.endianIn"
+            >
+                <j-card-select
+                    :showImage="false"
+                    v-model:value="formData.configuration.endianIn"
+                    :options="[
+                        { label: 'AB', value: 'BIG' },
+                        { label: 'BA', value: 'LITTLE' },
+                    ]"
+                    @change="changeCardSelectEndianIn"
+                    :column="2"
+                />
+            </j-form-item>
+            <div
+                style="color: #616161"
+                v-if="
+                    formData.configuration.endian ||
+                    formData.configuration.endianIn
+                "
+            >
+                <p>
+                    当前内存布局:{{
+                        endianMap.get(formData.configuration.endian)
+                    }}{{ endianMap.get(formData.configuration.endianIn) }}
+                </p>
+                <p>
+                    只有4字节数据类型(int32、ieee754 float)
+                    具有4种内存布局，其它只有ABCD、DCBA两种内存布局(以双字配置为准)
+                </p>
+            </div>
+
             <j-form-item label="说明" name="description">
                 <j-textarea
                     placeholder="请输入说明"
@@ -150,6 +175,11 @@ const emit = defineEmits(['change']);
 const id = props.data.id;
 const formRef = ref<FormInstance>();
 
+const endianMap = new Map([
+    ['BIG', 'AB'],
+    ['LITTLE', 'BA'],
+]);
+
 const formData = ref({
     channelId: undefined,
     name: '',
@@ -157,6 +187,7 @@ const formData = ref({
         unitId: '',
         type: 'LowerFrequency',
         endian: 'BIG',
+        endianIn: 'BIG',
     },
     circuitBreaker: {
         type: 'LowerFrequency',
@@ -203,6 +234,9 @@ const changeCardSelectType = (value: Array<string>) => {
 const changeCardSelectEndian = (value: Array<string>) => {
     formData.value.configuration.endian = value[0];
 };
+const changeCardSelectEndianIn = (value: Array<string>) => {
+    formData.value.configuration.endianIn = value[0];
+};
 const getChannelNoPaging = async () => {
     channelListAll.value = Store.get('channelListAll');
     channelList.value = channelListAll.value.map((item) => ({
diff --git a/src/views/DataCollect/Collector/data.ts b/src/views/DataCollect/Collector/data.ts
index 738c5eb4..3599f0d3 100644
--- a/src/views/DataCollect/Collector/data.ts
+++ b/src/views/DataCollect/Collector/data.ts
@@ -162,7 +162,12 @@ export const LeftTreeRules = {
         },
     ],
     type: [{ required: true, message: '请选择处理方式', trigger: 'blur' }],
-    endian: [{ required: true, message: '请选择高低位切换', trigger: 'blur' }],
+    endian: [
+        { required: true, message: '请选择双字高低位切换', trigger: 'blur' },
+    ],
+    endianIn: [
+        { required: true, message: '请选择单字高低位切换', trigger: 'blur' },
+    ],
 };
 
 export const FormTableColumns = [

From 2dbd7e31b6a9c07dfddd7913b5a3dd3ea9af477d Mon Sep 17 00:00:00 2001
From: leiqiaochu <leiqiaochu@aossci.com>
Date: Thu, 30 Mar 2023 15:39:04 +0800
Subject: [PATCH 11/11] =?UTF-8?q?fix:=20bug=E8=B7=AF=E7=94=B1=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=20=E5=88=9D=E5=A7=8B=E5=8C=96=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/init-home/index.vue              | 14 ++++++++++----
 src/views/system/Menu/Detail/BasicInfo.vue |  1 +
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/views/init-home/index.vue b/src/views/init-home/index.vue
index 81dde0a8..c54aa561 100644
--- a/src/views/init-home/index.vue
+++ b/src/views/init-home/index.vue
@@ -71,6 +71,7 @@ import { BASE_API_PATH, TOKEN_KEY } from '@/utils/variable';
 import { FILE_UPLOAD } from '@/api/comm';
 import { LocalStore } from '@/utils/comm';
 import { message } from 'jetlinks-ui-components';
+import { useUserInfo } from '@/store/userInfo';
 const basicRef = ref();
 const roleRef = ref();
 const initDataRef = ref();
@@ -81,6 +82,7 @@ const loading = ref(false);
  */
 const activeKey = ref<string>('1');
 const spinning = ref<boolean>(false);
+const userInfo = useUserInfo();
 // const action = ref<string>(`${BASE_API_PATH}/file/static`);
 // const headers = ref({ [TOKEN_KEY]: LocalStore.get(TOKEN_KEY) });
 /**
@@ -132,12 +134,16 @@ const submitData = async () => {
  * 判断是否已有配置
  */
 const judgeInitSet = async () => {
-    const resp:any = await getInit();
-    if(resp.status === 200 && resp.result.length){
+    if (userInfo.$state.userInfos.username === 'admin') {
+        const resp: any = await getInit();
+        if (resp.status === 200 && resp.result.length) {
+            window.location.href = '/';
+        }
+    } else {
         window.location.href = '/';
     }
-}
-onMounted(()=>{
+};
+onMounted(() => {
     judgeInitSet();
 });
 </script>
diff --git a/src/views/system/Menu/Detail/BasicInfo.vue b/src/views/system/Menu/Detail/BasicInfo.vue
index 4d965770..025a1d92 100644
--- a/src/views/system/Menu/Detail/BasicInfo.vue
+++ b/src/views/system/Menu/Detail/BasicInfo.vue
@@ -101,6 +101,7 @@
                                         message: '请输入页面地址',
                                     },
                                     { max: 128, message: '最多可输入128字符' },
+                                    { pattern: /^\// ,message:'请正确填写地址，以/开头'},
                                 ]"
                             >
                                 <j-input