Merge branch 'beta'

package-lock.json

@@ -2110,7 +2110,7 @@
     },
     "node_modules/@microsoft/fetch-event-source": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmmirror.com/@microsoft/fetch-event-source/-/fetch-event-source-2.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/@microsoft/fetch-event-source/-/fetch-event-source-2.0.1.tgz",
       "integrity": "sha512-W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="
     },
     "node_modules/@mrmlnc/readdir-enhanced": {
@@ -25636,7 +25636,7 @@
     },
     "@microsoft/fetch-event-source": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmmirror.com/@microsoft/fetch-event-source/-/fetch-event-source-2.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/@microsoft/fetch-event-source/-/fetch-event-source-2.0.1.tgz",
       "integrity": "sha512-W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="
     },
     "@mrmlnc/readdir-enhanced": {
@@ -38861,7 +38861,7 @@
         },
         "@microsoft/fetch-event-source": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmmirror.com/@microsoft/fetch-event-source/-/fetch-event-source-2.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/@microsoft/fetch-event-source/-/fetch-event-source-2.0.1.tgz",
           "integrity": "sha512-W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="
         },
         "@mrmlnc/readdir-enhanced": {

src/components/easy2/studyStudent.vue

@@ -1485,11 +1485,18 @@
                           </div>
                           <div v-if="tooC == 72">
                             <img
+                              v-if="tool.appJson && tool.appJson.json && tool.appJson.json.icon"
+                              @click="addTools(tooC, toolIndex, taskCount)"
+                              :src="tool.appJson.json.icon"
+                              alt
+                            />
+                            <img
+                              v-else
                               @click="addTools(tooC, toolIndex, taskCount)"
                               src="../../assets/icon/firstToolList/appStore.png"
                               alt
                             />
-                            <div style="margin: 5px 0">AI智能体</div>
+                            <div style="margin: 5px 0">{{tool.appJson && tool.appJson.name ? tool.appJson.name : '应用中心'}}</div>
                           </div>
                           <div v-if="tooC == 65">
                             <img
@@ -22944,7 +22951,8 @@ export default {
           this.$message.error("应用连接为空, 请到课程管理中添加");
           return;
         }
-        window.open(item.url, "_blank");
+        window.parent.postMessage({ tools: "72", data: item }, "*");
+        // window.open(item.url, "_blank");
       } else if (t == 69) {
         if (this.worksStudent[i].length) {
           for (var k = 0; k < this.worksStudent[i].length; k++) {

src/components/easy3/studyStudent.vue

@@ -1418,11 +1418,18 @@
                           </div>
                           <div v-if="tooC == 72">
                             <img
+                              v-if="tool.appJson && tool.appJson.json && tool.appJson.json.icon"
+                              @click="addTools(tooC, toolIndex, taskCount)"
+                              :src="tool.appJson.json.icon"
+                              alt
+                            />
+                            <img
+                              v-else
                               @click="addTools(tooC, toolIndex, taskCount)"
                               src="../../assets/icon/firstToolList/appStore.png"
                               alt
                             />
-                            <div style="margin: 5px 0">应用中心</div>
+                            <div style="margin: 5px 0">{{tool.appJson && tool.appJson.name ? tool.appJson.name : '应用中心'}}</div>
                           </div>
                           <div v-if="tooC == 65">
                             <img
@@ -18621,7 +18628,8 @@ export default {
           this.$message.error("应用连接为空, 请到课程管理中添加");
           return;
         }
-        window.open(item.url, "_blank");
+        window.parent.postMessage({ tools: "72", data: item }, "*");
+        // window.open(item.url, "_blank");
       } else if (t == 69) {
         if (this.worksStudent[i].length) {
           for (var k = 0; k < this.worksStudent[i].length; k++) {

src/components/studyStudent.vue

@@ -1379,11 +1379,18 @@
                           </div>
                           <div v-if="tooC == 72">
                             <img
+                              v-if="tool.appJson && tool.appJson.json && tool.appJson.json.icon"
+                              @click="addTools(tooC, toolIndex, taskCount)"
+                              :src="tool.appJson.json.icon"
+                              alt
+                            />
+                            <img
+                              v-else
                               @click="addTools(tooC, toolIndex, taskCount)"
                               src="../assets/icon/firstToolList/appStore.png"
                               alt
                             />
-                            <div style="margin: 5px 0">应用中心</div>
+                            <div style="margin: 5px 0">{{tool.appJson && tool.appJson.name ? tool.appJson.name : '应用中心'}}</div>
                           </div>
                           <div v-if="tooC == 65">
                             <img
@@ -18606,7 +18613,8 @@ export default {
           this.$message.error("应用连接为空, 请到课程管理中添加");
           return;
         }
-        window.open(item.url, "_blank");
+        // window.open(item.url, "_blank");
+        window.parent.postMessage({ tools: "72", data: item }, "*");
       } else if (t == 69) {
         if (this.worksStudent[i].length) {
           for (var k = 0; k < this.worksStudent[i].length; k++) {