codeMan 3 роки тому
батько
коміт
97e366f47f

+ 2 - 0
src/HManagement/archives/index.vue

@@ -105,6 +105,8 @@ export default {
       this.$api.requested(this.params).then(res => {
         this.total = res.total
         this.fileData = res.data
+        console.log(this.fileData);
+        
       })
     },
     //监听文件单击事件

+ 170 - 168
src/HManagement/archives_sc/archives_details/index.vue

@@ -16,7 +16,7 @@
           <span class="people">25人学习</span>
         </div>
       </div>
-      
+
     </div>
     <div class="right">
       <div class="header">
@@ -29,7 +29,9 @@
       <div class="body">
         <div class="descript">
           <p class="title">课程描述</p>
-          <p class="content">产品知识要点,产品知识要点,产品知识要点,产品知识要点,产品知识要点,产品知识要点产品知识要点,产品知识要点,产品知识要点,产品知识要点,产品知识要点,产品知识要点产品知识要点,产品知识要点,产品知识要点,产品知识要点,产品知识要点,产品知识要点</p>
+          <p class="content">
+            产品知识要点,产品知识要点,产品知识要点,产品知识要点,产品知识要点,产品知识要点产品知识要点,产品知识要点,产品知识要点,产品知识要点,产品知识要点,产品知识要点产品知识要点,产品知识要点,产品知识要点,产品知识要点,产品知识要点,产品知识要点
+          </p>
         </div>
         <div class="main">
           <p class="title">课件</p>
