diff --git a/src/api/common/api.ts b/src/api/common/api.ts index 47d5cfb..7065ceb 100644 --- a/src/api/common/api.ts +++ b/src/api/common/api.ts @@ -14,8 +14,17 @@ enum Api { getDictItems = '/sys/dict/getDictItems/', getTableList = '/sys/user/queryUserComponentData', getCategoryData = '/sys/category/loadAllData', + getNuList = '/iot/cameraInfo/nuList',//后期调整 } +/** + * 护理单元列表 + * @param params + */ +export const getNuList = (params) => { + return defHttp.get({ url: Api.getNuList, params }); +}; + /** * 上传父路径 */ diff --git a/src/components/Form/src/componentMap.ts b/src/components/Form/src/componentMap.ts index 2e17b62..322bd3a 100644 --- a/src/components/Form/src/componentMap.ts +++ b/src/components/Form/src/componentMap.ts @@ -45,6 +45,7 @@ import JImageUpload from './jeecg/components/JImageUpload.vue'; import JDictSelectTag from './jeecg/components/JDictSelectTag.vue'; import JSelectDept from './jeecg/components/JSelectDept.vue'; import JAreaSelect from './jeecg/components/JAreaSelect.vue'; +import JSelectNu from './jeecg/components/JSelectNu.vue'; import JEditor from './jeecg/components/JEditor.vue'; // import JMarkdownEditor from './jeecg/components/JMarkdownEditor.vue'; import JSelectInput from './jeecg/components/JSelectInput.vue'; @@ -127,6 +128,7 @@ componentMap.set('JImageUpload', JImageUpload); componentMap.set('JDictSelectTag', JDictSelectTag); componentMap.set('JSelectDept', JSelectDept); componentMap.set('JAreaSelect', JAreaSelect); +componentMap.set('JSelectNu', JSelectNu); // componentMap.set( // 'JEditor', // createAsyncComponent(() => import('./jeecg/components/JEditor.vue')) diff --git a/src/components/Form/src/jeecg/components/JSelectNu.vue b/src/components/Form/src/jeecg/components/JSelectNu.vue new file mode 100644 index 0000000..6e4f05c --- /dev/null +++ b/src/components/Form/src/jeecg/components/JSelectNu.vue @@ -0,0 +1,167 @@ + + + + diff --git a/src/components/Form/src/jeecg/components/modal/NuSelectModal.vue b/src/components/Form/src/jeecg/components/modal/NuSelectModal.vue new file mode 100644 index 0000000..4ca1771 --- /dev/null +++ b/src/components/Form/src/jeecg/components/modal/NuSelectModal.vue @@ -0,0 +1,190 @@ + + + diff --git a/src/components/Form/src/types/index.ts b/src/components/Form/src/types/index.ts index 560c949..1a5a215 100644 --- a/src/components/Form/src/types/index.ts +++ b/src/components/Form/src/types/index.ts @@ -156,5 +156,6 @@ export type ComponentType = | 'linkRecordSelect' | 'RangeTime' | 'JRangeNumber' - | 'JInputSelect'; - + | 'JInputSelect' + | 'JSelectNu'; + diff --git a/src/views/iot/tplink/camera/components/CameraLeftTree.vue b/src/views/iot/tplink/camera/components/CameraLeftTree.vue index 8e2f93f..005e568 100644 --- a/src/views/iot/tplink/camera/components/CameraLeftTree.vue +++ b/src/views/iot/tplink/camera/components/CameraLeftTree.vue @@ -1,31 +1,33 @@ + diff --git a/src/views/iot/tplink/region/RegionInfoList.vue b/src/views/iot/tplink/region/components/RegionInfoList.vue similarity index 91% rename from src/views/iot/tplink/region/RegionInfoList.vue rename to src/views/iot/tplink/region/components/RegionInfoList.vue index 8a8f30f..1a8f88a 100644 --- a/src/views/iot/tplink/region/RegionInfoList.vue +++ b/src/views/iot/tplink/region/components/RegionInfoList.vue @@ -6,7 +6,7 @@