fix bug

88f86be8 · zhentian.jia · 9c715641 · 88f86be8 · 88f86be8 · 88f86be8
--- a/src/utils/envConfig.js
+++ b/src/utils/envConfig.js
@@ -9,7 +9,7 @@ export const envConfig = {
    
    // baseUrl: 'https://test1-sc.yunqueyi.com/', 
    //baseUrl: 'https://uat-sc.yunqueyi.com/',
-    baseUrl: 'http://192.168.110.226:11905/portal/',
+    baseUrl: 'http://dev-sc.yunqueyi.com/portal/',
    qiniuFileUrl: "http://localhost:10201/contents/admin/qiniu/token1",
    qiniuResourceUrl: "https://test1-videos.yunqueyi.com",
    qiniuImgUrl: "https://test1-file.yunqueyi.com",

--- a/src/views/education/add-manager.vue
+++ b/src/views/education/add-manager.vue
@@ -74,7 +74,7 @@
            </el-upload>
          </el-form-item>
          <el-form-item label="封面类型：">
-            <el-radio-group size="mini" v-model="formData.type">
+            <el-radio-group size="mini" v-model="formData.type" @change="changeCover">
              <el-radio :label="1">图片</el-radio>
              <el-radio :label="2">视频</el-radio>
            </el-radio-group>
@@ -87,18 +87,27 @@
              :show-file-list="false"
              :before-upload="beforeUploadCoverPic"
            >
-              <img v-if="formData.attachmentUrl2" :src="formData.attachmentUrl2" class="bg-img">
+              <img v-if="formData.type == 1 && formData.attachmentUrl2" :src="formData.attachmentUrl2" class="bg-img">
+              <video v-if="formData.type == 2 && formData.attachmentUrl2"  width="100" controls class="bg-video">
+                <source :src="formData.attachmentUrl2" type="video/mp4">
+                浏览器不支持mp4
+              </video>
              <img
                v-if="!formData.attachmentUrl2"
                class="bg-img"
                src="../../assets/image/small.png"
              >
              <!-- <i v-else class="el-icon-plus avatar-uploader-icon"></i> -->
-              <div class="limit-text">
+              <div v-show="formData.type == 1" class="limit-text">
                <p>尺寸:750*420</p>
                <p>限制大小: 2.0 Mb</p>
                <p>支持.jpg,.png格式</p>
              </div>
+              <div v-show="formData.type == 2" class="limit-text">
+                <p></p>
+                <p>限制大小: 500 Mb</p>
+                <p>支持.mp4</p>
+              </div>
            </el-upload>
          </el-form-item>
          <el-form-item label="可下载附件：">
@@ -527,7 +536,7 @@ export default {
        certificate: ""
      },
      tagsComponent: [],
-      projectStatus: '',
+      projectStatus: "",
      //校验工具 数据
      rulesComponent: {
        component: [
@@ -623,6 +632,11 @@ export default {
    resetForm(formName) {
      this.$refs[formName].resetFields();
    },
+    //改变封面类型
+    changeCover(radio) {
+      this.formData.attachmentUrl2 = '';
+      //console.log(radio);
+    },
    //设置编辑数据
    setEditData(editData) {
      //console.log(editData);
@@ -776,7 +790,7 @@ export default {
        certificateId: this.formComponent.certificate,
        projectId: parseInt(vm.getUrlSearch(window.location.href, "projectId")),
        type: type,
-        status: this.projectStatus,
+        status: this.projectStatus
      };
      vm.POST("portalInfo/componentDraft", param).then(res => {
        console.log(res);
@@ -785,6 +799,7 @@ export default {
            title: "成功",
            message: "项目创建成功"
          });
+          this.$router.push("item-manager");
        } else {
          this.$notify({
            title: "",
@@ -944,13 +959,13 @@ export default {
      if (this.formData.type == 1) {
        this.beforeAvatarUpload(file, fileLimit);
      } else {
-        console.log(file);
+        this.beforeUploadMp4(file);
      }
    },
    //上传PDF
    beforeUploadPDF(file) {
-      console.log(file);
-      console.log(this.fileList);
+      // console.log(file);
+      // console.log(this.fileList);
      const isPDF = file.type === "application/pdf";
      if (!isPDF) {
        this.$message.error("请上传PDF格式文件!");
@@ -979,7 +994,28 @@ export default {
      //this.fileList3 = fileList.slice(-3);
    },
    //上传mp4
-    beforeUploadMp4(file) {},
+    beforeUploadMp4(file) {
+      console.log(file);
+      const isMP4 = file.type === "video/mp4";
+      if (!isMP4) {
+        this.$message.error("请上传MP4格式文件!");
+      } else {
+        openLoading(vm);
+        doUpload(
+          vm,
+          file,
+          getFilePath(file, null),
+          "preview4",
+          "progress1",
+          1
+        ).then(function(path) {
+          closeLoading(vm);
+          console.log(path);
+          vm.formData.attachmentUrl2 = path.fullPath;
+          vm.$message.success("上传成功");
+        });
+      }
+    },
    //上传图片校验
    beforeAvatarUpload(file, fileLimit) {
      const isJPG = file.type === "image/jpeg";
@@ -1508,7 +1544,7 @@ export default {
    //获取科室信息
    getDepartment() {
      let req = {
-        projectId: this.projectId,
+        projectId: this.projectId
      };
      vm.GET("scope/v1/department", req).then(res => {
        if (res.code == "000000") {
@@ -1774,6 +1810,11 @@ export default {
        width: 84px;
        height: 100px;
      }
+      .bg-video {
+        float: left;
+        width: 100px;
+        height: 100px;
+      }
      .limit-text {
        float: left;
        margin-left: 10px;

--- a/src/views/education/item-manager.vue
+++ b/src/views/education/item-manager.vue
@@ -10,7 +10,7 @@
              <el-input v-model="formInline.projectName" size="mini" placeholder="请输入项目名称"></el-input>
            </el-form-item>
          </el-col>
-          <el-col :span="8">
+          <!-- <el-col :span="8">
            <el-form-item label="项目时间：">
              <el-date-picker
                v-model="formInline.duringTime"
@@ -21,34 +21,54 @@
                value-format="yyyy-MM-dd HH:mm:ss"
              ></el-date-picker>
            </el-form-item>
+          </el-col>-->
+          <el-col :span="6">
+            <el-form-item label="项目时间：">
+              <el-date-picker
+                v-model="formInline.projectBegintime"
+                size="mini"
+                type="date"
+                placeholder="请选择开始时间"
+                value-format="yyyy-MM-dd HH:mm:ss"
+              ></el-date-picker>
+            </el-form-item>
          </el-col>
-          <el-col :span="5">
-            <el-form-item label="发布状态：">
-              <el-select size="mini" v-model="formInline.projectStatus" placeholder="请选择发布状态">
-                <el-option
-                  v-for="item in optionStatus"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                ></el-option>
-              </el-select>
+          <el-col :span="4">
+            <el-form-item label="~">
+              <el-date-picker
+                v-model="formInline.projectEndtime"
+                size="mini"
+                type="date"
+                placeholder="请选择结束时间"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                :picker-options="pickerBeginDateAfter"
+              ></el-date-picker>
            </el-form-item>
          </el-col>
-          <el-col :span="6" style="padding:0;text-align:right;padding-right:15px;">
+          <el-col :span="9" style="padding:0;text-align:right;padding-right:15px;">
            <el-button type="primary" size="small" @click="getProjectList">查询</el-button>
            <el-button type="default" size="small" @click="resetForm" style="margin-left:0;">重置</el-button>
          </el-col>
        </el-form>
      </el-row>
+      <el-row>
+        <el-col :span="5">
+          <el-select size="mini" v-model="formInline.projectStatus" placeholder="请选择发布状态">
+            <el-option
+              v-for="item in optionStatus"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-col>
+      </el-row>
      <el-form :model="formInline" class="demo-form-inline">
        <el-form-item>
          <el-button class="add-button" size="small" type="primary" @click="toPage()">新建项目</el-button>
        </el-form-item>
      </el-form>
-      <el-table
-        :data="tableData"
-        :header-cell-style="{background:'#FAFAFA',color:'#000'}"
-      >
+      <el-table :data="tableData" :header-cell-style="{background:'#FAFAFA',color:'#000'}">
        <el-table-column prop="id" label="ID编号" min-width="100" align="center"></el-table-column>
        <el-table-column prop="projectName" label="项目名称" min-width="100" align="center"></el-table-column>
        <el-table-column prop="createdName" label="创建人" align="center"></el-table-column>
@@ -197,8 +217,15 @@ export default {
        projectEndtime: "",
        projectStatus: "",
        pageNo: 1,
-        pageSize: 10,
-        duringTime: ""
+        pageSize: 10
+      },
+      pickerBeginDateAfter: {
+        disabledDate: time => {
+          let beginDateVal = this.formInline.projectBegintime;
+          if (beginDateVal) {
+            return time.getTime() < beginDateVal;
+          }
+        }
      }
    };
  },
@@ -236,7 +263,7 @@ export default {
    //查询项目列表
    getProjectList() {
      let req = {};
-      req = this.setParam(this.formInline);
+      req = this.formInline;
      openLoading(vm);
      vm.GET("portalInfo/getProjectList", req).then(res => {
        closeLoading(vm);