Browse Source

fix: 优化系统配置个页面首页列表页的显示效果

yanglzh 1 year ago
parent
commit
4ce8bfd4af
100 changed files with 702 additions and 762 deletions
  1. 2 2
      src/components/cropper/index.vue
  2. 15 15
      src/layout/navBars/breadcrumb/setings.vue
  3. 2 1
      src/theme/fast.scss
  4. 1 1
      src/views/iot/alarm/log/component/detail.vue
  5. 3 3
      src/views/iot/alarm/log/component/edit.vue
  6. 5 5
      src/views/iot/alarm/log/index.vue
  7. 3 3
      src/views/iot/alarm/setting/component/edit.vue
  8. 3 3
      src/views/iot/alarm/setting/component/level.vue
  9. 7 7
      src/views/iot/alarm/setting/index.vue
  10. 5 5
      src/views/iot/certificate/component/editParams.vue
  11. 5 5
      src/views/iot/certificate/index.vue
  12. 3 3
      src/views/iot/configuration/list/index.vue
  13. 1 1
      src/views/iot/configuration/screen/index.vue
  14. 3 3
      src/views/iot/device-tree/tree/component/edit.vue
  15. 3 3
      src/views/iot/device-tree/tree/index.vue
  16. 3 3
      src/views/iot/device/category/component/edit.vue
  17. 4 4
      src/views/iot/device/category/index.vue
  18. 3 3
      src/views/iot/device/channel/index.vue
  19. 3 3
      src/views/iot/device/instance/component/edit.vue
  20. 3 3
      src/views/iot/device/instance/component/excel.vue
  21. 2 2
      src/views/iot/device/instance/component/setAttr.vue
  22. 4 4
      src/views/iot/device/instance/component/subDevice.vue
  23. 3 3
      src/views/iot/device/instance/component/tag.vue
  24. 6 6
      src/views/iot/device/instance/detail.vue
  25. 13 13
      src/views/iot/device/instance/index.vue
  26. 3 3
      src/views/iot/device/product/component/editAttr.vue
  27. 3 3
      src/views/iot/device/product/component/editEvent.vue
  28. 3 3
      src/views/iot/device/product/component/editFun.vue
  29. 3 3
      src/views/iot/device/product/component/editOption.vue
  30. 3 3
      src/views/iot/device/product/component/editPro.vue
  31. 3 3
      src/views/iot/device/product/component/editTab.vue
  32. 1 1
      src/views/iot/device/product/detail.vue
  33. 9 9
      src/views/iot/device/product/index.vue
  34. 5 5
      src/views/iot/device/template/detail.vue
  35. 3 3
      src/views/iot/device/template/index.vue
  36. 63 63
      src/views/iot/ice104/device/component/deviceTaskTable.vue
  37. 3 3
      src/views/iot/ice104/device/index.vue
  38. 3 3
      src/views/iot/ice104/template/component/templateTaskTable.vue
  39. 3 3
      src/views/iot/ice104/template/index.vue
  40. 4 4
      src/views/iot/network/server/index.vue
  41. 4 4
      src/views/iot/network/tunnel/index.vue
  42. 3 3
      src/views/iot/noticeservices/config/component/edit.vue
  43. 3 3
      src/views/iot/noticeservices/config/component/setEdit.vue
  44. 3 3
      src/views/iot/noticeservices/config/component/temEdit.vue
  45. 10 10
      src/views/iot/noticeservices/config/setting.vue
  46. 2 2
      src/views/iot/noticeservices/log/component/detail.vue
  47. 5 5
      src/views/iot/noticeservices/log/index.vue
  48. 3 3
      src/views/iot/ota-update/module/component/edit.vue
  49. 4 4
      src/views/iot/ota-update/module/index.vue
  50. 4 4
      src/views/iot/ota-update/update/component/batch.vue
  51. 3 3
      src/views/iot/ota-update/update/component/check.vue
  52. 3 3
      src/views/iot/ota-update/update/component/device.vue
  53. 1 1
      src/views/iot/ota-update/update/component/deviceBind.vue
  54. 3 3
      src/views/iot/ota-update/update/component/deviceList.vue
  55. 3 3
      src/views/iot/ota-update/update/component/edit.vue
  56. 1 1
      src/views/iot/ota-update/update/component/productBind.vue
  57. 4 4
      src/views/iot/ota-update/update/index.vue
  58. 3 3
      src/views/iot/property/attribute/index.vue
  59. 3 3
      src/views/iot/property/dossier/index.vue
  60. 1 1
      src/views/iot/rule-engine/index.vue
  61. 2 2
      src/views/iot/rule-engine/send.vue
  62. 5 5
      src/views/iot/scene/list/index.vue
  63. 5 5
      src/views/iot/scene/manage/index.vue
  64. 1 1
      src/views/limits/backEnd/page/index.vue
  65. 27 27
      src/views/limits/frontEnd/btn/index.vue
  66. 1 1
      src/views/limits/frontEnd/page/index.vue
  67. 1 1
      src/views/login/component/changePwd.vue
  68. 35 37
      src/views/system/api/index.vue
  69. 5 5
      src/views/system/application/index.vue
  70. 3 3
      src/views/system/assess/component/editAttr.vue
  71. 3 3
      src/views/system/assess/component/editEvent.vue
  72. 3 3
      src/views/system/assess/component/editFun.vue
  73. 3 3
      src/views/system/assess/component/editPro.vue
  74. 3 3
      src/views/system/assess/component/editTab.vue
  75. 4 4
      src/views/system/assess/totalIndex/component/addItem.vue
  76. 3 3
      src/views/system/assess/totalIndex/component/addSign.vue
  77. 4 4
      src/views/system/assess/totalIndex/component/editItem.vue
  78. 3 3
      src/views/system/assess/totalIndex/component/setTask.vue
  79. 4 5
      src/views/system/assess/totalIndex/index.vue
  80. 4 4
      src/views/system/basicConfig/basic.vue
  81. 1 1
      src/views/system/basicConfig/index.vue
  82. 3 3
      src/views/system/city/component/edit.vue
  83. 31 34
      src/views/system/city/index.vue
  84. 4 4
      src/views/system/config/component/editConfig.vue
  85. 61 70
      src/views/system/config/index.vue
  86. 3 3
      src/views/system/datahub/modeling/component/edit.vue
  87. 3 3
      src/views/system/datahub/modeling/component/editNode.vue
  88. 3 3
      src/views/system/datahub/modeling/component/juhe.vue
  89. 3 3
      src/views/system/datahub/modeling/component/relation.vue
  90. 7 7
      src/views/system/datahub/modeling/detail.vue
  91. 44 66
      src/views/system/datahub/modeling/index.vue
  92. 1 1
      src/views/system/datahub/source/component/edit.vue
  93. 3 3
      src/views/system/datahub/source/component/editNode.vue
  94. 1 1
      src/views/system/datahub/source/detail.vue
  95. 14 28
      src/views/system/datahub/source/index.vue
  96. 4 4
      src/views/system/dict/component/editDic.vue
  97. 3 3
      src/views/system/dict/component/editDicData.vue
  98. 37 39
      src/views/system/dict/dataList.vue
  99. 71 79
      src/views/system/dict/index.vue
  100. 3 3
      src/views/system/manage/blacklist/component/editPro.vue

+ 2 - 2
src/components/cropper/index.vue

@@ -23,8 +23,8 @@
 			</div>
 			</div>
 			<template #footer>
 			<template #footer>
 				<span class="dialog-footer">
 				<span class="dialog-footer">
-					<el-button @click="onCancel" size="default">取 消</el-button>
-					<el-button type="primary" @click="onSubmit" size="default">更 换</el-button>
+					<el-button @click="onCancel">取 消</el-button>
+					<el-button type="primary" @click="onSubmit">更 换</el-button>
 				</span>
 				</span>
 			</template>
 			</template>
 		</el-dialog>
 		</el-dialog>

+ 15 - 15
src/layout/navBars/breadcrumb/setings.vue

@@ -7,7 +7,7 @@
 				<div class="layout-breadcrumb-seting-bar-flex">
 				<div class="layout-breadcrumb-seting-bar-flex">
 					<div class="layout-breadcrumb-seting-bar-flex-label">primary</div>
 					<div class="layout-breadcrumb-seting-bar-flex-label">primary</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-color-picker v-model="getThemeConfig.primary" size="default" @change="onColorPickerChange"> </el-color-picker>
+						<el-color-picker v-model="getThemeConfig.primary" @change="onColorPickerChange"> </el-color-picker>
 					</div>
 					</div>
 				</div>
 				</div>
 				<div class="layout-breadcrumb-seting-bar-flex mt15">
 				<div class="layout-breadcrumb-seting-bar-flex mt15">
@@ -22,13 +22,13 @@
 				<div class="layout-breadcrumb-seting-bar-flex">
 				<div class="layout-breadcrumb-seting-bar-flex">
 					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoTopBar') }}</div>
 					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoTopBar') }}</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-color-picker v-model="getThemeConfig.topBar" size="default" @change="onBgColorPickerChange('topBar')"> </el-color-picker>
+						<el-color-picker v-model="getThemeConfig.topBar" @change="onBgColorPickerChange('topBar')"> </el-color-picker>
 					</div>
 					</div>
 				</div>
 				</div>
 				<div class="layout-breadcrumb-seting-bar-flex">
 				<div class="layout-breadcrumb-seting-bar-flex">
 					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoTopBarColor') }}</div>
 					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoTopBarColor') }}</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-color-picker v-model="getThemeConfig.topBarColor" size="default" @change="onBgColorPickerChange('topBarColor')"> </el-color-picker>
+						<el-color-picker v-model="getThemeConfig.topBarColor" @change="onBgColorPickerChange('topBarColor')"> </el-color-picker>
 					</div>
 					</div>
 				</div>
 				</div>
 				<div class="layout-breadcrumb-seting-bar-flex mt10">
 				<div class="layout-breadcrumb-seting-bar-flex mt10">
@@ -43,13 +43,13 @@
 				<div class="layout-breadcrumb-seting-bar-flex">
 				<div class="layout-breadcrumb-seting-bar-flex">
 					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoMenuBar') }}</div>
 					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoMenuBar') }}</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-color-picker v-model="getThemeConfig.menuBar" size="default" @change="onBgColorPickerChange('menuBar')"> </el-color-picker>
+						<el-color-picker v-model="getThemeConfig.menuBar" @change="onBgColorPickerChange('menuBar')"> </el-color-picker>
 					</div>
 					</div>
 				</div>
 				</div>
 				<div class="layout-breadcrumb-seting-bar-flex">
 				<div class="layout-breadcrumb-seting-bar-flex">
 					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoMenuBarColor') }}</div>
 					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoMenuBarColor') }}</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-color-picker v-model="getThemeConfig.menuBarColor" size="default" @change="onBgColorPickerChange('menuBarColor')"> </el-color-picker>
+						<el-color-picker v-model="getThemeConfig.menuBarColor" @change="onBgColorPickerChange('menuBarColor')"> </el-color-picker>
 					</div>
 					</div>
 				</div>
 				</div>
 				<div class="layout-breadcrumb-seting-bar-flex mt14">
 				<div class="layout-breadcrumb-seting-bar-flex mt14">
@@ -66,14 +66,14 @@
 				<div class="layout-breadcrumb-seting-bar-flex" :style="{ opacity: getThemeConfig.layout !== 'columns' ? 0.5 : 1 }">
 				<div class="layout-breadcrumb-seting-bar-flex" :style="{ opacity: getThemeConfig.layout !== 'columns' ? 0.5 : 1 }">
 					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoColumnsMenuBar') }}</div>
 					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoColumnsMenuBar') }}</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-color-picker v-model="getThemeConfig.columnsMenuBar" size="default" @change="onBgColorPickerChange('columnsMenuBar')" :disabled="getThemeConfig.layout !== 'columns'">
+						<el-color-picker v-model="getThemeConfig.columnsMenuBar" @change="onBgColorPickerChange('columnsMenuBar')" :disabled="getThemeConfig.layout !== 'columns'">
 						</el-color-picker>
 						</el-color-picker>
 					</div>
 					</div>
 				</div>
 				</div>
 				<div class="layout-breadcrumb-seting-bar-flex" :style="{ opacity: getThemeConfig.layout !== 'columns' ? 0.5 : 1 }">
 				<div class="layout-breadcrumb-seting-bar-flex" :style="{ opacity: getThemeConfig.layout !== 'columns' ? 0.5 : 1 }">
 					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoColumnsMenuBarColor') }}</div>
 					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.twoColumnsMenuBarColor') }}</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-color-picker v-model="getThemeConfig.columnsMenuBarColor" size="default" @change="onBgColorPickerChange('columnsMenuBarColor')" :disabled="getThemeConfig.layout !== 'columns'">
+						<el-color-picker v-model="getThemeConfig.columnsMenuBarColor" @change="onBgColorPickerChange('columnsMenuBarColor')" :disabled="getThemeConfig.layout !== 'columns'">
 						</el-color-picker>
 						</el-color-picker>
 					</div>
 					</div>
 				</div>
 				</div>
@@ -120,7 +120,7 @@
 				<div class="layout-breadcrumb-seting-bar-flex mt11">
 				<div class="layout-breadcrumb-seting-bar-flex mt11">
 					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.threeLockScreenTime') }}</div>
 					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.threeLockScreenTime') }}</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-input-number v-model="getThemeConfig.lockScreenTime" controls-position="right" :min="1" :max="9999" @change="setLocalThemeConfig" size="default" style="width: 90px">
+						<el-input-number v-model="getThemeConfig.lockScreenTime" controls-position="right" :min="1" :max="9999" @change="setLocalThemeConfig" style="width: 90px">
 						</el-input-number>
 						</el-input-number>
 					</div>
 					</div>
 				</div>
 				</div>
@@ -202,7 +202,7 @@
 				<div class="layout-breadcrumb-seting-bar-flex mt14">
 				<div class="layout-breadcrumb-seting-bar-flex mt14">
 					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourWartermarkText') }}</div>
 					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fourWartermarkText') }}</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-input v-model="getThemeConfig.wartermarkText" size="default" style="width: 90px" @input="onWartermarkTextInput($event)"></el-input>
+						<el-input v-model="getThemeConfig.wartermarkText" style="width: 90px" @input="onWartermarkTextInput($event)"></el-input>
 					</div>
 					</div>
 				</div>
 				</div>
 
 
@@ -211,7 +211,7 @@
 				<div class="layout-breadcrumb-seting-bar-flex mt15">
 				<div class="layout-breadcrumb-seting-bar-flex mt15">
 					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fiveTagsStyle') }}</div>
 					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fiveTagsStyle') }}</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-select v-model="getThemeConfig.tagsStyle" placeholder="请选择" size="default" style="width: 90px" @change="setLocalThemeConfig">
+						<el-select v-model="getThemeConfig.tagsStyle" placeholder="请选择" style="width: 90px" @change="setLocalThemeConfig">
 							<el-option label="风格1" value="tags-style-one"></el-option>
 							<el-option label="风格1" value="tags-style-one"></el-option>
 							<el-option label="风格4" value="tags-style-four"></el-option>
 							<el-option label="风格4" value="tags-style-four"></el-option>
 							<el-option label="风格5" value="tags-style-five"></el-option>
 							<el-option label="风格5" value="tags-style-five"></el-option>
@@ -221,7 +221,7 @@
 				<div class="layout-breadcrumb-seting-bar-flex mt15">
 				<div class="layout-breadcrumb-seting-bar-flex mt15">
 					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fiveAnimation') }}</div>
 					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fiveAnimation') }}</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-select v-model="getThemeConfig.animation" placeholder="请选择" size="default" style="width: 90px" @change="setLocalThemeConfig">
+						<el-select v-model="getThemeConfig.animation" placeholder="请选择" style="width: 90px" @change="setLocalThemeConfig">
 							<el-option label="slide-right" value="slide-right"></el-option>
 							<el-option label="slide-right" value="slide-right"></el-option>
 							<el-option label="slide-left" value="slide-left"></el-option>
 							<el-option label="slide-left" value="slide-left"></el-option>
 							<el-option label="opacitys" value="opacitys"></el-option>
 							<el-option label="opacitys" value="opacitys"></el-option>
@@ -231,7 +231,7 @@
 				<div class="layout-breadcrumb-seting-bar-flex mt15" :style="{ opacity: getThemeConfig.layout !== 'columns' ? 0.5 : 1 }">
 				<div class="layout-breadcrumb-seting-bar-flex mt15" :style="{ opacity: getThemeConfig.layout !== 'columns' ? 0.5 : 1 }">
 					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fiveColumnsAsideStyle') }}</div>
 					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fiveColumnsAsideStyle') }}</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-select v-model="getThemeConfig.columnsAsideStyle" placeholder="请选择" size="default" style="width: 90px" :disabled="getThemeConfig.layout !== 'columns' ? true : false" @change="setLocalThemeConfig">
+						<el-select v-model="getThemeConfig.columnsAsideStyle" placeholder="请选择" style="width: 90px" :disabled="getThemeConfig.layout !== 'columns' ? true : false" @change="setLocalThemeConfig">
 							<el-option label="圆角" value="columns-round"></el-option>
 							<el-option label="圆角" value="columns-round"></el-option>
 							<el-option label="卡片" value="columns-card"></el-option>
 							<el-option label="卡片" value="columns-card"></el-option>
 						</el-select>
 						</el-select>
@@ -240,7 +240,7 @@
 				<div class="layout-breadcrumb-seting-bar-flex mt15 mb27" :style="{ opacity: getThemeConfig.layout !== 'columns' ? 0.5 : 1 }">
 				<div class="layout-breadcrumb-seting-bar-flex mt15 mb27" :style="{ opacity: getThemeConfig.layout !== 'columns' ? 0.5 : 1 }">
 					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fiveColumnsAsideLayout') }}</div>
 					<div class="layout-breadcrumb-seting-bar-flex-label">{{ $t('message.layout.fiveColumnsAsideLayout') }}</div>
 					<div class="layout-breadcrumb-seting-bar-flex-value">
 					<div class="layout-breadcrumb-seting-bar-flex-value">
-						<el-select v-model="getThemeConfig.columnsAsideLayout" placeholder="请选择" size="default" style="width: 90px" :disabled="getThemeConfig.layout !== 'columns' ? true : false" @change="setLocalThemeConfig">
+						<el-select v-model="getThemeConfig.columnsAsideLayout" placeholder="请选择" style="width: 90px" :disabled="getThemeConfig.layout !== 'columns' ? true : false" @change="setLocalThemeConfig">
 							<el-option label="水平" value="columns-horizontal"></el-option>
 							<el-option label="水平" value="columns-horizontal"></el-option>
 							<el-option label="垂直" value="columns-vertical"></el-option>
 							<el-option label="垂直" value="columns-vertical"></el-option>
 						</el-select>
 						</el-select>
@@ -317,13 +317,13 @@
 				</div>
 				</div>
 				<div class="copy-config">
 				<div class="copy-config">
 					<el-alert :title="$t('message.layout.tipText')" type="warning" :closable="false"> </el-alert>
 					<el-alert :title="$t('message.layout.tipText')" type="warning" :closable="false"> </el-alert>
-					<el-button size="default" class="copy-config-btn" type="primary" ref="copyConfigBtnRef" @click="onCopyConfigClick">
+					<el-button class="copy-config-btn" type="primary" ref="copyConfigBtnRef" @click="onCopyConfigClick">
 						<el-icon class="mr5">
 						<el-icon class="mr5">
 							<ele-CopyDocument />
 							<ele-CopyDocument />
 						</el-icon>
 						</el-icon>
 						{{ $t('message.layout.copyText') }}
 						{{ $t('message.layout.copyText') }}
 					</el-button>
 					</el-button>
-					<el-button size="default" class="copy-config-btn-reset" type="info" @click="onResetConfigClick">
+					<el-button class="copy-config-btn-reset" type="info" @click="onResetConfigClick">
 						<el-icon class="mr5">
 						<el-icon class="mr5">
 							<ele-RefreshRight />
 							<ele-RefreshRight />
 						</el-icon>
 						</el-icon>

+ 2 - 1
src/theme/fast.scss

@@ -25,7 +25,8 @@
 		transition: all ease 0.3s;
 		transition: all ease 0.3s;
 	}
 	}
 
 
