From c9571c465c756deedbfe424b5eab2d7591119f77 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 19 五月 2023 17:04:45 +0800
Subject: [PATCH] 新增选项组件，修改组合式函数fetchData
---
src/composables/fetchData.js | 20 ++
src/components/search-option/OptionLocation.vue | 61 +++++++
src/enum/onlineStatus.js | 24 +-
src/views/baseinfo/fysp/scene/CompSceneDeviceInfo.vue | 4
src/components.d.ts | 7
src/views/fytz/user/components/CompUserInfo.vue | 10
src/views/fytz/user/UserInfo.vue | 4
src/enum/location.js | 42 ++++
src/test.js | 39 +---
src/enum/scene.js | 62 ++++---
src/views/notice/NoticeManage.vue | 4
src/views/baseinfo/fysp/scene/SceneInfo.vue | 52 +++---
src/views/notice/CompNoticeAdd.vue | 4
src/views/baseinfo/fysp/user/UserInfo.vue | 4
src/components/SearchBar.vue | 4
src/components/search-option/OptionOnlineStatus.vue | 48 ++++++
src/components/search-option/OptionScene.vue | 53 ++++++
src/views/baseinfo/fysp/scene/CompSceneBaseInfo.vue | 8
src/views/fytz/monitor-data/DustData.vue | 4
19 files changed, 334 insertions(+), 120 deletions(-)
diff --git a/src/components.d.ts b/src/components.d.ts
index 385c905..b5199cd 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -10,6 +10,7 @@
BaseContentLayout: typeof import('./components/core/BaseContentLayout.vue')['default']
BasePanelLayout: typeof import('./components/core/BasePanelLayout.vue')['default']
Content: typeof import('./components/core/Content.vue')['default']
+ copy: typeof import('./components/search-option/OptionScene copy.vue')['default']
ElAside: typeof import('element-plus/es')['ElAside']
ElAvatar: typeof import('element-plus/es')['ElAvatar']
ElBacktop: typeof import('element-plus/es')['ElBacktop']
@@ -60,10 +61,16 @@
Footer: typeof import('./components/core/Footer.vue')['default']
FormCol: typeof import('./components/layout/FormCol.vue')['default']
Header: typeof import('./components/core/Header.vue')['default']
+ Location: typeof import('./components/search-option/Location.vue')['default']
+ LocationOption: typeof import('./components/search-option/LocationOption.vue')['default']
MenuItems: typeof import('./components/core/MenuItems.vue')['default']
+ OptionLocation: typeof import('./components/search-option/OptionLocation.vue')['default']
+ OptionOnlineStatus: typeof import('./components/search-option/OptionOnlineStatus.vue')['default']
+ OptionScene: typeof import('./components/search-option/OptionScene.vue')['default']
ProblemCard: typeof import('./components/ProblemCard.vue')['default']
RouterLink: typeof import('vue-router')['RouterLink']
RouterView: typeof import('vue-router')['RouterView']
+ SceneOption: typeof import('./components/search-option/SceneOption.vue')['default']
SearchBar: typeof import('./components/SearchBar.vue')['default']
SideList: typeof import('./components/SideList.vue')['default']
SiderMenu: typeof import('./components/core/SiderMenu.vue')['default']
diff --git a/src/components/SearchBar.vue b/src/components/SearchBar.vue
index d2533eb..fedb1e6 100644
--- a/src/components/SearchBar.vue
+++ b/src/components/SearchBar.vue
@@ -38,14 +38,14 @@
<script>
import taskApi from '@/api/fysp/taskApi';
-import { enumScene_2NA } from "@/enum/scene";
+import { enumScene } from "@/enum/scene";
export default {
emits: ['onSubmit'],
data() {
return {
topTasks: [],
- sceneTypes: enumScene_2NA(),
+ sceneTypes: enumScene(2, false),
formSearch: {
topTaskId: '',
sceneTypeId: '',
diff --git a/src/components/search-option/OptionLocation.vue b/src/components/search-option/OptionLocation.vue
new file mode 100644
index 0000000..2db31e3
--- /dev/null
+++ b/src/components/search-option/OptionLocation.vue
@@ -0,0 +1,61 @@
+<template>
+ <el-cascader
+ v-model="selectedOptions"
+ :options="locations"
+ placeholder="placeholder"
+ :props="props"
+ style="width: 280px"
+ />
+</template>
+
+<script>
+import { enumLocation } from '@/enum/location';
+
+export default {
+ props: {
+ // 鏄惁鍦ㄩ閫夐」澶勬坊鍔犫�滃叏閮ㄢ�濋�夐」
+ allOption: {
+ type: Boolean,
+ default: true,
+ },
+ // 鏌ヨ鐨勮鏀跨骇鍒紝鍙栧��1锛�2锛�3锛�4
+ level: {
+ type: Number,
+ default: 4,
+ },
+ // 缁撴灉杩斿洖鏁扮粍
+ value: Array,
+ },
+ emits: ['update:value'],
+ data() {
+ return {
+ locations: enumLocation(this.allOption, this.level),
+ selectedOptions: [],
+ props: {
+ checkStrictly: true,
+ },
+ };
+ },
+ computed: {
+ placeholder() {
+ const list = '鐪�/甯�/鍖�/闀�'.split('/');
+ const p = [];
+ for (let i = 0; i < this.level; i++) {
+ p.push(list[i]);
+ }
+ return p;
+ },
+ },
+ watch: {
+ selectedOptions: {
+ handler(val) {
+ this.$emit('update:value', val);
+ },
+ deep: true,
+ },
+ },
+ mounted() {
+ this.selectedOptions = [this.locations[0].value];
+ },
+};
+</script>
diff --git a/src/components/search-option/OptionOnlineStatus.vue b/src/components/search-option/OptionOnlineStatus.vue
new file mode 100644
index 0000000..a613172
--- /dev/null
+++ b/src/components/search-option/OptionOnlineStatus.vue
@@ -0,0 +1,48 @@
+<template>
+ <el-select
+ v-model="selectedOptions"
+ placeholder="涓婄嚎鐘舵��"
+ style="width: 75px"
+ >
+ <el-option
+ v-for="s in onlineStatus"
+ :key="s.value"
+ :label="s.label"
+ :value="s"
+ />
+ </el-select>
+</template>
+
+<script>
+import { enumOnlineStatus } from '@/enum/onlineStatus';
+
+export default {
+ props: {
+ // 鏄惁鍦ㄩ閫夐」澶勬坊鍔犫�滃叏閮ㄢ�濋�夐」
+ allOption: {
+ type: Boolean,
+ default: true,
+ },
+ // 杩斿洖缁撴灉
+ value: Object,
+ },
+ emits: ['update:value'],
+ data() {
+ return {
+ onlineStatus: enumOnlineStatus(),
+ selectedOptions: {},
+ };
+ },
+ watch: {
+ selectedOptions: {
+ handler(val) {
+ this.$emit('update:value', val);
+ },
+ deep: true,
+ },
+ },
+ mounted() {
+ this.selectedOptions = this.onlineStatus[0];
+ },
+};
+</script>
diff --git a/src/components/search-option/OptionScene.vue b/src/components/search-option/OptionScene.vue
new file mode 100644
index 0000000..a8cc2bc
--- /dev/null
+++ b/src/components/search-option/OptionScene.vue
@@ -0,0 +1,53 @@
+<template>
+ <el-select
+ v-model="selectedOptions"
+ placeholder="鍦烘櫙绫诲瀷"
+ style="width: 150px"
+ >
+ <el-option
+ v-for="s in sceneTypes"
+ :key="s.value"
+ :label="s.label"
+ :value="s"
+ />
+ </el-select>
+</template>
+
+<script>
+import { enumScene } from '@/enum/scene';
+
+export default {
+ props: {
+ // 鏄惁鍦ㄩ閫夐」澶勬坊鍔犫�滃叏閮ㄢ�濋�夐」
+ allOption: {
+ type: Boolean,
+ default: true,
+ },
+ // 1:椋炵窘鐜绯荤粺锛�2锛氶缇界洃绠＄郴缁燂紱
+ type: {
+ type: Number,
+ default: 1,
+ },
+ // 杩斿洖缁撴灉
+ value: Object,
+ },
+ emits: ['update:value'],
+ data() {
+ return {
+ sceneTypes: enumScene(this.type, this.allOption),
+ selectedOptions: {},
+ };
+ },
+ watch: {
+ selectedOptions: {
+ handler(val) {
+ this.$emit('update:value', val);
+ },
+ deep: true,
+ },
+ },
+ mounted() {
+ this.selectedOptions = this.sceneTypes[0];
+ },
+};
+</script>
diff --git a/src/composables/fetchData.js b/src/composables/fetchData.js
index 08c7b46..3598753 100644
--- a/src/composables/fetchData.js
+++ b/src/composables/fetchData.js
@@ -23,8 +23,22 @@
// 鏁版嵁鑾峰彇
function fetchData() {
- fetch(currentPage, pageSize).then((res) => {
-
- });
+ loadStatus.value = 1;
+ fetch(currentPage.value, pageSize.value)
+ .then((pageInfo) => {
+ currentPage.value = pageInfo.currentPage;
+ totalPage.value = pageInfo.totalPage;
+ total.value = pageInfo.total;
+
+ loadStatus.value = 0;
+ })
+ .catch(() => {
+ loadStatus.value = 3;
+ })
+ .finally(() => {
+ loadStatus.value = 2;
+ });
}
+
+ return {currentPage, totalPage, pageSize, total, loadStatus, fetchData}
}
diff --git a/src/enum/location.js b/src/enum/location.js
index ff9fb5a..0d79acb 100644
--- a/src/enum/location.js
+++ b/src/enum/location.js
@@ -1,6 +1,20 @@
-// 琛屾斂鍖哄垝
+/**
+ * 鑾峰彇琛屾斂鍖哄垝
+ * @param {Boolean} allOption 鏄惁鍦ㄥご閮ㄦ坊鍔犫�滃叏閮ㄢ�濋�夐」
+ * @param {Number} level 鑾峰彇鐨勫垎绫绘繁搴︼紝鑼冨洿 1 - 4
+ * @returns
+ */
+function enumLocation(allOption = true, level = 4) {
+ const l = _enumLocation();
+ if (!allOption) {
+ l.shift();
+ }
+ _deleteByLevel(l, level, 1);
-function enumLocation() {
+ return l;
+}
+
+function _enumLocation() {
return [
{
label: '鍏ㄩ儴',
@@ -127,10 +141,24 @@
},
];
}
-function enumLocationNA() {
- const l = enumLocation();
- l.shift();
- return l;
+
+// 鎸夌収闇�姹傜殑瀹氫綅绮惧害杩斿洖瀵瑰簲鏁版嵁
+function _deleteByLevel(locations, level, step) {
+ if (step == level) {
+ locations.forEach((l) => {
+ if (l.children) {
+ l.children = undefined;
+ }
+ });
+ return;
+ } else {
+ step++;
+ locations.forEach((l) => {
+ if (l.children) {
+ _deleteByLevel(l.children, level, step);
+ }
+ });
+ }
}
-export { enumLocation, enumLocationNA };
+export { enumLocation };
diff --git a/src/enum/onlineStatus.js b/src/enum/onlineStatus.js
index e958e40..363303e 100644
--- a/src/enum/onlineStatus.js
+++ b/src/enum/onlineStatus.js
@@ -1,6 +1,18 @@
-// 涓婁笅绾跨姸鎬�
+/**
+ * 涓婁笅绾跨姸鎬�
+ * @param {Boolean} allOption 鏄惁鍦ㄥご閮ㄦ坊鍔犫�滃叏閮ㄢ�濋�夐」
+ * @returns
+ */
+function enumOnlineStatus(allOption = true) {
+ const l = _enumOnlineStatus();
+ if (!allOption) {
+ l.shift();
+ }
-function enumOnlineStatus() {
+ return l;
+}
+
+function _enumOnlineStatus() {
return [
{
label: '鍏ㄩ儴',
@@ -17,10 +29,4 @@
];
}
-function enumOnlineStatusNA() {
- const l = enumOnlineStatus();
- l.shift();
- return l;
-}
-
-export { enumOnlineStatus, enumOnlineStatusNA };
\ No newline at end of file
+export { enumOnlineStatus };
diff --git a/src/enum/scene.js b/src/enum/scene.js
index a62b681..2dcf30a 100644
--- a/src/enum/scene.js
+++ b/src/enum/scene.js
@@ -1,7 +1,38 @@
-// 鍦烘櫙绫诲瀷鏋氫妇
+/**
+ * 鍦烘櫙绫诲瀷鏋氫妇
+ * @param {Number} type 1:椋炵窘鐜绯荤粺锛�2锛氶缇界洃绠＄郴缁燂紱
+ * @param {Boolean} allOption 鏄惁鍦ㄥご閮ㄦ坊鍔犫�滃叏閮ㄢ�濋�夐」
+ */
+function enumScene(type, allOption = true) {
+ let l;
+ switch (type) {
+ case 1:
+ l = _enumScene_1();
+ break;
+ case 2:
+ l = _enumScene_2();
+ break;
+ default:
+ l = _enumScene_1();
+ break;
+ }
+ if (!allOption) {
+ l.shift();
+ }
+
+ return l;
+}
+
+function getSceneName(value, type = 1) {
+ enumScene(type).find((v) => {
+ if (v.value == value) {
+ return v;
+ }
+ });
+}
// 椋炵窘鐜绯荤粺
-function enumScene_1() {
+function _enumScene_1() {
return [
{
label: '鍏ㄩ儴',
@@ -37,21 +68,9 @@
},
];
}
-function enumScene_1NA() {
- const l = enumScene_1();
- l.shift();
- return l;
-}
-function getSceneName_1(value) {
- enumScene_1().find((v) => {
- if (v.value == value) {
- return v;
- }
- });
-}
// 椋炵窘鐩戠绯荤粺
-function enumScene_2() {
+function _enumScene_2() {
return [
{
label: '鍏ㄩ儴',
@@ -95,16 +114,5 @@
},
];
}
-function enumScene_2NA() {
- const l = enumScene_2();
- l.shift();
- return l;
-}
-export {
- enumScene_1,
- enumScene_1NA,
- getSceneName_1,
- enumScene_2,
- enumScene_2NA,
-};
+export { enumScene, getSceneName };
diff --git a/src/test.js b/src/test.js
index 7104bb5..cca19e1 100644
--- a/src/test.js
+++ b/src/test.js
@@ -1,26 +1,17 @@
-const list = [
- [310104501, '婕曟渤娉炬柊鍏存妧鏈紑鍙戝尯'],
- [310104004, '婀栧崡璺閬�'],
- [310104003, '澶╁钩璺閬�'],
- [310104012, '铏规璺閬�'],
- [310104008, '鏋灄璺閬�'],
- [310104007, '鏂滃湡璺閬�'],
- [310104010, '闀挎ˉ琛楅亾'],
- [310104011, '鐢版灄琛楅亾'],
- [310104013, '搴峰仴鏂版潙琛楅亾'],
- [310104014, '寰愬姹囪閬�'],
- [310104015, '鍑屼簯璺閬�'],
- [310104016, '榫欏崕琛楅亾'],
- [310104017, '婕曟渤娉捐閬�'],
- [310104103, '鍗庢尘闀�'],
-];
+const shape = {
+ radius: 9,
+ d() {
+ return this.radius * 2;
+ },
+ p: () => 2 * Math.PI * this.radius,
+};
-const result = [];
-list.forEach((l) => {
- result.push({
- label: l[1],
- value: l[0] + '',
- });
-});
+console.log(shape.d());
+console.log(shape.p());
-console.log(result);
+const str = 'abc';
+if (str[0] >= 'a' && str[0] <= 'z') {
+ let a = parseInt(str[0]);
+ a -= 32;
+ console.log(a);
+}
diff --git a/src/views/baseinfo/fysp/scene/CompSceneBaseInfo.vue b/src/views/baseinfo/fysp/scene/CompSceneBaseInfo.vue
index 7e44c39..9985726 100644
--- a/src/views/baseinfo/fysp/scene/CompSceneBaseInfo.vue
+++ b/src/views/baseinfo/fysp/scene/CompSceneBaseInfo.vue
@@ -103,8 +103,8 @@
<script setup>
import { defineProps, defineEmits, reactive, ref, watch } from 'vue';
-import { enumScene_2NA } from '@/enum/scene';
-import { enumLocationNA } from '@/enum/location';
+import { enumScene } from '@/enum/scene';
+import { enumLocation } from '@/enum/location';
import sceneApi from '@/api/fysp/sceneApi';
import { useFormConfirm } from '@/composables/formConfirm';
@@ -126,8 +126,8 @@
},
});
const loading = ref(false);
-const sceneTypes = reactive(enumScene_2NA());
-const locations = reactive(enumLocationNA());
+const sceneTypes = reactive(enumScene(2, false));
+const locations = reactive(enumLocation(false));
const cascaderProps = reactive({
checkStrictly: true,
});
diff --git a/src/views/baseinfo/fysp/scene/CompSceneDeviceInfo.vue b/src/views/baseinfo/fysp/scene/CompSceneDeviceInfo.vue
index 25eaef2..d32ef8b 100644
--- a/src/views/baseinfo/fysp/scene/CompSceneDeviceInfo.vue
+++ b/src/views/baseinfo/fysp/scene/CompSceneDeviceInfo.vue
@@ -76,7 +76,7 @@
<script setup>
import { defineProps, defineEmits, reactive, ref, watch } from 'vue';
import { useFormConfirm } from '@/composables/formConfirm';
-import { enumOnlineStatusNA } from '@/enum/onlineStatus';
+import { enumOnlineStatus } from '@/enum/onlineStatus';
import sceneApi from '@/api/fysp/sceneApi';
const props = defineProps({
@@ -97,7 +97,7 @@
},
});
const loading = ref(false);
-const onlineStatus = reactive(enumOnlineStatusNA());
+const onlineStatus = reactive(enumOnlineStatus(false));
const rules = reactive({
sdNum: [
{
diff --git a/src/views/baseinfo/fysp/scene/SceneInfo.vue b/src/views/baseinfo/fysp/scene/SceneInfo.vue
index 3f7d8c5..9fe1c9e 100644
--- a/src/views/baseinfo/fysp/scene/SceneInfo.vue
+++ b/src/views/baseinfo/fysp/scene/SceneInfo.vue
@@ -2,16 +2,26 @@
<el-row ref="searchRef">
<el-form :inline="true" :model="formSearch">
<el-form-item label="鐪�/甯�/鍖�/闀�" prop="_locations">
- <el-cascader
+ <!-- <el-cascader
v-model="formSearch._locations"
:options="locations"
placeholder="鐪�/甯�/鍖�/闀�"
:props="props"
style="width: 280px"
- />
+ /> -->
+ <OptionLocation
+ :allOption="true"
+ :level="4"
+ v-model:value="formSearch._locations"
+ ></OptionLocation>
</el-form-item>
- <el-form-item label="鍦烘櫙绫诲瀷" prop="scensetypeid">
- <el-select
+ <el-form-item label="鍦烘櫙绫诲瀷" prop="scensetype">
+ <OptionScene
+ :allOption="true"
+ :type="2"
+ v-model:value="formSearch.scensetype"
+ ></OptionScene>
+ <!-- <el-select
v-model="formSearch.scensetypeid"
placeholder="鍦烘櫙绫诲瀷"
style="width: 150px"
@@ -22,10 +32,14 @@
:label="s.label"
:value="s.value"
/>
- </el-select>
+ </el-select> -->
</el-form-item>
<el-form-item label="涓婄嚎鐘舵��" prop="online">
- <el-select
+ <OptionOnlineStatus
+ :allOption="true"
+ v-model:value="formSearch.online"
+ ></OptionOnlineStatus>
+ <!-- <el-select
v-model="formSearch.online"
placeholder="涓婄嚎鐘舵��"
style="width: 75px"
@@ -36,7 +50,7 @@
:label="s.label"
:value="s.value"
/>
- </el-select>
+ </el-select> -->
</el-form-item>
<el-form-item>
<el-button icon="Search" type="primary" @click="onSearch"
@@ -106,9 +120,6 @@
</template>
<script>
-import { enumScene_2 } from '@/enum/scene';
-import { enumLocation } from '@/enum/location';
-import { enumOnlineStatus } from '@/enum/onlineStatus';
import sceneApi from '@/api/fysp/sceneApi';
import { useLoadingStore } from '@/stores/loadingStore';
import { mapStores } from 'pinia';
@@ -117,20 +128,10 @@
export default {
data() {
return {
- locations: enumLocation(),
- sceneTypes: enumScene_2(),
- onlineStatus: enumOnlineStatus(),
formSearch: {
_locations: [],
- provincecode: '',
- citycode: '',
- districtcode: '',
- towncode: '',
- scensetypeid: '',
- online: '',
- },
- props: {
- checkStrictly: true,
+ scensetype: {},
+ online: {},
},
tableData: [],
@@ -177,10 +178,10 @@
? (area.towncode = f._locations[3][0])
: (area.towncode = null);
// 鍦烘櫙绫诲瀷
- area.scensetypeid = f.scensetypeid;
+ area.scensetypeid = f.scensetype.value;
if (area.scensetypeid == '0') area.scensetypeid = null;
// 涓婁笅绾跨姸鎬�
- area.online = f.online;
+ area.online = f.online.value;
sceneApi
.searchScene(area, this.currentPage, this.pageSize)
@@ -234,9 +235,6 @@
},
},
mounted() {
- this.formSearch.scensetypeid = this.sceneTypes[0].value;
- this.formSearch._locations = [this.locations[0].value];
- this.formSearch.online = this.onlineStatus[0].value;
this.tableHeight = this.calcTableHeight();
this.onSearch();
},
diff --git a/src/views/baseinfo/fysp/user/UserInfo.vue b/src/views/baseinfo/fysp/user/UserInfo.vue
index df875d5..585f0cb 100644
--- a/src/views/baseinfo/fysp/user/UserInfo.vue
+++ b/src/views/baseinfo/fysp/user/UserInfo.vue
@@ -29,14 +29,14 @@
</template>
<script>
-import { enumScene_2 } from '@/enum/scene';
+import { enumScene } from '@/enum/scene';
import { enumDistrict } from '@/enum/district';
export default {
data() {
return {
districts: enumDistrict(),
- sceneTypes: enumScene_2(),
+ sceneTypes: enumScene(2),
formSearch: {
district: '',
sceneTypeId: '',
diff --git a/src/views/fytz/monitor-data/DustData.vue b/src/views/fytz/monitor-data/DustData.vue
index db93d69..7a8aa02 100644
--- a/src/views/fytz/monitor-data/DustData.vue
+++ b/src/views/fytz/monitor-data/DustData.vue
@@ -106,14 +106,14 @@
</template>
<script>
-import { enumScene_1 } from '@/enum/scene';
+import { enumScene } from '@/enum/scene';
import { enumLocation } from '@/enum/location';
export default {
data() {
return {
locations: enumLocation(),
- sceneTypes: enumScene_1(),
+ sceneTypes: enumScene(1),
formSearch: {
_locations: [],
provincecode: '',
diff --git a/src/views/fytz/user/UserInfo.vue b/src/views/fytz/user/UserInfo.vue
index 50acda9..93ed643 100644
--- a/src/views/fytz/user/UserInfo.vue
+++ b/src/views/fytz/user/UserInfo.vue
@@ -133,7 +133,7 @@
</template>
<script>
-import { enumScene_1 } from '@/enum/scene';
+import { enumScene } from '@/enum/scene';
import { enumLocation } from '@/enum/location';
import { enumOnlineStatus } from '@/enum/onlineStatus';
import userApi from '@/api/fytz/userApi';
@@ -149,7 +149,7 @@
data() {
return {
locations: enumLocation(),
- sceneTypes: enumScene_1(),
+ sceneTypes: enumScene(1),
onlineStatus: enumOnlineStatus(),
formSearch: {
_locations: [],
diff --git a/src/views/fytz/user/components/CompUserInfo.vue b/src/views/fytz/user/components/CompUserInfo.vue
index 0f9a433..3e48095 100644
--- a/src/views/fytz/user/components/CompUserInfo.vue
+++ b/src/views/fytz/user/components/CompUserInfo.vue
@@ -113,8 +113,8 @@
import { defineProps, defineEmits, reactive, ref, watch } from 'vue';
import { useFormConfirm } from '@/composables/formConfirm';
import { enumUserNA } from '@/enum/user';
-import { enumScene_1NA, getSceneName_1 } from '@/enum/scene';
-import { enumLocationNA } from '@/enum/location';
+import { enumScene, getSceneName } from '@/enum/scene';
+import { enumLocation } from '@/enum/location';
import userApi from '@/api/fytz/userApi';
const props = defineProps({
@@ -146,8 +146,8 @@
});
const userTypes = reactive(enumUserNA());
-const sceneTypes = reactive(enumScene_1NA());
-const locations = enumLocationNA();
+const sceneTypes = reactive(enumScene(1, false));
+const locations = enumLocation(false);
const locationsProps = reactive({
checkStrictly: true,
});
@@ -206,7 +206,7 @@
};
s._scenetype = {
- label: getSceneName_1(s.extension2),
+ label: getSceneName(s.extension2, 1),
value: s.extension2,
};
diff --git a/src/views/notice/CompNoticeAdd.vue b/src/views/notice/CompNoticeAdd.vue
index 4a83d87..545b138 100644
--- a/src/views/notice/CompNoticeAdd.vue
+++ b/src/views/notice/CompNoticeAdd.vue
@@ -54,7 +54,7 @@
</template>
<script>
-import { enumScene_1 } from '@/enum/scene';
+import { enumScene } from '@/enum/scene';
import { enumDistrict } from '@/enum/district';
import { enumNotice } from '@/enum/notice';
@@ -74,7 +74,7 @@
// expandTrigger: 'hover'
},
districts: enumDistrict(),
- sceneTypes: enumScene_1(),
+ sceneTypes: enumScene(1),
noticeTypes: enumNotice(),
form: {
//鍙戝竷鑰卛d
diff --git a/src/views/notice/NoticeManage.vue b/src/views/notice/NoticeManage.vue
index 8dcd7df..bcdcd05 100644
--- a/src/views/notice/NoticeManage.vue
+++ b/src/views/notice/NoticeManage.vue
@@ -140,7 +140,7 @@
<script>
import noticeApi from '@/api/fytz/noticeApi';
import { useDateFormat } from '@vueuse/core';
-import { enumScene_1 } from '@/enum/scene';
+import { enumScene } from '@/enum/scene';
import { enumDistrict } from '@/enum/district';
import { enumNotice } from '@/enum/notice';
@@ -156,7 +156,7 @@
loading: false,
drawer: false,
districts: enumDistrict(),
- sceneTypes: enumScene_1(),
+ sceneTypes: enumScene(1),
noticeTypes: enumNotice(),
formSearch: {
district: '',
--
Gitblit v1.9.3