wenhongquan 2 年之前
父節點
當前提交
4be32d64fc
共有 9 個文件被更改,包括 67 次插入9 次删除
  1. 1 0
      .env.dev
  2. 2 1
      .env.prod
  3. 2 1
      .env.test
  4. 1 0
      .env.zwy
  5. 1 0
      .env.zwynw
  6. 24 1
      src/service/login.ts
  7. 21 0
      src/store/useMainStore.ts
  8. 7 5
      src/views/HomePage/index.tsx
  9. 8 1
      src/views/IncidentManagementReport/index.tsx

+ 1 - 0
.env.dev

@@ -6,3 +6,4 @@ VITE_API_SERVER = 'https://tocc.jtj.suqian.gov.cn:9999/server'
 VITE_MAP_SERVER = 'https://tocc.jtj.suqian.gov.cn:21100'
 VITE_LOGIN_SERVER = 'https://tocc.jtj.suqian.gov.cn:9999/'
 VITE_DH_SERVER = 'http://sqdh.xt.wenhq.top:8083'
+VITE_HELP_BASE='https://tocc.jtj.suqian.gov.cn:30443/service-out-mobile/#/pages/helpCenter/systemDetail?'

+ 2 - 1
.env.prod

@@ -5,4 +5,5 @@ NODE_ENV = prod
 VITE_API_SERVER = 'http://10.11.208.17:30876'
 VITE_MAP_SERVER = 'https://tocc.jtj.suqian.gov.cn:21100'
 VITE_LOGIN_SERVER = 'http://10.11.208.32:9999/'
-VITE_DH_SERVER = 'http://sqdh.xt.wenhq.top:8083'
+VITE_DH_SERVER = 'http://sqdh.xt.wenhq.top:8083'
+VITE_HELP_BASE='http://10.11.208.17:30063/service-out-mobile/#/pages/helpCenter/systemDetail?'

+ 2 - 1
.env.test

@@ -5,4 +5,5 @@ NODE_ENV = test
 VITE_API_SERVER = 'http://61.147.254.211:30876'
 VITE_MAP_SERVER = 'https://tocc.jtj.suqian.gov.cn:21100'
 VITE_LOGIN_SERVER = 'https://tocc.jtj.suqian.gov.cn:9999/'
-VITE_DH_SERVER = 'http://sqdh.xt.wenhq.top:8083'
+VITE_DH_SERVER = 'http://sqdh.xt.wenhq.top:8083'
+VITE_HELP_BASE='https://tocc.jtj.suqian.gov.cn:30443/service-out-mobile/#/pages/helpCenter/systemDetail?'

+ 1 - 0
.env.zwy

@@ -6,3 +6,4 @@ VITE_API_SERVER = 'https://tocc.jtj.suqian.gov.cn:9999/server'
 VITE_MAP_SERVER = 'https://tocc.jtj.suqian.gov.cn:21100'
 VITE_LOGIN_SERVER = 'https://tocc.jtj.suqian.gov.cn:9999/'
 VITE_DH_SERVER = 'http://sqdh.xt.wenhq.top:8083'
+VITE_HELP_BASE='https://tocc.jtj.suqian.gov.cn:30443/service-out-mobile/#/pages/helpCenter/systemDetail?'

+ 1 - 0
.env.zwynw

@@ -6,3 +6,4 @@ VITE_API_SERVER = 'https://tocc.jtj.suqian.gov.cn:9999/server'
 VITE_MAP_SERVER = 'https://tocc.jtj.suqian.gov.cn:21100'
 VITE_LOGIN_SERVER = 'https://tocc.jtj.suqian.gov.cn:9999/'
 VITE_DH_SERVER = 'http://sqdh.xt.wenhq.top:8083'
+VITE_HELP_BASE='https://tocc.jtj.suqian.gov.cn:30443/service-out-mobile/#/pages/helpCenter/systemDetail?'

+ 24 - 1
src/service/login.ts

@@ -1,9 +1,16 @@
 import request from "@/utils/request";
 import { BASE_USER_URL,BASE_USER_LOCATION_URL } from "@/utils/constant";
 
