Преглед на файлове

Merge branch 'beta' of https://git.cocorobo.cn/CocoRoboLabs/pbl-teacher-table into beta

lsc преди 7 месеца
родител
ревизия
7faa1b7278

+ 1 - 1
dist/index.html

@@ -32,7 +32,7 @@
       width: 100%;
       background: #e6eaf0;
       font-family: '黑体';
-    }</style><link href=./static/css/app.b0f0899e6ca70d23058fd23688930811.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.161e82026ac2ae03ab6f.js></script><script type=text/javascript src=./static/js/vendor.de15001ce66f032e9274.js></script><script type=text/javascript src=./static/js/app.67cc379d8542d53337da.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.17c42978dcfecc0ed8fbaef75fc2e381.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.161e82026ac2ae03ab6f.js></script><script type=text/javascript src=./static/js/vendor.de15001ce66f032e9274.js></script><script type=text/javascript src=./static/js/app.d8f4e64b9e73c113fa4a.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/static/css/app.17c42978dcfecc0ed8fbaef75fc2e381.css


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/static/css/app.17c42978dcfecc0ed8fbaef75fc2e381.css.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/static/js/app.d8f4e64b9e73c113fa4a.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/static/js/app.d8f4e64b9e73c113fa4a.js.map


Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/static/js/manifest.161e82026ac2ae03ab6f.js.map


+ 20 - 3
src/components/pages/appStore/dialog/addAppDialog.vue

@@ -81,11 +81,24 @@
             style="display: flex;width: 100%;justify-content: space-between;"
           >
             <el-form-item label="应用标签" prop="label">
-              <el-input
+              <!-- <el-input
                 v-model="form.label"
                 placeholder="请输入应用标签"
                 style="width: 300px;"
-              ></el-input>
+              ></el-input> -->
+              <el-select
+                v-model="form.label"
+                placeholder="请选择应用标签"
+                style="width: 300px;"
+              >
+                <el-option
+                  v-for="item in selectLabelList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
             </el-form-item>
             <el-form-item label="应用类型" prop="type">
               <el-select
@@ -186,6 +199,10 @@ export default {
       show: false,
       uploadIconLoading: false,
       type: 1, //1添加,2编辑
+      selectLabelList:[
+        {value:"agent",label:"智能体"},
+        {value:"workflow",label:"工作流"},
+      ],
       form: {
         name: "",
         label: "",
@@ -387,7 +404,7 @@ export default {
 .addNewAppDialog >>> .el-dialog {
   min-width: 700px;
 
-  height: 900px;
+  height: 1020px;
 	/* height: 780px; */
   box-shadow: 0px 0 8px 0px #555555;
   border-radius: 8px;

+ 23 - 6
src/components/pages/appStore/views/appManagement.vue

@@ -119,14 +119,14 @@
               icon="el-icon-search"
               @click="getData"
             ></el-button>
-            <!-- <el-button type="primary" @click="selectApp()">发布应用</el-button> -->
+            <el-button type="primary" @click="selectApp()">发布应用</el-button>
           </div>
         </div>
       </div>
 
       <div class="ac_content">
         <div class="ac_c_item" v-for="(item, index) in dataList" :key="item.id">
-          <div class="ac_c_i_top">
+          <div class="ac_c_i_top" @click="openApp(item)">
             <div class="ac_c_i_t_left">
               <img v-if="item.json.icon" :src="item.json.icon" />
               <svg
@@ -476,7 +476,9 @@ export default {
       selectList: [
         { index: 3, label: "所有组织" },
         { index: 2, label: "组织内" },
-        { index: 1, label: "我的" }
+        { index: 1, label: "我的" },
+        // { index: 98,label:"已发布"},
+        // { index: 99,label:"未发布"},
       ],
       labelSelect: [
         { value: "", label: "全部类型" },
@@ -618,7 +620,7 @@ export default {
     // },
     //复制app
     copyApp(item) {
-      this.$confirm(`确定复制《${item.name}》这个应用吗?`, "复制", {
+      this.$confirm(`确定复制《${item.name}》这个应用至我的列表吗?`, "复制", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
@@ -641,7 +643,7 @@ export default {
             .post(this.$store.state.api + "insert_appStore", params)
             .then(res => {
               if (res.data == 1) {
-                this.$message.success("复制成功");
+                this.$message.success("复制成功,已添加至我的列表。");
                 this.getData();
                 this.insertSave(item, 3);
               } else {
@@ -929,6 +931,9 @@ export default {
               } else {
                 this.$message.error("删除失败");
               }
+              if(this.collect.findIndex(i=>i.id == item.id)!=-1){
+                this.getCollect()
+              }
             })
             .catch(err => {
               console.log(err);
@@ -1238,15 +1243,26 @@ export default {
   height: 250px;
   background-color: #fff;
   border-radius: 10px;
-  box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.1);
+  /* box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.1); */
   box-sizing: border-box;
   padding: 15px;
   margin-right: 15px;
   margin-bottom: 15px;
   float: left;
+  border: solid 1px #e7e7e7;
+  transition: .2s;
+
   /* cursor: pointer; */
 }
 
+.ac_c_item:hover {
+  box-shadow: 0px 8px 10px -5px #00000014;
+
+  box-shadow: 0px 16px 24px 2px #0000000a;
+
+  box-shadow: 0px 6px 30px 5px #0000000d;
+}
+
 @media screen and (min-width: 1400px) {
   .ac_c_item {
     width: calc(100% / 5 - (15px * 4) / 5) !important;
@@ -1303,6 +1319,7 @@ export default {
   width: 100%;
   display: flex;
   height: calc(100% - 40px);
+  cursor: pointer;
 }
 
 .ac_c_i_t_left {

+ 5 - 5
src/components/pages/classroomObservation/components/wangEnduit.vue

@@ -13,8 +13,8 @@
       </div>
     </div>
   </div>
-</template>  
-  
+</template>
+
 <script>
 import E from "wangeditor";
 import "../../../../common/aws-sdk-2.235.1.min";
@@ -190,8 +190,8 @@ export default {
     },
   },
 };
-</script>  
-  
+</script>
+
 <style lang="css" scoped>
 .editor {
    width: 100%;
@@ -327,4 +327,4 @@ export default {
   width: 40px;
   margin-right: 20px;
 }
-</style>  
+</style>

Някои файлове не бяха показани, защото твърде много файлове са промени