From d91f0dfcd2ef95fb3624d94ade24fe69a9169a58 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 04 二月 2024 15:15:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.20.92:8888/r/P2022036_Web2

---
 src/store/index.js |   71 ++++++++++++++++++++++++++++-------
 1 files changed, 56 insertions(+), 15 deletions(-)

diff --git a/src/store/index.js b/src/store/index.js
index 7c4d991..c2817f0 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -9,6 +9,7 @@
 
 export default new Vuex.Store({
   state: {
+    oldTree: null,
     catalogueName: '',
     cataNode: {},
     lang: 'zh',
@@ -37,21 +38,58 @@
     mapMenuBoxFlag: null,
     mapSpaceQueryLayer: null,
     mapMenuShpFile: null,
+    propertiesFlag: null,
+    propertiesName: null,
+    propertiesInfo: null,
+    pickUpPointInfo: null,
 
     //涓婚鍒囨崲
     theme: variables.theme,
     //鐧诲綍鐢ㄦ埛鍚�
     uname: null,
+    unid: null,
     //椤圭洰绠$悊
     projeOl: null,
     download: false,
     showAllLayers: true,
-    primitLayer:null,
-    loading:false,
-    pipelineEntity:[],
-    reporturl:null,
+    primitLayer: null,
+    loading: false,
+    pipelineEntity: [],
+    reporturl: null,
+    layerMnage: false,
+    themeflag: false,
+    language: true,
+    isNaviget: false,
+    treeData: null,
+    checkedKeys: [],
+    queryInfo: [],
+    Map3: [],
+    histogramLayer: [],
+    attachModel: false,
+    attachinfo: null,
+    catModel: false,
+    catModelInfo: null,
+    showPopBoxFlag: false,
+    pickoption: null,
+    previewLayer: null,
+    histLenged: false,
+    setAlphaDity: null,
+    setAlphaList: [],
+    isProjectLayer: [],
+    pigCode: null,
+    listenTime: null,
+    //鍦拌〃鍙樺舰
+    surfaceDeForm: {
+      falg: false,
+      gid: null,
+      val: null
+    },
+    setChangeBaseMap:true,
   },
   mutations: {
+    UPDATE_LISTEN_TIME(state, msg) {
+      state.listenTime = msg;
+    },
     //鑾峰彇鏉冮檺鍚堥泦
     getPermsEntity(state, msg) {
       state.permsEntity = msg;
@@ -92,16 +130,16 @@
     },
     /* 鎵撳紑Loading */
     START_LOADING(state, msg) {
-      state.loadingInstance = Loading.service({
-        lock: true,
-        text: msg ? msg : '鍔犺浇涓�...',
-        background: 'rgba(0, 0, 0, 0.7)',
-      });
+      // state.loadingInstance = Loading.service({
+      //   lock: true,
+      //   text: msg ? msg : '鍔犺浇涓�...',
+      //   background: 'rgba(0, 0, 0, 0.7)',
+      // });
     },
     /* 鍏抽棴loading */
 
     CLOSE_LOADING(state) {
-      state.loadingInstance.close();
+      // state.loadingInstance.close();
     },
     /* 鏇存柊璇锋眰绾跨▼姹� */
     UPDATE_API_COUNT(state, handle) {
@@ -142,12 +180,15 @@
         login(data)
           .then((response) => {
             const data = response;
+
             if (data.code !== 200) {
-              return Message({
-                message: data.msg,
-                type: 'error',
-                duration: 5 * 1000,
-              });
+              resolve(data);
+              return
+              // return Message({
+              //   message: data.msg,
+              //   type: 'error',
+              //   duration: 5 * 1000,
+              // });
             }
             commit('SET_UNAME', data.result.uname);
             commit('SET_TOKEN', data.result.token);

--
Gitblit v1.9.3