-	>.el-card {
+	>.el-card,
+	&.el-card {
 		height: 100%;
 		height: 100%;
 
 
 		>.el-card__body {
 		>.el-card__body {

+ 1 - 1
src/views/iot/alarm/log/component/detail.vue

@@ -33,7 +33,7 @@
       </el-form>
       </el-form>
       <template #footer>
       <template #footer>
         <span class="dialog-footer">
         <span class="dialog-footer">
-          <el-button @click="onCancel" size="default">取 消</el-button>
+          <el-button @click="onCancel">取 消</el-button>
         </span>
         </span>
       </template>
       </template>
     </el-dialog>
     </el-dialog>

+ 3 - 3
src/views/iot/alarm/log/component/edit.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
 	<div class="system-edit-dic-container">
 	<div class="system-edit-dic-container">
 		<el-dialog title="告警处理" v-model="isShowDialog" width="769px">
 		<el-dialog title="告警处理" v-model="isShowDialog" width="769px">
-			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="110px">
+			<el-form :model="ruleForm" ref="formRef" :rules="rules" label-width="110px">
 				<el-form-item label="处理状态" prop="status">
 				<el-form-item label="处理状态" prop="status">
 					<el-radio-group v-model="ruleForm.status">
 					<el-radio-group v-model="ruleForm.status">
 						<el-radio :label="1">已处理</el-radio>
 						<el-radio :label="1">已处理</el-radio>
@@ -14,8 +14,8 @@
 			</el-form>
 			</el-form>
 			<template #footer>
 			<template #footer>
 				<span class="dialog-footer">
 				<span class="dialog-footer">
-					<el-button @click="onCancel" size="default">取 消</el-button>
-					<el-button type="primary" @click="onSubmit" size="default">确定</el-button>
+					<el-button @click="onCancel">取 消</el-button>
+					<el-button type="primary" @click="onSubmit">确定</el-button>
 				</span>
 				</span>
 			</template>
 			</template>
 		</el-dialog>
 		</el-dialog>

+ 5 - 5
src/views/iot/alarm/log/index.vue

@@ -1,25 +1,25 @@
 <template>
 <template>
 	<div class="page">
 	<div class="page">
 		<el-card shadow="nover">
 		<el-card shadow="nover">
-			<el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px">
+			<el-form :model="tableData.param" ref="queryRef" inline label-width="68px">
 				<el-form-item label="创建时间" prop="dateRange">
 				<el-form-item label="创建时间" prop="dateRange">
-					<el-date-picker v-model="tableData.param.dateRange" size="default" style="width: 240px" value-format="YYYY-MM-DD" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+					<el-date-picker v-model="tableData.param.dateRange" style="width: 240px" value-format="YYYY-MM-DD" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
 				</el-form-item>
 				</el-form-item>
 				<el-form-item label="告警状态" prop="status" style="width: 200px;">
 				<el-form-item label="告警状态" prop="status" style="width: 200px;">
-					<el-select v-model="tableData.param.status" placeholder="告警状态" clearable size="default" style="width: 240px">
+					<el-select v-model="tableData.param.status" placeholder="告警状态" clearable style="width: 240px">
 						<el-option label="未处理" :value="0" />
 						<el-option label="未处理" :value="0" />
 						<el-option label="已处理" :value="1" />
 						<el-option label="已处理" :value="1" />
 						<el-option label="已忽略" :value="2" />
 						<el-option label="已忽略" :value="2" />
 					</el-select>
 					</el-select>
 				</el-form-item>
 				</el-form-item>
 				<el-form-item>
 				<el-form-item>
-					<el-button size="default" type="primary" class="ml10" @click="typeList">
+					<el-button type="primary" class="ml10" @click="typeList">
 						<el-icon>
 						<el-icon>
 							<ele-Search />
 							<ele-Search />
 						</el-icon>
 						</el-icon>
 						查询
 						查询
 					</el-button>
 					</el-button>
-					<el-button size="default" @click="resetQuery(queryRef)">
+					<el-button @click="resetQuery(queryRef)">
 						<el-icon>
 						<el-icon>
 							<ele-Refresh />
 							<ele-Refresh />
 						</el-icon>
 						</el-icon>

+ 3 - 3
src/views/iot/alarm/setting/component/edit.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
 	<div class="system-edit-dic-container">
 	<div class="system-edit-dic-container">
 		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '告警'" v-model="isShowDialog" width="50%">
 		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '告警'" v-model="isShowDialog" width="50%">
-			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" v-if="isShowDialog" label-width="110px">
+			<el-form :model="ruleForm" ref="formRef" :rules="rules" v-if="isShowDialog" label-width="110px">
 				<el-form-item label="名称" prop="name">
 				<el-form-item label="名称" prop="name">
 					<el-input v-model="ruleForm.name" placeholder="请输入名称" />
 					<el-input v-model="ruleForm.name" placeholder="请输入名称" />
 				</el-form-item>
 				</el-form-item>
@@ -171,8 +171,8 @@
 			</el-form>
 			</el-form>
 			<template #footer>
 			<template #footer>
 				<span class="dialog-footer">
 				<span class="dialog-footer">
-					<el-button @click="onCancel" size="default">取 消</el-button>
-					<el-button type="primary" @click="onSubmit" size="default">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
+					<el-button @click="onCancel">取 消</el-button>
+					<el-button type="primary" @click="onSubmit">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
 				</span>
 				</span>
 			</template>
 			</template>
 		</el-dialog>
 		</el-dialog>

+ 3 - 3
src/views/iot/alarm/setting/component/level.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
 	<div class="system-edit-dept-container">
 	<div class="system-edit-dept-container">
 		<el-dialog title="设置告警级别" v-model="isShowDialog" width="769px">
 		<el-dialog title="设置告警级别" v-model="isShowDialog" width="769px">
-			<el-form ref="formRef" :model="ruleForm" :rules="rules" size="default" label-width="90px">
+			<el-form ref="formRef" :model="ruleForm" :rules="rules" label-width="90px">
 				<el-row :gutter="35">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-for="(item, index) in levelData" :key="index">
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-for="(item, index) in levelData" :key="index">
 						<el-form-item :label="'级别' + item.level" prop="name" required>
 						<el-form-item :label="'级别' + item.level" prop="name" required>
@@ -12,8 +12,8 @@
 			</el-form>
 			</el-form>
 			<template #footer>
 			<template #footer>
 				<span class="dialog-footer">
 				<span class="dialog-footer">
-					<el-button @click="onCancel" size="default">取 消</el-button>
-					<el-button type="primary" @click="onSubmit" size="default">设置</el-button>
+					<el-button @click="onCancel">取 消</el-button>
+					<el-button type="primary" @click="onSubmit">设置</el-button>
 				</span>
 				</span>
 			</template>
 			</template>
 		</el-dialog>
 		</el-dialog>

+ 7 - 7
src/views/iot/alarm/setting/index.vue

@@ -1,15 +1,15 @@
 <template>
 <template>
 	<div class="page page-full">
 	<div class="page page-full">
 		<div class="">
 		<div class="">
-			<el-form :model="tableData.param" ref="queryRef" :inline="true">
+			<el-form :model="tableData.param" ref="queryRef" inline>
 				<el-form-item class="mb-0">
 				<el-form-item class="mb-0">
-					<el-button size="default" type="primary" class="ml10" @click="onOpenAdd" v-auth="'add'">
+					<el-button type="primary" class="ml10" @click="onOpenAdd" v-auth="'add'">
 						<el-icon>
 						<el-icon>
 							<ele-FolderAdd />
 							<ele-FolderAdd />
 						</el-icon>
 						</el-icon>
 						新增告警
 						新增告警
 					</el-button>
 					</el-button>
-					<el-button size="default" type="primary" class="ml10" @click="onOpenLevel" v-auth="'level'">
+					<el-button type="primary" class="ml10" @click="onOpenLevel" v-auth="'level'">
 						<el-icon>
 						<el-icon>
 							<ele-Setting />
 							<ele-Setting />
 						</el-icon>
 						</el-icon>
@@ -67,28 +67,28 @@
 						</div>
 						</div>
 					</div>
 					</div>
 					<div class="card-tools">
 					<div class="card-tools">
-						<el-button size="default" type="primary" text bg @click="onOpenEdit(item)" v-auth="'edit'">
+						<el-button type="primary" text bg @click="onOpenEdit(item)" v-auth="'edit'">
 							<el-icon>
 							<el-icon>
 								<ele-Edit />
 								<ele-Edit />
 							</el-icon>
 							</el-icon>
 							修改
 							修改
 						</el-button>
 						</el-button>
 
 
-						<el-button size="default" type="warning" text bg @click="onActionStatus(item)" v-if="item.status == 0" v-auth="'status'">
+						<el-button type="warning" text bg @click="onActionStatus(item)" v-if="item.status == 0" v-auth="'status'">
 							<el-icon>
 							<el-icon>
 								<ele-Check />
 								<ele-Check />
 							</el-icon>
 							</el-icon>
 							启用
 							启用
 						</el-button>
 						</el-button>
 
 
-						<el-button size="default" type="info" text bg @click="onActionStatus(item)" v-if="item.status == 1" v-auth="'status'">
+						<el-button type="info" text bg @click="onActionStatus(item)" v-if="item.status == 1" v-auth="'status'">
 							<el-icon>
 							<el-icon>
 								<ele-Close />
 								<ele-Close />
 							</el-icon>
 							</el-icon>
 							禁用
 							禁用
 						</el-button>
 						</el-button>
 
 
-						<el-button size="default" type="info" text bg @click="onRowDel(item)" v-auth="'del'">
+						<el-button type="info" text bg @click="onRowDel(item)" v-auth="'del'">
 							<el-icon>
 							<el-icon>
 								<ele-Delete />
 								<ele-Delete />
 							</el-icon>
 							</el-icon>

+ 5 - 5
src/views/iot/certificate/component/editParams.vue

@@ -9,26 +9,26 @@
 				</el-select>
 				</el-select>
 			</el-form-item>
 			</el-form-item>
 			<el-form-item label="证书名称" prop="name">
 			<el-form-item label="证书名称" prop="name">
-				<el-input size="default" v-model.trim="state.ruleForm.name"></el-input>
+				<el-input v-model.trim="state.ruleForm.name"></el-input>
 			</el-form-item>
 			</el-form-item>
 			<el-form-item label="证书文件" prop="fileContent">
 			<el-form-item label="证书文件" prop="fileContent">
-				<el-input disabled v-if="state.ruleForm.fileContent" size="default" v-model="state.ruleForm.fileContent"></el-input>
+				<el-input disabled v-if="state.ruleForm.fileContent" v-model="state.ruleForm.fileContent"></el-input>
 				<uploadFile @update="updateFile"></uploadFile>
 				<uploadFile @update="updateFile"></uploadFile>
 			</el-form-item>
 			</el-form-item>
 			<el-form-item label="证书公钥" prop="publicKeyContent">
 			<el-form-item label="证书公钥" prop="publicKeyContent">
-				<el-input size="default" disabled type="textarea" :rows="6" v-model="state.ruleForm.publicKeyContent"></el-input>
+				<el-input disabled type="textarea" :rows="6" v-model="state.ruleForm.publicKeyContent"></el-input>
 				<el-upload class="upload-demo" action="" accept=".txt" :on-change="beforePublicUpload" :auto-upload="false">
 				<el-upload class="upload-demo" action="" accept=".txt" :on-change="beforePublicUpload" :auto-upload="false">
 					<el-button size="small" type="primary">上传</el-button>
 					<el-button size="small" type="primary">上传</el-button>
 				</el-upload>
 				</el-upload>
 			</el-form-item>
 			</el-form-item>
 			<el-form-item label="证书私钥" prop="privateKeyContent">
 			<el-form-item label="证书私钥" prop="privateKeyContent">
-				<el-input size="default" disabled type="textarea" :rows="6" v-model="state.ruleForm.privateKeyContent"></el-input>
+				<el-input disabled type="textarea" :rows="6" v-model="state.ruleForm.privateKeyContent"></el-input>
 				<el-upload class="upload-demo" action="" accept=".txt" :on-change="beforePrivateUpload" :auto-upload="false">
 				<el-upload class="upload-demo" action="" accept=".txt" :on-change="beforePrivateUpload" :auto-upload="false">
 					<el-button size="small" type="primary">上传</el-button>
 					<el-button size="small" type="primary">上传</el-button>
 				</el-upload>
 				</el-upload>
 			</el-form-item>
 			</el-form-item>
 			<el-form-item label="说明">
 			<el-form-item label="说明">
-				<el-input size="default" type="textarea" :rows="6" v-model="state.ruleForm.description"></el-input>
+				<el-input type="textarea" :rows="6" v-model="state.ruleForm.description"></el-input>
 			</el-form-item>
 			</el-form-item>
 		</el-form>
 		</el-form>
 
 

+ 5 - 5
src/views/iot/certificate/index.vue

@@ -1,24 +1,24 @@
 <template>
 <template>
 	<div class="page">
 	<div class="page">
 		<el-card shadow="nover">
 		<el-card shadow="nover">
-			<el-form :model="state.tableData.param" ref="queryRef" :inline="true" label-width="60px">
+			<el-form :model="state.tableData.param" ref="queryRef" inline label-width="60px">
 				<el-form-item label="关键字" prop="keyWord">
 				<el-form-item label="关键字" prop="keyWord">
-					<el-input v-model="state.tableData.param.name" placeholder="请输入关键字" clearable size="default" @keyup.enter="queryList" />
+					<el-input v-model="state.tableData.param.name" placeholder="请输入关键字" clearable @keyup.enter="queryList" />
 				</el-form-item>
 				</el-form-item>
 				<el-form-item>
 				<el-form-item>
-					<el-button v-auth="'query'" size="default" type="primary" class="ml10" @click="queryList">
+					<el-button v-auth="'query'" type="primary" class="ml10" @click="queryList">
 						<el-icon>
 						<el-icon>
 							<ele-Search />
 							<ele-Search />
 						</el-icon>
 						</el-icon>
 						查询
 						查询
 					</el-button>
 					</el-button>
-					<el-button v-auth="'reset'" size="default" @click="resetQuery(queryRef)">
+					<el-button v-auth="'reset'" @click="resetQuery(queryRef)">
 						<el-icon>
 						<el-icon>
 							<ele-Refresh />
 							<ele-Refresh />
 						</el-icon>
 						</el-icon>
 						重置
 						重置
 					</el-button>
 					</el-button>
-					<el-button v-auth="'add'" size="default" type="primary" class="ml10" @click="operate('add')">
+					<el-button v-auth="'add'" type="primary" class="ml10" @click="operate('add')">
 						<el-icon>
 						<el-icon>
 							<ele-FolderAdd />
 							<ele-FolderAdd />
 						</el-icon>
 						</el-icon>

+ 3 - 3
src/views/iot/configuration/list/index.vue

@@ -2,11 +2,11 @@
   <div class="page">
   <div class="page">
     <el-card shadow="nover">
     <el-card shadow="nover">
       <div class="search">
       <div class="search">
-        <el-form :inline="true">
+        <el-form inline>
           <el-form-item>
           <el-form-item>
-            <el-input size="default" v-model="params.keyWord" style="width: 200px; margin-left: 20px" class="search-input" placeholder="请输入搜索关键字" @keyup.enter.native="getList(1)" clearable>
+            <el-input v-model="params.keyWord" style="width: 200px; margin-left: 20px" class="search-input" placeholder="请输入搜索关键字" @keyup.enter.native="getList(1)" clearable>
             </el-input>
             </el-input>
-            <el-button size="default" type="primary" class="ml10" @click="getList(1)">
+            <el-button type="primary" class="ml10" @click="getList(1)">
               <el-icon>
               <el-icon>
                 <ele-Search />
                 <ele-Search />
               </el-icon>
               </el-icon>

+ 1 - 1
src/views/iot/configuration/screen/index.vue

@@ -2,7 +2,7 @@
   <div class="page">
   <div class="page">
     <el-card shadow="nover">
     <el-card shadow="nover">
       <div class="search">
       <div class="search">
-        <el-form :inline="true">
+        <el-form inline>
           <el-form-item>
           <el-form-item>
             <el-button type="primary" v-auth="'add'" @click="addOrEdit()">
             <el-button type="primary" v-auth="'add'" @click="addOrEdit()">
               <el-icon>
               <el-icon>

+ 3 - 3
src/views/iot/device-tree/tree/component/edit.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
 	<div class="system-edit-dept-container">
 	<div class="system-edit-dept-container">
 		<el-dialog :title="(ruleForm.id ? '修改' : '添加') + '设备树'" v-model="isShowDialog" width="769px">
 		<el-dialog :title="(ruleForm.id ? '修改' : '添加') + '设备树'" v-model="isShowDialog" width="769px">
-			<el-form ref="formRef" :model="ruleForm" :rules="rules" size="default" label-width="120px">
+			<el-form ref="formRef" :model="ruleForm" :rules="rules" label-width="120px">
 				<el-row :gutter="35">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
 						<el-form-item label="设备树" prop="parentId">
 						<el-form-item label="设备树" prop="parentId">
@@ -86,8 +86,8 @@
 			</el-form>
 			</el-form>
 			<template #footer>
 			<template #footer>
 				<span class="dialog-footer">
 				<span class="dialog-footer">
-					<el-button @click="onCancel" size="default">取 消</el-button>
-					<el-button type="primary" @click="onSubmit" size="default">{{ ruleForm.id ? '修 改' : '添 加' }}</el-button>
+					<el-button @click="onCancel">取 消</el-button>
+					<el-button type="primary" @click="onSubmit">{{ ruleForm.id ? '修 改' : '添 加' }}</el-button>
 				</span>
 				</span>
 			</template>
 			</template>
 		</el-dialog>
 		</el-dialog>

+ 3 - 3
src/views/iot/device-tree/tree/index.vue

@@ -4,7 +4,7 @@
       <el-col :span="6" class="h-full">
       <el-col :span="6" class="h-full">
         <el-card shadow="nover" class="h-full">
         <el-card shadow="nover" class="h-full">
           <el-scrollbar v-loading="treeLoading">
           <el-scrollbar v-loading="treeLoading">
-            <el-input :prefix-icon="Search" v-model="searchVal" placeholder="请输入设备树名称" clearable size="default" style="width: 100%;" />
+            <el-input :prefix-icon="Search" v-model="searchVal" placeholder="请输入设备树名称" clearable style="width: 100%;" />
             <el-button v-if="!treeLoading && !treeData.length" type="primary" v-auth="'add'" class="mt-2" @click="operateCmd('add', {})" style="width: 100%">新建节点</el-button>
             <el-button v-if="!treeLoading && !treeData.length" type="primary" v-auth="'add'" class="mt-2" @click="operateCmd('add', {})" style="width: 100%">新建节点</el-button>
             <el-tree ref="zlTreeSearchRef" class="mt-4" v-if="!treeLoading" :data="treeData" :props="{
             <el-tree ref="zlTreeSearchRef" class="mt-4" v-if="!treeLoading" :data="treeData" :props="{
               children: 'children',
               children: 'children',
@@ -52,10 +52,10 @@
       </el-col>
       </el-col>
       <el-col :span="18" class="h-full">
       <el-col :span="18" class="h-full">
         <el-card shadow="nover" class="h-full" v-if="treeDetail.name">
         <el-card shadow="nover" class="h-full" v-if="treeDetail.name">
-          <el-form :model="ruleForm" ref="formRef" size="default" label-width="80px">
+          <el-form :model="ruleForm" ref="formRef" label-width="80px">
             <el-tabs v-model="tabName" @tab-click="onTabClick">
             <el-tabs v-model="tabName" @tab-click="onTabClick">
               <el-tab-pane label="设备树信息" name="1">
               <el-tab-pane label="设备树信息" name="1">
-                <el-descriptions class="margin-top" :column="3" size="default" border>
+                <el-descriptions class="margin-top" :column="3" border>
                   <el-descriptions-item label="名称">{{ treeDetail.name }}</el-descriptions-item>
                   <el-descriptions-item label="名称">{{ treeDetail.name }}</el-descriptions-item>
                   <el-descriptions-item label="设备标识">{{ treeDetail.deviceKey }}</el-descriptions-item>
                   <el-descriptions-item label="设备标识">{{ treeDetail.deviceKey }}</el-descriptions-item>
                   <el-descriptions-item label="联系人">{{ treeDetail.contact }}</el-descriptions-item>
                   <el-descriptions-item label="联系人">{{ treeDetail.contact }}</el-descriptions-item>

+ 3 - 3
src/views/iot/device/category/component/edit.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
 	<div class="system-edit-dept-container">
 	<div class="system-edit-dept-container">
 		<el-dialog :title="(ruleForm.id ? '修改' : '添加') + '分类'" v-model="isShowDialog" width="769px">
 		<el-dialog :title="(ruleForm.id ? '修改' : '添加') + '分类'" v-model="isShowDialog" width="769px">
-			<el-form ref="formRef" :model="ruleForm" :rules="rules" size="default" label-width="90px">
+			<el-form ref="formRef" :model="ruleForm" :rules="rules" label-width="90px">
 				<el-row :gutter="35">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="上级分类">
 						<el-form-item label="上级分类">
@@ -37,8 +37,8 @@
 			</el-form>
 			</el-form>
 			<template #footer>
 			<template #footer>
 				<span class="dialog-footer">
 				<span class="dialog-footer">
-					<el-button @click="onCancel" size="default">取 消</el-button>
-					<el-button type="primary" @click="onSubmit" size="default"  :loading="loading">{{ ruleForm.id ? '修 改' : '添 加' }}</el-button>
+					<el-button @click="onCancel">取 消</el-button>
+					<el-button type="primary" @click="onSubmit"  :loading="loading">{{ ruleForm.id ? '修 改' : '添 加' }}</el-button>
 				</span>
 				</span>
 			</template>
 			</template>
 		</el-dialog>
 		</el-dialog>

+ 4 - 4
src/views/iot/device/category/index.vue

@@ -1,18 +1,18 @@
 <template>
 <template>
   <div class="page">
   <div class="page">
     <el-card shadow="nover">
     <el-card shadow="nover">
-      <el-form :inline="true">
+      <el-form inline>
         <el-form-item label="分类名称">
         <el-form-item label="分类名称">
-          <el-input size="default" v-model="tableData.param.name" placeholder="请输入分类名称" @keyup.enter.native="getCateList" class="w-50" clearable />
+          <el-input v-model="tableData.param.name" placeholder="请输入分类名称" @keyup.enter.native="getCateList" class="w-50" clearable />
         </el-form-item>
         </el-form-item>
         <el-form-item>
         <el-form-item>
-          <el-button size="default" type="primary" class="ml10" @click="getCateList">
+          <el-button type="primary" class="ml10" @click="getCateList">
             <el-icon>
             <el-icon>
               <ele-Search />
               <ele-Search />
             </el-icon>
             </el-icon>
             查询
             查询
           </el-button>
           </el-button>
-          <el-button size="default" type="primary" class="ml10" @click="onOpenAdd" v-auth="'add'">
+          <el-button type="primary" class="ml10" @click="onOpenAdd" v-auth="'add'">
             <el-icon>
             <el-icon>
               <ele-FolderAdd />
               <ele-FolderAdd />
             </el-icon>
             </el-icon>

+ 3 - 3
src/views/iot/device/channel/index.vue

@@ -10,7 +10,7 @@
 	<div class="page">
 	<div class="page">
 		<el-card shadow="nover">
 		<el-card shadow="nover">
 			<div class="search">
 			<div class="search">
-				<el-form :model="params" :inline="true" ref="queryRef" @keyup.enter.native="getList(1)">
+				<el-form :model="params" inline ref="queryRef" @keyup.enter.native="getList(1)">
 					<el-form-item label="通道名称" prop="title">
 					<el-form-item label="通道名称" prop="title">
 						<el-input v-model="params.title" placeholder="请输入通道名称" clearable style="width: 240px" />
 						<el-input v-model="params.title" placeholder="请输入通道名称" clearable style="width: 240px" />
 					</el-form-item>
 					</el-form-item>
@@ -18,13 +18,13 @@
 						<el-input v-model="params.number" placeholder="请输入注册码" clearable style="width: 240px" />
 						<el-input v-model="params.number" placeholder="请输入注册码" clearable style="width: 240px" />
 					</el-form-item>
 					</el-form-item>
 					<el-form-item>
 					<el-form-item>
-						<el-button size="default" type="primary" class="ml10" @click="getList(1)">
+						<el-button type="primary" class="ml10" @click="getList(1)">
 							<el-icon>
 							<el-icon>
 								<ele-Search />
 								<ele-Search />
 							</el-icon>
 							</el-icon>
 							查询
 							查询
 						</el-button>
 						</el-button>
-						<el-button size="default" @click="resetQuery()">
+						<el-button @click="resetQuery()">
 							<el-icon>
 							<el-icon>
 								<ele-Refresh />
 								<ele-Refresh />
 							</el-icon>
 							</el-icon>

+ 3 - 3
src/views/iot/device/instance/component/edit.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
   <div class="system-edit-dic-container">
   <div class="system-edit-dic-container">
     <el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '设备'" v-model="isShowDialog" width="769px">
     <el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '设备'" v-model="isShowDialog" width="769px">
-      <el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="110px">
+      <el-form :model="ruleForm" ref="formRef" :rules="rules" label-width="110px">
         <el-form-item label="设备标识" prop="key">
         <el-form-item label="设备标识" prop="key">
           <el-input v-model="ruleForm.key" placeholder="请输入设备标识" :disabled="ruleForm.id" />
           <el-input v-model="ruleForm.key" placeholder="请输入设备标识" :disabled="ruleForm.id" />
         </el-form-item>
         </el-form-item>
@@ -74,8 +74,8 @@
       </el-form>
       </el-form>
       <template #footer>
       <template #footer>
         <span class="dialog-footer">
         <span class="dialog-footer">
-          <el-button @click="onCancel" size="default">取 消</el-button>
-          <el-button type="primary" @click="onSubmit" size="default">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
+          <el-button @click="onCancel">取 消</el-button>
+          <el-button type="primary" @click="onSubmit">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
         </span>
         </span>
       </template>
       </template>
     </el-dialog>
     </el-dialog>

+ 3 - 3
src/views/iot/device/instance/component/excel.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
   <div class="system-edit-dic-container">
   <div class="system-edit-dic-container">
     <el-dialog :title="(open_type === 'upload' ? '导入' : '导出') + '设备'" v-model="isShowDialog" width="769px">
     <el-dialog :title="(open_type === 'upload' ? '导入' : '导出') + '设备'" v-model="isShowDialog" width="769px">
-      <el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="110px">
+      <el-form :model="ruleForm" ref="formRef" :rules="rules" label-width="110px">
 
 
         <el-form-item label="所属产品" prop="productId">
         <el-form-item label="所属产品" prop="productId">
           <el-select v-model="ruleForm.productId" placeholder="请选择所属产品" class="w100">
           <el-select v-model="ruleForm.productId" placeholder="请选择所属产品" class="w100">
@@ -29,8 +29,8 @@
       </el-form>
       </el-form>
       <template #footer>
       <template #footer>
         <span class="dialog-footer">
         <span class="dialog-footer">
-          <el-button @click="onCancel" size="default">取 消</el-button>
-          <el-button type="primary" @click="onSubmit" size="default" v-if="open_type !== 'upload'">{{ open_type === 'upload' ? '导入设备' : '导出设备'
+          <el-button @click="onCancel">取 消</el-button>
+          <el-button type="primary" @click="onSubmit" v-if="open_type !== 'upload'">{{ open_type === 'upload' ? '导入设备' : '导出设备'
           }}</el-button>
           }}</el-button>
         </span>
         </span>
       </template>
       </template>

+ 2 - 2
src/views/iot/device/instance/component/setAttr.vue

@@ -34,8 +34,8 @@
     </el-form>
     </el-form>
     <template #footer>
     <template #footer>
       <span class="dialog-footer">
       <span class="dialog-footer">
-        <el-button @click="visiable = false" size="default">取 消</el-button>
-        <el-button type="primary" @click="onSubmit" size="default" :loading="loading">设 置</el-button>
+        <el-button @click="visiable = false">取 消</el-button>
+        <el-button type="primary" @click="onSubmit" :loading="loading">设 置</el-button>
       </span>
       </span>
     </template>
     </template>
   </el-dialog>
   </el-dialog>

+ 4 - 4
src/views/iot/device/instance/component/subDevice.vue

@@ -239,9 +239,9 @@
 					</el-tab-pane>
 					</el-tab-pane>
 					<el-tab-pane label="日志管理" name="4">
 					<el-tab-pane label="日志管理" name="4">
 						<div class="system-user-search mb15">
 						<div class="system-user-search mb15">
-							<el-form :model="logtableData.param" ref="queryRef" :inline="true" label-width="68px">
+							<el-form :model="logtableData.param" ref="queryRef" inline label-width="68px">
 								<el-form-item label="日志类型" prop="types">
 								<el-form-item label="日志类型" prop="types">
-									<el-select v-model="logtableData.param.types" placeholder="日志类型" clearable size="default">
+									<el-select v-model="logtableData.param.types" placeholder="日志类型" clearable>
 										<el-option v-for="item in logTypeData" :key="item" :label="item" :value="item" />
 										<el-option v-for="item in logTypeData" :key="item" :label="item" :value="item" />
 									</el-select>
 									</el-select>
 								</el-form-item>
 								</el-form-item>
@@ -258,13 +258,13 @@
 									></el-date-picker>
 									></el-date-picker>
 								</el-form-item>
 								</el-form-item>
 								<el-form-item>
 								<el-form-item>
-									<el-button size="default" type="primary" class="ml10" @click="getlog">
+									<el-button type="primary" class="ml10" @click="getlog">
 										<el-icon>
 										<el-icon>
 											<ele-Search />
 											<ele-Search />
 										</el-icon>
 										</el-icon>
 										查询
 										查询
 									</el-button>
 									</el-button>
-									<el-button size="default" @click="resetQuery(queryRef)">
+									<el-button @click="resetQuery(queryRef)">
 										<el-icon>
 										<el-icon>
 											<ele-Refresh />
 											<ele-Refresh />
 										</el-icon>
 										</el-icon>

+ 3 - 3
src/views/iot/device/instance/component/tag.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
   <el-dialog title="标签设置" v-model="isShowDialog" width="500px">
   <el-dialog title="标签设置" v-model="isShowDialog" width="500px">
-    <el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="110px">
+    <el-form :model="ruleForm" ref="formRef" :rules="rules" label-width="110px">
       <el-form-item label="标签键名" prop="key">
       <el-form-item label="标签键名" prop="key">
         <el-input v-model="ruleForm.key" placeholder="请输入标签键名" />
         <el-input v-model="ruleForm.key" placeholder="请输入标签键名" />
       </el-form-item>
       </el-form-item>
@@ -14,8 +14,8 @@
       </el-form-item>
       </el-form-item>
     </el-form>
     </el-form>
     <template #footer>
     <template #footer>
-      <el-button @click="isShowDialog = false" size="default">取 消</el-button>
-      <el-button type="primary" @click="onSubmit" size="default">添 加</el-button>
+      <el-button @click="isShowDialog = false">取 消</el-button>
+      <el-button type="primary" @click="onSubmit">添 加</el-button>
     </template>
     </template>
   </el-dialog>
   </el-dialog>
 </template>
 </template>

+ 6 - 6
src/views/iot/device/instance/detail.vue

@@ -276,25 +276,25 @@
         </el-tab-pane>
         </el-tab-pane>
         <el-tab-pane label="日志管理" name="4">
         <el-tab-pane label="日志管理" name="4">
           <div class="system-user-search mb15">
           <div class="system-user-search mb15">
-            <el-form :model="logtableData.param" ref="logqueryRef" :inline="true" label-width="68px">
+            <el-form :model="logtableData.param" ref="logqueryRef" inline label-width="68px">
               <el-form-item label="日志类型" prop="types">
               <el-form-item label="日志类型" prop="types">
-                <el-select v-model="logtableData.param.types" placeholder="日志类型" clearable size="default">
+                <el-select v-model="logtableData.param.types" placeholder="日志类型" clearable>
                   <el-option v-for="item in logTypeData" :key="item" :label="item" :value="item" />
                   <el-option v-for="item in logTypeData" :key="item" :label="item" :value="item" />
                 </el-select>
                 </el-select>
               </el-form-item>
               </el-form-item>
 
 
               <el-form-item label="创建时间" prop="dateRange">
               <el-form-item label="创建时间" prop="dateRange">
-                <el-date-picker v-model="logtableData.param.dateRange" size="default" value-format="YYYY-MM-DD"
+                <el-date-picker v-model="logtableData.param.dateRange" value-format="YYYY-MM-DD"
                   type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
                   type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
               </el-form-item>
               </el-form-item>
               <el-form-item>
               <el-form-item>
-                <el-button size="default" type="primary" class="ml10" @click="getlog">
+                <el-button type="primary" class="ml10" @click="getlog">
                   <el-icon>
                   <el-icon>
                     <ele-Search />
                     <ele-Search />
                   </el-icon>
                   </el-icon>
                   查询
                   查询
                 </el-button>
                 </el-button>
-                <el-button size="default" @click="resetQuery(logqueryRef)">
+                <el-button @click="resetQuery(logqueryRef)">
                   <el-icon>
                   <el-icon>
                     <ele-Refresh />
                     <ele-Refresh />
                   </el-icon>
                   </el-icon>
@@ -362,7 +362,7 @@
 
 
         </el-tab-pane>
         </el-tab-pane>
         <el-tab-pane label="设备扩展属性信息" name="7">
         <el-tab-pane label="设备扩展属性信息" name="7">
-          <el-form size="default" label-width="110px">
+          <el-form label-width="110px">
             <el-form-item label="设备图片">
             <el-form-item label="设备图片">
               <el-image class="mr20" style="border: 1px solid #e5e5e5;border-radius: 8px;width: 100px;height: 100px;object-fit: contain;" :src="item" v-for="(item, index) in phone" :key="index" />
               <el-image class="mr20" style="border: 1px solid #e5e5e5;border-radius: 8px;width: 100px;height: 100px;object-fit: contain;" :src="item" v-for="(item, index) in phone" :key="index" />
             </el-form-item>
             </el-form-item>

+ 13 - 13
src/views/iot/device/instance/index.vue

@@ -2,12 +2,12 @@
   <div class="page">
   <div class="page">
     <el-card shadow="nover" v-loading="batchLoading">
     <el-card shadow="nover" v-loading="batchLoading">
       <div class="system-user-search mb15">
       <div class="system-user-search mb15">
-        <el-form :model="tableData.param" ref="queryRef" :inline="true">
+        <el-form :model="tableData.param" ref="queryRef" inline>
           <el-form-item label="设备名称" prop="name">
           <el-form-item label="设备名称" prop="name">
-            <el-input v-model="tableData.param.name" placeholder="请输入设备名称" clearable size="default" style="width: 180px" @keyup.enter.native="typeList" />
+            <el-input v-model="tableData.param.name" placeholder="请输入设备名称" clearable style="width: 180px" @keyup.enter.native="typeList" />
           </el-form-item>
           </el-form-item>
           <el-form-item label="设备标识" prop="key">
           <el-form-item label="设备标识" prop="key">
-            <el-input v-model="tableData.param.key" placeholder="请输入设备标识" clearable size="default" style="width: 180px" @keyup.enter.native="typeList" />
+            <el-input v-model="tableData.param.key" placeholder="请输入设备标识" clearable style="width: 180px" @keyup.enter.native="typeList" />
           </el-form-item>
           </el-form-item>
           <el-form-item label="所属产品" prop="productId">
           <el-form-item label="所属产品" prop="productId">
             <el-select v-model="tableData.param.productId" style="width: 150px" filterable placeholder="请选择产品">
             <el-select v-model="tableData.param.productId" style="width: 150px" filterable placeholder="请选择产品">
@@ -16,7 +16,7 @@
           </el-form-item>
           </el-form-item>
 
 
           <el-form-item label="状态" prop="status">
           <el-form-item label="状态" prop="status">
-            <el-select v-model="tableData.param.status" placeholder="状态" clearable size="default" style="width: 100px">
+            <el-select v-model="tableData.param.status" placeholder="状态" clearable style="width: 100px">
               <el-option label="在线" :value="2" />
               <el-option label="在线" :value="2" />
               <el-option label="离线" :value="1" />
               <el-option label="离线" :value="1" />
               <el-option label="未启用" :value="0" />
               <el-option label="未启用" :value="0" />
@@ -24,28 +24,28 @@
           </el-form-item>
           </el-form-item>
 
 
           <el-form-item label="创建时间" prop="dateRange">
           <el-form-item label="创建时间" prop="dateRange">
-            <el-date-picker v-model="tableData.param.dateRange" size="default" style="width: 240px" value-format="YYYY-MM-DD" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+            <el-date-picker v-model="tableData.param.dateRange" style="width: 240px" value-format="YYYY-MM-DD" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
           </el-form-item>
           <el-form-item>
           <el-form-item>
-            <el-button size="default" type="primary" class="ml10" @click="typeList">
+            <el-button type="primary" class="ml10" @click="typeList">
               <el-icon>
               <el-icon>
                 <ele-Search />
                 <ele-Search />
               </el-icon>
               </el-icon>
               查询
               查询
             </el-button>
             </el-button>
-            <el-button size="default" @click="resetQuery(queryRef)">
+            <el-button @click="resetQuery(queryRef)">
               <el-icon>
               <el-icon>
                 <ele-Refresh />
                 <ele-Refresh />
               </el-icon>
               </el-icon>
               重置
               重置
             </el-button>
             </el-button>
-            <el-button size="default" type="primary" class="ml10" @click="onOpenAddDic" v-auth="'add'">
+            <el-button type="primary" class="ml10" @click="onOpenAddDic" v-auth="'add'">
               <el-icon>
               <el-icon>
                 <ele-FolderAdd />
                 <ele-FolderAdd />
               </el-icon>
               </el-icon>
               新增设备
               新增设备
             </el-button>
             </el-button>
-            <el-button size="default" type="info" class="ml10" @click="onRowDel(null)" v-auth="'del'">
+            <el-button type="info" class="ml10" @click="onRowDel(null)" v-auth="'del'">
               <el-icon>
               <el-icon>
                 <ele-Delete />
                 <ele-Delete />
               </el-icon>
               </el-icon>
@@ -58,25 +58,25 @@
               </el-button>
               </el-button>
               <template #dropdown>
               <template #dropdown>
                 <el-dropdown-menu>
                 <el-dropdown-menu>
-                  <el-dropdown-item> <el-button size="default" type="success" @click="setDeviceStatus1(null)">
+                  <el-dropdown-item> <el-button type="success" @click="setDeviceStatus1(null)">
                       <el-icon>
                       <el-icon>
                         <ele-Delete />
                         <ele-Delete />
                       </el-icon>
                       </el-icon>
                       批量启用
                       批量启用
                     </el-button></el-dropdown-item>
                     </el-button></el-dropdown-item>
-                  <el-dropdown-item><el-button size="default" type="warning" @click="setDeviceStatus0(null)">
+                  <el-dropdown-item><el-button type="warning" @click="setDeviceStatus0(null)">
                       <el-icon>
                       <el-icon>
                         <ele-Delete />
                         <ele-Delete />
                       </el-icon>
                       </el-icon>
                       批量禁用
                       批量禁用
                     </el-button></el-dropdown-item>
                     </el-button></el-dropdown-item>
-                  <el-dropdown-item> <el-button size="default" @click="onOpenexcelDic('upload')">
+                  <el-dropdown-item> <el-button @click="onOpenexcelDic('upload')">
                       <el-icon>
                       <el-icon>
                         <ele-Upload />
                         <ele-Upload />
                       </el-icon>
                       </el-icon>
                       导入设备
                       导入设备
                     </el-button></el-dropdown-item>
                     </el-button></el-dropdown-item>
-                  <el-dropdown-item><el-button size="default" @click="onOpenexcelDic('down')">
+                  <el-dropdown-item><el-button @click="onOpenexcelDic('down')">
                       <el-icon>
                       <el-icon>
                         <ele-Download />
                         <ele-Download />
                       </el-icon>
                       </el-icon>

+ 3 - 3
src/views/iot/device/product/component/editAttr.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
 	<div class="system-edit-dic-container">
 	<div class="system-edit-dic-container">
 		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '属性定义'" v-model="isShowDialog" width="769px">
 		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '属性定义'" v-model="isShowDialog" width="769px">
-			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="120px">
+			<el-form :model="ruleForm" ref="formRef" :rules="rules" label-width="120px">
 				<el-form-item label="属性定义标识" prop="key">
 				<el-form-item label="属性定义标识" prop="key">
 					<el-input v-model="ruleForm.key" placeholder="请输入属性定义标识" :disabled="ruleForm.id !== 0 ? true : false" />
 					<el-input v-model="ruleForm.key" placeholder="请输入属性定义标识" :disabled="ruleForm.id !== 0 ? true : false" />
 				</el-form-item>
 				</el-form-item>
@@ -180,8 +180,8 @@
 			</el-form>
 			</el-form>
 			<template #footer>
 			<template #footer>
 				<span class="dialog-footer">
 				<span class="dialog-footer">
-					<el-button @click="onCancel" size="default">取 消</el-button>
-					<el-button type="primary" @click="onSubmit" size="default">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
+					<el-button @click="onCancel">取 消</el-button>
+					<el-button type="primary" @click="onSubmit">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
 				</span>
 				</span>
 			</template>
 			</template>
 		</el-dialog>
 		</el-dialog>

+ 3 - 3
src/views/iot/device/product/component/editEvent.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
 	<div class="system-edit-dic-container">
 	<div class="system-edit-dic-container">
 		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '事件定义'" v-model="isShowDialog" width="769px">
 		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '事件定义'" v-model="isShowDialog" width="769px">
-			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="120px">
+			<el-form :model="ruleForm" ref="formRef" :rules="rules" label-width="120px">
 				<el-form-item label="事件定义标识" prop="key">
 				<el-form-item label="事件定义标识" prop="key">
 					<el-input v-model="ruleForm.key" placeholder="请输入事件定义标识" :disabled="ruleForm.id !== 0 ? true : false" />
 					<el-input v-model="ruleForm.key" placeholder="请输入事件定义标识" :disabled="ruleForm.id !== 0 ? true : false" />
 				</el-form-item>
 				</el-form-item>
@@ -44,8 +44,8 @@
 			</el-form>
 			</el-form>
 			<template #footer>
 			<template #footer>
 				<span class="dialog-footer">
 				<span class="dialog-footer">
-					<el-button @click="onCancel" size="default">取 消</el-button>
-					<el-button type="primary" @click="onSubmit" size="default">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
+					<el-button @click="onCancel">取 消</el-button>
+					<el-button type="primary" @click="onSubmit">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
 				</span>
 				</span>
 			</template>
 			</template>
 		</el-dialog>
 		</el-dialog>

+ 3 - 3
src/views/iot/device/product/component/editFun.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
 	<div class="system-edit-dic-container">
 	<div class="system-edit-dic-container">
 		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '功能定义'" v-model="isShowDialog" width="769px">
 		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '功能定义'" v-model="isShowDialog" width="769px">
-			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="120px">
+			<el-form :model="ruleForm" ref="formRef" :rules="rules" label-width="120px">
 				<el-form-item label="功能定义标识" prop="key">
 				<el-form-item label="功能定义标识" prop="key">
 					<el-input v-model="ruleForm.key" placeholder="请输入功能定义标识" :disabled="ruleForm.id !== 0 ? true : false" />
 					<el-input v-model="ruleForm.key" placeholder="请输入功能定义标识" :disabled="ruleForm.id !== 0 ? true : false" />
 				</el-form-item>
 				</el-form-item>
@@ -61,8 +61,8 @@
 			</el-form>
 			</el-form>
 			<template #footer>
 			<template #footer>
 				<span class="dialog-footer">
 				<span class="dialog-footer">
-					<el-button @click="onCancel" size="default">取 消</el-button>
-					<el-button type="primary" @click="onSubmit" size="default">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
+					<el-button @click="onCancel">取 消</el-button>
+					<el-button type="primary" @click="onSubmit">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
 				</span>
 				</span>
 			</template>
 			</template>
 		</el-dialog>
 		</el-dialog>

+ 3 - 3
src/views/iot/device/product/component/editOption.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
 	<div class="system-edit-dic-container">
 	<div class="system-edit-dic-container">
 		<el-dialog :title="(typeof ruleForm.valueType !== 'undefined' ? '修改' : '添加') + '参数'" v-model="isShowDialog" width="769px">
 		<el-dialog :title="(typeof ruleForm.valueType !== 'undefined' ? '修改' : '添加') + '参数'" v-model="isShowDialog" width="769px">
-			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="120px">
+			<el-form :model="ruleForm" ref="formRef" :rules="rules" label-width="120px">
 				<el-form-item label="参数标识" prop="key">
 				<el-form-item label="参数标识" prop="key">
 					<el-input v-model="ruleForm.key" placeholder="请输入参数标识"  />
 					<el-input v-model="ruleForm.key" placeholder="请输入参数标识"  />
 				</el-form-item>
 				</el-form-item>
@@ -37,8 +37,8 @@
 			</el-form>
 			</el-form>
 			<template #footer>
 			<template #footer>
 				<span class="dialog-footer">
 				<span class="dialog-footer">
-					<el-button @click="onCancel" size="default">取 消</el-button>
-					<el-button type="primary" @click="onSubmit" size="default">{{ typeof ruleForm.valueType !== 'undefined' ? '修 改' : '添 加' }}</el-button>
+					<el-button @click="onCancel">取 消</el-button>
+					<el-button type="primary" @click="onSubmit">{{ typeof ruleForm.valueType !== 'undefined' ? '修 改' : '添 加' }}</el-button>
 				</span>
 				</span>
 			</template>
 			</template>
 		</el-dialog>
 		</el-dialog>

+ 3 - 3
src/views/iot/device/product/component/editPro.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
 	<div class="system-edit-dic-container">
 	<div class="system-edit-dic-container">
 		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '产品'" v-model="isShowDialog" width="769px">
 		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '产品'" v-model="isShowDialog" width="769px">
-			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="100px">
+			<el-form :model="ruleForm" ref="formRef" :rules="rules" label-width="100px">
 				<el-form-item label="产品标识" prop="key">
 				<el-form-item label="产品标识" prop="key">
 					<el-input v-model="ruleForm.key" placeholder="请输入产品标识" :disabled="ruleForm.id" />
 					<el-input v-model="ruleForm.key" placeholder="请输入产品标识" :disabled="ruleForm.id" />
 				</el-form-item>
 				</el-form-item>
@@ -88,8 +88,8 @@
 			</el-form>
 			</el-form>
 			<template #footer>
 			<template #footer>
 				<span class="dialog-footer">
 				<span class="dialog-footer">
-					<el-button @click="onCancel" size="default">取 消</el-button>
-					<el-button type="primary" @click="onSubmit" :loading="submitLoading" size="default">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
+					<el-button @click="onCancel">取 消</el-button>
+					<el-button type="primary" @click="onSubmit" :loading="submitLoading">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
 				</span>
 				</span>
 			</template>
 			</template>
 		</el-dialog>
 		</el-dialog>

+ 3 - 3
src/views/iot/device/product/component/editTab.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
 	<div class="system-edit-dic-container">
 	<div class="system-edit-dic-container">
 		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '标签定义'" v-model="isShowDialog" width="769px">
 		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '标签定义'" v-model="isShowDialog" width="769px">
-			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="120px">
+			<el-form :model="ruleForm" ref="formRef" :rules="rules" label-width="120px">
 				<el-form-item label="标签定义标识" prop="key">
 				<el-form-item label="标签定义标识" prop="key">
 					<el-input v-model="ruleForm.key" placeholder="请输入标签定义标识" :disabled="ruleForm.id !== 0 ? true : false" />
 					<el-input v-model="ruleForm.key" placeholder="请输入标签定义标识" :disabled="ruleForm.id !== 0 ? true : false" />
 				</el-form-item>
 				</el-form-item>
@@ -177,8 +177,8 @@
 			</el-form>
 			</el-form>
 			<template #footer>
 			<template #footer>
 				<span class="dialog-footer">
 				<span class="dialog-footer">
-					<el-button @click="onCancel" size="default">取 消</el-button>
-					<el-button type="primary" @click="onSubmit" size="default">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
+					<el-button @click="onCancel">取 消</el-button>
+					<el-button type="primary" @click="onSubmit">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
 				</span>
 				</span>
 			</template>
 			</template>
 		</el-dialog>
 		</el-dialog>

+ 1 - 1
src/views/iot/device/product/detail.vue

@@ -187,7 +187,7 @@
 										导入物模型
 										导入物模型
 									</el-button>
 									</el-button>
 								</el-upload>
 								</el-upload>
-								<el-button size="default" type="default" class="ml10" @click="onRowExport()">
+								<el-button type="default" class="ml10" @click="onRowExport()">
 									<el-icon>
 									<el-icon>
 										<ele-Download />
 										<ele-Download />
 									</el-icon>
 									</el-icon>

+ 9 - 9
src/views/iot/device/product/index.vue

@@ -1,42 +1,42 @@
 <template>
 <template>
   <div class="page">
   <div class="page">
     <el-card shadow="nover">
     <el-card shadow="nover">
-      <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px">
+      <el-form :model="tableData.param" ref="queryRef" inline label-width="68px">
         <el-form-item label="产品名称" prop="name">
         <el-form-item label="产品名称" prop="name">
-          <el-input v-model="tableData.param.name" placeholder="请输入产品名称" clearable size="default" style="width: 240px" @keyup.enter.native="typeList" />
+          <el-input v-model="tableData.param.name" placeholder="请输入产品名称" clearable style="width: 240px" @keyup.enter.native="typeList" />
         </el-form-item>
         </el-form-item>
         <el-form-item label="设备类型" prop="deviceType">
         <el-form-item label="设备类型" prop="deviceType">
-          <el-input v-model="tableData.param.deviceType" placeholder="请输入设备类型" clearable size="default" style="width: 240px" @keyup.enter.native="typeList" />
+          <el-input v-model="tableData.param.deviceType" placeholder="请输入设备类型" clearable style="width: 240px" @keyup.enter.native="typeList" />
         </el-form-item>
         </el-form-item>
         <el-form-item label="发布状态" prop="status" style="width: 200px;">
         <el-form-item label="发布状态" prop="status" style="width: 200px;">
-          <el-select v-model="tableData.param.status" placeholder="发布状态" clearable size="default" style="width: 240px">
+          <el-select v-model="tableData.param.status" placeholder="发布状态" clearable style="width: 240px">
             <el-option label="已发布" :value="1" />
             <el-option label="已发布" :value="1" />
             <el-option label="未发布" :value="0" />
             <el-option label="未发布" :value="0" />
           </el-select>
           </el-select>
         </el-form-item>
         </el-form-item>
         <el-form-item label="创建时间" prop="dateRange">
         <el-form-item label="创建时间" prop="dateRange">
-          <el-date-picker v-model="tableData.param.dateRange" size="default" style="width: 240px" value-format="YYYY-MM-DD" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+          <el-date-picker v-model="tableData.param.dateRange" style="width: 240px" value-format="YYYY-MM-DD" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
         </el-form-item>
         </el-form-item>
         <el-form-item>
         <el-form-item>
-          <el-button size="default" type="primary" class="ml10" @click="typeList">
+          <el-button type="primary" class="ml10" @click="typeList">
             <el-icon>
             <el-icon>
               <ele-Search />
               <ele-Search />
             </el-icon>
             </el-icon>
             查询
             查询
           </el-button>
           </el-button>
-          <el-button size="default" @click="resetQuery(queryRef)">
+          <el-button @click="resetQuery(queryRef)">
             <el-icon>
             <el-icon>
               <ele-Refresh />
               <ele-Refresh />
             </el-icon>
             </el-icon>
             重置
             重置
           </el-button>
           </el-button>
-          <el-button size="default" type="primary" class="ml10" @click="onOpenAddDic" v-auth="'add'">
+          <el-button type="primary" class="ml10" @click="onOpenAddDic" v-auth="'add'">
             <el-icon>
             <el-icon>
               <ele-FolderAdd />
               <ele-FolderAdd />
             </el-icon>
             </el-icon>
             新增产品
             新增产品
           </el-button>
           </el-button>
-          <el-button size="default" type="info" class="ml10" @click="onRowDel(null)" v-auth="'del'">
+          <el-button type="info" class="ml10" @click="onRowDel(null)" v-auth="'del'">
             <el-icon>
             <el-icon>
               <ele-Delete />
               <ele-Delete />
             </el-icon>
             </el-icon>

+ 5 - 5
src/views/iot/device/template/detail.vue

@@ -229,24 +229,24 @@
 
 
 				<el-tab-pane label="日志管理" name="4">
 				<el-tab-pane label="日志管理" name="4">
 					<div class="system-user-search mb15">
 					<div class="system-user-search mb15">
-						<el-form :model="logtableData.param" ref="queryRef" :inline="true" label-width="68px">
+						<el-form :model="logtableData.param" ref="queryRef" inline label-width="68px">
 							<el-form-item label="日志类型" prop="types">
 							<el-form-item label="日志类型" prop="types">
-								<el-select v-model="logtableData.param.types" placeholder="日志类型" clearable size="default">
+								<el-select v-model="logtableData.param.types" placeholder="日志类型" clearable>
 									<el-option v-for="item in logTypeData" :key="item" :label="item" :value="item" />
 									<el-option v-for="item in logTypeData" :key="item" :label="item" :value="item" />
 								</el-select>
 								</el-select>
 							</el-form-item>
 							</el-form-item>
 
 
 							<el-form-item label="创建时间" prop="dateRange">
 							<el-form-item label="创建时间" prop="dateRange">
-								<el-date-picker v-model="logtableData.param.dateRange" size="default" value-format="YYYY-MM-DD" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+								<el-date-picker v-model="logtableData.param.dateRange" value-format="YYYY-MM-DD" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
 							</el-form-item>
 							</el-form-item>
 							<el-form-item>
 							<el-form-item>
-								<el-button size="default" type="primary" class="ml10" @click="getlog">
+								<el-button type="primary" class="ml10" @click="getlog">
 									<el-icon>
 									<el-icon>
 										<ele-Search />
 										<ele-Search />
 									</el-icon>
 									</el-icon>
 									查询
 									查询
 								</el-button>
 								</el-button>
-								<el-button size="default" @click="resetQuery(queryRef)">
+								<el-button @click="resetQuery(queryRef)">
 									<el-icon>
 									<el-icon>
 										<ele-Refresh />
 										<ele-Refresh />
 									</el-icon>
 									</el-icon>

+ 3 - 3
src/views/iot/device/template/index.vue

@@ -2,18 +2,18 @@
 	<div class="page">
 	<div class="page">
 		<el-card shadow="nover">
 		<el-card shadow="nover">
 			<div class="search">
 			<div class="search">
-				<el-form :model="params" :inline="true" ref="queryRef">
+				<el-form :model="params" inline ref="queryRef">
 					<el-form-item label="模板名称" prop="title">
 					<el-form-item label="模板名称" prop="title">
 						<el-input v-model="params.title" placeholder="请输入模板名称" clearable style="width: 240px" @keyup.enter.native="getList(1)" />
 						<el-input v-model="params.title" placeholder="请输入模板名称" clearable style="width: 240px" @keyup.enter.native="getList(1)" />
 					</el-form-item>
 					</el-form-item>
 					<el-form-item>
 					<el-form-item>
-						<el-button size="default" type="primary" class="ml10" @click="getList(1)">
+						<el-button type="primary" class="ml10" @click="getList(1)">
 							<el-icon>
 							<el-icon>
 								<ele-Search />
 								<ele-Search />
 							</el-icon>
 							</el-icon>
 							查询
 							查询
 						</el-button>
 						</el-button>
-						<el-button size="default" @click="resetQuery()">
+						<el-button @click="resetQuery()">
 							<el-icon>
 							<el-icon>
 								<ele-Refresh />
 								<ele-Refresh />
 							</el-icon>
 							</el-icon>

+ 63 - 63
src/views/iot/ice104/device/component/deviceTaskTable.vue

@@ -1,52 +1,52 @@
 <template>
 <template>
-    <div>
-        <el-form :model="params" :inline="true" ref="queryRef">
-            <el-form-item label="任务名称" prop="title">
-                <el-input v-model="params.title" placeholder="请输入任务名称" clearable style="width: 240px" @submit.prevent />
-            </el-form-item>
-            <el-form-item>
-                <el-button v-auth="'query'" size="default" type="primary" class="ml10" @click="getList(1)">
-                    <el-icon>
-                        <ele-Search />
-                    </el-icon>
-                    查询
-                </el-button>
-                <el-button v-auth="'reset'" size="default" @click="resetQuery()">
-                    <el-icon>
-                        <ele-Refresh />
-                    </el-icon>
-                    重置
-                </el-button>
-                <el-button v-auth="'add'" type="primary" @click="addOrEdit()">
-                    <el-icon>
-                        <ele-FolderAdd />
-                    </el-icon>
-                    新增任务
-                </el-button>
-            </el-form-item>
-        </el-form>
-        <el-table :data="tableData" style="width: 100%" v-loading="loading">
-            <el-table-column v-col="'index'" type="index" label="序号" width="80" align="center" />
-            <el-table-column v-col="'title'" prop="title" label="任务名称" align="center" show-overflow-tooltip></el-table-column>
-            <el-table-column v-col="'deviceNumber'" prop="deviceNumber" label="设备编码" min-width="120" align="center" show-overflow-tooltip></el-table-column>
-            <el-table-column v-col="'interval'" prop="interval" label="执行间隔(s)" min-width="120" align="center" show-overflow-tooltip></el-table-column>
-            <el-table-column v-col="'jobType'" prop="jobType" label="任务类型" min-width="120" align="center" show-overflow-tooltip>
-                <template #default="scope">
-                    <el-tag type="info" size="small" v-if="scope.row.jobType == 100">总召唤</el-tag>
-                    <el-tag type="info" size="small" v-if="scope.row.jobType == 101">电度召唤</el-tag>
-                    <el-tag type="info" size="small" v-if="scope.row.jobType == 103">时钟同步</el-tag>
-                </template>
-            </el-table-column>
-            <el-table-column v-col="'handle'" fixed="right" label="操作" width="100" align="center">
-                <template #default="scope">
-                    <el-button size="small" v-auth="'edit'" text type="primary" @click="addOrEdit(scope.row)">修改</el-button>
-                    <el-button size="small" v-auth="'del'" text type="info" @click="onDel(scope.row)">删除</el-button>
-                </template>
-            </el-table-column>
-        </el-table>
-        <pagination v-if="params.total" :total="params.total" v-model:page="params.pageNum" v-model:limit="params.pageSize" @pagination="getList()" />
-        <EditForm ref="editFormRef" @updateList="getList(1)"></EditForm>
-    </div>
+  <div class="page">
+    <el-form :model="params" inline ref="queryRef">
+      <el-form-item label="任务名称" prop="title">
+        <el-input v-model="params.title" placeholder="请输入任务名称" clearable style="width: 240px" @submit.prevent />
+      </el-form-item>
+      <el-form-item>
+        <el-button v-auth="'query'" type="primary" class="ml10" @click="getList(1)">
+          <el-icon>
+            <ele-Search />
+          </el-icon>
+          查询
+        </el-button>
+        <el-button v-auth="'reset'" @click="resetQuery()">
+          <el-icon>
+            <ele-Refresh />
+          </el-icon>
+          重置
+        </el-button>
+        <el-button v-auth="'add'" type="primary" @click="addOrEdit()">
+          <el-icon>
+            <ele-FolderAdd />
+          </el-icon>
+          新增任务
+        </el-button>
+      </el-form-item>
+    </el-form>
+    <el-table :data="tableData" style="width: 100%" v-loading="loading">
+      <el-table-column v-col="'index'" type="index" label="序号" width="80" align="center" />
+      <el-table-column v-col="'title'" prop="title" label="任务名称" align="center" show-overflow-tooltip></el-table-column>
+      <el-table-column v-col="'deviceNumber'" prop="deviceNumber" label="设备编码" min-width="120" align="center" show-overflow-tooltip></el-table-column>
+      <el-table-column v-col="'interval'" prop="interval" label="执行间隔(s)" min-width="120" align="center" show-overflow-tooltip></el-table-column>
+      <el-table-column v-col="'jobType'" prop="jobType" label="任务类型" min-width="120" align="center" show-overflow-tooltip>
+        <template #default="scope">
+          <el-tag type="info" size="small" v-if="scope.row.jobType == 100">总召唤</el-tag>
+          <el-tag type="info" size="small" v-if="scope.row.jobType == 101">电度召唤</el-tag>
+          <el-tag type="info" size="small" v-if="scope.row.jobType == 103">时钟同步</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column v-col="'handle'" fixed="right" label="操作" width="100" align="center">
+        <template #default="scope">
+          <el-button size="small" v-auth="'edit'" text type="primary" @click="addOrEdit(scope.row)">修改</el-button>
+          <el-button size="small" v-auth="'del'" text type="info" @click="onDel(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination v-if="params.total" :total="params.total" v-model:page="params.pageNum" v-model:limit="params.pageSize" @pagination="getList()" />
+    <EditForm ref="editFormRef" @updateList="getList(1)"></EditForm>
+  </div>
 </template>
 </template>
 <script lang="ts" setup>
 <script lang="ts" setup>
 import { computed, reactive, ref, onMounted } from 'vue';
 import { computed, reactive, ref, onMounted } from 'vue';
@@ -70,40 +70,40 @@ const queryRef = ref();
  * 新增设备任务
  * 新增设备任务
  */
  */
 const addOrEdit = async (row?: any) => {
 const addOrEdit = async (row?: any) => {
-    const data = { ...row };
-    editFormRef.value.open(data);
+  const data = { ...row };
+  editFormRef.value.open(data);
 };
 };
 
 
 /**
 /**
  * 单一删除
  * 单一删除
  */
  */
 const onDel = (row: any) => {
 const onDel = (row: any) => {
-    ElMessageBox.confirm(`此操作将删除任务:“${row.title}”,是否继续?`, '提示', {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-    }).then(async () => {
-        await api.job.deleteItem({ number: row.number });
-        ElMessage.success('删除成功');
-        getList();
-    });
+  ElMessageBox.confirm(`此操作将删除任务:“${row.title}”,是否继续?`, '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(async () => {
+    await api.job.deleteItem({ number: row.number });
+    ElMessage.success('删除成功');
+    getList();
+  });
 };
 };
 
 
 // 重置表单
 // 重置表单
 const resetQuery = () => {
 const resetQuery = () => {
-    queryRef.value.resetFields();
-    getList();
+  queryRef.value.resetFields();
+  getList();
 };
 };
 
 
 // 页面加载时
 // 页面加载时
 onMounted(() => {
 onMounted(() => {
-    getList();
+  getList();
 });
 });
 
 
 </script>
 </script>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
 .width100 {
 .width100 {
-    width: 100%;
+  width: 100%;
 }
 }
 </style>
 </style>

+ 3 - 3
src/views/iot/ice104/device/index.vue

@@ -9,18 +9,18 @@
 <template>
 <template>
 	<div class="page">
 	<div class="page">
 		<el-card shadow="nover">
 		<el-card shadow="nover">
-			<el-form :model="params" :inline="true" ref="queryRef" @submit.prevent>
+			<el-form :model="params" inline ref="queryRef" @submit.prevent>
 				<el-form-item label="设备名称" prop="title">
 				<el-form-item label="设备名称" prop="title">
 					<el-input v-model="params.title" placeholder="请输入设备名称" clearable style="width: 240px" @keyup.enter.native="getList(1)" />
 					<el-input v-model="params.title" placeholder="请输入设备名称" clearable style="width: 240px" @keyup.enter.native="getList(1)" />
 				</el-form-item>
 				</el-form-item>
 				<el-form-item>
 				<el-form-item>
-					<el-button v-auth="'query'" size="default" type="primary" class="ml10" @click="getList(1)">
+					<el-button v-auth="'query'" type="primary" class="ml10" @click="getList(1)">
 						<el-icon>
 						<el-icon>
 							<ele-Search />
 							<ele-Search />
 						</el-icon>
 						</el-icon>
 						查询
 						查询
 					</el-button>
 					</el-button>
-					<el-button v-auth="'reset'" size="default" @click="resetQuery()">
+					<el-button v-auth="'reset'" @click="resetQuery()">
 						<el-icon>
 						<el-icon>
 							<ele-Refresh />
 							<ele-Refresh />
 						</el-icon>
 						</el-icon>

+ 3 - 3
src/views/iot/ice104/template/component/templateTaskTable.vue

@@ -1,17 +1,17 @@
 <template>
 <template>
     <div>
     <div>
-        <el-form :model="params" :inline="true" ref="queryRef">
+        <el-form :model="params" inline ref="queryRef">
             <el-form-item label="点位名称" prop="title">
             <el-form-item label="点位名称" prop="title">
                 <el-input v-model="params.title" placeholder="请输入点位名称" clearable style="width: 240px" @keyup.enter.native="getList(1)" />
                 <el-input v-model="params.title" placeholder="请输入点位名称" clearable style="width: 240px" @keyup.enter.native="getList(1)" />
             </el-form-item>
             </el-form-item>
             <el-form-item>
             <el-form-item>
-                <el-button v-auth="'query'" size="default" type="primary" class="ml10" @click="getList(1)">
+                <el-button v-auth="'query'" type="primary" class="ml10" @click="getList(1)">
                     <el-icon>
                     <el-icon>
                         <ele-Search />
                         <ele-Search />
                     </el-icon>
                     </el-icon>
                     查询
                     查询
                 </el-button>
                 </el-button>
-                <el-button v-auth="'reset'" size="default" @click="resetQuery()">
+                <el-button v-auth="'reset'" @click="resetQuery()">
                     <el-icon>
                     <el-icon>
                         <ele-Refresh />
                         <ele-Refresh />
                     </el-icon>
                     </el-icon>

+ 3 - 3
src/views/iot/ice104/template/index.vue

@@ -9,18 +9,18 @@
 <template>
 <template>
 	<div class="page">
 	<div class="page">
 		<el-card shadow="nover">
 		<el-card shadow="nover">
-			<el-form :model="params" :inline="true" ref="queryRef">
+			<el-form :model="params" inline ref="queryRef">
 				<el-form-item label="模版名称" prop="title">
 				<el-form-item label="模版名称" prop="title">
 					<el-input v-model="params.title" placeholder="请输入模版名称" clearable style="width: 240px" @keyup.enter.native="getList(1)" />
 					<el-input v-model="params.title" placeholder="请输入模版名称" clearable style="width: 240px" @keyup.enter.native="getList(1)" />
 				</el-form-item>
 				</el-form-item>
 				<el-form-item>
 				<el-form-item>
-					<el-button v-auth="'query'" size="default" type="primary" class="ml10" @click="getList(1)">
+					<el-button v-auth="'query'" type="primary" class="ml10" @click="getList(1)">
 						<el-icon>
 						<el-icon>
 							<ele-Search />
 							<ele-Search />
 						</el-icon>
 						</el-icon>
 						查询
 						查询
 					</el-button>
 					</el-button>
-					<el-button v-auth="'reset'" size="default" @click="resetQuery()">
+					<el-button v-auth="'reset'" @click="resetQuery()">
 						<el-icon>
 						<el-icon>
 							<ele-Refresh />
 							<ele-Refresh />
 						</el-icon>
 						</el-icon>

+ 4 - 4
src/views/iot/network/server/index.vue

@@ -1,19 +1,19 @@
 <template>
 <template>
   <div class="page">
   <div class="page">
     <el-card shadow="nover">
     <el-card shadow="nover">
-      <el-form :inline="true" label-width="82px" @keyup.enter="searchData">
+      <el-form inline label-width="82px" @keyup.enter="searchData">
         <el-form-item label="服务器名称">
         <el-form-item label="服务器名称">
-          <el-input size="default" style="width: 200px;margin-left: 20px;" class="search-input" v-model="key" placeholder="请输入搜索关键字" clearable>
+          <el-input style="width: 200px;margin-left: 20px;" class="search-input" v-model="key" placeholder="请输入搜索关键字" clearable>
           </el-input>
           </el-input>
         </el-form-item>
         </el-form-item>
         <el-form-item>
         <el-form-item>
-          <el-button size="default" type="primary" class="ml10" v-auth="'query'" @click="searchData">
+          <el-button type="primary" class="ml10" v-auth="'query'" @click="searchData">
             <el-icon>
             <el-icon>
               <ele-Search />
               <ele-Search />
             </el-icon>
             </el-icon>
             查询
             查询
           </el-button>
           </el-button>
-          <el-button @click="toPage" size="default" type="primary" v-auth="'add'" class="ml10">
+          <el-button @click="toPage" type="primary" v-auth="'add'" class="ml10">
             <el-icon>
             <el-icon>
               <ele-FolderAdd />
               <ele-FolderAdd />
             </el-icon>
             </el-icon>

+ 4 - 4
src/views/iot/network/tunnel/index.vue

@@ -1,19 +1,19 @@
 <template>
 <template>
   <div class="page">
   <div class="page">
     <el-card shadow="nover">
     <el-card shadow="nover">
-      <el-form :inline="true" label-width="68px">
+      <el-form inline label-width="68px">
         <el-form-item label="通道名称" @keyup.enter.native="searchData()">
         <el-form-item label="通道名称" @keyup.enter.native="searchData()">
-          <el-input size="default" style="width: 200px;margin-left: 20px;" class="search-input" v-model="key" placeholder="请输入搜索关键字" clearable>
+          <el-input style="width: 200px;margin-left: 20px;" class="search-input" v-model="key" placeholder="请输入搜索关键字" clearable>
           </el-input>
           </el-input>
         </el-form-item>
         </el-form-item>
         <el-form-item>
         <el-form-item>
-          <el-button size="default" v-auth="'query'" type="primary" class="ml10" @click="searchData">
+          <el-button v-auth="'query'" type="primary" class="ml10" @click="searchData">
             <el-icon>
             <el-icon>
               <ele-Search />
               <ele-Search />
             </el-icon>
             </el-icon>
             查询
             查询
           </el-button>
           </el-button>
-          <el-button @click="toPage" v-auth="'add'" size="default" type="primary" class="ml10">
+          <el-button @click="toPage" v-auth="'add'" type="primary" class="ml10">
             <el-icon>
             <el-icon>
               <ele-FolderAdd />
               <ele-FolderAdd />
             </el-icon>
             </el-icon>

+ 3 - 3
src/views/iot/noticeservices/config/component/edit.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
 	<div class="system-edit-dic-container">
 	<div class="system-edit-dic-container">
 		<el-dialog title="设置配置信息" v-model="isShowDialog" width="65%">
 		<el-dialog title="设置配置信息" v-model="isShowDialog" width="65%">
-			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="110px">
+			<el-form :model="ruleForm" ref="formRef" :rules="rules" label-width="110px">
 				<div style="display: flex; justify-content: space-between">
 				<div style="display: flex; justify-content: space-between">
 					<div style="width: 50%; padding: 10px">
 					<div style="width: 50%; padding: 10px">
 						<div>配置内容</div>
 						<div>配置内容</div>
@@ -15,8 +15,8 @@
 			</el-form>
 			</el-form>
 			<template #footer>
 			<template #footer>
 				<span class="dialog-footer">
 				<span class="dialog-footer">
-					<el-button @click="onCancel" size="default">取 消</el-button>
-					<el-button type="primary" @click="onSubmit" size="default">{{ ruleForm.id !== 0 ? '设 置' : '添 加' }}</el-button>
+					<el-button @click="onCancel">取 消</el-button>
+					<el-button type="primary" @click="onSubmit">{{ ruleForm.id !== 0 ? '设 置' : '添 加' }}</el-button>
 				</span>
 				</span>
 			</template>
 			</template>
 		</el-dialog>
 		</el-dialog>

+ 3 - 3
src/views/iot/noticeservices/config/component/setEdit.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
 	<div class="system-edit-dic-container">
 	<div class="system-edit-dic-container">
 		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '配置'" v-model="isShowDialog" width="50%">
 		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '配置'" v-model="isShowDialog" width="50%">
-			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="110px">
+			<el-form :model="ruleForm" ref="formRef" :rules="rules" label-width="110px">
 				<el-form-item label="名称" prop="title">
 				<el-form-item label="名称" prop="title">
 					<el-input v-model.trim="ruleForm.title" placeholder="请输入名称" />
 					<el-input v-model.trim="ruleForm.title" placeholder="请输入名称" />
 				</el-form-item>
 				</el-form-item>
@@ -14,8 +14,8 @@
 			</el-form>
 			</el-form>
 			<template #footer>
 			<template #footer>
 				<span class="dialog-footer">
 				<span class="dialog-footer">
-					<el-button @click="onCancel" size="default">取 消</el-button>
-					<el-button type="primary" @click="onSubmit" size="default">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
+					<el-button @click="onCancel">取 消</el-button>
+					<el-button type="primary" @click="onSubmit">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
 				</span>
 				</span>
 			</template>
 			</template>
 		</el-dialog>
 		</el-dialog>

+ 3 - 3
src/views/iot/noticeservices/config/component/temEdit.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
 	<div class="system-edit-dic-container">
 	<div class="system-edit-dic-container">
 		<el-dialog title="设置配置模板" v-model="isShowDialog" width="50%">
 		<el-dialog title="设置配置模板" v-model="isShowDialog" width="50%">
-			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="110px">
+			<el-form :model="ruleForm" ref="formRef" :rules="rules" label-width="110px">
         <el-form-item label="模版代码" prop="code">
         <el-form-item label="模版代码" prop="code">
           <el-input v-model.trim="ruleForm.code" placeholder="请输入代码" />
           <el-input v-model.trim="ruleForm.code" placeholder="请输入代码" />
         </el-form-item>
         </el-form-item>
@@ -15,8 +15,8 @@
 			</el-form>
 			</el-form>
 			<template #footer>
 			<template #footer>
 				<span class="dialog-footer">
 				<span class="dialog-footer">
-					<el-button @click="onCancel" size="default">取 消</el-button>
-					<el-button type="primary" @click="onSubmit" size="default">设置</el-button>
+					<el-button @click="onCancel">取 消</el-button>
+					<el-button type="primary" @click="onSubmit">设置</el-button>
 				</span>
 				</span>
 			</template>
 			</template>
 		</el-dialog>
 		</el-dialog>

+ 10 - 10
src/views/iot/noticeservices/config/setting.vue

@@ -2,9 +2,9 @@
 	<div class="system-dic-container">
 	<div class="system-dic-container">
 		<el-card shadow="nover">
 		<el-card shadow="nover">
 			<div class="system-user-search mb15">
 			<div class="system-user-search mb15">
-				<el-form :model="tableData.param" ref="queryRef" :inline="true" @keyup.enter.native="dataList">
+				<el-form :model="tableData.param" ref="queryRef" inline @keyup.enter.native="dataList">
 					<el-form-item label="配置名称" prop="keyWord">
 					<el-form-item label="配置名称" prop="keyWord">
-						<el-input v-model="tableData.param.keyWord" placeholder="请输入配置名称" clearable size="default" style="width: 240px" />
+						<el-input v-model="tableData.param.keyWord" placeholder="请输入配置名称" clearable style="width: 240px" />
 					</el-form-item>
 					</el-form-item>
 					<!-- <el-form-item label="通知方式" prop="name">
 					<!-- <el-form-item label="通知方式" prop="name">
 						<el-input
 						<el-input
@@ -18,19 +18,19 @@
 					</el-form-item> -->
 					</el-form-item> -->
 
 
 					<el-form-item>
 					<el-form-item>
-						<el-button size="default" type="primary" class="ml10" @click="dataList">
+						<el-button type="primary" class="ml10" @click="dataList">
 							<el-icon>
 							<el-icon>
 								<ele-Search />
 								<ele-Search />
 							</el-icon>
 							</el-icon>
 							查询
 							查询
 						</el-button>
 						</el-button>
-						<el-button size="default" @click="resetQuery(queryRef)">
+						<el-button @click="resetQuery(queryRef)">
 							<el-icon>
 							<el-icon>
 								<ele-Refresh />
 								<ele-Refresh />
 							</el-icon>
 							</el-icon>
 							重置
 							重置
 						</el-button>
 						</el-button>
-						<el-button size="default" type="primary" class="ml10" @click="onOpenAdd">
+						<el-button type="primary" class="ml10" @click="onOpenAdd">
 							<el-icon>
 							<el-icon>
 								<ele-FolderAdd />
 								<ele-FolderAdd />
 							</el-icon>
 							</el-icon>
@@ -72,7 +72,7 @@
 							</div>
 							</div>
 							<div class="card-tools">
 							<div class="card-tools">
 								<div class="card-button" @click="onOpenEdit(item)">
 								<div class="card-button" @click="onOpenEdit(item)">
-									<el-button size="default" type="primary" class="ml10" text bg>
+									<el-button type="primary" class="ml10" text bg>
 										<el-icon>
 										<el-icon>
 											<ele-Edit />
 											<ele-Edit />
 										</el-icon>
 										</el-icon>
@@ -80,7 +80,7 @@
 									</el-button>
 									</el-button>
 								</div>
 								</div>
 								<div class="card-button" @click="onOpenEditTem(item)">
 								<div class="card-button" @click="onOpenEditTem(item)">
-									<el-button size="default" type="primary" text bg>
+									<el-button type="primary" text bg>
 										<el-icon>
 										<el-icon>
 											<ele-Wallet />
 											<ele-Wallet />
 										</el-icon>
 										</el-icon>
@@ -88,7 +88,7 @@
 									</el-button>
 									</el-button>
 								</div>
 								</div>
 								<!--<div class="card-button" @click="onOpenEdit(item)">
 								<!--<div class="card-button" @click="onOpenEdit(item)">
-									<el-button size="default" type="primary" text bg>
+									<el-button type="primary" text bg>
 										<el-icon>
 										<el-icon>
 											<ele-View />
 											<ele-View />
 										</el-icon>
 										</el-icon>
@@ -97,7 +97,7 @@
 								</div>
 								</div>
 
 
 							 	<div class="card-button" @click="onOpenEdit(item)">
 							 	<div class="card-button" @click="onOpenEdit(item)">
-									<el-button size="default" type="info" text bg>
+									<el-button type="info" text bg>
 										<el-icon>
 										<el-icon>
 											<ele-Document />
 											<ele-Document />
 										</el-icon>
 										</el-icon>
@@ -106,7 +106,7 @@
 								</div> -->
 								</div> -->
 
 
 								<div class="card-button" @click="onRowDel(item)">
 								<div class="card-button" @click="onRowDel(item)">
-									<el-button size="default" type="danger" text bg>
+									<el-button type="danger" text bg>
 										<el-icon>
 										<el-icon>
 											<ele-Delete />
 											<ele-Delete />
 										</el-icon>
 										</el-icon>

+ 2 - 2
src/views/iot/noticeservices/log/component/detail.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
 	<div class="system-edit-dic-container">
 	<div class="system-edit-dic-container">
 		<el-dialog title="日志详情" v-model="isShowDialog" width="769px">
 		<el-dialog title="日志详情" v-model="isShowDialog" width="769px">
-			<el-form ref="formRef" size="default" label-width="110px">
+			<el-form ref="formRef" label-width="110px">
 				<el-form-item label="内容">
 				<el-form-item label="内容">
 					<div v-html="content"></div>
 					<div v-html="content"></div>
 
 
@@ -13,7 +13,7 @@
 			</el-form>
 			</el-form>
 			<template #footer>
 			<template #footer>
 				<span class="dialog-footer">
 				<span class="dialog-footer">
-					<el-button @click="onCancel" size="default">取 消</el-button>
+					<el-button @click="onCancel">取 消</el-button>
 				</span>
 				</span>
 			</template>
 			</template>
 		</el-dialog>
 		</el-dialog>

+ 5 - 5
src/views/iot/noticeservices/log/index.vue

@@ -1,24 +1,24 @@
 <template>
 <template>
 	<div class="page">
 	<div class="page">
 		<el-card shadow="nover">
 		<el-card shadow="nover">
-			<el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px">
+			<el-form :model="tableData.param" ref="queryRef" inline label-width="68px">
 				<el-form-item label="创建时间" prop="dateRange">
 				<el-form-item label="创建时间" prop="dateRange">
-					<el-date-picker v-model="tableData.param.dateRange" size="default" style="width: 240px" value-format="YYYY-MM-DD" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+					<el-date-picker v-model="tableData.param.dateRange" style="width: 240px" value-format="YYYY-MM-DD" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
 				</el-form-item>
 				</el-form-item>
 				<el-form-item>
 				<el-form-item>
-					<el-button size="default" type="primary" class="ml10" @click="typeList">
+					<el-button type="primary" class="ml10" @click="typeList">
 						<el-icon>
 						<el-icon>
 							<ele-Search />
 							<ele-Search />
 						</el-icon>
 						</el-icon>
 						查询
 						查询
 					</el-button>
 					</el-button>
-					<el-button size="default" @click="resetQuery(queryRef)">
+					<el-button @click="resetQuery(queryRef)">
 						<el-icon>
 						<el-icon>
 							<ele-Refresh />
 							<ele-Refresh />
 						</el-icon>
 						</el-icon>
 						重置
 						重置
 					</el-button>
 					</el-button>
-					<el-button size="default" type="info" class="ml10" @click="onRowDel(null)" v-auth="'del'">
+					<el-button type="info" class="ml10" @click="onRowDel(null)" v-auth="'del'">
 						<el-icon>
 						<el-icon>
 							<ele-Delete />
 							<ele-Delete />
 						</el-icon>
 						</el-icon>

+ 3 - 3
src/views/iot/ota-update/module/component/edit.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
 	<div class="ota-edit-module-container">
 	<div class="ota-edit-module-container">
 		<el-dialog :title="(ruleForm.id!==0?'修改':'添加')+'模块'" v-model="isShowDialog" width="769px">
 		<el-dialog :title="(ruleForm.id!==0?'修改':'添加')+'模块'" v-model="isShowDialog" width="769px">
-			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="90px">
+			<el-form :model="ruleForm" ref="formRef" :rules="rules" label-width="90px">
 				<el-form-item label="所属产品" prop="productId">
 				<el-form-item label="所属产品" prop="productId">
 					<el-select v-model="ruleForm.productId" filterable placeholder="请选择产品">
 					<el-select v-model="ruleForm.productId" filterable placeholder="请选择产品">
 						<el-option v-for="item in productData" :key="item.name" :label="item.name" :value="item.id.toString()" />
 						<el-option v-for="item in productData" :key="item.name" :label="item.name" :value="item.id.toString()" />
@@ -19,8 +19,8 @@
 			</el-form>
 			</el-form>
 			<template #footer>
 			<template #footer>
 				<span class="dialog-footer">
 				<span class="dialog-footer">
-				<el-button @click="onCancel" size="default">取 消</el-button>
-				<el-button type="primary" @click="onSubmit" size="default">{{ruleForm.id!==0?'修 改':'添 加'}}</el-button>
+				<el-button @click="onCancel">取 消</el-button>
+				<el-button type="primary" @click="onSubmit">{{ruleForm.id!==0?'修 改':'添 加'}}</el-button>
 				</span>
 				</span>
 			</template>
 			</template>
 		</el-dialog>
 		</el-dialog>

+ 4 - 4
src/views/iot/ota-update/module/index.vue

@@ -1,9 +1,9 @@
 <template>
 <template>
   <div class="page">
   <div class="page">
     <el-card shadow="nover">
     <el-card shadow="nover">
-      <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px" @keyup.enter.native="getList(1)">
+      <el-form :model="tableData.param" ref="queryRef" inline label-width="68px" @keyup.enter.native="getList(1)">
         <el-form-item label="模块名称" prop="name">
         <el-form-item label="模块名称" prop="name">
-          <el-input v-model="tableData.param.name" placeholder="请输入模块名称" clearable size="default" style="width: 200px;" />
+          <el-input v-model="tableData.param.name" placeholder="请输入模块名称" clearable style="width: 200px;" />
         </el-form-item>
         </el-form-item>
         <el-form-item label="所属产品" prop="productId">
         <el-form-item label="所属产品" prop="productId">
           <el-select v-model="tableData.param.productId" clearable filterable placeholder="请选择产品">
           <el-select v-model="tableData.param.productId" clearable filterable placeholder="请选择产品">
@@ -11,13 +11,13 @@
           </el-select>
           </el-select>
         </el-form-item>
         </el-form-item>
         <el-form-item>
         <el-form-item>
-          <el-button size="default" type="primary" class="ml10" @click="getList(1)">
+          <el-button type="primary" class="ml10" @click="getList(1)">
             <el-icon>
             <el-icon>
               <ele-Search />
               <ele-Search />
             </el-icon>
             </el-icon>
             查询
             查询
           </el-button>
           </el-button>
-          <el-button size="default" @click="resetQuery(queryRef)">
+          <el-button @click="resetQuery(queryRef)">
             <el-icon>
             <el-icon>
               <ele-Refresh />
               <ele-Refresh />
             </el-icon>
             </el-icon>

+ 4 - 4
src/views/iot/ota-update/update/component/batch.vue

@@ -2,19 +2,19 @@
   <div class="ota-module-container">
   <div class="ota-module-container">
     <el-card shadow="nover">
     <el-card shadow="nover">
       <div class="ota-module-search mb15">
       <div class="ota-module-search mb15">
-        <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="90px" @keyup.enter.native="getList(1)">
+        <el-form :model="tableData.param" ref="queryRef" inline label-width="90px" @keyup.enter.native="getList(1)">
           <el-form-item label="批次名称:" prop="name">
           <el-form-item label="批次名称:" prop="name">
-            <el-input v-model="tableData.param.keyWord" placeholder="请输入批次名称" clearable size="default" style="width: 240px" />
+            <el-input v-model="tableData.param.keyWord" placeholder="请输入批次名称" clearable style="width: 240px" />
           </el-form-item>
           </el-form-item>
 
 
           <el-form-item>
           <el-form-item>
-            <el-button size="default" type="primary" class="ml10" @click="getList(1)">
+            <el-button type="primary" class="ml10" @click="getList(1)">
               <el-icon>
               <el-icon>
                 <ele-Search />
                 <ele-Search />
               </el-icon>
               </el-icon>
               查询
               查询
             </el-button>
             </el-button>
-            <el-button size="default" @click="resetQuery()">
+            <el-button @click="resetQuery()">
               <el-icon>
               <el-icon>
                 <ele-Refresh />
                 <ele-Refresh />
               </el-icon>
               </el-icon>

+ 3 - 3
src/views/iot/ota-update/update/component/check.vue

@@ -9,7 +9,7 @@
     <el-form ref="formRef" :model="formData" :rules="ruleForm" label-width="160px"> -->
     <el-form ref="formRef" :model="formData" :rules="ruleForm" label-width="160px"> -->
   <div class="ota-edit-module-container">
   <div class="ota-edit-module-container">
     <el-dialog :title="'操作升级包'" v-model="isShowDialog" width="769px">
     <el-dialog :title="'操作升级包'" v-model="isShowDialog" width="769px">
-      <el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="160px">
+      <el-form :model="ruleForm" ref="formRef" :rules="rules" label-width="160px">
         <el-form-item label="类型" prop="formType" @change="getFormType">
         <el-form-item label="类型" prop="formType" @change="getFormType">
           <el-radio-group v-model="ruleForm.types">
           <el-radio-group v-model="ruleForm.types">
             <el-radio label="1">验证</el-radio>
             <el-radio label="1">验证</el-radio>
@@ -62,8 +62,8 @@
       </el-form>
       </el-form>
       <template #footer>
       <template #footer>
 				<span class="dialog-footer">
 				<span class="dialog-footer">
-				<el-button @click="onCancel" size="default">取 消</el-button>
-				<el-button type="primary" @click="onSubmit" size="default">{{ruleForm.id!==0?'修 改':'添 加'}}</el-button>
+				<el-button @click="onCancel">取 消</el-button>
+				<el-button type="primary" @click="onSubmit">{{ruleForm.id!==0?'修 改':'添 加'}}</el-button>
 				</span>
 				</span>
       </template>
       </template>
     </el-dialog>
     </el-dialog>

+ 3 - 3
src/views/iot/ota-update/update/component/device.vue

@@ -2,14 +2,14 @@
   <div>
   <div>
 	<el-card shadow="nover">
 	<el-card shadow="nover">
 		<div class="search">
 		<div class="search">
-			<el-form :inline="true" ref="queryRef">
+			<el-form inline ref="queryRef">
 				<el-form-item label="设备名称:" prop="name">
 				<el-form-item label="设备名称:" prop="name">
-					<el-input v-model="tableData.param.deviceName" placeholder="请输入设备名称" clearable size="default" style="width: 240px" @submit.prevent />
+					<el-input v-model="tableData.param.deviceName" placeholder="请输入设备名称" clearable style="width: 240px" @submit.prevent />
 				</el-form-item>
 				</el-form-item>
 
 
 				<el-form-item>
 				<el-form-item>
 
 
-					<el-button size="default" type="primary" class="ml10" @click="getDetail">
+					<el-button type="primary" class="ml10" @click="getDetail">
 						<el-icon>
 						<el-icon>
 							<ele-Search />
 							<ele-Search />
 						</el-icon>
 						</el-icon>

+ 1 - 1
src/views/iot/ota-update/update/component/deviceBind.vue

@@ -3,7 +3,7 @@
     <el-dialog title="选择设备" v-model="isShowDialog" width="90%">
     <el-dialog title="选择设备" v-model="isShowDialog" width="90%">
       <el-form :model="ruleForm" ref="formRef" :rules="rules" size="small" label-width="110px">
       <el-form :model="ruleForm" ref="formRef" :rules="rules" size="small" label-width="110px">
         <el-form-item label="设备名称" prop="name">
         <el-form-item label="设备名称" prop="name">
-          <el-input v-model="tableData.param.name" placeholder="请输入设备名称" clearable size="default" style="width: 240px" @keyup.enter.native="getDeviceList" />
+          <el-input v-model="tableData.param.name" placeholder="请输入设备名称" clearable style="width: 240px" @keyup.enter.native="getDeviceList" />
           <el-button style="margin-left: 20px;" type="primary" @click="getDeviceList()">查询</el-button>
           <el-button style="margin-left: 20px;" type="primary" @click="getDeviceList()">查询</el-button>
 
 
           <el-button style="margin-left: 20px;" :disabled="!deviceKeyList.length" type="danger" @click="confirmBind()">确定选择</el-button>
           <el-button style="margin-left: 20px;" :disabled="!deviceKeyList.length" type="danger" @click="confirmBind()">确定选择</el-button>

+ 3 - 3
src/views/iot/ota-update/update/component/deviceList.vue

@@ -2,14 +2,14 @@
   <div class="ota-edit-module-container">
   <div class="ota-edit-module-container">
     <el-dialog :title="'设备详情'" v-model="isShowDialog" width="769px">
     <el-dialog :title="'设备详情'" v-model="isShowDialog" width="769px">
       <div class="search">
       <div class="search">
-        <el-form :inline="true" ref="queryRef">
+        <el-form inline ref="queryRef">
           <el-form-item label="设备名称:" prop="name">
           <el-form-item label="设备名称:" prop="name">
-            <el-input v-model="tableData.param.deviceName" placeholder="请输入设备名称" clearable size="default" style="width: 240px" @submit.prevent />
+            <el-input v-model="tableData.param.deviceName" placeholder="请输入设备名称" clearable style="width: 240px" @submit.prevent />
           </el-form-item>
           </el-form-item>
 
 
           <el-form-item>
           <el-form-item>
 
 
-            <el-button size="default" type="primary" class="ml10" @click="getDetail">
+            <el-button type="primary" class="ml10" @click="getDetail">
               <el-icon>
               <el-icon>
                 <ele-Search />
                 <ele-Search />
               </el-icon>
               </el-icon>

+ 3 - 3
src/views/iot/ota-update/update/component/edit.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
   <div class="ota-edit-module-container">
   <div class="ota-edit-module-container">
     <el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '升级包'" v-model="isShowDialog" width="769px">
     <el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '升级包'" v-model="isShowDialog" width="769px">
-      <el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" v-if="isShowDialog" label-width="160px">
+      <el-form :model="ruleForm" ref="formRef" :rules="rules" v-if="isShowDialog" label-width="160px">
         <el-form-item label="升级包类型" prop="types">
         <el-form-item label="升级包类型" prop="types">
           <el-radio-group v-model="ruleForm.types">
           <el-radio-group v-model="ruleForm.types">
             <el-radio label="1">整包</el-radio>
             <el-radio label="1">整包</el-radio>
@@ -78,8 +78,8 @@
       </el-form>
       </el-form>
       <template #footer>
       <template #footer>
         <span class="dialog-footer">
         <span class="dialog-footer">
-          <el-button @click="onCancel" size="default">取 消</el-button>
-          <el-button type="primary" @click="onSubmit" size="default">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
+          <el-button @click="onCancel">取 消</el-button>
+          <el-button type="primary" @click="onSubmit">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
         </span>
         </span>
       </template>
       </template>
     </el-dialog>
     </el-dialog>

+ 1 - 1
src/views/iot/ota-update/update/component/productBind.vue

@@ -3,7 +3,7 @@
     <el-dialog title="选择产品" v-model="isShowDialog" width="90%">
     <el-dialog title="选择产品" v-model="isShowDialog" width="90%">
       <el-form ref="formRef" size="small" label-width="110px">
       <el-form ref="formRef" size="small" label-width="110px">
         <el-form-item label="设备名称" prop="name">
         <el-form-item label="设备名称" prop="name">
-          <el-input v-model="tableData.param.name" placeholder="请输入产品名称" clearable size="default" style="width: 240px" @keyup.enter.native="getProductList" />
+          <el-input v-model="tableData.param.name" placeholder="请输入产品名称" clearable style="width: 240px" @keyup.enter.native="getProductList" />
           <el-button style="margin-left: 20px;" type="primary" @click="getProductList()">查询</el-button>
           <el-button style="margin-left: 20px;" type="primary" @click="getProductList()">查询</el-button>
 
 
           <el-button style="margin-left: 20px;" :disabled="!deviceKeyList.length" type="danger" @click="confirmBind()">确定选择</el-button>
           <el-button style="margin-left: 20px;" :disabled="!deviceKeyList.length" type="danger" @click="confirmBind()">确定选择</el-button>

+ 4 - 4
src/views/iot/ota-update/update/index.vue

@@ -1,18 +1,18 @@
 <template>
 <template>
   <div class="page">
   <div class="page">
     <el-card shadow="nover">
     <el-card shadow="nover">
-      <el-form :model="tableData.param" ref="queryRef" :inline="true">
+      <el-form :model="tableData.param" ref="queryRef" inline>
         <el-form-item label="升级包名称" prop="keyWord">
         <el-form-item label="升级包名称" prop="keyWord">
-          <el-input v-model="tableData.param.keyWord" placeholder="请输入升级包名称" clearable size="default" style="width: 240px;" @keyup.enter.native="getList(1)" />
+          <el-input v-model="tableData.param.keyWord" placeholder="请输入升级包名称" clearable style="width: 240px;" @keyup.enter.native="getList(1)" />
         </el-form-item>
         </el-form-item>
         <el-form-item>
         <el-form-item>
-          <el-button size="default" type="primary" class="ml10" @click="getList(1)">
+          <el-button type="primary" class="ml10" @click="getList(1)">
             <el-icon>
             <el-icon>
               <ele-Search />
               <ele-Search />
             </el-icon>
             </el-icon>
             查询
             查询
           </el-button>
           </el-button>
-          <el-button size="default" @click="resetQuery">
+          <el-button @click="resetQuery">
             <el-icon>
             <el-icon>
               <ele-Refresh />
               <ele-Refresh />
             </el-icon>
             </el-icon>

+ 3 - 3
src/views/iot/property/attribute/index.vue

@@ -1,12 +1,12 @@
 <template>
 <template>
 	<div class="page">
 	<div class="page">
 		<el-card shadow="nover">
 		<el-card shadow="nover">
-			<el-form :inline="true" ref="queryRef" @keyup.enter="getList(1)">
+			<el-form inline ref="queryRef" @keyup.enter="getList(1)">
 				<el-form-item label="关键字:" prop="keyWord">
 				<el-form-item label="关键字:" prop="keyWord">
-					<el-input v-model="params.keyWord" placeholder="请输入关键字" clearable size="default" style="width: 240px" />
+					<el-input v-model="params.keyWord" placeholder="请输入关键字" clearable style="width: 240px" />
 				</el-form-item>
 				</el-form-item>
 				<el-form-item>
 				<el-form-item>
-					<el-button size="default" type="primary" class="ml10" @click="getList(1)">
+					<el-button type="primary" class="ml10" @click="getList(1)">
 						<el-icon>
 						<el-icon>
 							<ele-Search />
 							<ele-Search />
 						</el-icon>
 						</el-icon>

+ 3 - 3
src/views/iot/property/dossier/index.vue

@@ -1,13 +1,13 @@
 <template>
 <template>
 	<div class="page">
 	<div class="page">
 		<el-card shadow="nover">
 		<el-card shadow="nover">
-			<el-form :inline="true" ref="queryRef" @keyup.enter="getList(1)">
+			<el-form inline ref="queryRef" @keyup.enter="getList(1)">
 				<el-form-item label="名称:" prop="keyWord">
 				<el-form-item label="名称:" prop="keyWord">
-					<el-input v-model="params.keyWord" placeholder="请输入名称" clearable size="default" style="width: 240px" />
+					<el-input v-model="params.keyWord" placeholder="请输入名称" clearable style="width: 240px" />
 				</el-form-item>
 				</el-form-item>
 
 
 				<el-form-item>
 				<el-form-item>
-					<el-button size="default" type="primary" class="ml10" @click="getList(1)">
+					<el-button type="primary" class="ml10" @click="getList(1)">
 						<el-icon>
 						<el-icon>
 							<ele-Search />
 							<ele-Search />
 						</el-icon>
 						</el-icon>

+ 1 - 1
src/views/iot/rule-engine/index.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
 	<div class="page">
 	<div class="page">
 		<el-card shadow="nover">
 		<el-card shadow="nover">
-			<el-form :inline="true">
+			<el-form inline>
 				<el-form-item>
 				<el-form-item>
 					<el-button type="primary" v-auth="'add'" @click="addOrEdit()">
 					<el-button type="primary" v-auth="'add'" @click="addOrEdit()">
 						<el-icon>
 						<el-icon>

+ 2 - 2
src/views/iot/rule-engine/send.vue

@@ -1,9 +1,9 @@
 <template>
 <template>
   <div class="page">
   <div class="page">
     <el-card shadow="nover">
     <el-card shadow="nover">
-      <el-form :inline="true">
+      <el-form inline>
         <el-form-item>
         <el-form-item>
-          <!-- <el-button size="default" type="primary" class="ml10" @click="getList(1)">
+          <!-- <el-button type="primary" class="ml10" @click="getList(1)">
 							<el-icon>
 							<el-icon>
 								<ele-Search />
 								<ele-Search />
 							</el-icon>
 							</el-icon>

+ 5 - 5
src/views/iot/scene/list/index.vue

@@ -1,23 +1,23 @@
 <template>
 <template>
 	<div class="page">
 	<div class="page">
 		<el-card shadow="nover">
 		<el-card shadow="nover">
-			<el-form :inline="true" ref="queryRef">
+			<el-form inline ref="queryRef">
 				<el-form-item label="场景名称:" prop="name">
 				<el-form-item label="场景名称:" prop="name">
-					<el-input v-model="params.keyWord" placeholder="场景名称" clearable size="default" style="width: 220px" @keyup.enter.native="getList(1)" />
+					<el-input v-model="params.keyWord" placeholder="场景名称" clearable style="width: 220px" @keyup.enter.native="getList(1)" />
 				</el-form-item>
 				</el-form-item>
 				<el-form-item label="状态" prop="status">
 				<el-form-item label="状态" prop="status">
-					<el-select v-model="params.status" placeholder="发布状态" clearable size="default" style="width: 160px">
+					<el-select v-model="params.status" placeholder="发布状态" clearable style="width: 160px">
 						<el-option label="全部" :value="-1" />
 						<el-option label="全部" :value="-1" />
 						<el-option label="成功" :value="1" />
 						<el-option label="成功" :value="1" />
 						<el-option label="失败" :value="0" />
 						<el-option label="失败" :value="0" />
 					</el-select>
 					</el-select>
 				</el-form-item>
 				</el-form-item>
 				<el-form-item label="执行时间" prop="dateRange">
 				<el-form-item label="执行时间" prop="dateRange">
-					<el-date-picker v-model="params.dateRange" size="default" style="width: 240px" value-format="YYYY-MM-DD" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+					<el-date-picker v-model="params.dateRange" style="width: 240px" value-format="YYYY-MM-DD" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
 				</el-form-item>
 				</el-form-item>
 				<el-form-item>
 				<el-form-item>
 
 
-					<el-button size="default" type="primary" class="ml10" @click="getList(1)">
+					<el-button type="primary" class="ml10" @click="getList(1)">
 						<el-icon>
 						<el-icon>
 							<ele-Search />
 							<ele-Search />
 						</el-icon>
 						</el-icon>

+ 5 - 5
src/views/iot/scene/manage/index.vue

@@ -2,13 +2,13 @@
 	<div class="page">
 	<div class="page">
 		<el-card shadow="nover">
 		<el-card shadow="nover">
 			<div class="search">
 			<div class="search">
-				<el-form :inline="true" ref="queryRef" @keyup.enter="getList(1)">
+				<el-form inline ref="queryRef" @keyup.enter="getList(1)">
 					<el-form-item label="场景名称:" prop="keyWord">
 					<el-form-item label="场景名称:" prop="keyWord">
-						<el-input v-model="params.keyWord" placeholder="请输入场景名称" clearable size="default" style="width: 240px" />
+						<el-input v-model="params.keyWord" placeholder="请输入场景名称" clearable style="width: 240px" />
 					</el-form-item>
 					</el-form-item>
 
 
 					<el-form-item label="触发方式" prop="sceneType" style="width: 200px;">
 					<el-form-item label="触发方式" prop="sceneType" style="width: 200px;">
-						<el-select v-model="params.sceneType" placeholder="触发方式" clearable size="default" style="width: 240px">
+						<el-select v-model="params.sceneType" placeholder="触发方式" clearable style="width: 240px">
 							<el-option label="设备触发" value="device" />
 							<el-option label="设备触发" value="device" />
 							<el-option label="手动触发" value="manual" />
 							<el-option label="手动触发" value="manual" />
 							<el-option label="定时触发" value="timer" />
 							<el-option label="定时触发" value="timer" />
@@ -16,7 +16,7 @@
 					</el-form-item>
 					</el-form-item>
 
 
 					<el-form-item label="运行状态" prop="status" style="width: 200px;">
 					<el-form-item label="运行状态" prop="status" style="width: 200px;">
-						<el-select v-model="params.status" placeholder="运行状态" clearable size="default" style="width: 240px">
+						<el-select v-model="params.status" placeholder="运行状态" clearable style="width: 240px">
 							<el-option label="全部" :value="-1" />
 							<el-option label="全部" :value="-1" />
 							<el-option label="启用" :value="1" />
 							<el-option label="启用" :value="1" />
 							<el-option label="禁用" :value="0" />
 							<el-option label="禁用" :value="0" />
@@ -25,7 +25,7 @@
 
 
 					<el-form-item>
 					<el-form-item>
 
 
-						<el-button size="default" type="primary" class="ml10" @click="getList(1)">
+						<el-button type="primary" class="ml10" @click="getList(1)">
 							<el-icon>
 							<el-icon>
 								<ele-Search />
 								<ele-Search />
 							</el-icon>
 							</el-icon>

+ 1 - 1
src/views/limits/backEnd/page/index.vue

@@ -8,7 +8,7 @@
 			type="warning"
 			type="warning"
 			:closable="false"
 			:closable="false"
 		></el-alert>
 		></el-alert>
-		<el-button type="primary" size="default" class="mt15" @click="onGoToFrontEndPage">
+		<el-button type="primary" class="mt15" @click="onGoToFrontEndPage">
 			<el-icon>
 			<el-icon>
 				<ele-Position />
 				<ele-Position />
 			</el-icon>
 			</el-icon>

+ 27 - 27
src/views/limits/frontEnd/btn/index.vue

@@ -8,7 +8,7 @@
 				<Auth :value="'btn.add'">
 				<Auth :value="'btn.add'">
 					<div class="flex-warp-item">
 					<div class="flex-warp-item">
 						<div class="flex-warp-item-box">
 						<div class="flex-warp-item-box">
-							<el-button type="primary" size="default">
+							<el-button type="primary">
 								<el-icon>
 								<el-icon>
 									<ele-DocumentAdd />
 									<ele-DocumentAdd />
 								</el-icon>
 								</el-icon>
@@ -20,7 +20,7 @@
 				<Auth :value="'btn.edit'">
 				<Auth :value="'btn.edit'">
 					<div class="flex-warp-item">
 					<div class="flex-warp-item">
 						<div class="flex-warp-item-box">
 						<div class="flex-warp-item-box">
-							<el-button type="info" size="default">
+							<el-button type="info">
 								<el-icon>
 								<el-icon>
 									<ele-Edit />
 									<ele-Edit />
 								</el-icon>
 								</el-icon>
@@ -32,7 +32,7 @@
 				<Auth :value="'btn.del'">
 				<Auth :value="'btn.del'">
 					<div class="flex-warp-item">
 					<div class="flex-warp-item">
 						<div class="flex-warp-item-box">
 						<div class="flex-warp-item-box">
-							<el-button type="info" size="default">
+							<el-button type="info">
 								<el-icon>
 								<el-icon>
 									<ele-Delete />
 									<ele-Delete />
 								</el-icon>
 								</el-icon>
@@ -44,7 +44,7 @@
 				<Auth :value="'btn.link'">
 				<Auth :value="'btn.link'">
 					<div class="flex-warp-item">
 					<div class="flex-warp-item">
 						<div class="flex-warp-item-box">
 						<div class="flex-warp-item-box">
-							<el-button type="success" size="default">
+							<el-button type="success">
 								<el-icon>
 								<el-icon>
 									<ele-Link />
 									<ele-Link />
 								</el-icon>
 								</el-icon>
@@ -60,7 +60,7 @@
 				<Auths :value="['btn.addsss', 'btn.edit', 'btn.delsss', 'btn.linksss']">
 				<Auths :value="['btn.addsss', 'btn.edit', 'btn.delsss', 'btn.linksss']">
 					<div class="flex-warp-item">
 					<div class="flex-warp-item">
 						<div class="flex-warp-item-box">
 						<div class="flex-warp-item-box">
-							<el-button type="primary" size="default">
+							<el-button type="primary">
 								<el-icon>
 								<el-icon>
 									<ele-DocumentAdd />
 									<ele-DocumentAdd />
 								</el-icon>
 								</el-icon>
@@ -72,7 +72,7 @@
 				<Auths :value="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
 				<Auths :value="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
 					<div class="flex-warp-item">
 					<div class="flex-warp-item">
 						<div class="flex-warp-item-box">
 						<div class="flex-warp-item-box">
-							<el-button type="info" size="default">
+							<el-button type="info">
 								<el-icon>
 								<el-icon>
 									<ele-Edit />
 									<ele-Edit />
 								</el-icon>
 								</el-icon>
@@ -84,7 +84,7 @@
 				<Auths :value="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
 				<Auths :value="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
 					<div class="flex-warp-item">
 					<div class="flex-warp-item">
 						<div class="flex-warp-item-box">
 						<div class="flex-warp-item-box">
-							<el-button type="info" size="default">
+							<el-button type="info">
 								<el-icon>
 								<el-icon>
 									<ele-Delete />
 									<ele-Delete />
 								</el-icon>
 								</el-icon>
@@ -96,7 +96,7 @@
 				<Auths :value="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
 				<Auths :value="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
 					<div class="flex-warp-item">
 					<div class="flex-warp-item">
 						<div class="flex-warp-item-box">
 						<div class="flex-warp-item-box">
-							<el-button type="success" size="default">
+							<el-button type="success">
 								<el-icon>
 								<el-icon>
 									<ele-Link />
 									<ele-Link />
 								</el-icon>
 								</el-icon>
@@ -112,7 +112,7 @@
 				<AuthAll :value="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
 				<AuthAll :value="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
 					<div class="flex-warp-item">
 					<div class="flex-warp-item">
 						<div class="flex-warp-item-box">
 						<div class="flex-warp-item-box">
-							<el-button type="primary" size="default">
+							<el-button type="primary">
 								<el-icon>
 								<el-icon>
 									<ele-DocumentAdd />
 									<ele-DocumentAdd />
 								</el-icon>
 								</el-icon>
@@ -124,7 +124,7 @@
 				<AuthAll :value="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
 				<AuthAll :value="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
 					<div class="flex-warp-item">
 					<div class="flex-warp-item">
 						<div class="flex-warp-item-box">
 						<div class="flex-warp-item-box">
-							<el-button type="info" size="default">
+							<el-button type="info">
 								<el-icon>
 								<el-icon>
 									<ele-Edit />
 									<ele-Edit />
 								</el-icon>
 								</el-icon>
@@ -136,7 +136,7 @@
 				<AuthAll :value="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
 				<AuthAll :value="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
 					<div class="flex-warp-item">
 					<div class="flex-warp-item">
 						<div class="flex-warp-item-box">
 						<div class="flex-warp-item-box">
-							<el-button type="info" size="default">
+							<el-button type="info">
 								<el-icon>
 								<el-icon>
 									<ele-Delete />
 									<ele-Delete />
 								</el-icon>
 								</el-icon>
@@ -148,7 +148,7 @@
 				<AuthAll :value="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
 				<AuthAll :value="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
 					<div class="flex-warp-item">
 					<div class="flex-warp-item">
 						<div class="flex-warp-item-box">
 						<div class="flex-warp-item-box">
-							<el-button type="success" size="default">
+							<el-button type="success">
 								<el-icon>
 								<el-icon>
 									<ele-Link />
 									<ele-Link />
 								</el-icon>
 								</el-icon>
@@ -166,7 +166,7 @@
 			<div class="flex-warp">
 			<div class="flex-warp">
 				<div class="flex-warp-item" v-auth="'btn.add'">
 				<div class="flex-warp-item" v-auth="'btn.add'">
 					<div class="flex-warp-item-box">
 					<div class="flex-warp-item-box">
-						<el-button type="primary" size="default">
+						<el-button type="primary">
 							<el-icon>
 							<el-icon>
 								<ele-DocumentAdd />
 								<ele-DocumentAdd />
 							</el-icon>
 							</el-icon>
@@ -176,7 +176,7 @@
 				</div>
 				</div>
 				<div class="flex-warp-item" v-auth="'btn.edit'">
 				<div class="flex-warp-item" v-auth="'btn.edit'">
 					<div class="flex-warp-item-box">
 					<div class="flex-warp-item-box">
-						<el-button type="info" size="default">
+						<el-button type="info">
 							<el-icon>
 							<el-icon>
 								<ele-Edit />
 								<ele-Edit />
 							</el-icon>
 							</el-icon>
@@ -186,7 +186,7 @@
 				</div>
 				</div>
 				<div class="flex-warp-item" v-auth="'btn.del'">
 				<div class="flex-warp-item" v-auth="'btn.del'">
 					<div class="flex-warp-item-box">
 					<div class="flex-warp-item-box">
-						<el-button type="info" size="default">
+						<el-button type="info">
 							<el-icon>
 							<el-icon>
 								<ele-Delete />
 								<ele-Delete />
 							</el-icon>
 							</el-icon>
@@ -196,7 +196,7 @@
 				</div>
 				</div>
 				<div class="flex-warp-item" v-auth="'btn.link'">
 				<div class="flex-warp-item" v-auth="'btn.link'">
 					<div class="flex-warp-item-box">
 					<div class="flex-warp-item-box">
-						<el-button type="success" size="default">
+						<el-button type="success">
 							<el-icon>
 							<el-icon>
 								<ele-Link />
 								<ele-Link />
 							</el-icon>
 							</el-icon>
@@ -210,7 +210,7 @@
 			<div class="flex-warp">
 			<div class="flex-warp">
 				<div class="flex-warp-item" v-auths="['btn.addsss', 'btn.edit', 'btn.delsss', 'btn.linksss']">
 				<div class="flex-warp-item" v-auths="['btn.addsss', 'btn.edit', 'btn.delsss', 'btn.linksss']">
 					<div class="flex-warp-item-box">
 					<div class="flex-warp-item-box">
-						<el-button type="primary" size="default">
+						<el-button type="primary">
 							<el-icon>
 							<el-icon>
 								<ele-DocumentAdd />
 								<ele-DocumentAdd />
 							</el-icon>
 							</el-icon>
@@ -220,7 +220,7 @@
 				</div>
 				</div>
 				<div class="flex-warp-item" v-auths="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
 				<div class="flex-warp-item" v-auths="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
 					<div class="flex-warp-item-box">
 					<div class="flex-warp-item-box">
-						<el-button type="info" size="default">
+						<el-button type="info">
 							<el-icon>
 							<el-icon>
 								<ele-Edit />
 								<ele-Edit />
 							</el-icon>
 							</el-icon>
@@ -230,7 +230,7 @@
 				</div>
 				</div>
 				<div class="flex-warp-item" v-auths="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
 				<div class="flex-warp-item" v-auths="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
 					<div class="flex-warp-item-box">
 					<div class="flex-warp-item-box">
-						<el-button type="info" size="default">
+						<el-button type="info">
 							<el-icon>
 							<el-icon>
 								<ele-Delete />
 								<ele-Delete />
 							</el-icon>
 							</el-icon>
@@ -240,7 +240,7 @@
 				</div>
 				</div>
 				<div class="flex-warp-item" v-auths="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
 				<div class="flex-warp-item" v-auths="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
 					<div class="flex-warp-item-box">
 					<div class="flex-warp-item-box">
-						<el-button type="success" size="default">
+						<el-button type="success">
 							<el-icon>
 							<el-icon>
 								<ele-Link />
 								<ele-Link />
 							</el-icon>
 							</el-icon>
@@ -254,7 +254,7 @@
 			<div class="flex-warp">
 			<div class="flex-warp">
 				<div class="flex-warp-item" v-auth-all="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
 				<div class="flex-warp-item" v-auth-all="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
 					<div class="flex-warp-item-box">
 					<div class="flex-warp-item-box">
-						<el-button type="primary" size="default">
+						<el-button type="primary">
 							<el-icon>
 							<el-icon>
 								<ele-DocumentAdd />
 								<ele-DocumentAdd />
 							</el-icon>
 							</el-icon>
@@ -264,7 +264,7 @@
 				</div>
 				</div>
 				<div class="flex-warp-item" v-auth-all="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
 				<div class="flex-warp-item" v-auth-all="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
 					<div class="flex-warp-item-box">
 					<div class="flex-warp-item-box">
-						<el-button type="info" size="default">
+						<el-button type="info">
 							<el-icon>
 							<el-icon>
 								<ele-Edit />
 								<ele-Edit />
 							</el-icon>
 							</el-icon>
@@ -274,7 +274,7 @@
 				</div>
 				</div>
 				<div class="flex-warp-item" v-auth-all="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
 				<div class="flex-warp-item" v-auth-all="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
 					<div class="flex-warp-item-box">
 					<div class="flex-warp-item-box">
-						<el-button type="info" size="default">
+						<el-button type="info">
 							<el-icon>
 							<el-icon>
 								<ele-Delete />
 								<ele-Delete />
 							</el-icon>
 							</el-icon>
@@ -284,7 +284,7 @@
 				</div>
 				</div>
 				<div class="flex-warp-item" v-auth-all="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
 				<div class="flex-warp-item" v-auth-all="['btn.add', 'btn.edit', 'btn.del', 'btn.link']">
 					<div class="flex-warp-item-box">
 					<div class="flex-warp-item-box">
-						<el-button type="success" size="default">
+						<el-button type="success">
 							<el-icon>
 							<el-icon>
 								<ele-Link />
 								<ele-Link />
 							</el-icon>
 							</el-icon>
@@ -301,7 +301,7 @@
 			<div class="flex-warp">
 			<div class="flex-warp">
 				<div class="flex-warp-item">
 				<div class="flex-warp-item">
 					<div class="flex-warp-item-box">
 					<div class="flex-warp-item-box">
-						<el-button type="primary" size="default" @click="onAuthClick">
+						<el-button type="primary" @click="onAuthClick">
 							<el-icon>
 							<el-icon>
 								<ele-DocumentAdd />
 								<ele-DocumentAdd />
 							</el-icon>
 							</el-icon>
@@ -311,7 +311,7 @@
 				</div>
 				</div>
 				<div class="flex-warp-item">
 				<div class="flex-warp-item">
 					<div class="flex-warp-item-box">
 					<div class="flex-warp-item-box">
-						<el-button type="info" size="default" @click="onAuthsClick">
+						<el-button type="info" @click="onAuthsClick">
 							<el-icon>
 							<el-icon>
 								<ele-Edit />
 								<ele-Edit />
 							</el-icon>
 							</el-icon>
@@ -321,7 +321,7 @@
 				</div>
 				</div>
 				<div class="flex-warp-item">
 				<div class="flex-warp-item">
 					<div class="flex-warp-item-box">
 					<div class="flex-warp-item-box">
-						<el-button type="info" size="default" @click="onAuthAllClick">
+						<el-button type="info" @click="onAuthAllClick">
 							<el-icon>
 							<el-icon>
 								<ele-Delete />
 								<ele-Delete />
 							</el-icon>
 							</el-icon>

+ 1 - 1
src/views/limits/frontEnd/page/index.vue

@@ -14,7 +14,7 @@
 			class="mt15"
 			class="mt15"
 		></el-alert>
 		></el-alert>
 		<el-card shadow="nover" header="切换用户演示,前端控制不同用户显示不同页面、按钮权限" class="mt15">
 		<el-card shadow="nover" header="切换用户演示,前端控制不同用户显示不同页面、按钮权限" class="mt15">
-			<el-radio-group v-model="userAuth" size="default" @change="onRadioChange">
+			<el-radio-group v-model="userAuth" @change="onRadioChange">
 				<el-radio-button label="admin"></el-radio-button>
 				<el-radio-button label="admin"></el-radio-button>
 				<el-radio-button label="common"></el-radio-button>
 				<el-radio-button label="common"></el-radio-button>
 			</el-radio-group>
 			</el-radio-group>

+ 1 - 1
src/views/login/component/changePwd.vue

@@ -21,7 +21,7 @@
 			</el-form-item>
 			</el-form-item>
 		</el-form>
 		</el-form>
 		<template #footer>
 		<template #footer>
-			<el-button type="primary" @click="onSubmit" size="default">更 换</el-button>
+			<el-button type="primary" @click="onSubmit">更 换</el-button>
 		</template>
 		</template>
 	</el-dialog>
 	</el-dialog>
 </template>
 </template>

+ 35 - 37
src/views/system/api/index.vue

@@ -1,41 +1,40 @@
 <template>
 <template>
 	<div class="page">
 	<div class="page">
 		<el-card shadow="nover">
 		<el-card shadow="nover">
-			<div class="search">
-				<el-form :model="params" :inline="true" ref="queryRef">
-					<el-form-item label="接口名称" prop="name">
-						<el-input v-model="params.name" placeholder="请输入接口名称" clearable style="width: 240px" @keyup.enter.native="getList(1)" />
-					</el-form-item>
-					<el-form-item label="接口地址" prop="address">
-						<el-input v-model="params.address" placeholder="请输入接口地址" clearable style="width: 240px" @keyup.enter.native="getList(1)" />
-					</el-form-item>
-					<el-form-item label="状态" prop="status" style="width: 200px">
-						<el-select v-model="params.status" placeholder="接口状态" clearable style="width: 240px">
-							<el-option label="全部" :value="-1" />
-							<el-option label="启用" :value="1" />
-							<el-option label="禁用" :value="0" />
-						</el-select>
-					</el-form-item>
-					<el-form-item>
-						<el-button size="default" type="primary" class="ml10" @click="getList(1)">
-							<el-icon>
-								<ele-Search />
-							</el-icon>
-							查询
-						</el-button>
-						<el-button size="default" @click="resetQuery()">
+			<el-form :model="params" inline ref="queryRef">
+				<el-form-item label="接口名称" prop="name">
+					<el-input v-model="params.name" placeholder="请输入接口名称" clearable style="width: 180px" @keyup.enter.native="getList(1)" />
+				</el-form-item>
+				<el-form-item label="接口地址" prop="address">
+					<el-input v-model="params.address" placeholder="请输入接口地址" clearable style="width: 180px" @keyup.enter.native="getList(1)" />
+				</el-form-item>
+				<el-form-item label="状态" prop="status">
+					<el-select v-model="params.status" placeholder="接口状态" clearable style="width: 120px">
+						<el-option label="全部" :value="-1" />
+						<el-option label="启用" :value="1" />
+						<el-option label="禁用" :value="0" />
+					</el-select>
+				</el-form-item>
+				<el-form-item>
+					<el-button type="primary" class="ml10" @click="getList(1)">
+						<el-icon>
+							<ele-Search />
+						</el-icon>
+						查询
+					</el-button>
+					<!-- <el-button @click="resetQuery()">
 							<el-icon>
 							<el-icon>
 								<ele-Refresh />
 								<ele-Refresh />
 							</el-icon>
 							</el-icon>
 							重置
 							重置
-						</el-button>
-						<el-button type="primary" @click="addOrEdit()" v-auth="'add'">
-							<el-icon>
-								<ele-FolderAdd />
-							</el-icon>
-							新增接口
-						</el-button>
-						<el-button type="primary" :disabled="!ids.length" @click="bindMenus()" v-auth="'batch'">
+						</el-button> -->
+					<el-button type="primary" @click="addOrEdit()" v-auth="'add'">
+						<el-icon>
+							<ele-FolderAdd />
+						</el-icon>
+						新增接口
+					</el-button>
+					<!-- <el-button type="primary" :disabled="!ids.length" @click="bindMenus()" v-auth="'batch'">
 							<el-icon>
 							<el-icon>
 								<ele-Grid />
 								<ele-Grid />
 							</el-icon>
 							</el-icon>
@@ -46,14 +45,13 @@
 								<ele-Download />
 								<ele-Download />
 							</el-icon>
 							</el-icon>
 							系统API同步
 							系统API同步
-						</el-button>
-					</el-form-item>
-				</el-form>
-			</div>
+						</el-button> -->
+				</el-form-item>
+			</el-form>
 			<el-table :data="tableData" @selection-change="handleSelectionChange" style="width: 100%" v-loading="loading" :expand-row-keys="[]" row-key="id" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
 			<el-table :data="tableData" @selection-change="handleSelectionChange" style="width: 100%" v-loading="loading" :expand-row-keys="[]" row-key="id" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
 				<el-table-column v-col="'selection'" type="selection" width="55" align="center" />
 				<el-table-column v-col="'selection'" type="selection" width="55" align="center" />
 				<!-- <el-table-column type="index" label="序号" width="60" align="center" /> -->
 				<!-- <el-table-column type="index" label="序号" width="60" align="center" /> -->
-				<el-table-column prop="id" label="ID" width="100" align="center" />
+				<el-table-column prop="id" label="ID" width="120" align="center" />
 				<el-table-column prop="name" v-col="'name'" label="接口名称" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="name" v-col="'name'" label="接口名称" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="address" v-col="'address'" label="接口地址" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="address" v-col="'address'" label="接口地址" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="status" v-col="'status'" label="状态" min-width="100" align="center">
 				<el-table-column prop="status" v-col="'status'" label="状态" min-width="100" align="center">
@@ -62,7 +60,7 @@
 						<el-tag type="info" size="small" v-else>禁用</el-tag>
 						<el-tag type="info" size="small" v-else>禁用</el-tag>
 					</template>
 					</template>
 				</el-table-column>
 				</el-table-column>
-				<el-table-column prop="menuIds" label="绑定菜单" show-overflow-tooltip></el-table-column>
+				<!-- <el-table-column prop="menuIds" label="绑定菜单" show-overflow-tooltip></el-table-column> -->
 				<el-table-column label="操作" width="100" align="center" v-col="'handle'">
 				<el-table-column label="操作" width="100" align="center" v-col="'handle'">
 					<template #default="scope">
 					<template #default="scope">
 						<el-button size="small" text type="warning" @click="addOrEdit(scope.row)" v-auth="'edit'">修改</el-button>
 						<el-button size="small" text type="warning" @click="addOrEdit(scope.row)" v-auth="'edit'">修改</el-button>

+ 5 - 5
src/views/system/application/index.vue

@@ -1,18 +1,18 @@
 <template>
 <template>
-	<el-card shadow="nover">
+	<el-card shadow="nover" class="page">
 		<div class="search">
 		<div class="search">
-			<el-form :model="params" :inline="true" ref="queryRef">
+			<el-form :model="params" inline ref="queryRef">
 				<el-form-item label="应用名称:" prop="keyWord" @submit.prevent>
 				<el-form-item label="应用名称:" prop="keyWord" @submit.prevent>
-					<el-input v-model="params.keyWord" placeholder="请输入应用名称" clearable size="default" style="width: 240px" @keyup.enter.native="getList(1)" />
+					<el-input v-model="params.keyWord" placeholder="请输入应用名称" clearable style="width: 240px" @keyup.enter.native="getList(1)" />
 				</el-form-item>
 				</el-form-item>
 				<el-form-item>
 				<el-form-item>
-					<el-button size="default" type="primary" class="ml10" @click="getList(1)">
+					<el-button type="primary" class="ml10" @click="getList(1)">
 						<el-icon>
 						<el-icon>
 							<ele-Search />
 							<ele-Search />
 						</el-icon>
 						</el-icon>
 						查询
 						查询
 					</el-button>
 					</el-button>
-					<el-button size="default" @click="resetQuery(queryRef)">
+					<el-button @click="resetQuery(queryRef)">
 						<el-icon>
 						<el-icon>
 							<ele-Refresh />
 							<ele-Refresh />
 						</el-icon>
 						</el-icon>

+ 3 - 3
src/views/system/assess/component/editAttr.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
 	<div class="system-edit-dic-container">
 	<div class="system-edit-dic-container">
 		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '属性定义'" v-model="isShowDialog" width="769px">
 		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '属性定义'" v-model="isShowDialog" width="769px">
-			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="120px">
+			<el-form :model="ruleForm" ref="formRef" :rules="rules" label-width="120px">
 				<el-form-item label="属性定义标识" prop="key">
 				<el-form-item label="属性定义标识" prop="key">
 					<el-input v-model="ruleForm.key" placeholder="请输入属性定义标识" />
 					<el-input v-model="ruleForm.key" placeholder="请输入属性定义标识" />
 				</el-form-item>
 				</el-form-item>
@@ -48,8 +48,8 @@
 			</el-form>
 			</el-form>
 			<template #footer>
 			<template #footer>
 				<span class="dialog-footer">
 				<span class="dialog-footer">
-					<el-button @click="onCancel" size="default">取 消</el-button>
-					<el-button type="primary" @click="onSubmit" size="default">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
+					<el-button @click="onCancel">取 消</el-button>
+					<el-button type="primary" @click="onSubmit">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
 				</span>
 				</span>
 			</template>
 			</template>
 		</el-dialog>
 		</el-dialog>

+ 3 - 3
src/views/system/assess/component/editEvent.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
 	<div class="system-edit-dic-container">
 	<div class="system-edit-dic-container">
 		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '事件定义'" v-model="isShowDialog" width="769px">
 		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '事件定义'" v-model="isShowDialog" width="769px">
-			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="120px">
+			<el-form :model="ruleForm" ref="formRef" :rules="rules" label-width="120px">
 				<el-form-item label="事件定义标识" prop="key">
 				<el-form-item label="事件定义标识" prop="key">
 					<el-input v-model="ruleForm.key" placeholder="请输入事件定义标识" />
 					<el-input v-model="ruleForm.key" placeholder="请输入事件定义标识" />
 				</el-form-item>
 				</el-form-item>
@@ -51,8 +51,8 @@
 			</el-form>
 			</el-form>
 			<template #footer>
 			<template #footer>
 				<span class="dialog-footer">
 				<span class="dialog-footer">
-					<el-button @click="onCancel" size="default">取 消</el-button>
-					<el-button type="primary" @click="onSubmit" size="default">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
+					<el-button @click="onCancel">取 消</el-button>
+					<el-button type="primary" @click="onSubmit">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
 				</span>
 				</span>
 			</template>
 			</template>
 		</el-dialog>
 		</el-dialog>

+ 3 - 3
src/views/system/assess/component/editFun.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
   <div class="system-edit-dic-container">
   <div class="system-edit-dic-container">
     <el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '功能定义'" v-model="isShowDialog" width="769px">
     <el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '功能定义'" v-model="isShowDialog" width="769px">
-      <el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="120px">
+      <el-form :model="ruleForm" ref="formRef" :rules="rules" label-width="120px">
         <el-form-item label="功能定义标识" prop="key">
         <el-form-item label="功能定义标识" prop="key">
           <el-input v-model="ruleForm.key" placeholder="请输入功能定义标识" />
           <el-input v-model="ruleForm.key" placeholder="请输入功能定义标识" />
         </el-form-item>
         </el-form-item>
@@ -28,8 +28,8 @@
       </el-form>
       </el-form>
       <template #footer>
       <template #footer>
         <span class="dialog-footer">
         <span class="dialog-footer">
-          <el-button @click="onCancel" size="default">取 消</el-button>
-          <el-button type="primary" @click="onSubmit" size="default">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
+          <el-button @click="onCancel">取 消</el-button>
+          <el-button type="primary" @click="onSubmit">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
         </span>
         </span>
       </template>
       </template>
     </el-dialog>
     </el-dialog>

+ 3 - 3
src/views/system/assess/component/editPro.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
   <div class="system-edit-dic-container">
   <div class="system-edit-dic-container">
     <el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '产品'" v-model="isShowDialog" width="769px">
     <el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '产品'" v-model="isShowDialog" width="769px">
-      <el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="90px">
+      <el-form :model="ruleForm" ref="formRef" :rules="rules" label-width="90px">
         <el-form-item label="产品标识" prop="key">
         <el-form-item label="产品标识" prop="key">
           <el-input v-model="ruleForm.key" placeholder="请输入产品标识" />
           <el-input v-model="ruleForm.key" placeholder="请输入产品标识" />
         </el-form-item>
         </el-form-item>
@@ -63,8 +63,8 @@
       </el-form>
       </el-form>
       <template #footer>
       <template #footer>
         <span class="dialog-footer">
         <span class="dialog-footer">
-          <el-button @click="onCancel" size="default">取 消</el-button>
-          <el-button type="primary" @click="onSubmit" size="default">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
+          <el-button @click="onCancel">取 消</el-button>
+          <el-button type="primary" @click="onSubmit">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
         </span>
         </span>
       </template>
       </template>
     </el-dialog>
     </el-dialog>

+ 3 - 3
src/views/system/assess/component/editTab.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
 	<div class="system-edit-dic-container">
 	<div class="system-edit-dic-container">
 		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '标签定义'" v-model="isShowDialog" width="769px">
 		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '标签定义'" v-model="isShowDialog" width="769px">
-			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="120px">
+			<el-form :model="ruleForm" ref="formRef" :rules="rules" label-width="120px">
 				<el-form-item label="标签定义标识" prop="key">
 				<el-form-item label="标签定义标识" prop="key">
 					<el-input v-model="ruleForm.key" placeholder="请输入标签定义标识" />
 					<el-input v-model="ruleForm.key" placeholder="请输入标签定义标识" />
 				</el-form-item>
 				</el-form-item>
@@ -50,8 +50,8 @@
 			</el-form>
 			</el-form>
 			<template #footer>
 			<template #footer>
 				<span class="dialog-footer">
 				<span class="dialog-footer">
-					<el-button @click="onCancel" size="default">取 消</el-button>
-					<el-button type="primary" @click="onSubmit" size="default">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
+					<el-button @click="onCancel">取 消</el-button>
+					<el-button type="primary" @click="onSubmit">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
 				</span>
 				</span>
 			</template>
 			</template>
 		</el-dialog>
 		</el-dialog>

+ 4 - 4
src/views/system/assess/totalIndex/component/addItem.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
 	<div class="system-add-user-container">
 	<div class="system-add-user-container">
 		<el-dialog title="新增指标" v-model="isShowDialog" width="769px">
 		<el-dialog title="新增指标" v-model="isShowDialog" width="769px">
-			<el-form :model="ruleForm" size="default" label-width="90px">
+			<el-form :model="ruleForm" label-width="90px">
 				<!-- <el-row :gutter="35">
 				<!-- <el-row :gutter="35">
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> -->
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> -->
 				<el-form-item label="评价名称" required>
 				<el-form-item label="评价名称" required>
@@ -15,7 +15,7 @@
 				<!-- </el-col> -->
 				<!-- </el-col> -->
 				<!-- </el-row> -->
 				<!-- </el-row> -->
 			</el-form>
 			</el-form>
-			<el-button size="default" type="primary" class="mb10 mt10" @click="onOpenAddSign">
+			<el-button type="primary" class="mb10 mt10" @click="onOpenAddSign">
 				<el-icon>
 				<el-icon>
 					<ele-FolderAdd />
 					<ele-FolderAdd />
 				</el-icon>
 				</el-icon>
@@ -45,8 +45,8 @@
 
 
 			<template #footer>
 			<template #footer>
 				<span class="dialog-footer">
 				<span class="dialog-footer">
-					<el-button @click="onCancel" size="default">取 消</el-button>
-					<el-button type="primary" @click="onSubmit" size="default">保 存</el-button>
+					<el-button @click="onCancel">取 消</el-button>
+					<el-button type="primary" @click="onSubmit">保 存</el-button>
 				</span>
 				</span>
 			</template>
 			</template>
 		</el-dialog>
 		</el-dialog>

+ 3 - 3
src/views/system/assess/totalIndex/component/addSign.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
 	<div class="add-or-edit-assess">
 	<div class="add-or-edit-assess">
 		<el-dialog :title="isEdit?'编辑标识项':'新建标识项'" v-model="isShowDialog" width="569px">
 		<el-dialog :title="isEdit?'编辑标识项':'新建标识项'" v-model="isShowDialog" width="569px">
-			<el-form class="add-flag-container" ref="ruleTagRef" :rules="rules" :model="ruleForm" size="default" label-width="100px">
+			<el-form class="add-flag-container" ref="ruleTagRef" :rules="rules" :model="ruleForm" label-width="100px">
 				<el-row :gutter="35">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="标识" prop="name">
 						<el-form-item label="标识" prop="name">
@@ -49,8 +49,8 @@
 			</div>
 			</div>
 			<template #footer>
 			<template #footer>
 				<span class="dialog-footer">
 				<span class="dialog-footer">
-					<el-button @click="onCancel" size="default">取 消</el-button>
-					<el-button type="primary" @click="onSubmit(ruleTagRef)" size="default">保 存</el-button>
+					<el-button @click="onCancel">取 消</el-button>
+					<el-button type="primary" @click="onSubmit(ruleTagRef)">保 存</el-button>
 				</span>
 				</span>
 			</template>
 			</template>
 		</el-dialog>
 		</el-dialog>

+ 4 - 4
src/views/system/assess/totalIndex/component/editItem.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
 	<div class="system-add-user-container">
 	<div class="system-add-user-container">
 		<el-dialog :title="ruleForm.item_code ? '编辑指标' : '新增指标'" v-model="isShowDialog" width="769px">
 		<el-dialog :title="ruleForm.item_code ? '编辑指标' : '新增指标'" v-model="isShowDialog" width="769px">
-			<el-form ref="ruleFormRef" :rules="rules" :model="ruleForm" size="default" label-width="90px">
+			<el-form ref="ruleFormRef" :rules="rules" :model="ruleForm" label-width="90px">
 				<el-form-item label="评价名称" prop="title" class="mb20">
 				<el-form-item label="评价名称" prop="title" class="mb20">
 					<el-input size="small" v-model="ruleForm.title" placeholder="请输入评价名称" clearable></el-input>
 					<el-input size="small" v-model="ruleForm.title" placeholder="请输入评价名称" clearable></el-input>
 				</el-form-item>
 				</el-form-item>
@@ -9,7 +9,7 @@
 					<el-input width="400" size="small" v-model="ruleForm.explain" type="textarea" placeholder="请输入描述" maxlength="150"></el-input>
 					<el-input width="400" size="small" v-model="ruleForm.explain" type="textarea" placeholder="请输入描述" maxlength="150"></el-input>
 				</el-form-item>
 				</el-form-item>
 			</el-form>
 			</el-form>
-			<el-button size="default" type="primary" class="mb10 mt10" @click="onOpenAddSign">
+			<el-button type="primary" class="mb10 mt10" @click="onOpenAddSign">
 				<el-icon>
 				<el-icon>
 					<ele-FolderAdd />
 					<ele-FolderAdd />
 				</el-icon>
 				</el-icon>
@@ -36,8 +36,8 @@
 
 
 			<template #footer>
 			<template #footer>
 				<span class="dialog-footer">
 				<span class="dialog-footer">
-					<el-button @click="onCancel" size="default">取 消</el-button>
-					<el-button type="primary" @click="onSubmit(ruleFormRef)" size="default">保 存</el-button>
+					<el-button @click="onCancel">取 消</el-button>
+					<el-button type="primary" @click="onSubmit(ruleFormRef)">保 存</el-button>
 				</span>
 				</span>
 			</template>
 			</template>
 		</el-dialog>
 		</el-dialog>

+ 3 - 3
src/views/system/assess/totalIndex/component/setTask.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
 	<div class="system-add-user-container">
 	<div class="system-add-user-container">
 		<el-dialog title="数据源配置接口" v-model="isShowDialog" width="650px">
 		<el-dialog title="数据源配置接口" v-model="isShowDialog" width="650px">
-			<el-form :model="ruleForm" ref="ruleFormRef" :rules="rules" size="default" label-width="90px">
+			<el-form :model="ruleForm" ref="ruleFormRef" :rules="rules" label-width="90px">
 				<el-row :gutter="35">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="指标名称:">
 						<el-form-item label="指标名称:">
@@ -139,8 +139,8 @@
 			</el-form>
 			</el-form>
 			<template #footer>
 			<template #footer>
 				<span class="dialog-footer">
 				<span class="dialog-footer">
-					<el-button @click="onCancel" size="default">取 消</el-button>
-					<el-button type="primary" @click="onSubmit(ruleFormRef)" size="default">保 存</el-button>
+					<el-button @click="onCancel">取 消</el-button>
+					<el-button type="primary" @click="onSubmit(ruleFormRef)">保 存</el-button>
 				</span>
 				</span>
 			</template>
 			</template>
 		</el-dialog>
 		</el-dialog>

+ 4 - 5
src/views/system/assess/totalIndex/index.vue

@@ -1,15 +1,15 @@
 <template>
 <template>
-  <div class="assess-total-container">
+  <div class="page">
     <el-card shadow="nover">
     <el-card shadow="nover">
       <div class="system-user-search mb15">
       <div class="system-user-search mb15">
-        <!-- <el-input size="default" placeholder="请输入用户名称" style="max-width: 180px"> </el-input>
-				<el-button size="default" type="success" class="ml10">
+        <!-- <el-input placeholder="请输入用户名称" style="max-width: 180px"> </el-input>
+				<el-button type="success" class="ml10">
 					<el-icon>
 					<el-icon>
 						<ele-Search />
 						<ele-Search />
 					</el-icon>
 					</el-icon>
 					查询
 					查询
 				</el-button> -->
 				</el-button> -->
-        <el-button size="default" type="primary" class="ml10" @click="onOpenAddItem" v-auth="'add'">
+        <el-button type="primary" class="ml10" @click="onOpenAddItem" v-auth="'add'">
           <el-icon>
           <el-icon>
             <ele-FolderAdd />
             <ele-FolderAdd />
           </el-icon>
           </el-icon>
@@ -30,7 +30,6 @@
     </el-card>
     </el-card>
     <EditOrAddItem ref="EditOrAddItem" @fetchList="fetchList" />
     <EditOrAddItem ref="EditOrAddItem" @fetchList="fetchList" />
     <DetailItem ref="detailItemRef" />
     <DetailItem ref="detailItemRef" />
-
   </div>
   </div>
 </template>
 </template>
 
 

+ 4 - 4
src/views/system/basicConfig/basic.vue

@@ -1,12 +1,12 @@
 <template>
 <template>
-	<el-form :model="state.tableData.param" label-position="top" ref="queryRef" :inline="true" label-width="100px">
+	<el-form :model="state.tableData.param" label-position="top" ref="queryRef" inline label-width="100px">
 		<div class="form-inner-wrap">
 		<div class="form-inner-wrap">
 			<div class="left-wrap">
 			<div class="left-wrap">
 				<el-form-item label="系统名称" prop="keyWord">
 				<el-form-item label="系统名称" prop="keyWord">
-					<el-input v-model="state.info.name" placeholder="请输入系统名称" clearable size="default" />
+					<el-input v-model="state.info.name" placeholder="请输入系统名称" clearable />
 				</el-form-item>
 				</el-form-item>
 				<el-form-item label="系统版权" prop="keyWord">
 				<el-form-item label="系统版权" prop="keyWord">
-					<el-input v-model="state.info.copyright" placeholder="请输入系统版权" clearable size="default" />
+					<el-input v-model="state.info.copyright" placeholder="请输入系统版权" clearable />
 				</el-form-item>
 				</el-form-item>
 				<el-row>
 				<el-row>
 					<el-col :span="12">
 					<el-col :span="12">
@@ -28,7 +28,7 @@
 					</el-col>
 					</el-col>
 				</el-row>
 				</el-row>
 				<el-form-item>
 				<el-form-item>
-					<el-button v-auth="'save'" size="default" type="primary" class="ml10" @click="setDetails">保存</el-button>
+					<el-button v-auth="'save'" type="primary" class="ml10" @click="setDetails">保存</el-button>
 				</el-form-item>
 				</el-form-item>
 			</div>
 			</div>
 			<div class="right-wrap">
 			<div class="right-wrap">

+ 1 - 1
src/views/system/basicConfig/index.vue

@@ -1,5 +1,5 @@
 <template>
 <template>
-	<div class="page">
+	<div class="page padding">
 		<el-card shadow="nover">
 		<el-card shadow="nover">
 			<el-menu :default-active="activeName" @select="menuChange" class="el-menu-vertical-demo" size="small">
 			<el-menu :default-active="activeName" @select="menuChange" class="el-menu-vertical-demo" size="small">
 				<el-menu-item index="1">基础配置</el-menu-item>
 				<el-menu-item index="1">基础配置</el-menu-item>

+ 3 - 3
src/views/system/city/component/edit.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
 	<div class="system-edit-dic-container">
 	<div class="system-edit-dic-container">
 		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '城市'" v-model="dialogVisible" width="769px">
 		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '城市'" v-model="dialogVisible" width="769px">
-			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="110px">
+			<el-form :model="ruleForm" ref="formRef" :rules="rules" label-width="110px">
 				<el-form-item label="所属城市" prop="">
 				<el-form-item label="所属城市" prop="">
 					<el-tree-select v-model="ruleForm.parentId" :data="treeData" :props="{
 					<el-tree-select v-model="ruleForm.parentId" :data="treeData" :props="{
 						label: 'name',
 						label: 'name',
@@ -24,8 +24,8 @@
 			</el-form>
 			</el-form>
 			<template #footer>
 			<template #footer>
 				<span class="dialog-footer">
 				<span class="dialog-footer">
-					<el-button @click="onCancel" size="default">取 消</el-button>
-					<el-button type="primary" @click="onSubmit" size="default">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
+					<el-button @click="onCancel">取 消</el-button>
+					<el-button type="primary" @click="onSubmit">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
 				</span>
 				</span>
 			</template>
 			</template>
 		</el-dialog>
 		</el-dialog>

+ 31 - 34
src/views/system/city/index.vue

@@ -1,37 +1,34 @@
 <template>
 <template>
-  <div class="system-dic-container">
+  <div class="page">
     <el-card shadow="nover">
     <el-card shadow="nover">
-      <div class="system-user-search mb15">
-        <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="100px">
-          <el-form-item label="城市名称" prop="name">
-            <el-input v-model="tableData.param.name" placeholder="请输入城市名称" clearable size="default" @keyup.enter="queryList" />
-          </el-form-item>
-          <el-form-item label="城市编号" prop="code">
-            <el-input v-model="tableData.param.code" placeholder="请输入城市编号" clearable size="default" @keyup.enter="queryList" />
-          </el-form-item>
-          <el-form-item>
-            <el-button v-auth="'query'" size="default" type="primary" class="ml10" @click="queryList">
-              <el-icon>
-                <ele-Search />
-              </el-icon>
-              查询
-            </el-button>
-            <el-button v-auth="'reset'" size="default" @click="resetQuery(queryRef)">
-              <el-icon>
-                <ele-Refresh />
-              </el-icon>
-              重置
-            </el-button>
-            <el-button v-auth="'add'" size="default" type="primary" class="ml10" @click="onOpenAddDic">
-              <el-icon>
-                <ele-FolderAdd />
-              </el-icon>
-              新增
-            </el-button>
-          </el-form-item>
-        </el-form>
-      </div>
-
+      <el-form :model="tableData.param" ref="queryRef" inline>
+        <el-form-item label="城市名称" prop="name">
+          <el-input v-model="tableData.param.name" placeholder="请输入城市名称" clearable @keyup.enter="queryList" />
+        </el-form-item>
+        <el-form-item label="城市编号" prop="code">
+          <el-input v-model="tableData.param.code" placeholder="请输入城市编号" clearable @keyup.enter="queryList" />
+        </el-form-item>
+        <el-form-item>
+          <el-button v-auth="'query'" type="primary" class="ml10" @click="queryList">
+            <el-icon>
+              <ele-Search />
+            </el-icon>
+            查询
+          </el-button>
+          <el-button v-auth="'reset'" @click="resetQuery(queryRef)">
+            <el-icon>
+              <ele-Refresh />
+            </el-icon>
+            重置
+          </el-button>
+          <el-button v-auth="'add'" type="primary" class="ml10" @click="onOpenAddDic">
+            <el-icon>
+              <ele-FolderAdd />
+            </el-icon>
+            新增
+          </el-button>
+        </el-form-item>
+      </el-form>
       <el-table :data="tableData.data" v-loading="tableData.loading" style="width: 100%" row-key="id" default-expand-all :indent="16" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
       <el-table :data="tableData.data" v-loading="tableData.loading" style="width: 100%" row-key="id" default-expand-all :indent="16" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
         <el-table-column label="城市名称" v-col="'name'" prop="name" show-overflow-tooltip />
         <el-table-column label="城市名称" v-col="'name'" prop="name" show-overflow-tooltip />
         <el-table-column label="城市编号" v-col="'code'" prop="code" show-overflow-tooltip />
         <el-table-column label="城市编号" v-col="'code'" prop="code" show-overflow-tooltip />
@@ -42,14 +39,14 @@
         </el-table-column>
         </el-table-column>
         <el-table-column label="排序" v-col="'sort'" prop="sort" align="center" />
         <el-table-column label="排序" v-col="'sort'" prop="sort" align="center" />
         <el-table-column label="创建时间" prop="createdAt" v-col="'createdAt'" show-overflow-tooltip />
         <el-table-column label="创建时间" prop="createdAt" v-col="'createdAt'" show-overflow-tooltip />
-        <el-table-column label="操作" width="200" align="center" v-col="'handle'">
+        <el-table-column label="操作" width="150" align="center" v-col="'handle'">
           <template #default="scope">
           <template #default="scope">
             <el-button size="small" text type="warning" @click="onOpenEditDic(scope.row)" v-auth="'edit'">修改</el-button>
             <el-button size="small" text type="warning" @click="onOpenEditDic(scope.row)" v-auth="'edit'">修改</el-button>
             <el-button size="small" text type="info" @click="onRowDel(scope.row)" v-auth="'del'">删除</el-button>
             <el-button size="small" text type="info" @click="onRowDel(scope.row)" v-auth="'del'">删除</el-button>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
       </el-table>
       </el-table>
-      <pagination v-show="tableData.total>0" :total="tableData.total" v-model:page="tableData.param.pageNum" v-model:limit="tableData.param.pageSize" @pagination="queryList" />
+      <pagination v-show="tableData.total > 0" :total="tableData.total" v-model:page="tableData.param.pageNum" v-model:limit="tableData.param.pageSize" @pagination="queryList" />
     </el-card>
     </el-card>
     <EditDic ref="editDicRef" :treeData="tableData.data" @queryList="queryList" />
     <EditDic ref="editDicRef" :treeData="tableData.data" @queryList="queryList" />
     <!-- <Detail ref="detailRef"  /> -->
     <!-- <Detail ref="detailRef"  /> -->

+ 4 - 4
src/views/system/config/component/editConfig.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
   <div class="system-edit-dic-container">
   <div class="system-edit-dic-container">
     <el-dialog :title="(ruleForm.configId!==0?'修改':'添加')+'参数'" v-model="isShowDialog" width="769px">
     <el-dialog :title="(ruleForm.configId!==0?'修改':'添加')+'参数'" v-model="isShowDialog" width="769px">
-      <el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="90px">
+      <el-form :model="ruleForm" ref="formRef" :rules="rules" label-width="90px">
         <el-form-item label="参数名称" prop="configName">
         <el-form-item label="参数名称" prop="configName">
           <el-input v-model="ruleForm.configName" placeholder="请输入参数名称" />
           <el-input v-model="ruleForm.configName" placeholder="请输入参数名称" />
         </el-form-item>
         </el-form-item>
@@ -10,7 +10,7 @@
         </el-form-item>
         </el-form-item>
         <!-- 字典类型下拉框 -->
         <!-- 字典类型下拉框 -->
         <el-form-item label="字典分类" prop="moduleClassify">
         <el-form-item label="字典分类" prop="moduleClassify">
-          <el-select v-model="ruleForm.moduleClassify" placeholder="字典分类" clearable size="default" style="width: 240px">
+          <el-select v-model="ruleForm.moduleClassify" placeholder="字典分类" clearable style="width: 240px">
             <el-option v-for="dict in param_class_type" :label="dict.label" :value="dict.value" />
             <el-option v-for="dict in param_class_type" :label="dict.label" :value="dict.value" />
           </el-select>
           </el-select>
         </el-form-item>
         </el-form-item>
@@ -28,8 +28,8 @@
       </el-form>
       </el-form>
       <template #footer>
       <template #footer>
         <span class="dialog-footer">
         <span class="dialog-footer">
-          <el-button @click="onCancel" size="default">取 消</el-button>
-          <el-button type="primary" @click="onSubmit" size="default">{{ruleForm.configId!==0?'修 改':'添 加'}}</el-button>
+          <el-button @click="onCancel">取 消</el-button>
+          <el-button type="primary" @click="onSubmit">{{ruleForm.configId!==0?'修 改':'添 加'}}</el-button>
         </span>
         </span>
       </template>
       </template>
     </el-dialog>
     </el-dialog>

+ 61 - 70
src/views/system/config/index.vue

@@ -1,75 +1,66 @@
 <template>
 <template>
-  <div class="system-dic-container">
+  <div class="page">
     <el-card shadow="nover">
     <el-card shadow="nover">
-      <div class="system-user-search mb15">
-        <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px">
-          <el-form-item label="参数名称" prop="configName">
-            <el-input v-model="tableData.param.configName" placeholder="请输入参数名称" clearable size="default" @keyup.enter.native="dataList" />
-          </el-form-item>
-<!--          <el-form-item label="参数键名" prop="configKey">-->
-<!--            <el-input v-model="tableData.param.configKey" placeholder="请输入参数键名" clearable size="default" @keyup.enter.native="dataList" />-->
-<!--          </el-form-item>-->
-          <el-form-item label="系统内置" prop="configType" style="width: 200px">
-            <el-select v-model="tableData.param.configType" placeholder="系统内置" clearable size="default" style="width: 240px">
-              <el-option v-for="dict in sys_yes_no" :key="dict.value" :label="dict.label" :value="dict.value" />
-            </el-select>
-          </el-form-item>
-<!--          <el-form-item label="创建时间" prop="dateRange">-->
-<!--            <el-date-picker v-model="tableData.param.dateRange" size="default" style="width: 240px" value-format="YYYY-MM-DD" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>-->
-<!--          </el-form-item>-->
-          <el-form-item>
-            <el-button size="default" type="primary" class="ml10" @click="dataList">
-              <el-icon>
-                <ele-Search />
-              </el-icon>
-              查询
-            </el-button>
-            <el-button size="default" @click="resetQuery(queryRef)">
-              <el-icon>
-                <ele-Refresh />
-              </el-icon>
-              重置
-            </el-button>
-            <el-button size="default" type="primary" class="ml10" @click="onOpenAddDic" v-auth="'add'">
-              <el-icon>
-                <ele-FolderAdd />
-              </el-icon>
-              新增参数
-            </el-button>
-            <el-button size="default" type="info" class="ml10" @click="onRowDel()" v-auth="'del'">
-              <el-icon>
-                <ele-Delete />
-              </el-icon>
-              删除参数
-            </el-button>
-          </el-form-item>
-        </el-form>
-      </div>
+      <el-form :model="tableData.param" ref="queryRef" inline label-width="68px">
+        <el-form-item label="参数名称" prop="configName">
+          <el-input v-model="tableData.param.configName" placeholder="请输入参数名称" clearable @keyup.enter.native="dataList" />
+        </el-form-item>
+        <el-form-item label="系统内置" prop="configType">
+          <el-select v-model="tableData.param.configType" placeholder="系统内置" clearable style="width: 240px">
+            <el-option v-for="dict in sys_yes_no" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" class="ml10" @click="dataList">
+            <el-icon>
+              <ele-Search />
+            </el-icon>
+            查询
+          </el-button>
+          <el-button @click="resetQuery(queryRef)">
+            <el-icon>
+              <ele-Refresh />
+            </el-icon>
+            重置
+          </el-button>
+          <el-button type="primary" class="ml10" @click="onOpenAddDic" v-auth="'add'">
+            <el-icon>
+              <ele-FolderAdd />
+            </el-icon>
+            新增参数
+          </el-button>
+          <el-button type="info" class="ml10" @click="onRowDel()" v-auth="'del'">
+            <el-icon>
+              <ele-Delete />
+            </el-icon>
+            删除参数
+          </el-button>
+        </el-form-item>
+      </el-form>
       <!-- 字典切换 -->
       <!-- 字典切换 -->
       <el-tabs v-model="tableData.param.moduleClassify" class="demo-tabs" @tab-change="dataList">
       <el-tabs v-model="tableData.param.moduleClassify" class="demo-tabs" @tab-change="dataList">
-				<el-tab-pane v-for="dict in tabDataList" :label="dict.dictLabel" :name="dict.dictValue">
-          <el-table :data="tableData.data" style="width: 100%" @selection-change="handleSelectionChange" v-loading="tableData.loading">
-            <el-table-column type="selection" width="55" align="center" />
-            <el-table-column label="ID" v-col="'configId'" align="center" prop="configId" width="100" />
-            <el-table-column label="参数名称" v-col="'configName'" prop="configName" show-overflow-tooltip />
-            <el-table-column label="参数键名" v-col="'configKey'" prop="configKey" show-overflow-tooltip />
-            <el-table-column label="参数键值" v-col="'configValue'" prop="configValue" />
-            <el-table-column label="备注" prop="remark" v-col="'remark'" show-overflow-tooltip />
-            <!-- <el-table-column label="创建时间" prop="createdAt" width="180" align="center" /> -->
-            <el-table-column label="系统内置" v-col="'configType'" align="center" prop="configType" width="100">
-              <template #default="{ row }">
-                {{ row.configType ? '是' : '否' }}
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" width="100" v-col="'handle'" align="center" fixed="right">
-              <template #default="scope">
-                <el-button size="small" text type="warning" @click="onOpenEditDic(scope.row)" v-auth="'edit'">修改</el-button>
-                <el-button size="small" text type="info" @click="onRowDel(scope.row)" v-auth="'del'">删除</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-tab-pane>
-			</el-tabs>
+        <el-tab-pane v-for="dict in tabDataList" :label="dict.dictLabel" :name="dict.dictValue"></el-tab-pane>
+      </el-tabs>
+      <el-table :data="tableData.data" style="width: 100%" @selection-change="handleSelectionChange" v-loading="tableData.loading">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="ID" v-col="'configId'" align="center" prop="configId" width="100" />
+        <el-table-column label="参数名称" v-col="'configName'" prop="configName" show-overflow-tooltip />
+        <el-table-column label="参数键名" v-col="'configKey'" prop="configKey" show-overflow-tooltip />
+        <el-table-column label="参数键值" v-col="'configValue'" prop="configValue" />
+        <el-table-column label="备注" prop="remark" v-col="'remark'" show-overflow-tooltip />
+        <!-- <el-table-column label="创建时间" prop="createdAt" width="180" align="center" /> -->
+        <el-table-column label="系统内置" v-col="'configType'" align="center" prop="configType" width="100">
+          <template #default="{ row }">
+            {{ row.configType ? '是' : '否' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="100" v-col="'handle'" align="center" fixed="right">
+          <template #default="scope">
+            <el-button size="small" text type="warning" @click="onOpenEditDic(scope.row)" v-auth="'edit'">修改</el-button>
+            <el-button size="small" text type="info" @click="onRowDel(scope.row)" v-auth="'del'">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
       <pagination v-show="tableData.total > 0" :total="tableData.total" v-model:page="tableData.param.pageNum" v-model:limit="tableData.param.pageSize" @pagination="dataList" />
       <pagination v-show="tableData.total > 0" :total="tableData.total" v-model:page="tableData.param.pageNum" v-model:limit="tableData.param.pageSize" @pagination="dataList" />
     </el-card>
     </el-card>
     <EditConfig ref="editDicRef" @dataList="dataList" :sysYesNoOptions="sys_yes_no" />
     <EditConfig ref="editDicRef" @dataList="dataList" :sysYesNoOptions="sys_yes_no" />
@@ -120,7 +111,7 @@ export default defineComponent({
     const editDicRef = ref();
     const editDicRef = ref();
     const queryRef = ref();
     const queryRef = ref();
     const { sys_yes_no } = proxy.useDict('sys_yes_no');
     const { sys_yes_no } = proxy.useDict('sys_yes_no');
-    const tabDataList = ref([{dictLabel: '全部', dictValue: ''}]);
+    const tabDataList = ref([{ dictLabel: '全部', dictValue: '' }]);
     const state = reactive<TableDataState>({
     const state = reactive<TableDataState>({
       ids: [],
       ids: [],
       tableData: {
       tableData: {
@@ -208,7 +199,7 @@ export default defineComponent({
     // 获取字典列表
     // 获取字典列表
     const dictList = () => {
     const dictList = () => {
       state.tableData.loading = true;
       state.tableData.loading = true;
-      api.dict.getDataList({dictType: 'param_class_type',status: 1,pageNum: 1,pageSize: 50,defaultValue: ''})
+      api.dict.getDataList({ dictType: 'param_class_type', status: 1, pageNum: 1, pageSize: 50, defaultValue: '' })
         .then((res: any) => {
         .then((res: any) => {
           tabDataList.value = tabDataList.value.concat(res.list);
           tabDataList.value = tabDataList.value.concat(res.list);
           dataList();
           dataList();

+ 3 - 3
src/views/system/datahub/modeling/component/edit.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
 	<div class="system-edit-dic-container">
 	<div class="system-edit-dic-container">
 		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '模型'" v-model="isShowDialog" width="769px">
 		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '模型'" v-model="isShowDialog" width="769px">
-			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="110px">
+			<el-form :model="ruleForm" ref="formRef" :rules="rules" label-width="110px">
 				<el-form-item label="模型标识" prop="key">
 				<el-form-item label="模型标识" prop="key">
 					<el-input v-model.trim="ruleForm.key" placeholder="请输入模型名称" :disabled="ruleForm.id" />
 					<el-input v-model.trim="ruleForm.key" placeholder="请输入模型名称" :disabled="ruleForm.id" />
 				</el-form-item>
 				</el-form-item>
@@ -33,8 +33,8 @@
 			</el-form>
 			</el-form>
 			<template #footer>
 			<template #footer>
 				<span class="dialog-footer">
 				<span class="dialog-footer">
-					<el-button @click="onCancel" size="default">取 消</el-button>
-					<el-button type="primary" @click="onSubmit" size="default">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
+					<el-button @click="onCancel">取 消</el-button>
+					<el-button type="primary" @click="onSubmit">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
 				</span>
 				</span>
 			</template>
 			</template>
 		</el-dialog>
 		</el-dialog>

+ 3 - 3
src/views/system/datahub/modeling/component/editNode.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
 	<div class="system-edit-dic-container">
 	<div class="system-edit-dic-container">
 		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '字段节点'" v-model="isShowDialog" width="769px">
 		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '字段节点'" v-model="isShowDialog" width="769px">
-			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="110px">
+			<el-form :model="ruleForm" ref="formRef" :rules="rules" label-width="110px">
 				<el-form-item label="类型" prop="from">
 				<el-form-item label="类型" prop="from">
 					<el-radio-group v-model="ruleForm.from">
 					<el-radio-group v-model="ruleForm.from">
 						<el-radio :label="1">自定义</el-radio>
 						<el-radio :label="1">自定义</el-radio>
@@ -81,8 +81,8 @@
 			</el-form>
 			</el-form>
 			<template #footer>
 			<template #footer>
 				<span class="dialog-footer">
 				<span class="dialog-footer">
-					<el-button @click="onCancel" size="default">取 消</el-button>
-					<el-button type="primary" @click="onSubmit" size="default">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
+					<el-button @click="onCancel">取 消</el-button>
+					<el-button type="primary" @click="onSubmit">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
 				</span>
 				</span>
 			</template>
 			</template>
 		</el-dialog>
 		</el-dialog>

+ 3 - 3
src/views/system/datahub/modeling/component/juhe.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
 	<div class="system-edit-dic-container">
 	<div class="system-edit-dic-container">
 		<el-dialog title="设置聚合" v-model="isShowDialog" width="769px">
 		<el-dialog title="设置聚合" v-model="isShowDialog" width="769px">
-			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="110px">
+			<el-form :model="ruleForm" ref="formRef" :rules="rules" label-width="110px">
 				<el-form-item label="分组节点" prop="GroupNodeKey">
 				<el-form-item label="分组节点" prop="GroupNodeKey">
 					<el-select v-model="ruleForm.GroupNodeKey" filterable placeholder="请选择分组节点" class="w100">
 					<el-select v-model="ruleForm.GroupNodeKey" filterable placeholder="请选择分组节点" class="w100">
 						<el-option v-for="item in sourceData" :key="item.id" :label="item.name" :value="item.key">
 						<el-option v-for="item in sourceData" :key="item.id" :label="item.name" :value="item.key">
@@ -29,8 +29,8 @@
 			</el-form>
 			</el-form>
 			<template #footer>
 			<template #footer>
 				<span class="dialog-footer">
 				<span class="dialog-footer">
-					<el-button @click="onCancel" size="default">取 消</el-button>
-					<el-button type="primary" @click="onSubmit" size="default">设置</el-button>
+					<el-button @click="onCancel">取 消</el-button>
+					<el-button type="primary" @click="onSubmit">设置</el-button>
 				</span>
 				</span>
 			</template>
 			</template>
 		</el-dialog>
 		</el-dialog>

+ 3 - 3
src/views/system/datahub/modeling/component/relation.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
 	<div class="system-edit-dic-container">
 	<div class="system-edit-dic-container">
 		<el-dialog title="设置主源、关联字段" v-model="isShowDialog" width="769px">
 		<el-dialog title="设置主源、关联字段" v-model="isShowDialog" width="769px">
-			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="110px">
+			<el-form :model="ruleForm" ref="formRef" :rules="rules" label-width="110px">
 
 
 				<el-form-item label="数据源节点" prop="mainSourceId">
 				<el-form-item label="数据源节点" prop="mainSourceId">
 						<el-select v-model="ruleForm.mainSourceId" filterable placeholder="请选择数据源" @change="setNode">
 						<el-select v-model="ruleForm.mainSourceId" filterable placeholder="请选择数据源" @change="setNode">
@@ -24,8 +24,8 @@
 			</el-form>
 			</el-form>
 			<template #footer>
 			<template #footer>
 				<span class="dialog-footer">
 				<span class="dialog-footer">
-					<el-button @click="onCancel" size="default">取 消</el-button>
-					<el-button type="primary" @click="onSubmit" size="default">设置</el-button>
+					<el-button @click="onCancel">取 消</el-button>
+					<el-button type="primary" @click="onSubmit">设置</el-button>
 				</span>
 				</span>
 			</template>
 			</template>
 		</el-dialog>
 		</el-dialog>

+ 7 - 7
src/views/system/datahub/modeling/detail.vue

@@ -14,34 +14,34 @@
     <div class="content-box">
     <div class="content-box">
       <div class="wu-box">
       <div class="wu-box">
         <div class="system-user-search mb15">
         <div class="system-user-search mb15">
-          <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="130px">
+          <el-form :model="tableData.param" ref="queryRef" inline label-width="130px">
             <el-form-item label="字段标题" prop="name">
             <el-form-item label="字段标题" prop="name">
-              <el-input v-model="tableData.param.name" placeholder="请输入字段标题" clearable size="default" style="width: 240px" @keyup.enter.native="typeList" />
+              <el-input v-model="tableData.param.name" placeholder="请输入字段标题" clearable style="width: 240px" @keyup.enter.native="typeList" />
             </el-form-item>
             </el-form-item>
             <el-form-item label="字段名称" prop="key">
             <el-form-item label="字段名称" prop="key">
-              <el-input v-model="tableData.param.key" placeholder="请输入字段名称" clearable size="default" style="width: 240px" @keyup.enter.native="typeList" />
+              <el-input v-model="tableData.param.key" placeholder="请输入字段名称" clearable style="width: 240px" @keyup.enter.native="typeList" />
             </el-form-item>
             </el-form-item>
 
 
             <el-form-item>
             <el-form-item>
-              <el-button size="default" type="primary" class="ml10" @click="typeList">
+              <el-button type="primary" class="ml10" @click="typeList">
                 <el-icon>
                 <el-icon>
                   <ele-Search />
                   <ele-Search />
                 </el-icon>
                 </el-icon>
                 查询
                 查询
               </el-button>
               </el-button>
-              <el-button size="default" @click="resetQuery()">
+              <el-button @click="resetQuery()">
                 <el-icon>
                 <el-icon>
                   <ele-Refresh />
                   <ele-Refresh />
                 </el-icon>
                 </el-icon>
                 重置
                 重置
               </el-button>
               </el-button>
-              <el-button size="default" type="success" class="ml10" @click="onOpenAdd" v-auth="'add'" v-if="developer_status == 0">
+              <el-button type="success" class="ml10" @click="onOpenAdd" v-auth="'add'" v-if="developer_status == 0">
                 <el-icon>
                 <el-icon>
                   <ele-FolderAdd />
                   <ele-FolderAdd />
                 </el-icon>
                 </el-icon>
                 新增字段节点
                 新增字段节点
               </el-button>
               </el-button>
-              <!-- <el-button size="default" type="danger" class="ml10" @click="onRowDel(null)">
+              <!-- <el-button type="danger" class="ml10" @click="onRowDel(null)">
               <el-icon>
               <el-icon>
                 <ele-Delete />
                 <ele-Delete />
               </el-icon>
               </el-icon>

+ 44 - 66
src/views/system/datahub/modeling/index.vue

@@ -1,54 +1,45 @@
 <template>
 <template>
-	<div class="system-dic-container">
+	<div class="page">
 		<el-card shadow="nover">
 		<el-card shadow="nover">
-			<div class="system-user-search mb15">
-				<el-form :model="tableData.param" ref="queryRef" :inline="true">
-					<!-- <el-form-item label="模型标识" prop="key">
-            <el-input v-model="tableData.param.key" placeholder="请输入模型标识" clearable size="default" style="width: 240px" @keyup.enter.native="typeList" />
+			<el-form :model="tableData.param" ref="queryRef" inline>
+				<!-- <el-form-item label="模型标识" prop="key">
+            <el-input v-model="tableData.param.key" placeholder="请输入模型标识" clearable style="width: 240px" @keyup.enter.native="typeList" />
           </el-form-item> -->
           </el-form-item> -->
-					<el-form-item label="模型名称" prop="name">
-						<el-input
-							v-model="tableData.param.name"
-							placeholder="请输入模型名称"
-							clearable
-							size="default"
-							style="width: 240px"
-							@keyup.enter.native="typeList"
-						/>
-					</el-form-item>
-					<el-form-item label="模型类型" prop="type">
-						<el-select v-model="tableData.param.type" placeholder="请选择模型类型" class="w100">
-							<el-option v-for="item in datahub_model_type" :key="item.value" :label="item.label" :value="item.value" />
-						</el-select>
-					</el-form-item>
-					<el-form-item>
-						<el-button size="default" type="primary" class="ml10" @click="typeList">
-							<el-icon>
-								<ele-Search />
-							</el-icon>
-							查询
-						</el-button>
-						<el-button size="default" @click="resetQuery(queryRef)">
-							<el-icon>
-								<ele-Refresh />
-							</el-icon>
-							重置
-						</el-button>
-						<el-button size="default" type="primary" class="ml10" @click="onOpenAdd" v-auth="'add'">
-							<el-icon>
-								<ele-FolderAdd />
-							</el-icon>
-							新增模型
-						</el-button>
-						<el-button size="default" type="info" class="ml10" @click="onRowDel()" v-auth="'del'">
-							<el-icon>
-								<ele-Delete />
-							</el-icon>
-							删除
-						</el-button>
-					</el-form-item>
-				</el-form>
-			</div>
+				<el-form-item label="模型名称" prop="name">
+					<el-input v-model="tableData.param.name" placeholder="请输入" clearable style="width: 240px" @keyup.enter.native="typeList" />
+				</el-form-item>
+				<el-form-item label="模型类型" prop="type">
+					<el-select v-model="tableData.param.type" placeholder="请选择" class="w100">
+						<el-option v-for="item in datahub_model_type" :key="item.value" :label="item.label" :value="item.value" />
+					</el-select>
+				</el-form-item>
+				<el-form-item>
+					<el-button type="primary" class="ml10" @click="typeList">
+						<el-icon>
+							<ele-Search />
+						</el-icon>
+						查询
+					</el-button>
+					<el-button @click="resetQuery(queryRef)">
+						<el-icon>
+							<ele-Refresh />
+						</el-icon>
+						重置
+					</el-button>
+					<el-button type="primary" class="ml10" @click="onOpenAdd" v-auth="'add'">
+						<el-icon>
+							<ele-FolderAdd />
+						</el-icon>
+						新增模型
+					</el-button>
+					<el-button type="info" class="ml10" @click="onRowDel()" v-auth="'del'">
+						<el-icon>
+							<ele-Delete />
+						</el-icon>
+						删除
+					</el-button>
+				</el-form-item>
+			</el-form>
 			<el-table :data="tableData.data" style="width: 100%" @selection-change="handleSelectionChange" v-loading="tableData.loading">
 			<el-table :data="tableData.data" style="width: 100%" @selection-change="handleSelectionChange" v-loading="tableData.loading">
 				<el-table-column type="selection" width="55" align="center" />
 				<el-table-column type="selection" width="55" align="center" />
 				<el-table-column label="ID" align="center" prop="id" width="100" v-col="'id'" />
 				<el-table-column label="ID" align="center" prop="id" width="100" v-col="'id'" />
@@ -67,17 +58,10 @@
 
 
 				<el-table-column label="操作" width="280" align="center" fixed="right">
 				<el-table-column label="操作" width="280" align="center" fixed="right">
 					<template #default="scope">
 					<template #default="scope">
-						<router-link
-							:to="'/config/datahub/modeling/' + scope.row.id"
-							class="link-type"
-							style="padding-right: 12px; font-size: 12px; color: #409eff"
-							v-auth="'detail'"
-						>
+						<router-link :to="'/config/datahub/modeling/' + scope.row.id" class="link-type" style="padding-right: 12px; font-size: 12px; color: #409eff" v-auth="'detail'">
 							<span>字段管理</span>
 							<span>字段管理</span>
 						</router-link>
 						</router-link>
-						<el-button size="small" text type="success" @click="onOpenRecord(scope.row)" v-if="scope.row.status == 1" v-auth="'record'"
-							>数据记录</el-button
-						>
+						<el-button size="small" text type="success" @click="onOpenRecord(scope.row)" v-if="scope.row.status == 1" v-auth="'record'">数据记录</el-button>
 						<el-button size="small" text type="info" :disabled="scope.row.status" @click="onOpenJuhe(scope.row)" v-auth="'juhe'">聚合设置</el-button>
 						<el-button size="small" text type="info" :disabled="scope.row.status" @click="onOpenJuhe(scope.row)" v-auth="'juhe'">聚合设置</el-button>
 						<el-button size="small" text type="warning" @click="onOpenEdit(scope.row)" v-if="scope.row.status == 0" v-auth="'edit'">修改</el-button>
 						<el-button size="small" text type="warning" @click="onOpenEdit(scope.row)" v-if="scope.row.status == 0" v-auth="'edit'">修改</el-button>
 						<el-button size="small" text type="info" @click="onRowDel(scope.row)" v-if="scope.row.status == 0" v-auth="'del'">删除</el-button>
 						<el-button size="small" text type="info" @click="onRowDel(scope.row)" v-if="scope.row.status == 0" v-auth="'del'">删除</el-button>
@@ -85,13 +69,7 @@
 					</template>
 					</template>
 				</el-table-column>
 				</el-table-column>
 			</el-table>
 			</el-table>
-			<pagination
-				v-show="tableData.total > 0"
-				:total="tableData.total"
-				v-model:page="tableData.param.pageNum"
-				v-model:limit="tableData.param.pageSize"
-				@pagination="typeList"
-			/>
+			<pagination v-show="tableData.total > 0" :total="tableData.total" v-model:page="tableData.param.pageNum" v-model:limit="tableData.param.pageSize" @pagination="typeList" />
 		</el-card>
 		</el-card>
 		<EditDic ref="editDicRef" @typeList="typeList" />
 		<EditDic ref="editDicRef" @typeList="typeList" />
 		<Detail ref="detailRef" />
 		<Detail ref="detailRef" />
@@ -211,7 +189,7 @@ export default defineComponent({
 						typeList();
 						typeList();
 					});
 					});
 				})
 				})
-				.catch(() => {});
+				.catch(() => { });
 		};
 		};
 
 
 		//复制数据
 		//复制数据
@@ -227,7 +205,7 @@ export default defineComponent({
 						typeList();
 						typeList();
 					});
 					});
 				})
 				})
-				.catch(() => {});
+				.catch(() => { });
 		};
 		};
 
 
 		// 页面加载时
 		// 页面加载时

+ 1 - 1
src/views/system/datahub/source/component/edit.vue

@@ -154,7 +154,7 @@
 
 
 		<template #footer>
 		<template #footer>
 			<div class="dialog-footer">
 			<div class="dialog-footer">
-				<el-button @click="onTest" type="warning" size="default" v-if="sourceId > 0">测试</el-button>
+				<el-button @click="onTest" type="warning" v-if="sourceId > 0">测试</el-button>
 
 
 				<el-button @click="showDialog = false">取消</el-button>
 				<el-button @click="showDialog = false">取消</el-button>
 				<el-button type="primary" @click="onSubmit">确定</el-button>
 				<el-button type="primary" @click="onSubmit">确定</el-button>

+ 3 - 3
src/views/system/datahub/source/component/editNode.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
 	<div class="system-edit-dic-container">
 	<div class="system-edit-dic-container">
 		<el-dialog :title="(ruleForm.nodeId !== 0 ? '修改' : '添加') + '数据节点'" v-model="isShowDialog" width="769px">
 		<el-dialog :title="(ruleForm.nodeId !== 0 ? '修改' : '添加') + '数据节点'" v-model="isShowDialog" width="769px">
-			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="110px">
+			<el-form :model="ruleForm" ref="formRef" :rules="rules" label-width="110px">
 				<el-form-item label="数据节点标识" prop="key">
 				<el-form-item label="数据节点标识" prop="key">
 					<el-input v-model="ruleForm.key" placeholder="请输入数据节点名称" :disabled="detail.lockKey == 1 && ruleForm.nodeId !== 0" />
 					<el-input v-model="ruleForm.key" placeholder="请输入数据节点名称" :disabled="detail.lockKey == 1 && ruleForm.nodeId !== 0" />
 				</el-form-item>
 				</el-form-item>
@@ -72,8 +72,8 @@
 			</el-form>
 			</el-form>
 			<template #footer>
 			<template #footer>
 				<span class="dialog-footer">
 				<span class="dialog-footer">
-					<el-button @click="onCancel" size="default">取 消</el-button>
-					<el-button type="primary" @click="onSubmit" size="default">{{ ruleForm.nodeId !== 0 ? '修 改' : '添 加' }}</el-button>
+					<el-button @click="onCancel">取 消</el-button>
+					<el-button type="primary" @click="onSubmit">{{ ruleForm.nodeId !== 0 ? '修 改' : '添 加' }}</el-button>
 				</span>
 				</span>
 			</template>
 			</template>
 		</el-dialog>
 		</el-dialog>

+ 1 - 1
src/views/system/datahub/source/detail.vue

@@ -12,7 +12,7 @@
 		<div class="content-box">
 		<div class="content-box">
 			<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
 			<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
 				<el-tab-pane label="数据源信息" name="1">
 				<el-tab-pane label="数据源信息" name="1">
-					<el-form size="default" label-width="110px" :inline="true">
+					<el-form label-width="110px" inline>
 						<el-divider content-position="left">基本信息</el-divider>
 						<el-divider content-position="left">基本信息</el-divider>
 
 
 						<el-form-item label="数据源标识:">
 						<el-form-item label="数据源标识:">

+ 14 - 28
src/views/system/datahub/source/index.vue

@@ -1,46 +1,39 @@
 <template>
 <template>
 	<div class="page">
 	<div class="page">
 		<el-card shadow="nover">
 		<el-card shadow="nover">
-			<el-form :inline="true" ref="queryRef">
+			<el-form inline ref="queryRef">
 				<el-form-item label="数据源标识" prop="name">
 				<el-form-item label="数据源标识" prop="name">
-					<el-input v-model="params.key" placeholder="数据源标识" clearable size="default" style="width: 160px" @keyup.enter.native="getList" />
+					<el-input v-model="params.key" placeholder="请输入" clearable style="width: 140px" @keyup.enter.native="getList" />
 				</el-form-item>
 				</el-form-item>
 				<el-form-item label="数据源名称" prop="name">
 				<el-form-item label="数据源名称" prop="name">
-					<el-input
-						v-model="params.name"
-						placeholder="请输入数据源名称"
-						clearable
-						size="default"
-						style="width: 160px"
-						@keyup.enter.native="getList"
-					/>
+					<el-input v-model="params.name" placeholder="请输入" clearable style="width: 140px" @keyup.enter.native="getList" />
 				</el-form-item>
 				</el-form-item>
-				<el-form-item label="数据源类型" prop="from">
-					<el-select v-model="params.from" placeholder="请选择数据源类型" @keyup.enter.native="getList">
+				<el-form-item label="" prop="from">
+					<el-select v-model="params.from" placeholder="数据源类型" @keyup.enter.native="getList" style="width: 120px;">
 						<el-option v-for="item in typeData" :key="item.value" :label="item.label" :value="item.value" />
 						<el-option v-for="item in typeData" :key="item.value" :label="item.label" :value="item.value" />
 					</el-select>
 					</el-select>
 				</el-form-item>
 				</el-form-item>
 
 
 				<el-form-item>
 				<el-form-item>
-					<el-button size="default" type="primary" class="ml10" @click="getList(1)">
+					<el-button type="primary" class="ml10" @click="getList(1)">
 						<el-icon>
 						<el-icon>
 							<ele-Search />
 							<ele-Search />
 						</el-icon>
 						</el-icon>
 						查询
 						查询
 					</el-button>
 					</el-button>
-					<el-button v-auth="'reset'" size="default" @click="resetQuery()">
+					<!-- <el-button v-auth="'reset'" @click="resetQuery()">
 						<el-icon>
 						<el-icon>
 							<ele-Refresh />
 							<ele-Refresh />
 						</el-icon>
 						</el-icon>
 						重置
 						重置
-					</el-button>
-					<el-button v-auth="'add'" size="default" type="primary" class="ml10" @click="onOpenAdd">
+					</el-button> -->
+					<el-button v-auth="'add'" type="primary" class="ml10" @click="onOpenAdd">
 						<el-icon>
 						<el-icon>
 							<ele-FolderAdd />
 							<ele-FolderAdd />
 						</el-icon>
 						</el-icon>
 						新增数据源
 						新增数据源
 					</el-button>
 					</el-button>
-					<el-button size="default" type="info" class="ml10" @click="batchdel()" v-auth="'del'">
+					<el-button type="info" class="ml10" @click="batchdel()" v-auth="'del'">
 						<el-icon>
 						<el-icon>
 							<ele-Delete />
 							<ele-Delete />
 						</el-icon>
 						</el-icon>
@@ -70,17 +63,10 @@
 
 
 				<el-table-column label="操作" width="200" align="center" fixed="right">
 				<el-table-column label="操作" width="200" align="center" fixed="right">
 					<template #default="scope">
 					<template #default="scope">
-						<router-link
-							:to="'/config/datahub/source/' + scope.row.sourceId"
-							class="link-type"
-							style="padding-right: 12px; font-size: 12px; color: #409eff"
-							v-auth="'detail'"
-						>
+						<router-link :to="'/config/datahub/source/' + scope.row.sourceId" class="link-type" style="padding-right: 12px; font-size: 12px; color: #409eff" v-auth="'detail'">
 							<span>详情</span>
 							<span>详情</span>
 						</router-link>
 						</router-link>
-						<el-button size="small" text type="success" @click="onOpenList(scope.row)" v-if="scope.row.status == 1" v-auth="'detail'"
-							>数据记录</el-button
-						>
+						<el-button size="small" text type="success" @click="onOpenList(scope.row)" v-if="scope.row.status == 1" v-auth="'detail'">数据记录</el-button>
 						<el-button size="small" text type="warning" @click="onOpenEdit(scope.row)" v-if="scope.row.status == 0" v-auth="'edit'">修改</el-button>
 						<el-button size="small" text type="warning" @click="onOpenEdit(scope.row)" v-if="scope.row.status == 0" v-auth="'edit'">修改</el-button>
 						<el-button size="small" text type="info" @click="del(scope.row)" v-if="scope.row.status == 0" v-auth="'del'">删除</el-button>
 						<el-button size="small" text type="info" @click="del(scope.row)" v-if="scope.row.status == 0" v-auth="'del'">删除</el-button>
 						<el-button size="small" text type="primary" @click="copy(scope.row)" v-auth="'copy'">复制</el-button>
 						<el-button size="small" text type="primary" @click="copy(scope.row)" v-auth="'copy'">复制</el-button>
@@ -100,7 +86,7 @@ import { useSearch } from '/@/hooks/useCommon'
 import { ElMessageBox, ElMessage } from 'element-plus'
 import { ElMessageBox, ElMessage } from 'element-plus'
 import EditDic from './component/edit.vue'
 import EditDic from './component/edit.vue'
 import ListDic from './component/list.vue'
 import ListDic from './component/list.vue'
-import { ref,onMounted } from 'vue'
+import { ref, onMounted } from 'vue'
 const queryRef = ref()
 const queryRef = ref()
 const editDicRef = ref()
 const editDicRef = ref()
 const listDicRef = ref()
 const listDicRef = ref()
@@ -162,7 +148,7 @@ const copy = (row: any) => {
 				getList()
 				getList()
 			})
 			})
 		})
 		})
