ソースを参照

将配置提取出来

lipenghui 1 ヶ月 前
コミット
792cd1ab22

+ 6 - 4
.env.prod

@@ -4,7 +4,7 @@ NODE_ENV=production
 VITE_DEV=false
 
 # 请求路径
-VITE_BASE_URL='http://localhost:48080'
+VITE_BASE_URL='https://aims.deepoil.cc'
 
 # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持S3服务
 VITE_UPLOAD_TYPE=server
@@ -13,10 +13,10 @@ VITE_UPLOAD_TYPE=server
 VITE_API_URL=/admin-api
 
 # 是否删除debugger
-VITE_DROP_DEBUGGER=true
+VITE_DROP_DEBUGGER=false
 
 # 是否删除console.log
-VITE_DROP_CONSOLE=true
+VITE_DROP_CONSOLE=false
 
 # 是否sourcemap
 VITE_SOURCEMAP=false
@@ -30,5 +30,7 @@ VITE_OUT_DIR=dist-prod
 # 商城H5会员端域名
 VITE_MALL_H5_DOMAIN='http://mall.yudao.iocoder.cn'
 
+# 验证码的开关
+VITE_APP_CAPTCHA_ENABLE=false
 # GoView域名
-VITE_GOVIEW_URL='http://127.0.0.1:3000'
+VITE_GOVIEW_URL='http://127.0.0.1:3000'

+ 1 - 1
package.json

@@ -13,7 +13,7 @@
     "build:dev": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode dev",
     "build:test": "node --max_old_space_size=4096 ./node_modules/vite/bin/vite.js build --mode test",
     "build:stage": "node --max_old_space_size=4096 ./node_modules/vite/bin/vite.js build --mode stage",
-    "build:prod": "node --max_old_space_size=4096 ./node_modules/vite/bin/vite.js build --mode prod",
+    "build:prod": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode prod",
     "serve:dev": "vite preview --mode dev",
     "serve:prod": "vite preview --mode prod",
     "preview": "pnpm build:local && vite preview",

+ 2 - 1
src/locales/en.ts

@@ -982,7 +982,8 @@ export default {
     InspectionStandards:'IS',
     stanHolder:'Please enter inspections standards',
     isException:'IsException',
-    exceptionDes:'ExceptionDes'
+    exceptionDes:'ExceptionDes',
+    createName:'creator'
   },
   route:{
     RouteName:'RouteName',

+ 2 - 1
src/locales/zh-CN.ts

@@ -978,7 +978,8 @@ export default {
     InspectionStandards:'巡检标准',
     stanHolder:'请输入巡检标准',
     isException:'是否异常',
-    exceptionDes:'异常描述'
+    exceptionDes:'异常描述',
+    createName:'创建人'
   },
   route:{
     RouteName:'路线名称',

+ 1 - 1
src/views/Login/components/QrCodeForm.vue

@@ -28,7 +28,7 @@ const { handleBackLogin, getLoginState } = useLoginState()
 const getShow = computed(() => unref(getLoginState) === LoginStateEnum.QR_CODE)
 
 const appId = 'dingmr9ez0ecgbmscfeb'
-const dingRedirectUrl = 'https://iot.deepoil.cc/login?loginType=dingding&type=20'
+const dingRedirectUrl = import.meta.env.VITE_BASE_URL + '/login?loginType=dingding&type=20'
 
 onMounted(() => {
   initDingLogin()

+ 1 - 1
src/views/pms/device/DeviceInfo.vue

@@ -221,7 +221,7 @@ import { createImageViewer } from '@/components/ImageViewer'
 import { ref, onMounted } from 'vue';
 
 const defaultPicUrl = ref(
-  'https://iot.deepoil.cc/admin-api/infra/file/29/get/IntegratedSolution.png'
+  import.meta.env.VITE_BASE_URL + '/admin-api/infra/file/29/get/IntegratedSolution.png'
 ) // 默认设备图片
 
 defineOptions({ name: 'DeviceDetailInfo' })

+ 2 - 2
src/views/pms/dingding.vue

@@ -56,9 +56,9 @@ onMounted(async () => {
   const isValidType = Object.keys(businessRoutes).includes(type as string)
   if (isMobileDevice()) {
     if (type==='generateOperation') {
-      window.location.href = 'https://iot.deepoil.cc/deepoil/#/?type=' + type+'&id='+id+'&userId='+userId+'&deptId='+deptId+'&createTime='+createTime+'&orderStatus='+orderStatus+'&orderName='+orderName+'&userName='+userName;
+      window.location.href = import.meta.env.VITE_BASE_URL + '/deepoil/#/?type=' + type+'&id='+id+'&userId='+userId+'&deptId='+deptId+'&createTime='+createTime+'&orderStatus='+orderStatus+'&orderName='+orderName+'&userName='+userName;
     }else {
-      window.location.href = 'https://iot.deepoil.cc/deepoil/#/?type=' + type+'&id='+id+'&userId='+userId;
+      window.location.href = import.meta.env.VITE_BASE_URL + '/deepoil/#/?type=' + type+'&id='+id+'&userId='+userId;
     }
     // 移动端跳转deepoil协议
     // try{

+ 4 - 2
src/views/pms/inspect/item/index.vue

@@ -78,8 +78,10 @@
       <el-table-column :label="t('monitor.deviceName')" align="center" prop="deviceName" />
       <el-table-column :label="t('inspect.InspectionItems')" align="center" prop="item" />
       <el-table-column :label="t('inspect.InspectionStandards')" align="center" prop="standard" />
-      <el-table-column :label="t('common.sort')" align="center" prop="sort" />
-      <el-table-column :label="t('form.remark')" align="center" prop="remark" />
+      <el-table-column :label="t('inspect.createName')" align="center" prop="createName" />
+<!--      <el-table-column :label="t('common.sort')" align="center" prop="sort" />-->
+<!--      <el-table-column :label="t('form.remark')" align="center" prop="remark" />-->
+
       <el-table-column
         :label="t('common.createTime')"
         align="center"

+ 2 - 2
src/views/pms/map/Map.vue

@@ -117,8 +117,8 @@ const initDeviceMarkers = () => {
 const createDeviceMarker = (device: IotDeviceVO, point: any) => {
   // 根据设备是否在线选择不同的图标
   const iconUrl = device.ifInline === 3
-    ? 'https://iot.deepoil.cc/images/newding.svg'
-    : 'https://iot.deepoil.cc/images/newfail.svg';
+    ? import.meta.env.VITE_BASE_URL + '/images/newding.svg'
+    : import.meta.env.VITE_BASE_URL + '/images/newfail.svg';
 
   const marker = new (window as any).BMap.Marker(point, {
     icon: new (window as any).BMap.Icon(