From 33420911b713799abac53f3ed05a11a236a65fa5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 11 八月 2023 15:44:46 +0800
Subject: [PATCH] Merge branch 'master' of ssh://139.186.142.91:29418/productDev/dmMes
---
/dev/null | 25 ------------
h5_standard/src/views/tabPage/workBench.vue | 6 +-
web_standard/src/components/ext/.DS_Store | 0
.gitignore | 7 +++
web_standard/src/coderd.json | 1
web_standard/coderd.json | 10 +++++
web_standard/src/components/.DS_Store | 0
web_standard/src/views/.DS_Store | 0
web_standard/vue.config.js | 25 ++++++++++++
9 files changed, 45 insertions(+), 29 deletions(-)
diff --git a/.gitignore b/.gitignore
index 5599f77..faec672 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,9 @@
/workspace.xml
/platform_web/node_modules
/platform_web/admin
-/platform_web/doumeeplant_admin
\ No newline at end of file
+/platform_web/doumeeplant_admin
+
+*/node_modules
+/web_standard/web
+/web_standard/doumeeplant_web
+/web_standard/.vscode
\ No newline at end of file
diff --git a/h5_standard/src/views/tabPage/workBench.vue b/h5_standard/src/views/tabPage/workBench.vue
index fe084ae..ef2761e 100644
--- a/h5_standard/src/views/tabPage/workBench.vue
+++ b/h5_standard/src/views/tabPage/workBench.vue
@@ -38,11 +38,11 @@
<script setup lang="ts">
import { reactive, ref } from "vue"
import { useStore } from "vuex"
- import { BrowserMultiFormatReader } from '@zxing/library'
+ // import { BrowserMultiFormatReader } from '@zxing/library'
import vTags from '@/components/common/Tags.vue'
import vMenu from '@/components/common/Menu.vue'
const store = useStore()
- let openCode = ref<boolean>(false)
+ // let openCode = ref<boolean>(false)
// let loadingShow = ref<boolean>(false)
// let codeReader: any = ref(null)
@@ -181,7 +181,7 @@
height: 100%;
background: #f5f5f5;
.top {
- margin-top: 20px;
+ margin-bottom: 20px;
}
.box_notfound {
padding-top: 300px;
diff --git a/web_standard/.gitignore b/web_standard/.gitignore
deleted file mode 100644
index 2190591..0000000
--- a/web_standard/.gitignore
+++ /dev/null
@@ -1,25 +0,0 @@
-.DS_Store
-coderd.json
-node_modules
-doumeeplant_web
-vue.config.js
-
-
-# local env files
-.env.local
-.env.*.local
-
-# Log files
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-
-# Editor directories and files
-.idea
-.vscode
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?
diff --git a/web_standard/coderd.json b/web_standard/coderd.json
new file mode 100644
index 0000000..12a424d
--- /dev/null
+++ b/web_standard/coderd.json
@@ -0,0 +1,10 @@
+{
+ "project": 5247,
+ "template": {
+ "alias": "eva",
+ "command": "page",
+ "option": {
+ "resources": "workorder_check_attr_ext"
+ }
+ }
+}
\ No newline at end of file
diff --git a/web_standard/src/coderd.json b/web_standard/src/coderd.json
new file mode 100644
index 0000000..9e26dfe
--- /dev/null
+++ b/web_standard/src/coderd.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/web_standard/src/components/.DS_Store b/web_standard/src/components/.DS_Store
new file mode 100644
index 0000000..d2ebe36
--- /dev/null
+++ b/web_standard/src/components/.DS_Store
Binary files differ
diff --git a/web_standard/src/components/ext/.DS_Store b/web_standard/src/components/ext/.DS_Store
new file mode 100644
index 0000000..5008ddf
--- /dev/null
+++ b/web_standard/src/components/ext/.DS_Store
Binary files differ
diff --git a/web_standard/src/views/.DS_Store b/web_standard/src/views/.DS_Store
new file mode 100644
index 0000000..c35a195
--- /dev/null
+++ b/web_standard/src/views/.DS_Store
Binary files differ
diff --git a/web_standard/vue.config.js b/web_standard/vue.config.js
new file mode 100644
index 0000000..f907a03
--- /dev/null
+++ b/web_standard/vue.config.js
@@ -0,0 +1,25 @@
+// 璇︾粏閰嶇疆璇峰弬鑰僪ttps://cli.vuejs.org/zh/config/#vue-config-js
+// const outputDir = process.env.VUE_APP_CONTEXT_PATH.substring(1, process.env.VUE_APP_CONTEXT_PATH.length - 1)
+module.exports = {
+ publicPath: process.env.VUE_APP_CONTEXT_PATH,
+ // publicPath: './',
+ outputDir: 'doumeeplant_web',
+ // outputDir: 'web',
+ assetsDir: 'static',
+ lintOnSave: false,
+ devServer: {
+ disableHostCheck: true,
+ host: '0.0.0.0',
+ port: 10086,
+ // port: 10086,
+ proxy: {
+ [process.env.VUE_APP_API_PREFIX]: {
+ target: process.env.VUE_APP_BASE_URL,
+ changeOrigin: true,
+ pathRewrite: {
+ [`^${[process.env.VUE_APP_API_PREFIX]}`]: ''
+ }
+ }
+ }
+ }
+}
--
Gitblit v1.9.3