-		.catch(() => {})
+		.catch(() => { })
 }
 }
 const handleSelectionChange = (selection: any[]) => {
 const handleSelectionChange = (selection: any[]) => {
 	ids.value = selection.map((item) => item.sourceId)
 	ids.value = selection.map((item) => item.sourceId)

+ 4 - 4
src/views/system/dict/component/editDic.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
 	<div class="system-edit-dic-container">
 	<div class="system-edit-dic-container">
 		<el-dialog :title="(ruleForm.dictId!==0?'修改':'添加')+'字典'" v-model="isShowDialog" width="769px">
 		<el-dialog :title="(ruleForm.dictId!==0?'修改':'添加')+'字典'" v-model="isShowDialog" width="769px">
-			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="90px">
+			<el-form :model="ruleForm" ref="formRef" :rules="rules" label-width="90px">
         <el-form-item label="字典名称" prop="dictName">
         <el-form-item label="字典名称" prop="dictName">
           <el-input v-model="ruleForm.dictName" placeholder="请输入字典名称" />
           <el-input v-model="ruleForm.dictName" placeholder="请输入字典名称" />
         </el-form-item>
         </el-form-item>
@@ -10,7 +10,7 @@
         </el-form-item>
         </el-form-item>
         <!-- 字典类型下拉框 -->
         <!-- 字典类型下拉框 -->
         <el-form-item label="字典分类" prop="moduleClassify">
         <el-form-item label="字典分类" prop="moduleClassify">
-          <el-select v-model="ruleForm.moduleClassify" placeholder="字典分类" clearable size="default" style="width: 240px">
+          <el-select v-model="ruleForm.moduleClassify" placeholder="字典分类" clearable style="width: 240px">
             <el-option v-for="dict in dict_class_type" :label="dict.label" :value="dict.value" />
             <el-option v-for="dict in dict_class_type" :label="dict.label" :value="dict.value" />
           </el-select>
           </el-select>
         </el-form-item>
         </el-form-item>
@@ -26,8 +26,8 @@
 			</el-form>
 			</el-form>
 			<template #footer>
 			<template #footer>
 				<span class="dialog-footer">
 				<span class="dialog-footer">
-					<el-button @click="onCancel" size="default">取 消</el-button>
-					<el-button type="primary" @click="onSubmit" size="default">{{ruleForm.dictId!==0?'修 改':'添 加'}}</el-button>
+					<el-button @click="onCancel">取 消</el-button>
+					<el-button type="primary" @click="onSubmit">{{ruleForm.dictId!==0?'修 改':'添 加'}}</el-button>
 				</span>
 				</span>
 			</template>
 			</template>
 		</el-dialog>
 		</el-dialog>

+ 3 - 3
src/views/system/dict/component/editDicData.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
   <div class="system-edit-dic-container">
   <div class="system-edit-dic-container">
     <el-dialog :title="(ruleForm.dictCode!==0?'修改':'添加')+'字典'" v-model="isShowDialog" width="769px">
     <el-dialog :title="(ruleForm.dictCode!==0?'修改':'添加')+'字典'" v-model="isShowDialog" width="769px">
-      <el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="90px">
+      <el-form :model="ruleForm" ref="formRef" :rules="rules" label-width="90px">
         <el-form-item label="字典类型">
         <el-form-item label="字典类型">
           <el-input v-model="ruleForm.dictType" :disabled="true" />
           <el-input v-model="ruleForm.dictType" :disabled="true" />
         </el-form-item>
         </el-form-item>
@@ -31,8 +31,8 @@
       </el-form>
       </el-form>
       <template #footer>
       <template #footer>
         <span class="dialog-footer">
         <span class="dialog-footer">
-          <el-button @click="onCancel" size="default">取 消</el-button>
-          <el-button type="primary" @click="onSubmit" size="default">{{ruleForm.dictCode!==0?'修 改':'添 加'}}</el-button>
+          <el-button @click="onCancel">取 消</el-button>
+          <el-button type="primary" @click="onSubmit">{{ruleForm.dictCode!==0?'修 改':'添 加'}}</el-button>
         </span>
         </span>
       </template>
       </template>
     </el-dialog>
     </el-dialog>

+ 37 - 39
src/views/system/dict/dataList.vue

@@ -1,43 +1,41 @@
 <template>
 <template>
-  <div class="system-dic-container">
+  <div class="page">
     <el-card shadow="nover">
     <el-card shadow="nover">
-      <div class="system-user-search mb15">
-        <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px">
-          <el-form-item label="字典类型" prop="dictType">
-            <el-input v-model="tableData.param.dictType" placeholder="请输入字典类型" clearable size="default" @keyup.enter.native="dataList" />
-          </el-form-item>
-          <el-form-item label="字典标签" prop="dictLabel">
-            <el-input v-model="tableData.param.dictLabel" placeholder="请输入字典标签" clearable size="default" @keyup.enter.native="dataList" />
-          </el-form-item>
-          <el-form-item label="状态" prop="status" style="width: 200px;">
-            <el-select v-model="tableData.param.status" placeholder="字典状态" size="default" style="width: 240px">
-              <el-option label="全部" :value="-1" />
-              <el-option label="启用" :value="1" />
-              <el-option label="禁用" :value="0" />
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-button size="default" type="primary" class="ml10" @click="dataList">
-              <el-icon>
-                <ele-Search />
-              </el-icon>
-              查询
-            </el-button>
-            <el-button size="default" type="primary" class="ml10" @click="onOpenAddDic" v-auth="'add'">
-              <el-icon>
-                <ele-FolderAdd />
-              </el-icon>
-              新增字典
-            </el-button>
-            <el-button size="default" type="danger" class="ml10" @click="onRowDel()" v-auth="'del'">
-              <el-icon>
-                <ele-Delete />
-              </el-icon>
-              删除字典
-            </el-button>
-          </el-form-item>
-        </el-form>
-      </div>
+      <el-form :model="tableData.param" ref="queryRef" inline>
+        <el-form-item label="字典类型" prop="dictType">
+          <el-input v-model="tableData.param.dictType" placeholder="请输入字典类型" clearable @keyup.enter.native="dataList" />
+        </el-form-item>
+        <el-form-item label="字典标签" prop="dictLabel">
+          <el-input v-model="tableData.param.dictLabel" placeholder="请输入字典标签" style="width: 150px" clearable @keyup.enter.native="dataList" />
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-select v-model="tableData.param.status" placeholder="字典状态" style="width: 120px">
+            <el-option label="全部" :value="-1" />
+            <el-option label="启用" :value="1" />
+            <el-option label="禁用" :value="0" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" class="ml10" @click="dataList">
+            <el-icon>
+              <ele-Search />
+            </el-icon>
+            查询
+          </el-button>
+          <el-button type="primary" class="ml10" @click="onOpenAddDic" v-auth="'add'">
+            <el-icon>
+              <ele-FolderAdd />
+            </el-icon>
+            新增字典
+          </el-button>
+          <el-button type="danger" class="ml10" @click="onRowDel()" v-auth="'del'">
+            <el-icon>
+              <ele-Delete />
+            </el-icon>
+            删除字典
+          </el-button>
+        </el-form-item>
+      </el-form>
       <el-table :data="tableData.data" style="width: 100%" @selection-change="handleSelectionChange">
       <el-table :data="tableData.data" style="width: 100%" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="字典编码" v-col="'dictCode'" width="90" align="center" prop="dictCode" />
         <el-table-column label="字典编码" v-col="'dictCode'" width="90" align="center" prop="dictCode" />
@@ -59,7 +57,7 @@
           </template>
           </template>
         </el-table-column>
         </el-table-column>
       </el-table>
       </el-table>
-      <pagination v-show="tableData.total>0" :total="tableData.total" v-model:page="tableData.param.pageNum" v-model:limit="tableData.param.pageSize" @pagination="dataList" />
+      <pagination v-show="tableData.total > 0" :total="tableData.total" v-model:page="tableData.param.pageNum" v-model:limit="tableData.param.pageSize" @pagination="dataList" />
     </el-card>
     </el-card>
     <EditDic ref="editDicRef" @dataList="dataList" :dict-type="tableData.param.dictType" />
     <EditDic ref="editDicRef" @dataList="dataList" :dict-type="tableData.param.dictType" />
   </div>
   </div>

+ 71 - 79
src/views/system/dict/index.vue

@@ -1,90 +1,82 @@
 <template>
 <template>
-  <div class="system-dic-container">
+  <div class="page">
     <el-card shadow="nover">
     <el-card shadow="nover">
-      <div class="system-user-search mb15">
-        <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px">
-          <el-form-item label="字典名称" prop="dictName">
-            <el-input v-model="tableData.param.dictName" placeholder="请输入字典名称" clearable size="default" style="width: 240px" @keyup.enter.native="typeList" />
-          </el-form-item>
-<!--          <el-form-item label="字典类型" prop="dictType">-->
-<!--            <el-input v-model="tableData.param.dictType" placeholder="请输入字典类型" clearable size="default" style="width: 240px" @keyup.enter.native="typeList" />-->
-<!--          </el-form-item>-->
-          <el-form-item label="状态" prop="status" style="width: 200px">
-            <el-select v-model="tableData.param.status" placeholder="字典状态" clearable size="default" style="width: 240px">
-              <el-option label="启用" :value="1" />
-              <el-option label="禁用" :value="0" />
-            </el-select>
-          </el-form-item>
-<!--          <el-form-item label="创建时间" prop="dateRange">-->
-<!--            <el-date-picker v-model="tableData.param.dateRange" size="default" style="width: 240px" value-format="YYYY-MM-DD" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>-->
-<!--          </el-form-item>-->
-          <el-form-item>
-            <el-button size="default" type="primary" class="ml10" @click="typeList">
-              <el-icon>
-                <ele-Search />
-              </el-icon>
-              查询
-            </el-button>
-            <el-button size="default" @click="resetQuery(queryRef)">
-              <el-icon>
-                <ele-Refresh />
-              </el-icon>
-              重置
-            </el-button>
-            <el-button size="default" type="primary" class="ml10" @click="onOpenAddDic" v-auth="'add'">
-              <el-icon>
-                <ele-FolderAdd />
-              </el-icon>
-              新增字典
-            </el-button>
-            <el-button size="default" type="info" class="ml10" @click="onRowDel()" v-auth="'del'">
-              <el-icon>
-                <ele-Delete />
-              </el-icon>
-              删除字典
-            </el-button>
-          </el-form-item>
-        </el-form>
-      </div>
+      <el-form :model="tableData.param" ref="queryRef" inline label-width="68px">
+        <el-form-item label="字典名称" prop="dictName">
+          <el-input v-model="tableData.param.dictName" placeholder="请输入字典名称" clearable style="width: 240px" @keyup.enter.native="typeList" />
+        </el-form-item>
+        <el-form-item label="状态" prop="status" style="width: 200px">
+          <el-select v-model="tableData.param.status" placeholder="字典状态" clearable style="width: 240px">
+            <el-option label="启用" :value="1" />
+            <el-option label="禁用" :value="0" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" class="ml10" @click="typeList">
+            <el-icon>
+              <ele-Search />
+            </el-icon>
+            查询
+          </el-button>
+          <el-button @click="resetQuery(queryRef)">
+            <el-icon>
+              <ele-Refresh />
+            </el-icon>
+            重置
+          </el-button>
+          <el-button type="primary" class="ml10" @click="onOpenAddDic" v-auth="'add'">
+            <el-icon>
+              <ele-FolderAdd />
+            </el-icon>
+            新增字典
+          </el-button>
+          <el-button type="info" class="ml10" @click="onRowDel()" v-auth="'del'">
+            <el-icon>
+              <ele-Delete />
+            </el-icon>
+            删除字典
+          </el-button>
+        </el-form-item>
+      </el-form>
       <!-- 字典切换 -->
       <!-- 字典切换 -->
       <el-tabs v-model="tableData.param.moduleClassify" class="demo-tabs" @tab-change="typeList">
       <el-tabs v-model="tableData.param.moduleClassify" class="demo-tabs" @tab-change="typeList">
-				<el-tab-pane v-for="dict in tabDataList" :label="dict.dictLabel" :name="dict.dictValue">
-          <el-table :data="tableData.data" style="width: 100%" @selection-change="handleSelectionChange" v-loading="tableData.loading">
-            <el-table-column type="selection" width="55" align="center" />
-            <el-table-column label="字典ID" v-col="'dictId'" align="center" prop="dictId" width="80" />
-            <el-table-column label="字典名称" v-col="'dictName'" prop="dictName" show-overflow-tooltip />
-            <el-table-column label="字典类型" v-col="'dictType'" align="center" show-overflow-tooltip>
-              <template #default="scope">
-                <router-link :to="'/config/dict/' + scope.row.dictType" class="link-type">
-                  <span>{{ scope.row.dictType }}</span>
-                </router-link>
-              </template>
-            </el-table-column>
-            <el-table-column prop="status" label="字典状态" v-col="'status'" width="120" align="center">
-              <template #default="scope">
-                <el-tag type="success" size="small" v-if="scope.row.status">启用</el-tag>
-                <el-tag type="info" size="small" v-else>禁用</el-tag>
-              </template>
-            </el-table-column>
-            <el-table-column prop="remark" v-col="'remark'" label="字典描述" show-overflow-tooltip></el-table-column>
-            <!-- <el-table-column prop="createdAt" label="创建时间" align="center" width="180"></el-table-column> -->
-            <el-table-column label="操作" width="100" align="center" v-col="'handle'">
-              <template #default="scope">
-                <el-button size="small" text type="warning" @click="onOpenEditDic(scope.row)" v-auth="'edit'">修改</el-button>
-                <el-button size="small" text type="info" @click="onRowDel(scope.row)" v-auth="'del'">删除</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-          <pagination v-show="tableData.total > 0" :total="tableData.total" v-model:page="tableData.param.pageNum" v-model:limit="tableData.param.pageSize" @pagination="typeList" />
-				</el-tab-pane>
-			</el-tabs> 
+        <el-tab-pane v-for="dict in tabDataList" :label="dict.dictLabel" :name="dict.dictValue">
+        </el-tab-pane>
+      </el-tabs>
+      <el-table :data="tableData.data" style="width: 100%" @selection-change="handleSelectionChange" v-loading="tableData.loading">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="字典ID" v-col="'dictId'" align="center" prop="dictId" width="80" />
+        <el-table-column label="字典名称" v-col="'dictName'" prop="dictName" show-overflow-tooltip />
+        <el-table-column label="字典类型" v-col="'dictType'" align="center" show-overflow-tooltip>
+          <template #default="scope">
+            <router-link :to="'/config/dict/' + scope.row.dictType" class="link-type">
+              <span>{{ scope.row.dictType }}</span>
+            </router-link>
+          </template>
+        </el-table-column>
+        <el-table-column prop="status" label="字典状态" v-col="'status'" width="120" align="center">
+          <template #default="scope">
+            <el-tag type="success" size="small" v-if="scope.row.status">启用</el-tag>
+            <el-tag type="info" size="small" v-else>禁用</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="remark" v-col="'remark'" label="字典描述" show-overflow-tooltip></el-table-column>
+        <!-- <el-table-column prop="createdAt" label="创建时间" align="center" width="180"></el-table-column> -->
+        <el-table-column label="操作" width="100" align="center" v-col="'handle'">
+          <template #default="scope">
+            <el-button size="small" text type="warning" @click="onOpenEditDic(scope.row)" v-auth="'edit'">修改</el-button>
+            <el-button size="small" text type="info" @click="onRowDel(scope.row)" v-auth="'del'">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination v-show="tableData.total > 0" :total="tableData.total" v-model:page="tableData.param.pageNum" v-model:limit="tableData.param.pageSize" @pagination="typeList" />
     </el-card>
     </el-card>
     <EditDic ref="editDicRef" @typeList="typeList" />
     <EditDic ref="editDicRef" @typeList="typeList" />
   </div>
   </div>
 </template>
 </template>
 
 
 <script lang="ts">
 <script lang="ts">
-import { toRefs, reactive, onMounted, ref, defineComponent} from 'vue';
+import { toRefs, reactive, onMounted, ref, defineComponent } from 'vue';
 import { ElMessageBox, ElMessage, FormInstance } from 'element-plus';
 import { ElMessageBox, ElMessage, FormInstance } from 'element-plus';
 import EditDic from './component/editDic.vue';
 import EditDic from './component/editDic.vue';
 import api from '/@/api/system';
 import api from '/@/api/system';
@@ -124,7 +116,7 @@ export default defineComponent({
     const addDicRef = ref();
     const addDicRef = ref();
     const editDicRef = ref();
     const editDicRef = ref();
     const queryRef = ref();
     const queryRef = ref();
-    const tabDataList = ref([{dictLabel: '全部', dictValue: ''}]);
+    const tabDataList = ref([{ dictLabel: '全部', dictValue: '' }]);
     const state = reactive<TableDataState>({
     const state = reactive<TableDataState>({
       ids: [],
       ids: [],
       tableData: {
       tableData: {
@@ -209,7 +201,7 @@ export default defineComponent({
     // 获取字典列表
     // 获取字典列表
     const dictList = () => {
     const dictList = () => {
       state.tableData.loading = true;
       state.tableData.loading = true;
-      api.dict.getDataList({dictType: 'dict_class_type',status: 1,pageNum: 1,pageSize: 50,defaultValue: ''})
+      api.dict.getDataList({ dictType: 'dict_class_type', status: 1, pageNum: 1, pageSize: 50, defaultValue: '' })
         .then((res: any) => {
         .then((res: any) => {
           tabDataList.value = tabDataList.value.concat(res.list);
           tabDataList.value = tabDataList.value.concat(res.list);
           typeList();
           typeList();

+ 3 - 3
src/views/system/manage/blacklist/component/editPro.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
   <div class="system-edit-dic-container">
   <div class="system-edit-dic-container">
     <el-dialog :title="(ruleForm.id ? '修改' : '添加')" v-model="isShowDialog" width="769px">
     <el-dialog :title="(ruleForm.id ? '修改' : '添加')" v-model="isShowDialog" width="769px">
-      <el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="90px">
+      <el-form :model="ruleForm" ref="formRef" :rules="rules" label-width="90px">
         <el-form-item label="IP地址" prop="ip">
         <el-form-item label="IP地址" prop="ip">
           <el-input type="textarea" v-model.trim="ruleForm.ip" placeholder="请输入IP地址" />
           <el-input type="textarea" v-model.trim="ruleForm.ip" placeholder="请输入IP地址" />
           <div style="color: #a4a4a4;line-height: 20px;">
           <div style="color: #a4a4a4;line-height: 20px;">
@@ -23,8 +23,8 @@
       </el-form>
       </el-form>
       <template #footer>
       <template #footer>
         <span class="dialog-footer">
         <span class="dialog-footer">
-          <el-button @click="onCancel" size="default">取 消</el-button>
-          <el-button type="primary" @click="onSubmit" size="default">{{ ruleForm.id ? '修 改' : '添 加' }}</el-button>
+          <el-button @click="onCancel">取 消</el-button>
+          <el-button type="primary" @click="onSubmit">{{ ruleForm.id ? '修 改' : '添 加' }}</el-button>
         </span>
         </span>
       </template>
       </template>
     </el-dialog>
     </el-dialog>

Some files were not shown because too many files changed in this diff