fix: bug#11093

2023-07-11 16:50:28 +08:00 · 2023-07-11 16:50:28 +08:00 · e8946b1aae
parent 54e5688309
commit e8946b1aae
27 changed files with 32 additions and 28 deletions
--- a/src/components/Search/Search.vue
+++ b/src/components/Search/Search.vue
@ -2,8 +2,8 @@
  <j-advanced-search
    :target='target'
    :type='type'
-    :request='saveSearchHistory'
-    :historyRequest='getSearchHistory'
+    :request='(data) => saveSearchHistory(data, target)'
+    :historyRequest='() => getSearchHistory(target)'
    :deleteRequest='deleteSearchHistory'
    :columns='columns'
    :class='props.class'
--- a/src/views/DataCollect/Channel/index.vue
+++ b/src/views/DataCollect/Channel/index.vue
@ -3,7 +3,7 @@
        <div>
            <pro-search
                :columns="columns"
-                target="search"
+                target="search-datacollect-channel"
                @search="handleSearch"
            />
            <FullPage>
--- a/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
+++ b/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
@ -221,7 +221,8 @@
                    placeholder="请输入采集频率"
                    v-model:value="formData.configuration.interval"
                    addon-after="ms"
-                    :max="9999999999999998"
+                    :max="2147483648"
+                    :min="1"
                />
            </j-form-item>

--- a/src/views/DataCollect/Collector/Point/Save/SaveOPCUA.vue
+++ b/src/views/DataCollect/Collector/Point/Save/SaveOPCUA.vue
@ -58,7 +58,8 @@
                    placeholder="请输入采集频率"
                    v-model:value="formData.configuration.interval"
                    addon-after="ms"
-                    :max="9999999999999998"
+                    :max="2147483648"
+                    :min="1"
                />
            </j-form-item>
            <j-form-item label="" :name="['features']">
--- a/src/views/DataCollect/Collector/Point/Scan/Table.vue
+++ b/src/views/DataCollect/Collector/Point/Scan/Table.vue
@ -125,7 +125,8 @@
                            placeholder="请输入"
                            allowClear
                            addon-after="ms"
-                            :max="9999999999999998"
+                            :max="2147483647"
+                            :min="1"
                            :disabled="
                                index !== 0 &&
                                record.configuration[dataIndex].check
--- a/src/views/DataCollect/Collector/Point/components/BatchUpdate/index.vue
+++ b/src/views/DataCollect/Collector/Point/components/BatchUpdate/index.vue
@ -54,7 +54,8 @@
                    placeholder="请输入采集频率"
                    v-model:value="formData.interval"
                    addon-after="ms"
-                    :max="9999999999999998"
+                    :max="2147483648"
+                    :min="1"
                />
            </j-form-item>

--- a/src/views/DataCollect/Collector/Point/index.vue
+++ b/src/views/DataCollect/Collector/Point/index.vue
@ -1,6 +1,6 @@
 <template>
    <j-spin :spinning="spinning">
-        <pro-search :columns="columns" target="search" @search="handleSearch" />
+        <pro-search :columns="columns" target="search-point" @search="handleSearch" />
        <FullPage>
            <j-scrollbar height="680">
                <j-pro-table
--- a/src/views/DataCollect/Collector/Tree/Save/index.vue
+++ b/src/views/DataCollect/Collector/Tree/Save/index.vue
@ -122,7 +122,7 @@
                    placeholder="请输入请求超时时间配置"
                    v-model:value="formData.configuration.requsetTimeout"
                    addon-after="ms"
-                    :max="9999999999999998"
+                    :max="2147483648"
                    :min="1"
                />
            </j-form-item>
--- a/src/views/device/Firmware/Task/Detail/index.vue
+++ b/src/views/device/Firmware/Task/Detail/index.vue
@ -57,7 +57,7 @@

            <pro-search
                :columns="columns"
-                target="search"
+                target="search-task-detail"
                @search="handleSearch"
            />
            <FullPage>
--- a/src/views/device/Firmware/Task/Save/SelectDevices.vue
+++ b/src/views/device/Firmware/Task/Save/SelectDevices.vue
@ -24,7 +24,7 @@
    >
        <pro-search
            :columns="columns"
-            target="search"
+            target="search-select-device"
            @search="handleSearch"
            type="simple"
        />
--- a/src/views/device/Firmware/Task/index.vue
+++ b/src/views/device/Firmware/Task/index.vue
@ -1,6 +1,6 @@
 <template>
    <page-container>
-        <pro-search :columns="columns" target="search" @search="handleSearch" />
+        <pro-search :columns="columns" target="search-firmware-task" @search="handleSearch" />
        <j-pro-table
            ref="tableRef"
            model="TABLE"
--- a/src/views/device/Firmware/index.vue
+++ b/src/views/device/Firmware/index.vue
@ -3,7 +3,7 @@
        <div>
            <pro-search
                :columns="columns"
