Hooke / temple_material_request

Go to a project
Toggle navigation Toggle navigation pinning
hookehuyr
99bfed05 1 parent 2b8afb6c

fix 配置修改

Inline Side-by-side
Showing 8 changed files with 38 additions and 24 deletions
...@@ -8,7 +8,7 @@ VITE_PROXY_TARGET = https://oa.onwall.cn ...@@ -8,7 +8,7 @@ VITE_PROXY_TARGET = https://oa.onwall.cn
8 VITE_PROXY_PREFIX = /srv/ 8 VITE_PROXY_PREFIX = /srv/
9 9
10 # 打包输出文件夹名称 10 # 打包输出文件夹名称
11 -VITE_OUTDIR = front 11 +VITE_OUTDIR = sku_request
12 12
13 # 是否开启调试 13 # 是否开启调试
14 VITE_CONSOLE = 0 14 VITE_CONSOLE = 0
......
1 +###
2 + # @Date: 2024-07-23 10:29:03
3 + # @LastEditors: hookehuyr hookehuyr@gmail.com
4 + # @LastEditTime: 2024-07-26 18:06:52
5 + # @FilePath: /temple_material_request/.env.production
6 + # @Description: 文件描述
7 +###
1 # 资源公共路径 8 # 资源公共路径
2 -VITE_BASE = /f/custom_form/front/ 9 +VITE_BASE = /f/main/sku_request/
3 10
4 # 测试open-id 11 # 测试open-id
5 VITE_APP_OPENID = 12 VITE_APP_OPENID =
......
...@@ -14,4 +14,4 @@ src/test/mocha/test.js ...@@ -14,4 +14,4 @@ src/test/mocha/test.js
14 cypress.json 14 cypress.json
15 src/test 15 src/test
16 .idea 16 .idea
17 -front 17 +sku_request
......
...@@ -10,22 +10,22 @@ ...@@ -10,22 +10,22 @@
10 "build-ts": "vue-tsc --noEmit && vite build", 10 "build-ts": "vue-tsc --noEmit && vite build",
11 "serve": "vite preview", 11 "serve": "vite preview",
12 "cypress:open": "cypress open", 12 "cypress:open": "cypress open",
13 - "tar": "tar -czvpf dist.tar.gz front", 13 + "tar": "tar -czvpf dist.tar.gz sku_request",
14 "build_tar": "npm run build && npm run tar", 14 "build_tar": "npm run build && npm run tar",
15 - "scp-dev": "scp dist.tar.gz ipadbiz-inner:/opt/space-dev/f/custom_form", 15 + "scp-dev": "scp dist.tar.gz ipadbiz-inner:/opt/space-dev/f/main",
16 - "dec-dev": "ssh ipadbiz-inner 'cd /opt/space-dev/f/custom_form && tar -xzvf dist.tar.gz && rm -rf dist.tar.gz'", 16 + "dec-dev": "ssh ipadbiz-inner 'cd /opt/space-dev/f/main && tar -xzvf dist.tar.gz && rm -rf dist.tar.gz'",
17 - "scp-oa": "scp dist.tar.gz ipadbiz-inner:/opt/oa/f/custom_form", 17 + "scp-oa": "scp dist.tar.gz ipadbiz-inner:/opt/oa/f/main",
18 - "dec-oa": "ssh ipadbiz-inner 'cd /opt/oa/f/custom_form && tar -xzvf dist.tar.gz && rm -rf dist.tar.gz'", 18 + "dec-oa": "ssh ipadbiz-inner 'cd /opt/oa/f/main && tar -xzvf dist.tar.gz && rm -rf dist.tar.gz'",
19 - "scp-mituo": "scp dist.tar.gz itomix@ipadbiz.cn:/opt/mituo/f/custom_form", 19 + "scp-mituo": "scp dist.tar.gz itomix@ipadbiz.cn:/opt/mituo/f/main",
20 - "dec-mituo": "ssh itomix@ipadbiz.cn 'cd /opt/mituo/f/custom_form && tar -xzvf dist.tar.gz && rm -rf dist.tar.gz'", 20 + "dec-mituo": "ssh itomix@ipadbiz.cn 'cd /opt/mituo/f/main && tar -xzvf dist.tar.gz && rm -rf dist.tar.gz'",
21 - "scp-guanzong": "scp dist.tar.gz itomix@ipadbiz.cn:/opt/guanzong/f/custom_form", 21 + "scp-guanzong": "scp dist.tar.gz itomix@ipadbiz.cn:/opt/guanzong/f/main",
22 - "dec-guanzong": "ssh itomix@ipadbiz.cn 'cd /opt/guanzong/f/custom_form && tar -xzvf dist.tar.gz && rm -rf dist.tar.gz'", 22 + "dec-guanzong": "ssh itomix@ipadbiz.cn 'cd /opt/guanzong/f/main && tar -xzvf dist.tar.gz && rm -rf dist.tar.gz'",
23 - "scp-xys": "scp -P 12101 dist.tar.gz zhsy@oa.jcedu.org:/home/www/f/custom_form", 23 + "scp-xys": "scp -P 12101 dist.tar.gz zhsy@oa.jcedu.org:/home/www/f/main",
24 - "dec-xys": "ssh -p 12101 zhsy@oa.jcedu.org 'cd /home/www/f/custom_form && tar -xzvf dist.tar.gz && rm -rf dist.tar.gz'", 24 + "dec-xys": "ssh -p 12101 zhsy@oa.jcedu.org 'cd /home/www/f/main && tar -xzvf dist.tar.gz && rm -rf dist.tar.gz'",
25 - "scp-zentea": "scp dist.tar.gz zentea@anxinchashi.com:/data/www/zentea/f/custom_form", 25 + "scp-zentea": "scp dist.tar.gz zentea@anxinchashi.com:/data/www/zentea/f/main",
26 - "dec-zentea": "ssh zentea@anxinchashi.com 'cd /data/www/zentea/f/custom_form && tar -xzvf dist.tar.gz && rm -rf dist.tar.gz'", 26 + "dec-zentea": "ssh zentea@anxinchashi.com 'cd /data/www/zentea/f/main && tar -xzvf dist.tar.gz && rm -rf dist.tar.gz'",
27 "remove_tar": "rm -rf dist.tar.gz", 27 "remove_tar": "rm -rf dist.tar.gz",
28 - "remove_dist": "rm -rf front", 28 + "remove_dist": "rm -rf sku_request",
29 "dev_upload": "npm run build_tar && npm run scp-dev && npm run dec-dev && npm run remove_tar && npm run remove_dist", 29 "dev_upload": "npm run build_tar && npm run scp-dev && npm run dec-dev && npm run remove_tar && npm run remove_dist",
30 "oa_upload": "npm run build_tar && npm run scp-oa && npm run dec-oa && npm run remove_tar", 30 "oa_upload": "npm run build_tar && npm run scp-oa && npm run dec-oa && npm run remove_tar",
31 "mituo_upload": "npm run build_tar && npm run scp-mituo && npm run dec-mituo && npm run remove_tar", 31 "mituo_upload": "npm run build_tar && npm run scp-mituo && npm run dec-mituo && npm run remove_tar",
......
...@@ -14,7 +14,7 @@ set -e ...@@ -14,7 +14,7 @@ set -e
14 PHP_PATH=/Users/huyirui/program/itomix/git/isp/f/custom_form 14 PHP_PATH=/Users/huyirui/program/itomix/git/isp/f/custom_form
15 15
16 # 编译输出文件夹 16 # 编译输出文件夹
17 -OUTPUT=front 17 +OUTPUT=sku_request
18 18
19 # 打包 19 # 打包
20 npm run build 20 npm run build
......
...@@ -17,10 +17,10 @@ CURR_PATH=$(pwd) ...@@ -17,10 +17,10 @@ CURR_PATH=$(pwd)
17 PHP_PATH=/Users/huyirui/program/itomix/git/isp/f/custom_form 17 PHP_PATH=/Users/huyirui/program/itomix/git/isp/f/custom_form
18 18
19 # 编译输出文件夹 19 # 编译输出文件夹
20 -output=front 20 +output=sku_request
21 21
22 # 打包 22 # 打包
23 -rm -rf front 23 +rm -rf sku_request
24 npm run build 24 npm run build
25 25
26 # 删除 PHP 项目里的编译产物 26 # 删除 PHP 项目里的编译产物
......
1 <!-- 1 <!--
2 * @Date: 2024-07-23 12:53:15 2 * @Date: 2024-07-23 12:53:15
3 * @LastEditors: hookehuyr hookehuyr@gmail.com 3 * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2024-07-26 17:34:38 4 + * @LastEditTime: 2024-07-26 17:54:05
5 * @FilePath: /temple_material_request/src/views/material_request.vue 5 * @FilePath: /temple_material_request/src/views/material_request.vue
6 * @Description: 申领物资页面 6 * @Description: 申领物资页面
7 --> 7 -->
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
60 <van-empty v-if="!tabList.length" image="error" description="物资情况列表为空" /> 60 <van-empty v-if="!tabList.length" image="error" description="物资情况列表为空" />
61 <div class="control-bar"> 61 <div class="control-bar">
62 <div> 62 <div>
63 - <van-button icon="plus" type="primary" :color="styleColor.baseColor" @click="addMore">添加更多</van-button> 63 + <van-button icon="plus" type="primary" :color="styleColor.baseColor" @click="addMore" style="width: 9rem;">添加更多</van-button>
64 </div> 64 </div>
65 <div style="display: flex; align-items: center;"> 65 <div style="display: flex; align-items: center;">
66 <van-button plain type="primary" :color="styleColor.baseColor" @click="addShoppingCart">加入购物车</van-button> 66 <van-button plain type="primary" :color="styleColor.baseColor" @click="addShoppingCart">加入购物车</van-button>
......
1 +<!--
2 + * @Date: 2024-07-23 10:29:03
3 + * @LastEditors: hookehuyr hookehuyr@gmail.com
4 + * @LastEditTime: 2024-07-26 18:02:58
5 + * @FilePath: /temple_material_request/src/views/test.vue
6 + * @Description: 文件描述
7 +-->
1 <template> 8 <template>
2 <div class="tinymce-box"> 9 <div class="tinymce-box">
3 - <TEditor ref="refEdit" ></TEditor> 10 + <!-- <TEditor ref="refEdit" ></TEditor> -->
4 <div @click="getValue">获取内容</div> 11 <div @click="getValue">获取内容</div>
5 <div @click="setValue">设置内容</div> 12 <div @click="setValue">设置内容</div>
6 </div> 13 </div>
7 </template> 14 </template>
8 15
9 <script setup> 16 <script setup>
10 - import TEditor from "@/components/TEditor/index.vue"; 17 + // import TEditor from "@/components/TEditor/index.vue";
11 18
12 const refEdit = ref(null); 19 const refEdit = ref(null);
13 20
......