环境、机构列表等

src/utils/env-config.js

@@ -10,10 +10,10 @@ export const envConfig = {
     // baseUrl: 'https://uat-sc.yunqueyi.com/',
     // baseUrl: 'http://10.177.15.150:10401/',
     // baseUrl: 'http://10.177.15.150:11905/',
-    baseUrl: 'https://dev-sc.yunqueyi.com/',
+    // baseUrl: 'https://dev-sc.yunqueyi.com/',
     // baseUrl: 'https://test1-sc.yunqueyi.com/',
     // baseUrl: 'https://sc.yunqueyi.com/',
-    // baseUrl: 'https://uat-sc.yunqueyi.com/',
+    baseUrl: 'https://uat-sc.yunqueyi.com/',
     apiUrl: 'https://uat-api.yunqueyi.com/',
     qiniuFileUrl: "https://uat-sc.yunqueyi.com/contents/admin/qiniu/token1",
     qiniuResourceUrl: "https://test1-videos.yunqueyi.com",

src/views/education/edit-entry.vue

@@ -34,6 +34,7 @@
               v-model="formData.organizationNameList[index]"
               placeholder="请输入发起机构名称"
               style="width:70%;"
+              maxlength=16
               :disabled="peopleLevel == 'L3'"
               @input="changeOrganizationName"
               @blur="blurName"
@@ -44,7 +45,7 @@
             <img @click="deleteOrg(index)" v-if="index >= 1" class="edit-img" src="../../assets/image/trash.png" />
           </el-col>
           <el-popover
-            class="popover-content"
+            class="popover-content" :style="{'top': orgListIndex * 41 + 'px'}"
             placement="bottom"
             :content="organizationContent"
             v-model="visibleName"
@@ -306,6 +307,7 @@ export default {
         organizationNameList: [''],
         project: []
       },
+      orgListIndex: 0,
       optionsProject: [],
       tagsProject: [],
       visibleName: false,
@@ -580,7 +582,7 @@ export default {
     },
     checkDefault() {
       // vm.formData.organizationNameList[0] = vm.organizationContent;
-      vm.formData.organizationNameList.splice(0, 1, vm.organizationContent);
+      vm.formData.organizationNameList.splice(this.orgListIndex, 1, vm.organizationContent);
       // vm.formData.organizationNameList.push(vm.organizationContent);
       // vm.formData.organizationName = vm.organizationContent;
       vm.visibleName = false;
@@ -595,6 +597,7 @@ export default {
     focusName(index) {
       let textLength = vm.formData.organizationNameList[index].length;
       if (textLength == 0) {
+        this.orgListIndex = index;
         vm.visibleName = true;
       } else {
         vm.visibleName = false;
@@ -602,7 +605,6 @@ export default {
     },
     changeOrganizationName() {
       let textLength = vm.formData.organizationName.length;
-      // console.log("文字长度", textLength);
       if (textLength == 0) {
         vm.visibleName = true;
       } else {
@@ -697,6 +699,7 @@ export default {
       vm.formData = {
         entryName: data.portalEntry.entryName,
         organizationName: data.portalEntry.organizationName,
+        organizationNameList: data.portalEntry.organizationNameList,
         entryBegintime: data.portalEntry.entryBegintime,
         entryEndtime: data.portalEntry.entryEndtime,
         entryIntro: data.portalEntry.entryIntro,
@@ -762,7 +765,8 @@ export default {
             entryEndtime: vm.formData.entryEndtime,
             entryIntro: vm.formData.entryIntro,
             entryName: vm.formData.entryName,
-            organizationName: vm.formData.organizationName
+            organizationName: vm.formData.organizationName,
+            organizationNameList: vm.formData.organizationNameList
           },
           attachments: [
             {
@@ -807,7 +811,8 @@ export default {
             entryStatus: vm.entryOptionData.portalEntry.entryStatus,
             id: vm.entryOptionData.portalEntry.id,
             organizationId: 0,
-            organizationName: vm.formData.organizationName
+            organizationName: vm.formData.organizationName,
+            organizationNameList: vm.formData.organizationNameList
           },
           attachments: [
             {
@@ -997,4 +1002,9 @@ export default {
     }
   }
 }
+.popover-content {
+  position: relative;
+  top: 0;
+  left: 0;
+}
 </style>
\ No newline at end of file

src/views/education/edit-manager.vue

@@ -47,6 +47,7 @@
                 v-model="formData.organizationNameList[index]"
                 placeholder="请输入发起机构名称"
                 style="width:70%;"
+                maxlength=16
                 :disabled="peopleLevel == 'L3'"
                 @input="changeOrganizationName"
                 @blur = "blurName"
@@ -57,7 +58,7 @@
               <img @click="deleteOrg(index)" v-if="index >= 1" class="edit-img" src="../../assets/image/trash.png" />
             </el-col>
             <el-popover
-              class="popover-content"
+              class="popover-content" :style="{'top': orgListIndex * 41 + 'px'}"
               placement="bottom"
               :content="organizationContent"
               v-model="visibleName"
@@ -1068,6 +1069,7 @@ export default {
         authorityType: 1,
         allowLearn: 2
       },
+      orgListIndex: 0,
       pickerOptions0: {
         disabledDate: time => {
           if (
@@ -3809,6 +3811,7 @@ export default {
     focusName(index) {
       let textLength = vm.formData.organizationNameList[index].length;
       if (textLength == 0) {
+        this.orgListIndex = index;
         vm.visibleName = true;
       } else {
         vm.visibleName = false;
@@ -3825,7 +3828,7 @@ export default {
     },
     checkDefault() {
       // vm.formData.organizationNameList[0] = vm.organizationContent;
-      vm.formData.organizationNameList.splice(0, 1, vm.organizationContent);
+      vm.formData.organizationNameList.splice(this.orgListIndex, 1, vm.organizationContent);
       // vm.formData.organizationNameList.push(vm.organizationContent);
       // vm.formData.organizationName = vm.organizationContent;
       vm.visibleName = false;
@@ -4517,4 +4520,9 @@ export default {
 .edit-img {
   width: 20px;
 }
+.popover-content {
+  position: relative;
+  top: 0;
+  left: 0;
+}
 </style>

src/views/education/item-manager.vue

@@ -678,20 +678,12 @@ export default {
     // 删除项目
     confirmDelete() {
       let req = {};
-      vm.GET('portal/portalComponent/deleteComponentById',{id: this.currentRow.id}).then((res) => {
-        vm.deleteVisible = false;
-        console.log('$$$$$$$$$$$$$$$$$');
-        if(res.code == "000000") {
-          vm.$message({
-            type: 'success',
-            message: '删除成功!'
-          });
-          vm.search()
-        } else {
-          vm.$message.info(res.message)
+      vm.DELETE("portal/portalInfo/delete/" + this.currentRow.id, req).then(res => {
+        vm.$message.info(res.message);
+        if (res.code == "000000") {
+          console.log(res);
+          vm.getProjectList();
         }
-      }).catch(function (error) {
-        vm.$message.error(error);
       });
     },
     // 重置表单