@@ -65,28 +67,29 @@
 <script>
 export default {
   name: 'index',
-  data() {
+  data () {
     return {
-        param: {
-          "accesstoken": "305def8607e623c06f118e94adcebaf1",
-          "classname": "saletool.courseware.courseware",
-          "method": "selectDetail",
-          "content": {
-              "sat_coursewareid": 12
-          }
-        },
+      param: {
+        "accesstoken": "305def8607e623c06f118e94adcebaf1",
+        "classname": "saletool.courseware.courseware",
+        "method": "selectDetail",
+        "content": {
+          "sat_coursewareid": ''
+        }
+      }
     };
   },
-  computed:{
+  computed: {
   },
-  watch:{
+  watch: {
   },
-  created() {
+  created () {
     this.getDetailData()
   },
   methods: {
-    getDetailData() {
-      this.$api.requested(this.param).then( res => {
+    getDetailData () {
+      this.param.content.sat_coursewareid = this.$route.query.id
+      this.$api.requested(this.param).then(res => {
         console.log(res);
       })
     }
@@ -95,157 +98,156 @@ export default {
 </script>
 
 <style scoped>
-  * {
-    box-sizing: border-box;   
-  }
-  .detail {
-    width: 100%;
-    height: 100%;
-    display: flex;
-    font-family: PingFang SC-Bold, PingFang SC;
-  }
-  .detail .left {
-    width: calc(100% - 475px);
-  }
-  .detail .left .left-box {
-    width: 100%;
-    height: 100%;
-    background: #EEEEEE;
-    border-radius: 4px 4px 0px 0px;
-  }
-  .detail .left .left-box .top {
-    height: calc(100% - 73px);
-    position: relative;
-  }
-  .detail .left .left-box .top video {
-    width: 100%;
-    height: 100%;
-  }
-  .detail .left .left-box .top .see {
-    position: absolute;
-    left: 50%;
-    top: 50%;
-    transform: translate(-50%,-50%);
-    width: 120px;
-    height: 180px;
-  }
-  .detail .left .left-box .top .see .image {
-    width: 100%;
-    height: 120px;
-    padding: 0 11px;
-  }
-  .detail .left .left-box .top .see .image img {
-    width: 100%;
-    height: 100%;
-  }
-  .detail .left .left-box .top .see .el-button {
-    position: absolute;
-    width: 100%;
-    margin-top: 20px;
-  }
-  .detail .left .left-box .footer {
-    height: 73px;
-    padding: 0 30px;
-    background: #000000;
-    display: flex;
-    line-height: 73px;
-    justify-content: space-between;
-  }
-
-  .detail .left .left-box .footer span:first-child {
-    font-size: 24px;
-    font-family: PingFang SC-Bold, PingFang SC;
-    font-weight: bold;
-    color: #FFFFFF;
-  }
-  .detail .left .left-box .footer span:last-child {
-    font-size: 16px;
-    font-family: PingFang SC-Regular, PingFang SC;
-    font-weight: 400;
-    color: #FFFFFF;
-  }
-  .detail .right {
-    width: 475px;
-    background: #FFFFFF;
-  }
-  .detail .right .header {
-    padding: 30px;
-  }
-  .detail .right .header .title {
-    font-size: 16px;
-    font-weight: bold;
-    color: #333333;
-    margin-bottom: 20px;
-  }
-  .detail .right .header .info {
-    font-weight: 400;
-    color: #666666;
-    display: flex;
-    justify-content: space-between;
-    font-size: 14px;
-  }
-  .detail .right .body {
-    padding: 30px;
-    border-top: 1px solid #DDDDDD;
-  }
-  .detail .right .body .descript {
-    margin-bottom: 40px;
-  }
-  .detail .right .body .descript .title {
-    font-size: 16px;
-    font-weight: bold;
-    margin-bottom: 20px;
-  }
-  .detail .right .body .descript .content {
-    font-size: 14px;
-  }
-  .detail .right .body .main {
+* {
+  box-sizing: border-box;
+}
+.detail {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: space-between;
+  font-family: PingFang SC-Bold, PingFang SC;
+}
+.detail .left {
+  width: calc(100% - 500px);
+}
+.detail .left .left-box {
+  width: 100%;
+  height: 880px;
+  background: #eeeeee;
+  border-radius: 4px 4px 0px 0px;
+}
+.detail .left .left-box .top {
+  height: 807px;
+  position: relative;
+}
+.detail .left .left-box .top video {
+  width: 100%;
+  height: 100%;
+}
+.detail .left .left-box .top .see {
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
+  width: 120px;
+  height: 180px;
+}
+.detail .left .left-box .top .see .image {
+  width: 100%;
+  height: 120px;
+  padding: 0 11px;
+}
+.detail .left .left-box .top .see .image img {
+  width: 100%;
+  height: 100%;
+}
+.detail .left .left-box .top .see .el-button {
+  position: absolute;
+  width: 100%;
+  margin-top: 20px;
+}
+.detail .left .left-box .footer {
+  height: 73px;
+  padding: 0 30px;
+  background: #000000;
+  display: flex;
+  line-height: 73px;
+  justify-content: space-between;
+}
 
-  }
-  .detail .right .body .main .title {
-    margin-bottom: 20px;
-  }
-  .detail .right .body .main .file {
-    width: 415px;
-    margin-bottom: 20px;
-  }
-  .detail .right .body .main .file .file-item {
-    width: 100%;
-    height: 96px;
-    padding: 16px 30px 16px 16px;
-    margin-bottom: 10px;
-    border: 1px solid #CCCCCC;
-    border-radius: 4px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-  }
-  .detail .right .body .main .file .file-item .left1 {
-    display: flex;
-    justify-content: space-between;
-    margin-right: 22px;
-    align-items: center;
-  }
-  .detail .right .body .main .file .file-item .left1 img {
-    width: 53px;
-    height: 64px;
-    margin-right: 16px;
-  }
-  .detail .right .body .main .file .file-item .left1 .info {
-    
-  }
-  .detail .right .body .main .file .file-item .left1 .info .title {
-    font-size: 16px;
-    font-weight: bold;
-    color: #333333;
-    margin-bottom: 16px;
-  }
-  .detail .right .body .main .file .file-item .left1 .info .time {
-    font-size: 12px;
-    font-weight: 400;
-    color: #999999;
-  }
-  .detail .right .body .main .file .file-item .right {
-    
-  }
+.detail .left .left-box .footer span:first-child {
+  font-size: 24px;
+  font-family: PingFang SC-Bold, PingFang SC;
+  font-weight: bold;
+  color: #ffffff;
+}
+.detail .left .left-box .footer span:last-child {
+  font-size: 16px;
+  font-family: PingFang SC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #ffffff;
+}
+.detail .right {
+  width: 475px;
+  height: 984px;
+  background: #ffffff;
+}
+.detail .right .header {
+  padding: 30px;
+}
+.detail .right .header .title {
+  font-size: 16px;
+  font-weight: bold;
+  color: #333333;
+  margin-bottom: 20px;
+}
+.detail .right .header .info {
+  font-weight: 400;
+  color: #666666;
+  display: flex;
+  justify-content: space-between;
+  font-size: 14px;
+}
+.detail .right .body {
+  padding: 30px;
+  border-top: 1px solid #dddddd;
+}
+.detail .right .body .descript {
+  margin-bottom: 40px;
+}
+.detail .right .body .descript .title {
+  font-size: 16px;
+  font-weight: bold;
+  margin-bottom: 20px;
+}
+.detail .right .body .descript .content {
+  font-size: 14px;
+}
+.detail .right .body .main {
+}
+.detail .right .body .main .title {
+  margin-bottom: 20px;
+}
+.detail .right .body .main .file {
+  width: 415px;
+  margin-bottom: 20px;
+}
+.detail .right .body .main .file .file-item {
+  width: 100%;
+  height: 96px;
+  padding: 16px 30px 16px 16px;
+  margin-bottom: 10px;
+  border: 1px solid #cccccc;
+  border-radius: 4px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.detail .right .body .main .file .file-item .left1 {
+  display: flex;
+  justify-content: space-between;
+  margin-right: 22px;
+  align-items: center;
+}
+.detail .right .body .main .file .file-item .left1 img {
+  width: 53px;
+  height: 64px;
+  margin-right: 16px;
+}
+.detail .right .body .main .file .file-item .left1 .info {
+}
+.detail .right .body .main .file .file-item .left1 .info .title {
+  font-size: 16px;
+  font-weight: bold;
+  color: #333333;
+  margin-bottom: 16px;
+}
+.detail .right .body .main .file .file-item .left1 .info .time {
+  font-size: 12px;
+  font-weight: 400;
+  color: #999999;
+}
+.detail .right .body .main .file .file-item .right {
+}
 </style>

+ 16 - 72
src/HManagement/archives_sc/index.vue

@@ -23,76 +23,14 @@
                            @sortTypeChange="sortTypeChange"></hot-new-control>
       </div>
       <div class="file">
-        <div class="file-item" @click="itemClick()">
-          <div class="top"></div>
-          <div class="bottom">
-            <p class="title">销售技巧培训小白课</p>
-            <p class="descript">1111111111111111111111111</p>
-            <p class="people">5人学习</p>
-          </div>
-        </div>
-        <div class="file-item">
-          <div class="top"></div>
-          <div class="bottom">
-            <p class="title">销售技巧培训小白课</p>
-            <p class="descript">1111111111111111111111111</p>
-            <p class="people">5人学习</p>
-          </div>
-        </div>
-        <div class="file-item">
-          <div class="top"></div>
-          <div class="bottom">
-            <p class="title">销售技巧培训小白课</p>
-            <p class="descript">1111111111111111111111111</p>
-            <p class="people">5人学习</p>
-          </div>
-        </div>
-        <div class="file-item">
-          <div class="top"></div>
-          <div class="bottom">
-            <p class="title">销售技巧培训小白课</p>
-            <p class="descript">1111111111111111111111111</p>
-            <p class="people">5人学习</p>
-          </div>
-        </div>
-        <div class="file-item">
-          <div class="top"></div>
-          <div class="bottom">
-            <p class="title">销售技巧培训小白课</p>
-            <p class="descript">1111111111111111111111111</p>
-            <p class="people">5人学习</p>
-          </div>
-        </div>
-        <div class="file-item">
-          <div class="top"></div>
-          <div class="bottom">
-            <p class="title">销售技巧培训小白课</p>
-            <p class="descript">1111111111111111111111111</p>
-            <p class="people">5人学习</p>
-          </div>
-        </div>
-        <div class="file-item">
-          <div class="top"></div>
-          <div class="bottom">
-            <p class="title">销售技巧培训小白课</p>
-            <p class="descript">1111111111111111111111111</p>
-            <p class="people">5人学习</p>
-          </div>
-        </div>
-        <div class="file-item">
-          <div class="top"></div>
-          <div class="bottom">
-            <p class="title">销售技巧培训小白课</p>
-            <p class="descript">1111111111111111111111111</p>
-            <p class="people">5人学习</p>
+        <div class="file-item" v-for="(item,index) in list" :key="index" @click="itemClick(item.sat_coursewareid)">
+          <div class="top">
+            <img src="@/assets/1.jpg" alt="">
           </div>
-        </div>
-        <div class="file-item">
-          <div class="top"></div>
           <div class="bottom">
-            <p class="title">销售技巧培训小白课</p>
-            <p class="descript">1111111111111111111111111</p>
-            <p class="people">5人学习</p>
+            <p class="title">{{item.title}}</p>
+            <p class="descript">{{item.notes}}</p>
+            <p class="people">{{item.readcount}}人学习</p>
           </div>
         </div>
       </div>
@@ -121,7 +59,6 @@ export default {
           "where": {
             "condition": "",
             "sorttype": 1,
-            "sat_courseware_classid": ''
           }
         }
       },
@@ -182,9 +119,12 @@ export default {
 
     },
     //单击进入详情
-    itemClick() {
+    itemClick(id) {
       this.$router.push({
-        path: '/archives_sc_detail'
+        path: '/archives_sc_detail',
+        query: {
+          id:id
+        }
       })
     }
   },
@@ -224,6 +164,7 @@ export default {
     border: 1px solid #CCCCCC;
     transition: all 0.2s ease-in;
     margin: 0 16px 16px 0;
+    cursor: pointer;
   }
   .normal-card .file .file-item:hover {
     box-shadow: 0px 3px 6px 1px rgba(0, 0, 0, 0.16);
@@ -236,7 +177,10 @@ export default {
     border-top-left-radius: 4px;
   }
   .normal-card .file .file-item .top img {
-    
+    width: 100%;
+    height: 100%;
+    border-top-right-radius: 4px;
+    border-top-left-radius: 4px;
   }
   .normal-card .file .file-item .bottom {
     padding: 10px 20px 16px 16px;

+ 8 - 8
src/HManagement/notice/compoents/FileItem.vue

@@ -1,8 +1,8 @@
 <template>
-  <div class="item-file">
+  <div class="item-file" :style="{width:itemStyle.itemWidth + 'px'}">
     <div class="left">
-      <div class="icon">
-        <img src="../../../assets/file_icons/image.png" alt />
+      <div class="icon" :style="{width:itemStyle.img.width+'px',height:itemStyle.img.height+'px',}">
+        <img src="../../../assets/file_icons/image.png" alt  />
       </div>
       <div class="text">
         <p>销售策略</p>
@@ -25,7 +25,8 @@ export default {
     };
   },
   props: {
-    isDownLoad: Boolean
+    isDownLoad: Boolean,
+    itemStyle: Object
   },
   computed: {
   },
@@ -38,11 +39,10 @@ export default {
 <style scoped>
 .item-file {
   width: 334px;
-  height: 44px;
   background: #ffffff;
   border-radius: 4px 4px 4px 4px;
   border: 1px solid #cccccc;
-  margin: 0 10px 10px 0;
+  margin: 0 20px 10px 0;
   padding: 12px 16px;
   display: flex;
   justify-content: space-between;
@@ -57,8 +57,8 @@ export default {
   margin-right: 16px;
 }
 .item-file .left .icon img {
-  width: 29px;
-  height: 29px;
+  width: 100%;
+  height: 100%;
 }
 .item-file .left .text {
 }

+ 7 - 4
src/HManagement/notice/index.vue

@@ -85,13 +85,16 @@ export default {
 };
 </script>
 <style scoped>
+*{
+  box-sizing: border-box;
+}
 .normal-card {
   width: 1200px;
+  height: 100%;
   padding: 20px 0 0 30px;
   position: absolute;
   left: 50%;
   transform: translateX(-50%);
-  margin-top: 10px;
   font-family: PingFang SC-Regular;
   box-sizing: border-box;
 }
@@ -101,9 +104,9 @@ export default {
 }
 
 .normal-card .el-pagination {
-  margin: 0 0 10px 0;
-  float: right;
-  padding-right: 30px;
+  position: absolute;
+  right: 16px;
+  bottom: 0;
 }
 
 </style>

+ 0 - 0
src/HManagement/submitedit/index.vue


+ 0 - 169
src/HManagement/submitedit_action/index.vue

@@ -1,169 +0,0 @@
-<template>
-  <div class="normal-card">
-    <!--提报选择-->
-      <select-panl :titleLists="titleLists"
-                   @CurrentSelectType="CurrentSelectType"
-                   ref="selectPanl">
-      </select-panl>
-      <div class="list">
-        <div class="list-item" @click="itemClick()">
-          <img src="@/assets/file_icons/image.png" alt="">
-          <div class="descript">
-            <p class="title">提报标题提报标题提报标题提报标题提报标题</p>
-            <div class="info1">
-              <p class="time">2022-01-01 ~ 2022-01-01</p>
-              <span class="tag">未读</span>
-              <span class="tag">未提报</span>
-            </div>
-          </div>
-        </div>
-        <div class="list-item">
-          <img src="@/assets/file_icons/image.png" alt="">
-          <div class="descript">
-            <p class="title">提报标题提报标题提报标题提报标题提报标题</p>
-            <div class="info1">
-              <p class="time">2022-01-01 ~ 2022-01-01</p>
-              <span class="tag">未读</span>
-              <span class="tag">未提报</span>
-            </div>
-          </div>
-        </div>
-        <div class="list-item">
-          <img src="@/assets/file_icons/image.png" alt="">
-          <div class="descript">
-            <p class="title">提报标题提报标题提报标题提报标题提报标题</p>
-            <div class="info1">
-              <p class="time">2022-01-01 ~ 2022-01-01</p>
-              <span class="tag">未读</span>
-              <span class="tag">未提报</span>
-            </div>
-          </div>
-        </div>
-      </div>
-      <!--分页-->
-      <pagination :total="20"
-                  :pageSize="3"
-                  :currentPage="1"
-                  @pageChange="pageChange">
-      </pagination>
-  </div>
-</template>
-
-<script>
-import Pagination from '@/components/pagination/Pagination'
-import SelectPanl from '@/components/select-panl/SelectPanl'
-export default {
-  name: 'index',
-  data () {
-    return {
-      param: {
-        "accesstoken": "7dd56a865a9c6759a52c35b6da522dcb",
-        "classname": "saletool.submitedit.submitedit",
-        "method": "select_inprogresslist",
-        "content": {
-
-        }
-      },
-      //类型选择数据
-      titleLists: [
-        { name: '一事一报',type: 'one'},
-        { name: '一事多报',type: 'two'},
-      ],
-    }
-  },
-  components: {
-    Pagination,
-    SelectPanl
-  },
-  computed: {
-  },
-  watch: {
-  },
-  created() {
-    this.getSubmitEditAction()
-  },
-  methods: {
-    //获取进行中提报
-    getSubmitEditAction() {
-      this.$api.requested(this.param).then( res => {
-        console.log(res);
-        
-      })
-    },
-    pageChange() {
-
-    },
-    CurrentSelectType() {
-
-    },
-    itemClick() {
-      this.$router.push({
-        path: '/submiteditmag_detail'
-      })
-    }
-  },
-};
-</script>
-
-<style scoped>
-  * {
-    box-sizing: border-box;
-  }
-  .normal-card {
-    height: 100%;
-    padding: 18px 20px 10px 10px;
-    position: relative;
-  }
-  .normal-card .list {
-    display: flex;
-    flex-wrap: wrap;
-    margin-top: 16px;
-  }
-  .normal-card .list .list-item {
-    width: 525px;
-    height: 93px;
-    background: #FFFFFF;
-    border-radius: 4px 4px 4px 4px;
-    border: 1px solid #CCCCCC;
-    margin: 0 16px 16px 0;
-    padding: 22px 20px;
-    display: flex;
-  }
-  .normal-card .list .list-item img {
-    width: 40px;
-    height: 48px;
-    margin-right: 20px;
-  }
-  .normal-card .list .list-item .descript {
-    
-  }
-  .normal-card .list .list-item .descript .title {
-    font-size: 14px;
-    font-weight: 500;
-    color: #333333;
-    margin-bottom: 13px;
-  }
-  .normal-card .list .list-item .descript .info1 {
-    display: flex;
-    align-items: center;
-  }
-  .normal-card .list .list-item .descript .info1 .time {
-    font-size: 12px;
-    font-weight: 400;
-    color: #666666;
-  }
-  .normal-card .list .list-item .descript .info1 .tag {
-    margin-left: 12px;
-    display: block;
-    font-size: 12px;
-    font-weight: normal;
-    color: #FF3B30;
-    padding: 4px 6px;
-    background: #FFEDEC;
-  }
-  /deep/ .el-pagination {
-    position:absolute;
-    bottom: 0;
-    right: 16px;
-  }
-</style>

+ 101 - 0
src/HManagement/submitedit_details/components/SubmiteditAction.vue

@@ -0,0 +1,101 @@
+<template>
+  <el-drawer title="提报上传" :visible.sync="isFileInfoPanlShow">
+    <el-button type="warning" size="small">保存</el-button>
+    <div class="content" style="word-break:break-all">
+      <p>提报内容</p>
+      <el-input
+        type="textarea"
+        :autosize="{ minRows: 2, maxRows: 4}"
+        placeholder="请输入内容"
+        v-model="textarea2">
+</el-input>
+    </div>
+    <div class="file-box">
+      <p>提报附件</p>
+      <div class="file">
+        <file-item :isDownLoad="false" :itemStyle="itemDrawerStyle"></file-item>
+        <file-item :isDownLoad="false" :itemStyle="itemDrawerStyle"></file-item>
+        <file-item :isDownLoad="false" :itemStyle="itemDrawerStyle"></file-item>
+        <file-item :isDownLoad="false" :itemStyle="itemDrawerStyle"></file-item>
+      </div>
+    </div>
+    <el-button type="primary" size="small">下载文件</el-button>
+    <div class="upload">
+      <el-button> <i class="iconfont icon-a-tuiguangsucaishangchuan1" style="color:#3874F6"></i> 上传</el-button>
+    </div>
+  </el-drawer>
+</template>
+
+<script>
+import FileItem from '@/HManagement/notice/compoents/FileItem'
+export default {
+  name: 'SubmiteditItemInfo',
+  data () {
+    return {
+      isFileInfoPanlShow:false,
+      itemDrawerStyle: {
+        itemWidth:460,
+        img: {
+          width:53,
+          height:64
+        },
+        title:16,
+        descript: 12
+      },
+      textarea2: ''
+    };
+  },
+  components: {
+    FileItem,
+  },
+  computed: {
+  },
+  watch: {
+  },
+  methods: {},
+};
+</script>
+
+<style scoped>
+  * {
+    box-sizing: border-box;
+  }
+  /deep/ .el-drawer__header {
+    margin-bottom: 0;
+  }
+  /deep/ .el-drawer__body {
+    padding: 30px;
+  }
+  /deep/ .el-drawer {
+    width: 1052px !important;
+  }
+  .el-drawer__body .el-button {
+    margin-bottom: 30px;
+  }
+  .el-drawer__body .content p:first-child {
+    font-size: 16px;
+    font-weight: bold;
+    color: #333333;
+    margin-bottom: 20px;
+  }
+  .el-drawer__body .content p:last-child {
+    font-size: 16px;
+    font-weight: 400;
+    color: #666666;
+    margin-bottom: 40px;
+
+  }
+  .el-drawer .file-box p {
+    margin: 20px 0 20px 0;
+  }
+  .el-drawer .file-box .file {
+    display: flex;
+    flex-wrap: wrap;
+  }
+  .upload {
+    display: flex;
+  }
+  .upload .el-button {
+    width: 100%;
+  }
+</style>

+ 74 - 0
src/HManagement/submitedit_details/components/SubmiteditItemInfo.vue

@@ -0,0 +1,74 @@
+<template>
+  <el-drawer title="详情" :visible.sync="isFileInfoPanlShow">
+    <div class="content" style="word-break:break-all">
+      <p>提报内容</p>
+      <p>
+        xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+      </p>
+    </div>
+    <div class="file-box">
+      <p>提报条件</p>
+      <div class="file">
+        <file-item :isDownLoad="false" :itemStyle="itemDrawerStyle"></file-item>
+      </div>
+    </div>
+    <el-button type="primary" size="small">下载文件</el-button>
+  </el-drawer>
+</template>
+
+<script>
+import FileItem from '@/HManagement/notice/compoents/FileItem'
+export default {
+  name: 'SubmiteditItemInfo',
+  data () {
+    return {
+      isFileInfoPanlShow:false,
+      itemDrawerStyle: {
+        itemWidth:486,
+        img: {
+          width:53,
+          height:64
+        },
+        title:16,
+        descript: 12
+      }
+    };
+  },
+  components: {
+    FileItem,
+  },
+  computed: {
+  },
+  watch: {
+  },
+  methods: {},
+};
+</script>
+
+<style scoped>
+  * {
+    box-sizing: border-box;
+  }
+  /deep/ .el-drawer__body {
+    padding: 30px;
+  }
+  /deep/ .el-drawer {
+    width: 550px !important;
+  }
+  .el-drawer__body .content p:first-child {
+    font-size: 16px;
+    font-weight: bold;
+    color: #333333;
+    margin-bottom: 20px;
+  }
+  .el-drawer__body .content p:last-child {
+    font-size: 16px;
+    font-weight: 400;
+    color: #666666;
+    margin-bottom: 40px;
+
+  }
+  .el-drawer .file-box p {
+    margin-bottom: 20px;
+  }
+</style>

+ 150 - 2
src/HManagement/submitedit_details/index.vue

@@ -1,22 +1,170 @@
 <template>
-  <div></div>
+  <div class="index">
+    <div class="normal-card">
+      <el-button type="primary" size="small" @click="$refs.submitAction.isFileInfoPanlShow = true">提报</el-button>
+      <img src="@/assets/refresh.png" alt="">
+    </div>
+    <div class="normal-card">
+      <p>每日提交提报</p>
+      <p>时间: 2000:00:00 12:11:11</p>
+      <p>提报要求:请认真写完!!!</p>
+      <p>附件下载</p>
+      <div class="file">
+        <file-item :isDownLoad="true" :itemStyle="itemStyle"></file-item>
+      </div>
+    </div>
+    <div class="normal-card">
+      <p>提报记录</p>
+      <div class="submit-edit">
+        <div class="submit-item" @click="itemClick()">
+          <p class="title">提报内容文本宽度固定,超过换行。若填写的内容有换行段落,在此处段落之间用空格隔开显示,如:段落 段落 段落</p>
+          <p class="descript">xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx</p>
+          <div class="info1">
+            <span>提报时间:000000000</span>
+            <span>附件:2</span>
+          </div>
+        </div>
+      </div>
+      <div class="pagin">
+        <pagination :total="20"
+                :pageSize="4"
+                :currentPage="1"
+                @pageChange="pageChange">
+        </pagination>
+      </div>
+    </div>
+    <!--提报详情-->
+    <submit-item-info></submit-item-info>
+    <!--提报上传-->
+    <submit-action ref="submitAction"></submit-action>
+  </div>
 </template>
 
 <script>
+import FileItem from '@/HManagement/notice/compoents/FileItem'
+import Pagination from '@/components/pagination/Pagination'
+import SubmitItemInfo from '@/HManagement/submitedit_details/components/SubmiteditItemInfo'
+import SubmitAction from '@/HManagement/submitedit_details/components/SubmiteditAction'
 export default {
   name: 'index',
   data() {
     return {
+      itemStyle: {
+        itemWidth:334,
+        img: {
+          width:29,
+          height:29
+        },
+        title:14,
+        descript: 10
+      },
+      
     };
   },
+  components: {
+    FileItem,
+    Pagination,
+    SubmitItemInfo,
+    SubmitAction
+  },
   computed:{
   },
   watch:{
   },
-  methods: {},
+  methods: {
+    pageChange() {
+
+    },
+    itemClick() {
+    }
+  },
 };
 </script>
 
 <style scoped>
+  * {
+    box-sizing: border-box;
+  }
+  .index .normal-card {
+    margin-bottom: 16px;
+  }
+  .index .normal-card:nth-child(1) {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+  .index .normal-card:nth-child(2) p {
+  }
+  .index .normal-card:nth-child(2) p:nth-child(1) {
+    font-size: 14px;
+    font-weight: bold;
+    color: #333333;
+  }
+  .index .normal-card:nth-child(2) p:nth-child(2) {
+    font-size: 14px;
+    font-weight: 400;
+    color: #666666;
+
+  }
+  .index .normal-card:nth-child(2) p:nth-child(3) {
+    font-size: 14px;
+    font-weight: 400;
+    color: #666666;
+  }
+  .index .normal-card:nth-child(2) p:nth-child(4) {
+    font-size: 14px;
+    font-weight: bold;
+    color: #333333;
+    margin: 20px 0 10px 0;
+  }
+  .index .normal-card:nth-child(2) .file {
+    display: flex;
+    flex-wrap: wrap;
+  }
+  .index .normal-card:nth-child(3) {
+    padding-bottom: 0;
+    height: 100%;
+  }
+  .index .normal-card:nth-child(3) p {
+    margin-bottom: 34px;
+  }
+  .index .normal-card:nth-child(3) .submit-edit {
+    
+  }
+  .index .normal-card:nth-child(3) .submit-edit .submit-item {
+    padding: 20px 0;
+  }
+  .index .normal-card:nth-child(3) .submit-edit .submit-item:hover {
+    background: #FAFAFA;
+  }
+  .index .normal-card:nth-child(3) .submit-edit .submit-item p {
+    margin-bottom: 10px;
+  }
+  .index .normal-card:nth-child(3) .submit-edit .submit-item .title {
+    font-size: 14px;
+    font-weight: 400;
+    color: #333333;
+  }
+  .index .normal-card:nth-child(3) .submit-edit .submit-item .descript {
+    font-size: 12px;
+    font-weight: 400;
+    color: #333333;
+  }
+  .index .normal-card:nth-child(3) .submit-edit .submit-item .info1 {
+    font-size: 12px;
+    font-weight: 400;
+    color: #999999;
+  }
+  .index .normal-card:nth-child(3) .submit-edit .submit-item .info1 span:first-child {
+ 
+  }
+  .index .normal-card:nth-child(3) .submit-edit .submit-item .info1 span:last-child {
+    margin-left: 50px;
+  }
+  .index .normal-card:nth-child(3) .pagin {
+    display: flex;
+    flex-direction: row-reverse;
+  }
 
+  
 </style>

+ 2 - 2
src/HManagement/submiteditmag_hostoiry/index.vue → src/HManagement/submitedit_more/index.vue

@@ -66,8 +66,8 @@ export default {
       },
       //类型选择数据
       titleLists: [
-        { name: '一事一报',type: 'one'},
-        { name: '一事多报',type: 'two'},
+        { name: '进行中',type: 'one'},
+        { name: '历史提报',type: 'two'},
       ],
     }
   },

+ 184 - 0
src/HManagement/submitedit_one/index.vue

@@ -0,0 +1,184 @@
+<template>
+  <div class="normal-card">
+    <!--提报选择-->
+    <select-panl :titleLists="titleLists" @CurrentSelectType="CurrentSelectType" ref="selectPanl">
+    </select-panl>
+    <h-upload></h-upload>
+    <div class="list">
+      <div class="list-item" @click="itemClick()">
+        <div class="left">
+          <img src="@/assets/file_icons/image.png" alt="">
+          <div class="descript">
+            <p class="title">提报标题提报标题提报标题提报标题提报标题</p>
+            <div class="info1">
+              <p class="time">2022-01-01 ~ 2022-01-01</p>
+              <span class="tag">已提报: 0</span>
+            </div>
+          </div>
+        </div>
+        <div class="right">已读</div>
+      </div>
+      <div class="list-item" @click="itemClick()">
+        <div class="left">
+          <img src="@/assets/file_icons/image.png" alt="">
+          <div class="descript">
+            <p class="title">提报标题提报标题提报标题提报标题提报标题</p>
+            <div class="info1">
+              <p class="time">2022-01-01 ~ 2022-01-01</p>
+              <span class="tag">已提报: 0</span>
+            </div>
+          </div>
+        </div>
+        <div class="right">已读</div>
+      </div>
+      <div class="list-item" @click="itemClick()">
+        <div class="left">
+          <img src="@/assets/file_icons/image.png" alt="">
+          <div class="descript">
+            <p class="title">提报标题提报标题提报标题提报标题提报标题</p>
+            <div class="info1">
+              <p class="time">2022-01-01 ~ 2022-01-01</p>
+              <span class="tag">已提报: 0</span>
+            </div>
+          </div>
+        </div>
+        <div class="right">已读</div>
+      </div>
+    </div>
+    <!--分页-->
+    <pagination :total="20" :pageSize="3" :currentPage="1" @pageChange="pageChange">
+    </pagination>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/pagination/Pagination'
+import SelectPanl from '@/components/select-panl/SelectPanl'
+import hUpload from '@/components/upload/hw_obs_upload'
+export default {
+  name: 'index',
+  data () {
+    return {
+      param: {
+        "accesstoken": "7dd56a865a9c6759a52c35b6da522dcb",
+        "classname": "saletool.submitedit.submitedit",
+        "method": "select_inprogresslist",
+        "content": {
+
+        }
+      },
+      //类型选择数据
+      titleLists: [
+        { name: '进行中', type: 'one' },
+        { name: '历史提报', type: 'two' },
+      ],
+    }
+  },
+  components: {
+    Pagination,
+    SelectPanl,
+    hUpload
+  },
+  computed: {
+  },
+  watch: {
+  },
+  created () {
+    this.getSubmitEditAction()
+  },
+  methods: {
+    //获取进行中提报
+    getSubmitEditAction () {
+      this.$api.requested(this.param).then(res => {
+        console.log(res);
+
+      })
+    },
+    pageChange () {
+
+    },
+    CurrentSelectType () {
+
+    },
+    itemClick () {
+      this.$router.push({
+        path: '/submiteditmag_detail'
+      })
+    }
+  },
+};
+</script>
+
+<style scoped>
+* {
+  box-sizing: border-box;
+}
+.normal-card {
+  height: 100%;
+  padding: 18px 20px 10px 10px;
+  position: relative;
+}
+.normal-card .list {
+  display: flex;
+  flex-wrap: wrap;
+  margin-top: 16px;
+}
+.normal-card .list .list-item {
+  width: 525px;
+  height: 93px;
+  background: #ffffff;
+  border-radius: 4px 4px 4px 4px;
+  border: 1px solid #cccccc;
+  margin: 0 16px 16px 0;
+  padding: 22px 20px;
+  display: flex;
+  justify-content: space-between;
+}
+.normal-card .list .list-item .left {
+  display: flex;
+}
+.normal-card .list .list-item .left img {
+  width: 40px;
+  height: 48px;
+  margin-right: 20px;
+}
+.normal-card .list .list-item .left .descript {
+}
+.normal-card .list .list-item .left .descript .title {
+  font-size: 14px;
+  font-weight: 500;
+  color: #333333;
+  margin-bottom: 13px;
+}
+.normal-card .list .list-item .left .descript .info1 {
+  display: flex;
+  align-items: center;
+}
+.normal-card .list .list-item .left .descript .info1 .time {
+  font-size: 12px;
+  font-weight: 400;
+  color: #666666;
+}
+.normal-card .list .list-item .left .descript .info1 .tag {
+  font-size: 12px;
+  font-weight: 400;
+  color: #666666;
+  margin-left: 30px;
+}
+.normal-card .list .list-item .right {
+  width: 36px;
+  height: 24px;
+  background: #FFEDEC;
+  border-radius: 4px 4px 4px 4px;
+  font-size: 12px;
+  font-weight: normal;
+  color: #FF3B30;
+  text-align: center;
+  line-height: 24px;
+}
+/deep/ .el-pagination {
+  position: absolute;
+  bottom: 0;
+  right: 16px;
+}
+</style>

BIN
src/assets/refresh.png


+ 3 - 1
src/components/upload/hw_obs_upload.vue

@@ -65,10 +65,12 @@ export default {
 
     // 获取华为云上传地址
     async getUploadUrl (file,ext) {
-      this.params.content.parentid = this.folderid
+      this.params.content.parentid = '87'
       const res = await this.$api.requested(this.params)
       let url = res.data.uploadurl
       let obsfilename = res.data.serialfilename
+      console.log(url,file,ext,obsfilename);
+      
       this.upoladFileToServer(url,file,ext,obsfilename)
     },
 

+ 7 - 7
src/router/HManagement.js

@@ -79,21 +79,21 @@ const HManagement = [{
   },
   component: () => import(/* webpackChunkName: "about" */ '@/HManagement/archives_sc/archives_details/index')
 },{
-  path: '/submitedit_action',
-  name: 'submitedit_action',
+  path: '/submitedit_one',
+  name: 'submitedit_one',
   meta: {
-    title: '提报进行中',
+    title: '一事一报',
     ast_nav:true
   },
-  component: () => import(/* webpackChunkName: "about" */ '@/HManagement/submitedit_action/index')
+  component: () => import(/* webpackChunkName: "about" */ '@/HManagement/submitedit_one/index')
 },{
-  path: '/submiteditmag_hostoiry',
-  name: 'submiteditmag_hostoiry',
+  path: '/submitedit_more',
+  name: 'submitedit_more',
   meta: {
     title: '历史提报',
     ast_nav:true
   },
-  component: () => import(/* webpackChunkName: "about" */ '@/HManagement/submiteditmag_hostoiry/index')
+  component: () => import(/* webpackChunkName: "about" */ '@/HManagement/submitedit_more/index')
 },{
   path: '/submiteditmag_detail',
   name: 'submiteditmag_detail',