libushang 11 bulan lalu
induk
melakukan
b477a91e58
6 mengubah file dengan 64 tambahan dan 10 penghapusan
  1. 9 0
      .env.development
  2. 1 1
      .env.production
  3. 9 0
      src/api/event.ts
  4. 5 2
      src/views/event/index.vue
  5. 4 3
      src/views/index.vue
  6. 36 4
      src/views/leader/index.vue

+ 9 - 0
.env.development

@@ -1,5 +1,14 @@
+# 页面标题
+VITE_APP_TITLE = 应急工作台移动端
+
+# 开发环境配置
+VITE_APP_ENV = 'development'
+
+# 开发环境
 # baseUrl
 VITE_BASE_API = 'http://19.155.220.206:80'
+VITE_BASE_DOWNLOAD_API = '/api/file/download/'
+# VITE_BASE_API = 'http://127.0.0.1:9988'
 
 # 开发环境启用 cdn eruda 调试工具。若不启用,将 true 修改为 false 或其他任意值即可
 VITE_ENABLE_ERUDA = "false"

+ 1 - 1
.env.production

@@ -1,5 +1,5 @@
 # baseUrl
-VITE_BASE_API = "http://19.155.220.206:80"
+VITE_BASE_API = "http://19.155.220.206:8088"
 
 # 线上环境平台打包路径
 VITE_PUBLIC_PATH = "/"

+ 9 - 0
src/api/event.ts

@@ -0,0 +1,9 @@
+import request from '@/utils/request';
+
+// 获取当前活动事件列表
+export function getActiveEventList() {
+    return request({
+        url: '/api/event_management/event/notice_bar',
+        method: 'get'
+    });
+}

+ 5 - 2
src/views/event/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <van-search v-model="search_keyword" placeholder="请输入内容" />
+    <van-search v-model="search_keyword" placeholder="请输入事件标题/事件地点" />
 
     <van-dropdown-menu>
         <van-dropdown-item title="类型" v-model="evnt_type" :options="opt_event_type" />
@@ -49,9 +49,12 @@
 </template>
 
 <script lang="ts" setup>
-import { reactive, ref } from 'vue';
+import { reactive, ref, toRefs } from 'vue';
 import { useRouter } from 'vue-router'
 import { showConfirmDialog } from 'vant';
+import { getActiveEventList } from "@/api/event";
+// const proxy = getCurrentInstance()?.proxy;
+// const { mm_event_type, mm_event_level, mm_event_state, region } = toRefs<any>(proxy?.useDict('mm_event_type', 'mm_event_level', 'mm_event_state', 'region'));
 
 const router = useRouter()
 

+ 4 - 3
src/views/index.vue

@@ -21,9 +21,10 @@ import {ref} from "vue";
 import {showFailToast} from "vant";
 
 let dataList = ref([]);
-getReportsList({ page: 1, pageSize: 10, sortBy: 'publishDate', sortOrder: 'asc' }).then((res) => {
-  dataList.value = res.data
-})
+//getReportsList({ page: 1, pageSize: 10, sortBy: 'publishDate', sortOrder: 'asc' }).then((res) => {
+//  dataList.value = res.data
+//})
+
 showFailToast('12213')
 </script>
 

+ 36 - 4
src/views/leader/index.vue

@@ -6,8 +6,12 @@
     </van-swipe>
     <van-search v-model="search_keyword" placeholder="请输入内容" />
     <van-notice-bar
+        @click="handleNoticeBar"
+        v-show="noticeBarState.show"
         left-icon="volume-o"
-        text="茂名市茂南区XX高速路口发生交通事故。"
+        scrollable
+        mode="closeable"
+        :text="noticeBarState.event_title"
         />
 
     <van-grid :column-num="2">
@@ -53,14 +57,42 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, reactive } from 'vue';
+import { ref, reactive, onMounted } from 'vue';
+import { getActiveEventList } from "@/api/event";
+
+const downLoadApi = import.meta.env.VITE_BASE_API + import.meta.env.VITE_BASE_DOWNLOAD_API;
+
 const search_keyword = ref('');
 
 const banners = ref([
-    'https://img.yzcdn.cn/public_files/2017/10/24/e5a5a02309a41f9f5def56684808d9ae.jpeg',
-    'https://img.yzcdn.cn/public_files/2017/10/24/1791ba14088f9c2be8c610d0a6cc0f93.jpeg',
+    downLoadApi + 'banner_1.png',
+    downLoadApi + 'banner_2.png',
 ]);
 
+const noticeBarState = reactive({
+    show: false,
+    event_id: '',
+    event_title: ''
+})
+
+const handleNoticeBar = () => {
+    console.log(noticeBarState.event_title);
+}
+
+onMounted(() => {
+    getActiveEventList().then((res) => {
+        if(res.data.event_id != noticeBarState.event_id) {
+            noticeBarState.show = true
+            noticeBarState.event_id = res.data.event_id;
+            noticeBarState.event_title = res.data.event_title;
+        }
+        
+    }).catch((err)=> {
+        noticeBarState.show = false
+        noticeBarState.event_id = '';
+        noticeBarState.event_title = '';
+    })
+})
 </script>
 
 <style lang="scss" scoped>