Compare commits

...

49 Commits

Author SHA1 Message Date
白了个白 0fc08f647f Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl 2024-09-24 16:33:19 +08:00
朱浩 09159ae2d8 Merge pull request 'zhuhao_dev' (#260) from zhuhao_dev into main
Reviewed-on: #260
2024-09-24 16:23:23 +08:00
朱浩 d3a3acdedc 解决冲突 2024-09-24 16:22:41 +08:00
朱浩 1a678afb89 Merge branch 'main' into zhuhao_dev 2024-09-24 16:21:06 +08:00
朱浩 da20aecfc6 更名文枢课堂 2024-09-24 16:20:20 +08:00
朱浩 d46a86e303 更名文枢课堂 2024-09-24 16:20:06 +08:00
qinqing 32baef766f Merge pull request 'qinqing_dev' (#259) from qinqing_dev into main
Reviewed-on: #259
2024-09-24 15:37:39 +08:00
qinqing 65f959c492 Merge pull request 'main' (#258) from main into qinqing_dev
Reviewed-on: #258
2024-09-24 15:36:42 +08:00
qinqing 4d7b69c8c2 课标分析 2024-09-24 15:35:36 +08:00
yangws 0e832a4a32 Merge pull request 'fix:2.0.4bug修改;' (#250) from yangws into main
Reviewed-on: #250
2024-09-24 13:57:31 +08:00
小杨 c1d6cb7767 fix: 解除注释的部分; 2024-09-24 13:55:37 +08:00
朱浩 53ce42cc59 Merge branch 'main' into zhuhao_dev 2024-09-24 11:03:58 +08:00
朱浩 0d71dee801 更名文枢课堂 2024-09-24 11:03:40 +08:00
yangws 4596ce4911 Merge remote-tracking branch 'origin/main' into yangws 2024-09-23 17:30:05 +08:00
zhengdegang 83e985e0d6 Merge pull request 'zdg' (#257) from zdg into main
Reviewed-on: #257
2024-09-23 17:28:43 +08:00
zdg 20ca8f71d6 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-23 17:27:42 +08:00
zdg c9292af67b 优化-下课和stroe监听相关bug 2024-09-23 17:26:44 +08:00
lyc fa6f61e3b3 Merge pull request 'lyc-dev' (#256) from lyc-dev into main 2024-09-23 17:24:35 +08:00
lyc bfa7cc4cd9 Merge branch 'main' into lyc-dev 2024-09-23 17:22:56 +08:00
lyc 852b92e1f3 首页跳转 2024-09-23 17:22:43 +08:00
qinqing 56a44740b6 合并代码 2024-09-23 17:12:44 +08:00
qinqing f00fa243c1 调用切换课本 2024-09-23 17:08:35 +08:00
qinqing 82e02f472b 添加课标分析入口 2024-09-23 17:08:02 +08:00
qinqing 3e532c1afd 隐藏工具栏 2024-09-23 17:07:06 +08:00
lyc 47390723a7 Merge pull request '跳转修改' (#255) from lyc-dev into main 2024-09-23 16:50:23 +08:00
lyc 713a592bcf 跳转修改 2024-09-23 16:49:48 +08:00
yangws d1ae68d184 Merge remote-tracking branch 'origin/main' into yangws 2024-09-23 16:24:05 +08:00
lyc 3dc36cbc34 Merge pull request '生成图片地址修改' (#254) from lyc-dev into main 2024-09-23 13:01:46 +08:00
lyc 781829373a 生成图片地址修改 2024-09-23 13:01:13 +08:00
朱浩 1be00156a8 去除console 2024-09-23 11:07:59 +08:00
朱浩 dafe13a1a7 Merge branch 'main' into zhuhao_dev 2024-09-23 11:07:47 +08:00
zhengdegang 776e77a88c Merge pull request 'zdg' (#253) from zdg into main
Reviewed-on: #253
2024-09-23 11:06:14 +08:00
zdg 7145658d13 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-23 11:05:20 +08:00
zdg 372371e2f0 解决下课异常 2024-09-23 11:05:14 +08:00
lyc 2f49d42418 推出 提示正在上课 2024-09-23 10:38:21 +08:00
lyc 8b9cc3f1ee Merge pull request '推出 提示正在上课' (#252) from lyc-dev into main 2024-09-23 10:38:18 +08:00
朱浩 3b4f463883 BUG修复 2024-09-23 10:31:47 +08:00
zdg a05cf19e74 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-23 10:14:31 +08:00
朱浩 9a5581cea3 Merge branch 'main' into zhuhao_dev 2024-09-23 10:01:45 +08:00
lyc a5ad6c2250 Merge pull request 'edit' (#251) from lyc-dev into main 2024-09-23 09:58:48 +08:00
lyc 60e31f4b43 edit 2024-09-23 09:58:47 +08:00
yangws e36ede941c Merge remote-tracking branch 'origin/main' into yangws 2024-09-23 09:32:35 +08:00
yangws 87a50c397f fix:2.0.4bug修改; 2024-09-23 09:20:19 +08:00
朱浩 6b9949dfae BUG修复 2024-09-22 16:55:00 +08:00
朱浩 56976c6642 Merge branch 'main' into zhuhao_dev 2024-09-22 16:48:16 +08:00
朱浩 dfe28eb037 打包联通文枢课堂 2024-09-22 14:36:25 +08:00
zdg 6935bec1e4 测试 2024-09-21 12:05:46 +08:00
qinqing 2532dc5fc2 解决冲突 2024-09-20 16:58:25 +08:00
qinqing f67380b2c9 PDF插件 2024-09-20 16:52:59 +08:00
399 changed files with 132800 additions and 160 deletions

View File

@ -1,5 +1,5 @@
# 页面标题 # 页面标题
VITE_APP_TITLE = 文枢课堂 VITE_APP_TITLE = AIX智慧课堂
# 生产环境配置 # 生产环境配置
VITE_APP_ENV = 'production' VITE_APP_ENV = 'production'

View File

@ -1,5 +1,5 @@
# 页面标题 # 页面标题
VITE_APP_TITLE = AIX智慧课堂 VITE_APP_TITLE = 文枢课堂
# 生产环境配置 # 生产环境配置
VITE_APP_ENV = 'production' VITE_APP_ENV = 'production'

View File

@ -1,10 +1,10 @@
appId: com.electron.app appId: com.electron.app
productName: 文枢课堂 productName: AIx
directories: directories:
output: dist output: dist
buildResources: build buildResources: build
win: win:
executableName: 文枢课堂 executableName: AIx
icon: resources/logo2.ico icon: resources/logo2.ico
files: files:
- '!**/.vscode/*' - '!**/.vscode/*'

View File

@ -1,10 +1,10 @@
appId: com.electron.app appId: com.electron.app
productName: AIx productName: 文枢课堂
directories: directories:
output: dist output: dist
buildResources: build buildResources: build
win: win:
executableName: AIx executableName: 文枢课堂
icon: resources/logo2.ico icon: resources/logo2.ico
files: files:
- '!**/.vscode/*' - '!**/.vscode/*'

View File

@ -36,7 +36,13 @@ export default defineConfig({
// target: 'http://192.168.2.52:7863', // target: 'http://192.168.2.52:7863',
changeOrigin: true, changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api/, '') rewrite: (p) => p.replace(/^\/dev-api/, '')
} },
'/baidubce': {
target: 'https://aip.baidubce.com',
ws: true,
changeOrigin: true,
rewrite: (p) => p.replace(/^\/baidubce/, '')
},
}, },
}, },
plugins: [vue(), WindiCSS()], plugins: [vue(), WindiCSS()],

View File

@ -1,6 +1,6 @@
{ {
"name": "aix-win", "name": "aix-win",
"version": "2.0.6", "version": "2.1.1",
"description": "", "description": "",
"main": "./out/main/index.js", "main": "./out/main/index.js",
"author": "example.com", "author": "example.com",

View File

@ -273,9 +273,14 @@ function handleAll() {
}) })
// 用于监听-状态管理变化-同步所有窗口 // 用于监听-状态管理变化-同步所有窗口
ipcMain.handle('pinia-state-change', (e, storeName, jsonStr) => { ipcMain.handle('pinia-state-change', (e, storeName, jsonStr) => {
console.log('pinia-state-change-1', storeName, jsonStr)
for(const curWin of BrowserWindow.getAllWindows()){ for(const curWin of BrowserWindow.getAllWindows()){
const id = curWin.webContents.id const id = curWin.webContents.id
const bool = id !== e.sender.id && !curWin.isDestroyed() const bool = id !== e.sender.id && !curWin.isDestroyed()
if (id === e.sender.id) {
console.log('pinia-state-change-2', 'windows-send', curWin.type)
}
if (bool) { // 除了消息发送窗口和销毁的窗口 其他都发送 if (bool) { // 除了消息发送窗口和销毁的窗口 其他都发送
curWin.webContents.send('pinia-state-set', storeName, jsonStr) curWin.webContents.send('pinia-state-set', storeName, jsonStr)
} }

View File

@ -0,0 +1,177 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,3 @@
àRCopyright 1990-2009 Adobe Systems Incorporated.
All rights reserved.
See ./LICENSEáCNS2-H

View File

@ -0,0 +1,3 @@
àRCopyright 1990-2009 Adobe Systems Incorporated.
All rights reserved.
See ./LICENSEá ETen-B5-H` ^

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,4 @@
àRCopyright 1990-2009 Adobe Systems Incorporated.
All rights reserved.
See ./LICENSE!!<21>º]aX!!]`<60>21<32>> <09>p <0B>z<EFBFBD>$]<06>"Rd<E2809A>-Uƒ7<C692>*4„%<25>+ „Z „{<7B>/%…<<3C>9K…b<E280A6>1]†.<2E>" ‰`]‡,<2C>"]ˆ
<EFBFBD>"]ˆh<CB86>"]‰F<E280B0>"]Š$<24>"]<02>"]`<60>"]Œ><3E>"]<5D><1C>"]<5D>z<EFBFBD>"]ŽX<C5BD>"]<5D>6<EFBFBD>"]<5D><14>"]<5D>r<EFBFBD>"]P<E28098>"].<2E>"]“ <0C>"]“j<E2809C>"]”H<E2809D>"]•&<26>"]<04>"]b<E28093>"]—@<40>"]˜<1E>"]˜|<7C>"]™Z<E284A2>"]š8<C5A1>"]<16>"]t<E280BA>"]œR<C593>"]<5D>0<EFBFBD>"]ž<0E>"]žl<C5BE>"]ŸJ<C5B8>"] (<28>"]¡<06>"]¡d<C2A1>"]¢B<C2A2>"]£ <20>"X£~<7E>']¤W<C2A4>"]¥5<C2A5>"]¦<13>"]¦q<C2A6>"]§O<C2A7>"]¨-<2D>"]© <0B>"]©i<C2A9>"]ªG<C2AA>"]«%<25>"]¬<03>"]¬a<C2AC>"]­?<3F>"]®<1D>"]®{<7B>"]¯Y<C2AF>"]°7<C2B0>"]±<15>"]±s<C2B1>"]²Q<C2B2>"]³/<2F>"]´ <0A>"]´k<C2B4>"]µI<C2B5>"]¶'<27>"]·<05>"]·c<C2B7>"]¸A<C2B8>"]¹<1F>"]¹}<7D>"]º[<5B>"]»9

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More