-
+export interface BaseResponse {
+  code?: number;
+  msg?: string;
+}
+export interface StringResponse extends BaseResponse {
+  data: string;
+}
 
 export const api_gettokenByTicket = (ticket:string) => { 
+   localStorage.setItem("userticket",ticket);
    return request<Object>('GET', {
      url: `${BASE_USER_URL}/user?ticket=${ticket}`
    });
@@ -20,6 +27,22 @@ export const api_getusergps = () => {
 };
 
 
+export const getTicket = () =>{
+
+  var tokenkjson = window.localStorage.getItem('userdata');
+  tokenkjson = tokenkjson == null ? "{}" : tokenkjson;
+  tokenkjson = tokenkjson == undefined ? "{}" : tokenkjson;
+  tokenkjson = JSON.parse(tokenkjson);
+
+return request<StringResponse>('GET', {
+  url: `${BASE_USER_URL}/ticket`,
+  headers: {
+    AppId: '3bcb760743ea456faba29a1dfb247bf4',
+    Authorization: 'Bearer ' + (tokenkjson["accessToken"]),
+  },
+});
+}
+
   
 function docheck() { 
   var token = localStorage.getItem("token");

+ 21 - 0
src/store/useMainStore.ts

@@ -1,20 +1,29 @@
 import { Canceler } from 'axios';
 import { defineStore } from 'pinia';
 
+import { getTicket } from '@/service/login';
+
 export interface MainStateType {
   cancelReqToken: Canceler[];
+  loading: boolean,
 }
 
 export interface MainActionsType {
   pushReqToken(cancelToken: Canceler): void;
   clearReqToken(): void;
+  gotohelp(sign:string):void;
+  toggleLoading(): void;
 }
 
 export default defineStore<'main', MainStateType, {}, MainActionsType>('main', {
   state: () => ({
     cancelReqToken: [],
+    loading: false,
   }),
   actions: {
+    toggleLoading() {
+      this.loading = !this.loading;
+    },
     pushReqToken(cancelToken) {
       this.cancelReqToken.push(cancelToken);
     },
@@ -24,5 +33,17 @@ export default defineStore<'main', MainStateType, {}, MainActionsType>('main', {
       });
       this.cancelReqToken = [];
     },
+    gotohelp(sign:string){
+      this.toggleLoading();
+      getTicket().then((res)=>{
+
+        this.toggleLoading();
+        const urlc = `${(import.meta.env.VITE_HELP_BASE as string)}sign=${sign}&ticket=${res.data}`;
+        window.location.href = urlc;
+
+      }).catch(eee=>{
+        this.toggleLoading();
+      })
+    }
   },
 });

+ 7 - 5
src/views/HomePage/index.tsx

@@ -9,8 +9,9 @@ import {
   onUnmounted,
 } from 'vue';
 
+
 import { useRouter, useRoute } from 'vue-router';
-import { useCommonStore, useIncidentStore } from '@/store';
+import { useCommonStore, useIncidentStore, useMainStore } from '@/store';
 import useMarkerStore from '@/store/useMarkerStore';
 import {
   DropdownItemOption,
@@ -153,10 +154,11 @@ export default defineComponent({
               
             }
           }}
-          // onClickRight={() =>
-          //   router.push(`/status/${route.params.status}/report`)
-          // }
-          // v-slots={{ right: () => <Icon name="plus" /> }}
+          onClick-right={() =>{
+            useMainStore().gotohelp("007d3bbdee714bacad2af7892a25a533");
+          }
+          }
+          v-slots={{ right: () => <Icon name="question-o" />  }}
           style={{ zIndex: 2 }}
         />
         <div

+ 8 - 1
src/views/IncidentManagementReport/index.tsx

@@ -10,7 +10,7 @@ import { useRoute, useRouter } from 'vue-router';
 import { upload, UploadData } from '@/api/common';
 import cloneDeep from 'lodash/cloneDeep';
 
-import { useCommonStore, useIncidentStore } from '@/store';
+import { useCommonStore, useIncidentStore, useMainStore } from '@/store';
 import QueryMap from '@/components/QueryMap';
 import Map from '@/components/MapView';
 import { BaseMediaUrl,isImage,isVideo } from '@/utils/index';
@@ -481,6 +481,13 @@ export default defineComponent({
               uni.navigateBack();
             } catch (E) {}
           }}
+          onClick-right={() =>{
+            useMainStore().gotohelp("be2dc45c2e644314a6b5a1ff2bf24420");
+          }
+          }
+          v-slots={{ right: () => <Icon name="question-o" />  }}
+
+          
         />
         <Popup
           style="width:100%;background:rgba(0,0,0,0)"