-                target="search"
+                target="search-firmware"
                @search="handleSearch"
            />
            <FullPage>
--- a/src/views/link/AccessConfig/index.vue
+++ b/src/views/link/AccessConfig/index.vue
@ -3,7 +3,7 @@
        <div>
            <pro-search
                :columns="columns"
-                target="search"
+                target="search-link-access-config"
                @search="handleSearch"
            />
            <FullPage>
--- a/src/views/link/Certificate/index.vue
+++ b/src/views/link/Certificate/index.vue
@ -3,7 +3,7 @@
        <div>
            <pro-search
                :columns="columns"
-                target="search"
+                target="search-certificate"
                @search="handleSearch"
            />
            <FullPage>
--- a/src/views/link/Protocol/index.vue
+++ b/src/views/link/Protocol/index.vue
@ -3,7 +3,7 @@
        <div>
            <pro-search
                :columns="columns"
-                target="search"
+                target="search-protocol"
                @search="handleSearch"
            />
            <FullPage>
--- a/src/views/link/Type/index.vue
+++ b/src/views/link/Type/index.vue
@ -3,7 +3,7 @@
        <div>
            <pro-search
                :columns="columns"
-                target="search"
+                target="search-type"
                @search="handleSearch"
            />
            <FullPage>
--- a/src/views/media/Cascade/Channel/BindChannel/index.vue
+++ b/src/views/media/Cascade/Channel/BindChannel/index.vue
@ -10,7 +10,7 @@
        @cancel="_vis = false"
        :confirmLoading="loading"
    >
-        <pro-search :columns="columns" target="media" @search="handleSearch" />
+        <pro-search :columns="columns" target="media-bind" @search="handleSearch" />

        <JProTable
            ref="listRef"
--- a/src/views/media/Stream/index.vue
+++ b/src/views/media/Stream/index.vue
@ -3,7 +3,7 @@
        <div>
            <pro-search
                :columns="columns"
-                target="search"
+                target="search-stream"
                @search="handleSearch"
            />
            <FullPage>
--- a/src/views/rule-engine/Alarm/Configuration/index.vue
+++ b/src/views/rule-engine/Alarm/Configuration/index.vue
@ -3,7 +3,7 @@
        <div>
            <pro-search
                :columns="columns"
-                target="device-instance"
+                target="search-configuration"
                @search="handleSearch"
            />
            <FullPage>
--- a/src/views/rule-engine/Instance/index.vue
+++ b/src/views/rule-engine/Instance/index.vue
@ -3,7 +3,7 @@
        <div>
            <pro-search
                :columns="query.columns"
-                target="device-instance"
+                target="rule-engine-instance"
                @search="handleSearch"
            />
            <FullPage>
--- a/src/views/system/Apply/index.vue
+++ b/src/views/system/Apply/index.vue
@ -3,7 +3,7 @@
        <div class="apply-container">
            <pro-search
                :columns="columns"
-                target="category"
+                target="system-apply"
                @search="(params:any)=>queryParams = {...params}"
            />
            <FullPage>
--- a/src/views/system/DataSource/index.vue
+++ b/src/views/system/DataSource/index.vue
@ -3,7 +3,7 @@
        <div class="data-source-container">
            <pro-search
                :columns="columns"
-                target="category"
+                target="system-data-source"
                @search="(params:any)=>queryParams = {...params}"
            />
            <FullPage>
--- a/src/views/system/Menu/index.vue
+++ b/src/views/system/Menu/index.vue
@ -3,7 +3,7 @@
        <div class="menu-container">
            <pro-search
                :columns="columns"
-                target="category"
+                target="system-menu"
                @search="handleSearch"
            />
            <FullPage>
--- a/src/views/system/Relationship/index.vue
+++ b/src/views/system/Relationship/index.vue
@ -3,7 +3,7 @@
        <div class="relationship-container">
            <pro-search
                :columns="columns"
-                target="category"
+                target="system-relationship"
                @search="(params:any)=>queryParams = {...params}"
            />
            <FullPage>
--- a/src/views/system/Role/Detail/User/index.vue
+++ b/src/views/system/Role/Detail/User/index.vue
@ -2,7 +2,7 @@
    <div class="role-user-container">
        <pro-search
            :columns="columns"
-            target="category"
+            target="system-role-user"
            @search="(params:any)=>queryParams = {...params}"
        />

--- a/src/views/system/Role/index.vue
+++ b/src/views/system/Role/index.vue
@ -3,7 +3,7 @@
        <div class="role-container">
            <pro-search
                :columns="columns"
-                target="category"
+                target="system-role"
                @search="(params:any)=>queryParams = {...params}"
            />
            <FullPage>
--- a/src/views/system/User/index.vue
+++ b/src/views/system/User/index.vue
@ -3,7 +3,7 @@
        <div class="user-container">
            <pro-search
                :columns="columns"
-                target="category"
+                target="system-user"
                @search="handleParams"
            />
            <FullPage>