新需求迭代

src/utils-o/fetch.js

@@ -56,7 +56,7 @@ service.interceptors.request.use(config => {
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
       // config.headers['token'] = 'BFD804F3A3194FBBBE113962222839F6';
       // config.headers['token'] = 'F8209898391C40A0B8DBC1ED9E157291';
-      config.headers['token'] = '2E46B77D801C479DBA1C550CE70D348F';
+      config.headers['token'] = '3167CD6495A14C14AEF28AB99F69984D';
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')
     }

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/utils/fetch.js

@@ -55,6 +55,7 @@ service.interceptors.request.use(config => {
     if( process.env.BUILD_ENV == "development" ){  // 本地开发环境
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
       // config.headers['token'] = '29D71EAAB92E4580AFB16A8011BE7206';
+      // config.headers['token'] = '3167CD6495A14C14AEF28AB99F69984D';
       config.headers['token'] = localStorage.getItem('storageToken')
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')

src/views/education/edit-entry.vue

@@ -20,25 +20,27 @@
               size="small"
               v-model="formData.entryName"
               placeholder="请输入名称"
-              style="width:83%;"
+              style="width:70%;"
               :disabled="peopleLevel == 'L3'"
             ></el-input>
             <span class="word-num">{{(formData.entryName).replace(/\s+/g,"").length}}/24</span>
           </el-col>
         </el-form-item>
         <el-form-item label="发起机构：" prop="organizationName">
-          <el-col :span="13">
+          <el-col :span="13" v-for="(item, index) in formData.organizationNameNew" :key="index">
             <el-input
               size="small"
-              v-model="formData.organizationName"
+              v-model="formData.organizationNameNew[index]"
               placeholder="请输入发起机构名称"
-              style="width:83%;"
+              style="width:70%;"
               :disabled="peopleLevel == 'L3'"
               @input="changeOrganizationName"
               @blur="blurName"
               @focus="focusName"
             ></el-input>
-            <span class="word-num">{{(formData.organizationName).replace(/\s+/g,"").length}}/12</span>
+            <span class="word-num">{{(formData.organizationName).replace(/\s+/g,"").length}}/16</span>
+            <img class="edit-img" src="../../assets/image/plus.png" />
+            <img class="edit-img" src="../../assets/image/delete.png" />
           </el-col>
           <el-popover
             class="popover-content"
@@ -296,6 +298,7 @@ export default {
         attachmentMore1: {},
         attachmentMore2: {},
         organizationName: "",
+        organizationNameNew: ['22', '33', '44'],
         project: []
       },
       optionsProject: [],
@@ -336,7 +339,7 @@ export default {
           { required: true, message: "请填写发起机构名称", trigger: "blur" },
           {
             min: 1,
-            max: 12,
+            max: 16,
             message: "超过12个最大字数限制，请精简字数或使用简称",
             trigger: "blur"
           }

src/views/education/item-manager.vue

@@ -244,6 +244,20 @@
           <el-button @click="handleCheckRight">不通过</el-button>
         </span>
       </el-dialog>
+      <!-- 删除 弹窗 -->
+      <el-dialog
+        title="确认删除"
+        :show-close=false
+        :visible.sync="deleteVisible"
+        :close-on-click-modal="false"
+        width="600px"
+        center>
+        <p style="text-align: center;">删除后将不可撤销，确认删除吗？</p>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="confirmDelete">删 除</el-button>
+          <el-button type="primary" @click="hideDeleteFrom">取 消</el-button>
+        </span>
+      </el-dialog>
     </div>
   </div>
 </template>
@@ -357,7 +371,8 @@ export default {
         }
       },
       idType: '',
-      masterAdministratorFlag: false
+      masterAdministratorFlag: false,
+      deleteVisible: false,
     };
   },
   computed: {
@@ -388,6 +403,10 @@ export default {
     ...mapActions([
     	'updateItemManager'
     ]),
+    hideDeleteFrom() {
+      this.deleteVisible = false;
+    },
+    
     openProject() {
       if(vm.masterAdministratorFlag == 'true') {
         this.centerDialogVisible = true;
@@ -649,19 +668,31 @@ export default {
       }
       return data;
     },
-    //删除项目
     delItem(row) {
+      this.deleteVisible = true
+      this.currentRow = row;
+    },
+    hideDeleteFrom() {
+      this.deleteVisible = false;
+    },
+    // 删除项目
+    confirmDelete() {
       let req = {};
-      console.log(row);
-      vm.DELETE("portal/portalInfo/delete/" + row.id, req).then(res => {
-        vm.$message.info(res.message);
-        if (res.code == "000000") {
-          console.log(res);
-          vm.getProjectList();
+      vm.GET('portal/portalComponent/deleteComponentById',{id: this.currentRow.id}).then((res) => {
+        if(res.code == "000000") {
+          vm.$message({
+            type: 'success',
+            message: '删除成功!'
+          });
+          vm.search()
+        } else {
+          vm.$message.info(res.message)
         }
+      }).catch(function (error) {
+        vm.$message.error(error);
       });
     },
-    //重置表单
+    // 重置表单
     resetForm() {
       vm.formInline = Object.assign(
         {},

src/views/system/item-role.vue

@@ -432,6 +432,7 @@ export default {
   created() {
     vm = this;
     this.queryRoleList();
+    this.curmbThird = this.$route.query && this.$route.query.projectName || ''
   },
   // 挂载到Dom完成时
   mounted: function() {

src/views/system/role.vue

@@ -176,7 +176,7 @@ export default {
       vm.search();
     },
     toPage(row) {
-      this.$router.push("item-role?portalProjectId=" + row.id);
+      this.$router.push("item-role?portalProjectId=" + row.id + '&projectName=' + row.projectName);
     },
     handleSizeChange(val) {
       this.formInline.pageSize = val;