Home Explore Help
Sign In
CocoRoboLabs
/
pbl-teacher-table
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

lsc 4 months ago
parent
6730ce3ef3 312875202c
commit
c5a543c448
11 changed files with 500 additions and 88 deletions
Unified View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.b0f0899e6ca70d23058fd23688930811.css
  3. 0 0
      dist/static/css/app.b0f0899e6ca70d23058fd23688930811.css.map
  4. 0 0
      dist/static/js/app.67cc379d8542d53337da.js
  5. 0 0
      dist/static/js/app.67cc379d8542d53337da.js.map
  6. 0 0
      dist/static/js/manifest.161e82026ac2ae03ab6f.js.map
  7. 26 5
      src/components/pages/appStore/dialog/addAppDialog.vue
  8. 292 0
      src/components/pages/appStore/dialog/releaseAppDialog.vue
  9. 4 3
      src/components/pages/appStore/dialog/selectAppDialog.vue
  10. 175 77
      src/components/pages/appStore/views/appManagement.vue
  11. 2 2
      src/components/pages/kindStudentEva/test/component/sharePdf.vue

+ 1 - 1
dist/index.html
View File 

@@ -32,7 +32,7 @@
 
       width: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
       background: #e6eaf0;
 
       font-family: '黑体';
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.41fdbf1778d520db6eb0491624eff94b.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.de4a5c861ba1cf40378b.js></script></body></html><script>function stopSafari() {
 
+    }</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() {
 
     //阻止safari浏览器双击放大功能
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {
 
     document.documentElement.addEventListener("touchstart", function (event) {

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.b0f0899e6ca70d23058fd23688930811.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.b0f0899e6ca70d23058fd23688930811.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.67cc379d8542d53337da.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.67cc379d8542d53337da.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.161e82026ac2ae03ab6f.js.map


+ 26 - 5
src/components/pages/appStore/dialog/addAppDialog.vue
View File 

@@ -24,7 +24,7 @@
 
             <el-form-item label="应用图标" prop="icon">
 
             <el-form-item label="应用图标" prop="icon">
 
               <el-input
 
               <el-input
 
                 v-model="form.json.icon"
 
                 v-model="form.json.icon"
 
-                placeholder="请输入应用图标（可直接粘贴svg或者点击右侧图标上传图片）"
 
+                placeholder="请输入应用图标（可直接粘贴链接或者点击右侧图标上传图片）"
 
                 style="width: 500px;"
 
                 style="width: 500px;"
 
               ></el-input>
 
               ></el-input>
 
             </el-form-item>
 
             </el-form-item>
 
@@ -130,6 +130,16 @@
 
             </el-radio-group>
 
             </el-radio-group>
 
           </el-form-item>
 
           </el-form-item>
 
 
 
+          <el-form-item
 
+            label="应用状态"
 
+            style="display: flex;flex-direction: column;align-items: flex-start;"
 
+          >
 
+            <el-radio-group v-model="form.json.status">
 
+              <el-radio label="1">测试</el-radio>
 
+              <el-radio label="2">稳定</el-radio>
 
+            </el-radio-group>
 
+          </el-form-item>
 
+
 
 
 
 					<el-form-item label="权限设置"  style="display: flex;flex-direction: column;align-items: flex-start;">
 
 					<el-form-item label="权限设置"  style="display: flex;flex-direction: column;align-items: flex-start;">
 
 						<el-radio-group v-model="form.json.copy" style="display: flex;flex-direction: column;">
 
 						<el-radio-group v-model="form.json.copy" style="display: flex;flex-direction: column;">
 
@@ -186,7 +196,9 @@ export default {
 
         stand: "cn",
 
         stand: "cn",
 
         json: {
 
         json: {
 
           icon: "",
 
           icon: "",
 
-          copy: "0"
 
+          copy: "0",
 
+          status:"",
 
+          model:""
 
         }
 
         }
 
       },
 
       },
 
       rules: {
 
       rules: {
 
@@ -237,7 +249,11 @@ export default {
 
 					data.form.json.copy = "0"
 
 					data.form.json.copy = "0"
 
 				}
 
 				}
 
 
 
-        this.form = data.form;
 
+        if(!data.form.json.status){
 
+					data.form.json.status = ""
 
+				}
 
+
 
+        this.form = JSON.parse(JSON.stringify(data.form));
 
         this.type = data.type;
 
         this.type = data.type;
 
       } else {
 
       } else {
 
         this.form = {
 
         this.form = {
 
@@ -250,7 +266,9 @@ export default {
 
           stand: "cn",
 
           stand: "cn",
 
           json: {
 
           json: {
 
             icon: "",
 
             icon: "",
 
-            copy: "0"
 
+            copy: "0",
 
+            status:"",
 
+            model:""
 
           }
 
           }
 
         };
 
         };
 
       }
 
       }
 
@@ -297,7 +315,9 @@ export default {
 
         stand: "cn",
 
         stand: "cn",
 
         json: {
 
         json: {
 
           icon: "",
 
           icon: "",
 
-          copy: "0"
 
+          copy: "0",
 
+          status:"",
 
+          model:""
 
         }
 
         }
 
       };
 
       };
 
       this.loading = false;
 
       this.loading = false;
 
@@ -383,6 +403,7 @@ export default {
 
   box-sizing: border-box;
 
   box-sizing: border-box;
 
   padding-bottom: 50px;
 
   padding-bottom: 50px;
 
   padding-top: 10px;
 
   padding-top: 10px;
 
+  overflow: auto;
 
 }
 
 }
 
 .addNewAppDialog >>> .el-dialog__header {
 
 .addNewAppDialog >>> .el-dialog__header {
 
   display: none !important;
 
   display: none !important;

+ 292 - 0
src/components/pages/appStore/dialog/releaseAppDialog.vue
View File 

@@ -0,0 +1,292 @@
 
+<template>
 
+  <div>
 
+    <el-dialog
 
+      :center="true"
 
+      :visible.sync="show"
 
+      :close-on-click-modal="false"
 
+      width="500px"
 
+      class="releaseAppDialog"
 
+    >
 
+      <div class="a-d-top">
 
+        <div class="a-d-topTit">
 
+          <div>发布应用</div>
 
+        </div>
 
+        <div class="a-d-t-right">
 
+          <span @click="close()">×</span>
 
+        </div>
 
+      </div>
 
+      <div class="bfd_box" v-loading="loading" label-position="top">
 
+        <el-form :model="form" :rules="rules" ref="ruleForm">
 
+
 
+          <el-form-item
 
+            label="选择模式"
 
+            style="display: flex;flex-direction: column;align-items: flex-start;"
 
+          >
 
+            <el-radio-group v-model="form.json.model">
 
+              <el-radio label="1">对话式</el-radio>
 
+              <el-radio label="2">卡片式</el-radio>
 
+              <el-radio label="3">沉浸式</el-radio>
 
+            </el-radio-group>
 
+          </el-form-item>
 
+
 
+          <el-form-item
 
+            label="可见范围"
 
+            style="display: flex;flex-direction: column;align-items: flex-start;"
 
+          >
 
+            <el-radio-group v-model="form.juri">
 
+              <el-radio label="3">所有人可见</el-radio>
 
+              <el-radio label="2">组织内可见</el-radio>
 
+              <el-radio label="1">仅自己可见</el-radio>
 
+            </el-radio-group>
 
+          </el-form-item>
 
+
 
+
 
+					<el-form-item label="权限设置"  style="display: flex;flex-direction: column;align-items: flex-start;">
 
+						<el-radio-group v-model="form.json.copy" style="display: flex;flex-direction: column;">
 
+              <el-radio label="0" class="radioItem">仅体验（用户仅能使用，不可查看设置内容）</el-radio>
 
+              <el-radio label="1" class="radioItem">允许其他用户复制并进行二次创作</el-radio>
 
+            </el-radio-group>
 
+          </el-form-item>
 
+
 
+          <div
 
+            style="display: flex;width: 100%;justify-content: space-between;align-items: center;"
 
+          >
 
+            <el-form-item label="应用分类" prop="type">
 
+              <el-select
 
+                v-model="form.type"
 
+                placeholder="请选择应用类型"
 
+                style="width: 300px;"
 
+              >
 
+                <el-option
 
+                  v-for="item in typeList"
 
+                  :key="item.id"
 
+                  :label="item.name"
 
+                  :value="item.id"
 
+                >
 
+                </el-option>
 
+              </el-select>
 
+            </el-form-item>
 
+          </div>
 
+        </el-form>
 
+      </div>
 
+      <div class="bfd_bottom">
 
+        <el-button @click="close()">取消</el-button>
 
+        <el-button type="primary" @click="submitBtn('ruleForm')"
 
+          >确认发布</el-button
 
+        >
 
+      </div>
 
+    </el-dialog>
 
+  </div>
 
+</template>
 
+
 
+<script>
 
+let validUrl = (rule, value, callback) => {
 
+  if (value) {
 
+    // 验证链接是否有效
 
+    try {
 
+      new URL(value);
 
+      callback();
 
+    } catch (error) {
 
+      return callback(new Error("请输入有效的链接"));
 
+    }
 
+  }
 
+};
 
+export default {
 
+  props: {
 
+    typeList: {
 
+      type: Array,
 
+      default: () => {
 
+        return [];
 
+      }
 
+    }
 
+  },
 
+  data() {
 
+    return {
 
+      loading: false,
 
+      show: false,
 
+      form: {
 
+        name: "",
 
+        label: "",
 
+        detail: "",
 
+        url: "",
 
+        type: "",
 
+        juri: "1",
 
+        stand: "cn",
 
+        json: {
 
+          icon: "",
 
+          copy: "0"
 
+        }
 
+      },
 
+      rules: {
 
+
 
+        juri: [{ required: true, message: "请选择权限管理", trigger: "blur" }],
 
+        url: [
 
+          { required: true, message: "请输入应用链接", trigger: "blur" },
 
+          { validator: validUrl, trigger: "blur" }
 
+        ]
 
+      }
 
+    };
 
+  },
 
+  methods: {
 
+    open(data) {
 
+      if (!data.form.json) {
 
+        data.form.json = { icon: "", copy: "0" };
 
+      }
 
+			if(!data.form.json.icon){
 
+				data.form.json.icon = ""
 
+			}
 
+			if(!data.form.json.copy){
 
+				data.form.json.copy = "0"
 
+			}
 
+      if(!data.form.json.model){
 
+        data.form.json.model = "1"
 
+      }
 
+
 
+      data.form.juri = '3'
 
+      this.form = data.form;
 
+      this.loading = false;
 
+      this.show = true;
 
+    },
 
+    close() {
 
+      this.show = false;
 
+      this.init();
 
+    },
 
+    init() {
 
+      this.form = {
 
+        name: "",
 
+        label: "",
 
+        detail: "",
 
+        url: "",
 
+        type: "",
 
+        juri: "1",
 
+        stand: "cn",
 
+        json: {
 
+          icon: "",
 
+          copy: "0"
 
+        }
 
+      };
 
+      this.loading = false;
 
+    },
 
+    submitBtn(ref) {
 
+      if (this.loading) return this.$message.info("请稍等...");
 
+      this.$refs[ref].validate(valid => {
 
+        if (valid) {
 
+          this.$emit("success", this.form);
 
+        }
 
+      });
 
+    },
 
+  }
 
+};
 
+</script>
 
+
 
+<style scoped>
 
+.releaseAppDialog >>> .el-dialog {
 
+  min-width: 700px;
 
+
 
+  height: 550px;
 
+	/* height: 780px; */
 
+  box-shadow: 0px 0 8px 0px #555555;
 
+  border-radius: 8px;
 
+  background-color: #fff;
 
+  /* top: 0px; */
 
+  /* margin: 0 auto; */
 
+  overflow: hidden;
 
+}
 
+.releaseAppDialog >>> .el-dialog__body {
 
+  height: 100%;
 
+  min-width: 550px;
 
+  flex-shrink: 0;
 
+  box-sizing: border-box;
 
+  padding-bottom: 50px;
 
+  padding-top: 10px;
 
+}
 
+.releaseAppDialog >>> .el-dialog__header {
 
+  display: none !important;
 
+}
 
+
 
+.a-d-top {
 
+  /* background: #adadad; */
 
+  display: flex;
 
+  flex-direction: row;
 
+  flex-wrap: nowrap;
 
+  align-items: center;
 
+  justify-content: space-between;
 
+  height: 54px;
 
+  border-radius: 8px 8px 0 0;
 
+  user-select: none;
 
+  border-bottom: 1px #ccc solid;
 
+}
 
+.a-d-top >>> .el-input__inner {
 
+  width: 320px;
 
+  height: 32px;
 
+}
 
+.a-d-top >>> .el-input__icon {
 
+  line-height: 32px;
 
+}
 
+
 
+.a-d-topTit {
 
+  /* width: 171px; */
 
+  /* margin-left: 20px; */
 
+  height: 32px;
 
+  display: flex;
 
+  font-weight: bold;
 
+  font-size: 20px;
 
+  align-items: center;
 
+  font-family: PingFang SC;
 
+  box-sizing: border-box;
 
+  padding: 5px;
 
+  line-height: 22px;
 
+  justify-content: center;
 
+  /* text-align: left; */
 
+}
 
+
 
+.a-d-t-right > span {
 
+  font-size: 18px;
 
+  font-weight: bold;
 
+  cursor: pointer;
 
+}
 
+
 
+.bfd_bottom {
 
+  display: flex;
 
+  justify-content: flex-end;
 
+}
 
+
 
+.bfd_icon {
 
+  width: 70px;
 
+  height: 70px;
 
+  box-sizing: border-box;
 
+  padding: 5px;
 
+  margin-right: 40px;
 
+  cursor: pointer;
 
+}
 
+
 
+.bfd_icon > svg {
 
+  width: 100%;
 
+  height: 100%;
 
+}
 
+
 
+.bfd_icon > span {
 
+  width: 100%;
 
+  height: 100%;
 
+
 
+  display: block;
 
+}
 
+
 
+.bfd_icon > span >>> svg {
 
+  width: 100%;
 
+  height: 100%;
 
+}
 
+
 
+.switchForm{
 
+	display: flex;
 
+	align-items: center;
 
+}
 
+
 
+.switchForm>span{
 
+	margin-left: 10px;
 
+}
 
+
 
+.radioItem{
 
+	margin-bottom: 10px;
 
+}
 
+</style>

+ 4 - 3
src/components/pages/appStore/dialog/selectAppDialog.vue
View File 

@@ -90,8 +90,9 @@ export default {
 
     };
 
     };
 
   },
 
   },
 
   methods: {
 
   methods: {
 
-    open(data) {
 
+    open() {
 
       this.dataList = [];
 
       this.dataList = [];
 
+      this.search = ""
 
       this.loading = false;
 
       this.loading = false;
 
       this.getData();
 
       this.getData();
 
       this.show = true;
 
       this.show = true;
 
@@ -101,7 +102,7 @@ export default {
 
       this.init();
 
       this.init();
 
     },
 
     },
 
     init() {
 
     init() {
 
-
 
+      this.search = ""
 
       this.loading = false;
 
       this.loading = false;
 
       this.dataList = [];
 
       this.dataList = [];
 
     },
 
     },
 
@@ -112,7 +113,7 @@ export default {
 
         name: this.search, //应用名称搜索
 
         name: this.search, //应用名称搜索
 
         label: "", //应用的标签搜索
 
         label: "", //应用的标签搜索
 
         type: "", //应用的类型
 
         type: "", //应用的类型
 
-        juri: 1, //应用权限 1:我的  2：组织内  3：所有人
 
+        juri: 99, //应用权限 1:我的  2：组织内  3：所有人   99：未发布
 
         stand: "cn" //cn站还是hk站
 
         stand: "cn" //cn站还是hk站
 
       };
 
       };

+ 175 - 77
src/components/pages/appStore/views/appManagement.vue
View File 

@@ -119,7 +119,7 @@
 
               icon="el-icon-search"
 
               icon="el-icon-search"
 
               @click="getData"
 
               @click="getData"
 
             ></el-button>
 
             ></el-button>
 
-            <!-- <el-button type="primary" @click="releaseApp()">发布应用</el-button> -->
 
+            <!-- <el-button type="primary" @click="selectApp()">发布应用</el-button> -->
 
           </div>
 
           </div>
 
         </div>
 
         </div>
 
       </div>
 
       </div>
 
@@ -154,8 +154,16 @@
 
             </div>
 
             </div>
 
             <div class="ac_c_i_t_right">
 
             <div class="ac_c_i_t_right">
 
               <div class="ac_c_i_t_r_top">
 
               <div class="ac_c_i_t_r_top">
 
-                <span>{{ item.name }}</span>
 
-                <div class="ac_c_i_t_popover">
 
+                <el-tooltip
 
+                  class="item"
 
+                  effect="light"
 
+                  :content="item.name"
 
+                  placement="top"
 
+                >
 
+                  <span>{{ item.name }}</span>
 
+                </el-tooltip>
 
+
 
+                <div class="ac_c_i_t_popover" v-if="showMenu(item)">
 
                   <div
 
                   <div
 
                     class="ac_c_i_t_p_box"
 
                     class="ac_c_i_t_p_box"
 
                     v-if="editAppCard === item.id"
 
                     v-if="editAppCard === item.id"
 
@@ -223,46 +231,71 @@
 
           </div>
 
           </div>
 
           <div class="ac_c_i_bottom">
 
           <div class="ac_c_i_bottom">
 
             <div class="ac_c_i_b_left">
 
             <div class="ac_c_i_b_left">
 
-              <div>
 
-                <img src="../../../../assets/icon/appStore/user_copy.svg" />
 
-                <span>{{ item.copyCount }}</span>
 
-              </div>
 
-              <div>
 
-                <img
 
-                  src="../../../../assets/icon/appStore/praise_default.svg"
 
-                  v-if="!item.likeId"
 
-                  style="cursor: pointer;"
 
-                  @click="praiseFn(item, 0)"
 
-                />
 
-                <img
 
-                  src="../../../../assets/icon/appStore/praise_active.svg"
 
-                  v-else
 
-                  style="cursor: pointer;"
 
-                  @click="praiseFn(item, 1)"
 
-                />
 
-                <span>{{ item.likeCount }}</span>
 
-              </div>
 
-              <div>
 
-                <img
 
-                  src="../../../../assets/icon/appStore/collect_default.svg"
 
-                  v-if="!item.collectId"
 
-                  style="cursor: pointer;"
 
-                  @click="collectFn(item, 0)"
 
-                />
 
-                <img
 
-                  src="../../../../assets/icon/appStore/collect_active.svg"
 
-                  v-else
 
-                  style="cursor: pointer;"
 
-                  @click="collectFn(item, 1)"
 
-                />
 
-                <span>{{ item.collectCount }}</span>
 
-              </div>
 
+              <el-tooltip
 
+                class="item"
 
+                effect="light"
 
+                content="被复制数"
 
+                placement="top"
 
+              >
 
+                <div>
 
+                  <img src="../../../../assets/icon/appStore/user_copy.svg" />
 
+                  <span>{{ item.copyCount }}</span>
 
+                </div>
 
+              </el-tooltip>
 
+              <el-tooltip
 
+                class="item"
 
+                effect="light"
 
+                :content="item.likeId ? '取消点赞' : '点赞'"
 
+                placement="top"
 
+              >
 
+                <div>
 
+                  <img
 
+                    :src="
 
+                      require('../../../../assets/icon/appStore/praise_default.svg')
 
+                    "
 
+                    v-if="!item.likeId"
 
+                    style="cursor: pointer;"
 
+                    @click="praiseFn(item, 0)"
 
+                  />
 
+                  <img
 
+                    :src="
 
+                      require('../../../../assets/icon/appStore/praise_active.svg')
 
+                    "
 
+                    v-else
 
+                    style="cursor: pointer;"
 
+                    @click="praiseFn(item, 1)"
 
+                  />
 
+                  <span>{{ item.likeCount }}</span>
 
+                </div>
 
+              </el-tooltip>
 
+              <el-tooltip
 
+                class="item"
 
+                effect="light"
 
+                :content="item.collectId ? '取消收藏' : '收藏'"
 
+                placement="top"
 
+              >
 
+                <div>
 
+                  <img
 
+                    src="../../../../assets/icon/appStore/collect_default.svg"
 
+                    v-if="!item.collectId"
 
+                    style="cursor: pointer;"
 
+                    @click="collectFn(item, 0)"
 
+                  />
 
+                  <img
 
+                    src="../../../../assets/icon/appStore/collect_active.svg"
 
+                    v-else
 
+                    style="cursor: pointer;"
 
+                    @click="collectFn(item, 1)"
 
+                  />
 
+                  <span>{{ item.collectCount }}</span>
 
+                </div>
 
+              </el-tooltip>
 
             </div>
 
             </div>
 
             <div class="ac_c_i_b_right" v-if="item.json.status">
 
             <div class="ac_c_i_b_right" v-if="item.json.status">
 
-              <span class="ac_c_i_b_r_type2" v-if="item.json.status === '0'"
 
+              <span class="ac_c_i_b_r_type2" v-if="item.json.status === '1'"
 
                 >测试</span
 
                 >测试</span
 
               >
 
               >
 
-              <span class="ac_c_i_b_r_type1" v-if="item.json.status === '1'"
 
+              <span class="ac_c_i_b_r_type1" v-if="item.json.status === '2'"
 
                 >稳定</span
 
                 >稳定</span
 
               >
 
               >
 
             </div>
 
             </div>
 
@@ -387,9 +420,12 @@
 
       :typeList="typeList"
 
       :typeList="typeList"
 
       @success="addAppSuccess"
 
       @success="addAppSuccess"
 
     />
 
     />
 
-    <selectAppDialog
 
-      ref="selectAppDialogRef"
 
-      @success="selectAppSuccess"/>
 
+    <selectAppDialog ref="selectAppDialogRef" @success="selectAppSuccess" />
 
+    <releaseAppDialog
 
+      ref="releaseAppDialogRef"
 
+      :typeList="typeList"
 
+      @success="releaseAppSuccess"
 
+    />
 
   </div>
 
   </div>
 
 </template>
 
 </template>
 
 
 
@@ -415,13 +451,15 @@ const clickOutside = {
 
 import addAppDialog from "../dialog/addAppDialog.vue";
 
 import addAppDialog from "../dialog/addAppDialog.vue";
 
 import saveCard from "../components/saveCard.vue";
 
 import saveCard from "../components/saveCard.vue";
 
 import selectAppDialog from "../dialog/selectAppDialog.vue";
 
 import selectAppDialog from "../dialog/selectAppDialog.vue";
 
+import releaseAppDialog from "../dialog/releaseAppDialog.vue";
 
 // import collectCard from "./dialog/collectCard.vue";
 
 // import collectCard from "./dialog/collectCard.vue";
 
 // import recentUseCard from "./dialog/recentUseCard.vue";
 
 // import recentUseCard from "./dialog/recentUseCard.vue";
 
 export default {
 
 export default {
 
   components: {
 
   components: {
 
     addAppDialog,
 
     addAppDialog,
 
     saveCard,
 
     saveCard,
 
-    selectAppDialog
 
+    selectAppDialog,
 
+    releaseAppDialog
 
     // collectCard,
 
     // collectCard,
 
     // recentUseCard
 
     // recentUseCard
 
   },
 
   },
 
@@ -438,9 +476,7 @@ export default {
 
       selectList: [
 
       selectList: [
 
         { index: 3, label: "所有组织" },
 
         { index: 3, label: "所有组织" },
 
         { index: 2, label: "组织内" },
 
         { index: 2, label: "组织内" },
 
-        // { index: 1, label: "我的" }
 
-        // { index: 2, label: "组织" },
 
-        // { index: 3, label: "所有人" }
 
+        { index: 1, label: "我的" }
 
       ],
 
       ],
 
       labelSelect: [
 
       labelSelect: [
 
         { value: "", label: "全部类型" },
 
         { value: "", label: "全部类型" },
 
@@ -475,6 +511,20 @@ export default {
 
         }
 
         }
 
         return _result;
 
         return _result;
 
       };
 
       };
 
+    },
 
+    showMenu() {
 
+      return data => {
 
+        let _result = false;
 
+        if (data && this.userId) {
 
+          if (
 
+            data.userid === this.userId ||
 
+            (data.json && data.json.copy === "1")
 
+          ) {
 
+            _result = true;
 
+          }
 
+        }
 
+        return _result;
 
+      };
 
     }
 
     }
 
   },
 
   },
 
   methods: {
 
   methods: {
 
@@ -524,9 +574,27 @@ export default {
 
     addApp() {
 
     addApp() {
 
       this.$refs.addAppDialogRef.open({ type: 1 });
 
       this.$refs.addAppDialogRef.open({ type: 1 });
 
     },
 
     },
 
-    releaseApp() {
 
+    selectApp() {
 
       this.$refs.selectAppDialogRef.open();
 
       this.$refs.selectAppDialogRef.open();
 
     },
 
     },
 
+    selectAppSuccess(data) {
 
+      if (data) {
 
+        this.$refs.selectAppDialogRef.close();
 
+        this.$refs.releaseAppDialogRef.open({
 
+          form: {
 
+            id: data.id,
 
+            name: data.name,
 
+            label: data.label,
 
+            detail: data.detail,
 
+            url: data.url,
 
+            type: data.type,
 
+            juri: data.juri,
 
+            stand: data.stand,
 
+            json: data.json
 
+          }
 
+        });
 
+      }
 
+    },
 
     updateApp(data) {
 
     updateApp(data) {
 
       this.$refs.addAppDialogRef.open({
 
       this.$refs.addAppDialogRef.open({
 
         type: 2,
 
         type: 2,
 
@@ -575,6 +643,7 @@ export default {
 
               if (res.data == 1) {
 
               if (res.data == 1) {
 
                 this.$message.success("复制成功");
 
                 this.$message.success("复制成功");
 
                 this.getData();
 
                 this.getData();
 
+                this.insertSave(item, 3);
 
               } else {
 
               } else {
 
                 this.$message.error("复制失败");
 
                 this.$message.error("复制失败");
 
               }
 
               }
 
@@ -688,8 +757,38 @@ export default {
 
           });
 
           });
 
       }
 
       }
 
     },
 
     },
 
-    selectAppSuccess(item){
 
-      console.log(item)
 
+    releaseAppSuccess(data) {
 
+      this.$refs.releaseAppDialogRef.loading = true;
 
+      let params = [
 
+        {
 
+          aid: data.id,
 
+          name: data.name, //app名称
 
+          userid: this.userId, //创建的用户ID
 
+          label: data.label, //app标签
 
+          detail: data.detail, //app简介
 
+          url: data.url, //app链接
 
+          type: data.type, //app类型
 
+          juri: data.juri, //app权限 1:我的 2:组织 3:所有人
 
+          stand: "cn", //语言
 
+          json: JSON.stringify(data.json) //其他信息
 
+        }
 
+      ];
 
+      this.ajax
 
+        .post(this.$store.state.api + "update_appStore", params)
 
+        .then(res => {
 
+          if (res.data == 1) {
 
+            this.$message.success("发布成功");
 
+            this.$refs.releaseAppDialogRef.close(true);
 
+            this.getData();
 
+          } else {
 
+            this.$message.error("发布失败");
 
+            this.$refs.releaseAppDialogRef.loading = false;
 
+          }
 
+        })
 
+        .catch(err => {
 
+          console.log(err);
 
+          this.$message.error("修改失败");
 
+        });
 
     },
 
     },
 
     getTypeList() {
 
     getTypeList() {
 
       let params = {
 
       let params = {
 
@@ -783,38 +882,37 @@ export default {
 
         });
 
         });
 
     },
 
     },
 
     insertSave(item, type) {
 
     insertSave(item, type) {
 
-      let params = [
 
-        {
 
-          uid: this.userId,
 
-          type: type,
 
-          aid: item.id,
 
-          json: ""
 
-        }
 
-      ];
 
+      return new Promise(resolve => {
 
+        let params = [
 
+          {
 
+            uid: this.userId,
 
+            type: type,
 
+            aid: item.id,
 
+            json: ""
 
+          }
 
+        ];
 
 
 
-      this.ajax
 
-        .post(this.$store.state.api + "insert_appStoreSave", params)
 
-        .then(res => {
 
-          if (res.data) {
 
-            if (type === 1) {
 
-              this.getRecentUse();
 
+        this.ajax
 
+          .post(this.$store.state.api + "insert_appStoreSave", params)
 
+          .then(res => {
 
+            if (res.data) {
 
+              if (type === 1) {
 
+                resolve(1);
 
+              }
 
             }
 
             }
 
-          }
 
-        })
 
-        .catch(err => {
 
-          console.log(err);
 
-        });
 
+          })
 
+          .catch(err => {
 
+            resolve(0);
 
+            console.log(err);
 
+          });
 
+      });
 
     },
 
     },
 
     delApp(item) {
 
     delApp(item) {
 
-      this.$confirm(
 
-        `确定要删除《${item.name}》这个应用吗，删除后无法找回！`,
 
-        `确定删除应用`,
 
-        {
 
-          confirmButtonText: "确定",
 
-          cancelButtonText: "取消",
 
-          type: "warning"
 
-        }
 
-      )
 
+      this.$confirm(`确定要删除《${item.name}》这个应用吗！`, `确定删除应用`, {
 
+        confirmButtonText: "确定",
 
+        cancelButtonText: "取消",
 
+        type: "warning"
 
+      })
 
         .then(() => {
 
         .then(() => {
 
           let params = [
 
           let params = [
 
             {
 
             {

+ 2 - 2
src/components/pages/kindStudentEva/test/component/sharePdf.vue
View File 

@@ -102,7 +102,7 @@ export default {
 
     },
 
     },
 
     setQr() {
 
     setQr() {
 
       setTimeout(() => {
 
       setTimeout(() => {
 
-        let url = `https://beta.cloud.cocorobo.cn/#/echarts?cid=${this.cid}&userid=${this.userid}&oid=${this.oid}&org=${this.org}`;
 
+        let url = `https://beta.cloud.cocorobo.cn/#/echarts?cid=${this.cid}&userid=${this.userid}&oid=${this.oid}`;       
         this.origin = url;
 
         this.origin = url;
 
         this.$refs.qrCodeUrl.innerHTML = "";
 
         this.$refs.qrCodeUrl.innerHTML = "";
 
         var qrcode = new QRCode(this.$refs.qrCodeUrl, {
 
         var qrcode = new QRCode(this.$refs.qrCodeUrl, {
 
@@ -125,7 +125,7 @@ export default {
 
       link.click();
 
       link.click();
 
     },
 
     },
 
     copy() {
 
     copy() {
 
-      this.copyText = `https://beta.cloud.cocorobo.cn/#/echarts?cid=${this.cid}&userid=${this.userid}&oid=${this.oid}&org=${this.org}`;
 
+      this.copyText = `https://beta.cloud.cocorobo.cn/#/echarts?cid=${this.cid}&userid=${this.userid}&oid=${this.oid}`;
 
       var clipboard = new Clipboard(".tag-read");
 
       var clipboard = new Clipboard(".tag-read");
 
       clipboard.on("success", e => {
 
       clipboard.on("success", e => {
 
         this.$message.success("复制成功");
 
         this.$message.success("复制成功");

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