Browse Source

fix: 字段管理更新问题

master
wangqi 2 months ago
parent
commit
771c384ec6
  1. 4
      src/pages/deviceInfo/components/data-filter.vue
  2. 4
      src/pages/deviceStorage/components/data-filter.vue
  3. 1
      src/pages/deviceTest/testPlan/index.vue
  4. 2
      src/pages/ota/upgradeTask/utils.ts
  5. 2
      src/pages/system/config/index.vue
  6. 9
      src/pages/system/deviceField/index.vue
  7. 1
      src/pages/system/manufacturer/index.vue

4
src/pages/deviceInfo/components/data-filter.vue

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
<template>
<div class="storage-data-filter">
<el-scrollbar class="storage-data-filter">
<div class="time-item">
<el-config-provider :locale="locale">
<span>开始时间:</span>
@ -81,7 +81,7 @@ @@ -81,7 +81,7 @@
/>
<EdfsButton inner-text="重置" style="width: 100%" @click="onReset" />
</div>
</div>
</el-scrollbar>
</template>
<script setup lang="ts">

4
src/pages/deviceStorage/components/data-filter.vue

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
<template>
<div class="storage-data-filter">
<el-scrollbar class="storage-data-filter">
<div class="time-item">
<el-config-provider :locale="locale">
<span>开始时间:</span>
@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
@click="onSearch"
/>
</div>
</div>
</el-scrollbar>
</template>
<script setup lang="ts">

1
src/pages/deviceTest/testPlan/index.vue

@ -39,7 +39,6 @@ @@ -39,7 +39,6 @@
type="primary"
plain
@click="openDlg('create')"
v-hasPermi="['system:user:create']"
>
<Icon icon="ep:plus" /> 新增
</el-button>

2
src/pages/ota/upgradeTask/utils.ts

@ -12,7 +12,7 @@ export const tableColumns = [ @@ -12,7 +12,7 @@ export const tableColumns = [
{
label: '固件版本',
prop: 'version',
width: '6%',
width: '8%',
},
{

2
src/pages/system/config/index.vue

@ -13,8 +13,6 @@ @@ -13,8 +13,6 @@
v-model="isEnableFileStorage"
active-color="#13ce66"
inactive-color="#ff4949"
active-text="开启"
inactive-text="关闭"
/>
</div>
</div>

9
src/pages/system/deviceField/index.vue

@ -31,13 +31,14 @@ @@ -31,13 +31,14 @@
:action="categoryAction"
:isShow="isShowCategoryDlg"
:row="categoryEditRow"
:treeData="categoryTreeData"
@on-close="isShowCategoryDlg = false"
:treeData="cloneDeep(categoryTreeData)"
@on-close="onClone"
@on-save="onSaveCategory"
/>
</template>
<script setup lang="ts">
import { cloneDeep } from 'lodash'
import {
deleteCategory,
getCategoryTree,
@ -90,7 +91,11 @@ async function onDeleteCategory(row: ICategoryTree) { @@ -90,7 +91,11 @@ async function onDeleteCategory(row: ICategoryTree) {
function onSaveCategory() {
loadDeviceTypeTree()
}
function onClone() {
isShowCategoryDlg.value = false
categoryEditRow.value = undefined
}
onMounted(() => {

1
src/pages/system/manufacturer/index.vue

@ -47,7 +47,6 @@ @@ -47,7 +47,6 @@
type="primary"
plain
@click="openDlg('create')"
v-hasPermi="['system:user:create']"
>
<Icon icon="ep:plus" /> 新增
</el-button>

Loading…
Cancel
Save