0017
/
iot-ui-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: bug#20763、20736、20731 

* fix: bug#20763、20736、20731
This commit is contained in:
XieYongHong 2023-12-05 11:11:49 +08:00 committed by GitHub
parent 9ba07046e3
commit 3beae8b718
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 50 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -13,6 +13,7 @@
"prepare": "husky install"
},
"dependencies": {
"@ant-design/icons-vue": "^7.0.1",
"@liveqing/liveplayer-v3": "^3.7.10",
"@types/marked": "^4.0.8",
"@vitejs/plugin-vue-jsx": "^3.0.0",
@ -37,6 +38,7 @@
"nrm": "^1.2.5",
"pinia": "^2.0.28",
"rollup-plugin-copy": "^3.4.0",
"rxjs": "^7.8.1",
"unplugin-auto-import": "^0.12.1",
"unplugin-vue-components": "^0.22.12",
"v-clipboard3": "^0.1.4",

3
src/components/FRuleEditor-copy/Debug/index.vue
View File

@ -71,7 +71,6 @@
</template>
<script setup lang="ts" name="Debug">
import { PropType } from 'vue';
import { DeleteOutlined, PlusOutlined } from '@ant-design/icons-vue';
import { useProductStore } from '@/store/product';
import { useRuleEditorStore } from '@/store/ruleEditor';
import moment from 'moment';
@ -300,4 +299,4 @@ getProperty()
}
}
}
</style>
</style>

3
src/views/DataCollect/Collector/Tree/Save/index.vue
View File

@ -39,7 +39,7 @@
placeholder="请输入采集器名称"
v-model:value="formData.name"
/>
</j-form-item>
<j-form-item v-if="provider === 'snap7'" label="IP" :name="['configuration', 'host']" :rules="LeftTreeRules.host" >
<j-input v-model:value="formData.configuration.host" autocomplete="off" placeholder="请输入通道IP" :disabled="false"/>
@ -163,6 +163,7 @@
v-if="provider !== 'snap7'"
:name="['configuration', 'requestTimeout']"
:rules="LeftTreeRules.requestTimeout"
label='请求超时时间'
>
<j-input-number
style="width: 100%"

4
src/views/device/DashBoard/components/Amap.vue
View File

@ -26,7 +26,7 @@
clipOrigin: [459, 92],
clipSize: [50, 68],
}"
>123</el-amap-label-marker
></el-amap-label-marker
>
</AmapComponent>
</div>
@ -47,4 +47,4 @@ const getMapData = async () => {
getMapData();
</script>
<style scoped>
</style>
</style>

2
src/views/device/Instance/Detail/Info/components/InklingModal/index.vue
View File

@ -71,4 +71,4 @@ const handleCancel = () => {
<style scoped>
</style>
</style>

3
src/views/device/Instance/Detail/Running/Event/index.vue
View File

@ -83,6 +83,7 @@ watchEffect(() => {
type: i?.valueType?.type || 'string',
rename: i.id
},
ellipsis: true,
});
});
} else {
@ -124,4 +125,4 @@ const detail = (_info: any) => {
padding: 0 20px;
}
}
</style>
</style>

17
src/views/device/Instance/Detail/Running/Property/Detail/Charts.vue
View File

@ -81,8 +81,11 @@ const queryChartsAggList = async () => {
from: prop.time[0],
to: prop.time[1],
},
});
loading.value = false;
}).finally(
()=>{
loading.value = false;
}
)
if (resp.status === 200) {
const dataList: any[] = [
{
@ -127,8 +130,12 @@ const queryChartsList = async () => {
],
sorts: [{ name: 'timestamp', order: 'asc' }],
},
);
loading.value = false;
).finally(
()=>{
loading.value = false;
}
)
if (resp.status === 200) {
const dataList: any[] = [
{
@ -216,4 +223,4 @@ watchEffect(() => {
getOptions(chartsList.value);
}
});
</script>
</script>

8
src/views/device/Instance/Detail/Running/Property/Detail/PropertyAMap.vue
View File

@ -65,8 +65,10 @@ const query = async () => {
},
sorts: { timestamp: 'asc' },
}),
);
loading.value = false;
).finally(()=>{
loading.value = false;
}
)
if (resp.status === 200) {
const list: any[] = [];
((resp.result as any)?.data || []).forEach((item: any) => {
@ -93,4 +95,4 @@ watch(
</script>
<style lang="less" scoped>
</style>
</style>

2
src/views/system/Menu/Detail/BasicInfo.vue
View File

@ -66,7 +66,7 @@
required: true,
message: '请输入页面地址',
},
{ max: 128, message: '最多可输入128字符' },
{ max: 128, message: '最多可输入128个字符' },
{ pattern: /^\//, message: '请正确填写地址，以/开头' },
]" :validateFirst="true" label="页面地址" name="url">
<j-input v-model:value="form.data.url" placeholder="请输入页面地址" />

17
src/views/system/Menu/index.vue
View File

@ -196,17 +196,14 @@ const table = reactive({
],
},
{
terms:[
type: 'or',
terms:[
{
terms:[
{
value:"%show\":true%",
termType:"like",
column:"options"
}
]
value:"%show\":true%",
termType:"like",
column:"options"
}
]
]
}
],
};
@ -239,7 +236,7 @@ const table = reactive({
router.push(
`/system/Menu/detail/:id?pid=${row.id}&basePath=${
row.url || ''
}&sortIndex=${sortIndex + 1}&isChildren=${true}`,
}&sortIndex=${sortIndex + 1}`,
);
},

15
yarn.lock
View File

@ -54,6 +54,14 @@
"@ant-design/colors" "^6.0.0"
"@ant-design/icons-svg" "^4.2.1"
"@ant-design/icons-vue@^7.0.1":
version "7.0.1"
resolved "https://registry.npmjs.org/@ant-design/icons-vue/-/icons-vue-7.0.1.tgz#83de301771fadd03f3890e627314102405c31c22"
integrity sha512-eCqY2unfZK6Fe02AwFlDHLfoyEFreP6rBwAZMIJ1LugmfMiVgwWDYlp1YsRugaPtICYOabV1iWxXdP12u9U43Q==
dependencies:
"@ant-design/colors" "^6.0.0"
"@ant-design/icons-svg" "^4.2.1"
"@antfu/utils@^0.7.2":
version "0.7.2"
resolved "https://registry.npmjs.org/@antfu/utils/-/utils-0.7.2.tgz"
@ -5891,6 +5899,13 @@ rxjs@^7.5.7:
dependencies:
tslib "^2.1.0"
rxjs@^7.8.1:
version "7.8.1"
resolved "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
dependencies:
tslib "^2.1.0"
safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
version "5.2.1"
resolved "https://registry.jetlinks.cn/safe-buffer/-/safe-buffer-5.2.1.tgz"