Browse Source

chore: .env.inspur

__TAKEOVER__ defaults to disabled, __JUMP_REVIEW__ defaults to enabled
Casper Dai 2 years ago
parent
commit
bd4d7f0af8

+ 5 - 2
.env

@@ -9,9 +9,11 @@ __PLACEHOLDER__ = 'disabled'
 # 备份设备
 __SUB_DEVICE__ = 'disabled'
 # 设备接管
-__TAKEOVER__ = 'enabled'
+__TAKEOVER__ = 'disabled'
 # 微信
-__WECHAT__ = 'enabled'
+__WECHAT__ = 'disabled'
+# 跳审
+__JUMP_REVIEW__ = 'enabled'
 
 VUE_APP_NAME = '浪潮屏媒安播云平台'
 
@@ -56,6 +58,7 @@ VUE_APP_SALT = '42857cfddb33f3fddb27fff9773683f3'
 # VUE_APP_GAODE_MAP_JSCODE = 'e7b3c29a5112657edcc688a3c589bd15'
 VUE_APP_GAODE_MAP_KEY = 'd450b58ff3a620e5eaf477e29c7ea94c'
 VUE_APP_GAODE_MAP_JSCODE = '92a333ddc89042aee3e3459162f0abe6'
+VUE_APP_GAODE_MAP_RANGE_LEVEL = 'country'
 VUE_APP_GAODE_MAP_RANGE = '中国'
 
 VUE_APP_AD_ORDER_QR = 'https://msr.inspur.com'

+ 1 - 5
.env.fujian

@@ -6,11 +6,7 @@ PLATFORM = 'fujian'
 
 VUE_APP_NAME = '万福千屏户外安播云平台'
 
-# 设备接管
-__TAKEOVER__ = 'disabled'
-# 小程序
-__WECHAT__ = 'disabled'
-
 VUE_APP_THUMBNAIL_ORIGIN = 'http://192.168.63.114'
 
+VUE_APP_GAODE_MAP_RANGE_LEVEL = 'province'
 VUE_APP_GAODE_MAP_RANGE = '福建省'

+ 9 - 0
.env.inspur

@@ -0,0 +1,9 @@
+NODE_ENV = 'production'
+
+ENV = 'inspur'
+
+# 微信
+__WECHAT__ = 'enabled'
+
+VUE_APP_GAODE_MAP_RANGE_LEVEL = 'city'
+VUE_APP_GAODE_MAP_RANGE = '济南市'

+ 2 - 1
feature.js

@@ -25,6 +25,7 @@ module.exports = {
     ...createFeature('__PLACEHOLDER__'),
     ...createFeature('__SUB_DEVICE__'),
     ...createFeature('__TAKEOVER__'),
-    ...createFeature('__WECHAT__')
+    ...createFeature('__WECHAT__'),
+    ...createFeature('__JUMP_REVIEW__')
   }
 }

+ 1 - 2
src/api/workflow.js

@@ -1,6 +1,5 @@
 import store from '@/store'
 import {
-  JUMP_REVIEW,
   State,
   Access,
   WorkflowState
@@ -16,7 +15,7 @@ export function getAuditWorkflows (query, options) {
   const condition = { status: State.SUBMITTED }
   const access = store.getters.access
   const isFinal = access.has(Access.REVIEW_RELEASE_FINAL)
-  if (!isFinal || !JUMP_REVIEW) {
+  if (!isFinal || !__JUMP_REVIEW__) {
     const arr = []
     if (isFinal) {
       arr.push(WorkflowState.FINAL_LEVEL)

+ 0 - 2
src/constant.js

@@ -260,8 +260,6 @@ export const Role = {
   VISITOR: '__ROLE_VISITOR__'
 }
 
-export const JUMP_REVIEW = true
-
 export const Access = {
   MANAGE_TENANTS: 'manange-tenants',
   MANAGE_TENANT: 'manange-tenant',

+ 2 - 5
src/views/screen/review/workflow/api.js

@@ -1,8 +1,5 @@
 import store from '@/store'
-import {
-  JUMP_REVIEW,
-  Access
-} from '@/constant'
+import { Access } from '@/constant'
 import request, { tenantRequest } from '@/utils/request'
 import {
   confirmAndSend,
@@ -89,7 +86,7 @@ function resolveFinal (workflowNodeId) {
 }
 
 export function resolveWorkflow (workflowNodeId) {
-  if (JUMP_REVIEW && store.getters.access.has(Access.REVIEW_RELEASE_FINAL)) {
+  if (__JUMP_REVIEW__ && store.getters.access.has(Access.REVIEW_RELEASE_FINAL)) {
     return resolveFinal(workflowNodeId)
   }
   return send({

+ 2 - 3
src/views/screen/review/workflow/audit/index.vue

@@ -102,7 +102,6 @@
 <script>
 import { mapGetters } from 'vuex'
 import {
-  JUMP_REVIEW,
   State,
   Access,
   WorkflowState,
@@ -184,7 +183,7 @@ export default {
     },
     status () {
       const isFinal = this.access.has(Access.REVIEW_RELEASE_FINAL)
-      if (isFinal && JUMP_REVIEW) {
+      if (__JUMP_REVIEW__ && isFinal) {
         return [WorkflowState.FIRST_LEVEL, WorkflowState.SECOND_LEVEL, WorkflowState.FINAL_LEVEL]
       }
       const arr = []
@@ -200,7 +199,7 @@ export default {
       return arr
     },
     title () {
-      if (JUMP_REVIEW && this.access.has(Access.REVIEW_RELEASE_FINAL)) {
+      if (__JUMP_REVIEW__ && this.access.has(Access.REVIEW_RELEASE_FINAL)) {
         return '审核'
       }
       if (this.workflow) {

+ 5 - 5
src/views/visualization/v1/Map.vue

@@ -129,12 +129,12 @@ export default {
         辅助转化函数 str.split(';').map(i=>i.split(',').map(i=>Number))
         后续 可以  new AMap.Polyline画轮廓  setFiew 定位轮廓
         */
-        const options = {
-          subdistrict: 1,
+        const district = new AMap.DistrictSearch({
+          level: process.env.VUE_APP_GAODE_MAP_RANGE_LEVEL,
+          showbiz: false,
           extensions: 'all',
-          level: 'province'
-        }
-        const district = new AMap.DistrictSearch(options)
+          subdistrict: 1
+        })
         const outer = [
           new AMap.LngLat(-360, 90, true),
           new AMap.LngLat(-360, -90, true),