ltao 3 سال پیش
والد
کامیت
240c4fa637

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 17393 - 1
package-lock.json


+ 1 - 0
package.json

@@ -45,6 +45,7 @@
     "file-saver": "2.0.5",
     "fuse.js": "6.4.3",
     "highlight.js": "9.18.5",
+    "jquery": "^3.6.0",
     "js-beautify": "1.13.0",
     "js-cookie": "2.2.1",
     "jsencrypt": "3.0.0-rc.1",

+ 8 - 0
src/api/regulations/fileinfo.js

@@ -53,4 +53,12 @@ export function exportFileinfo(query) {
     method: 'get',
     params: query
   })
+}
+
+// 获取排行列表接口
+export function rankList() {  
+  return request({
+    url:"/regulations/fileinfo/getReadNumber",
+    method:"get"
+  })
 }

+ 21 - 1
src/assets/styles/global.css

@@ -634,4 +634,24 @@ background-color: #1d96ff;
 }
 .el-dialog__wrapper .el-table .el-table__row .el-progress{
   margin-bottom: 0px !important;
-}
+}
+.guizhangzhidu .RankingTables .el-table__cell{
+  /* text-align: center !important; */
+  border-bottom: 1px solid rgba(113, 138, 157, 1) !important;
+   /* padding-left: 1s0px !important; */
+}
+.guizhangzhidu .RankingTables .el-table_3_column_9 {
+  text-align: center;
+}
+/* 下拉框样式 */
+.guizhangzhidu .el-select-dropdown .el-select-dropdown__wrap .el-scrollbar__view{
+  background-color: white !important;
+  text-indent: 1em;
+}
+.guizhangzhidu .el-select-dropdown .el-select-dropdown__wrap .el-scrollbar__view .el-select-dropdown__item{
+  text-indent: 1em;
+}
+/* 工作任务表格 */
+.workTask .el-table__empty-block{
+  border-bottom: 2px solid white !important;
+}

+ 2 - 7
src/components/FileUpload/index.vue

@@ -14,7 +14,7 @@
       ref="upload"
     >
       <!-- 上传按钮 -->
-      <el-button size="mini" type="primary" class="select_file" @blur.native="choose">选取文件</el-button>
+      <el-button size="mini" type="primary" class="select_file">选取文件</el-button>
       <!-- 上传提示 -->
       <div class="el-upload__tip" slot="tip" v-if="showTip">
         请上传
@@ -111,10 +111,6 @@ export default {
     },
   },
   methods: {
-    choose() {
-      console.log(this.names, 5555)
-      this.$emit("names", this.fileList)
-    },
     // 上传前校检格式和大小
     handleBeforeUpload(file) {
       // 校检文件类型
@@ -154,8 +150,7 @@ export default {
     // 上传成功回调
     handleUploadSuccess(res, file) {
       this.$message.success("上传成功");
-      this.fileList.push({name: file.name, url: res.fileName,});
-      console.log(this.fileList)
+      this.fileList.push({name: file.name, url: res.fileName,pageCount:res.pageCount,houZUI:res.houZUi,fileLength:res.fileLength});
       this.$emit("input", this.fileList);
     },
     // 删除文件

BIN
src/images/PDF.png


BIN
src/images/doc.png


BIN
src/images/downRow.png


BIN
src/images/upRow.png


+ 0 - 0
src/views/regulations/directoryinfo/index1.vue → src/views/regulations/directoryinfo/index.vue


+ 254 - 164
src/views/regulations/fileinfo/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="flexlayout">
+  <div class="flexlayout guizhangzhidu">
     <!-- 文件区域 左边-->
     <div class="tablesfile">
       <div class="jichu">文件</div>
@@ -9,58 +9,80 @@
         @selection-change="handleSelectionChange"
         :header-cell-style="{ background: '#003C69', color: 'white' }"
       >
-        <el-table-column label="序号" type="index" width="50">
+        <el-table-column label="序号" type="index" width="100">
         </el-table-column>
         <el-table-column
           label="文件"
           align="center"
-          width="600"
+          width="650"
           prop="directory"
           class="fileNAME"
         >
           <template slot-scope="scope">
-            <div>
+            <div style="display: flex; flex-warp: warp; margin-top: 10px">
+              <div style="padding-left: 20px" class="uploadPeople">
+                <!-- 根据后缀名控制图片显示doc还是pdf形式 -->
+                <img
+                  v-if="scope.row.parentDirId == '.pdf'"
+                  src="../../../images/PDF.png"
+                  alt=""
+                />
+                <img
+                  v-else-if="scope.row.parentDirId == '.doc'"
+                  src="../../../images/doc.png"
+                  alt=""
+                />
+              </div>
               <!-- 文件名称 fileName -->
-              <div style="text-align: start; text-indent: 4em">
-                {{ scope.row.fileName }}
+              <div>
+                <div style="text-align: start; width: 100%;margin-left:20px">
+                  {{ scope.row.fileName }}
+                </div>
+                <!-- 上传人 createUser -->
+                <!-- 页数 theNumberPages-->
+                <!-- 时间 createTime -->
+                <!-- 阅读量 readVolume -->
+                <div>
+                  <span
+                    style="
+                      font-size: 14px;
+                      color: rgba(204, 204, 204, 1);
+                      margin-right: 30px;
+                      margin-left: 0px;
+                      width:150px;
+                      margin-left:20px
+                    "
+                    >上传人:{{ scope.row.createUser }}</span
+                  >
+                  <span
+                    style="
+                      font-size: 14px;
+                      color: rgba(204, 204, 204, 1);
+                      margin-right: 30px;
+                      width:150px;
+                    "
+                    >页数:{{ scope.row.theNumberPages }}</span
+                  >
+                  <span
+                    style="
+                      font-size: 14px;
+                      color: rgba(204, 204, 204, 1);
+                      margin-right: 30px;
+                      width:150px
+                    "
+                    >时间:{{ scope.row.createTime }}</span
+                  >
+                  <span
+                    style="
+                      font-size: 14px;
+                      color: rgba(204, 204, 204, 1);
+                      margin-right: 30px;
+                      width:150px
+                    "
+                    >阅读量:{{ scope.row.readVolume }}</span
+                  >
+                </div>
               </div>
-              <!-- 上传人 createUser -->
-              <!-- 页数 theNumberPages-->
-              <!-- 时间 createTime -->
-              <!-- 阅读量 readVolume -->
-              <span
-                style="
-                  font-size: 14px;
-                  color: rgba(204, 204, 204, 1);
-                  margin-right: 30px;
-                  margin-left: -105px;
-                "
-                >上传人:{{ scope.row.createUser }}</span
-              >
-              <span
-                style="
-                  font-size: 14px;
-                  color: rgba(204, 204, 204, 1);
-                  margin-right: 30px;
-                "
-                >页数:{{ scope.row.theNumberPages }}</span
-              >
-              <span
-                style="
-                  font-size: 14px;
-                  color: rgba(204, 204, 204, 1);
-                  margin-right: 30px;
-                "
-                >时间:2022-03-05{{ scope.row.createTime }}</span
-              >
-              <span
-                style="
-                  font-size: 14px;
-                  color: rgba(204, 204, 204, 1);
-                  margin-right: 30px;
-                "
-                >阅读量:145{{ scope.row.readVolume }}</span
-              >
             </div>
           </template>
         </el-table-column>
@@ -68,13 +90,22 @@
           label="操作"
           align="center"
           class-name="small-padding fixed-width"
+          label-width="150px"
         >
           <template slot-scope="scope">
-            <el-button size="read" type="text" @click="ViewRead(scope.row)">
+            <el-button
+              size="read"
+              type="text"
+              @click.native="ViewRead(scope.row)"
+            >
               <span>
                 <!-- <iframe :src="'http://192.168.5.177:8080'+scope.row.parentDirName" target="_blank">阅读</iframe> -->
-                <a :href="'http://192.168.5.177:8080'+scope.row.parentDirName" target="_blank">阅读</a>
-                </span>
+                <a
+                  :href="'http://192.168.5.177:8088' + scope.row.parentDirName"
+                  target="_blank"
+                  >阅读</a
+                >
+              </span>
             </el-button>
             <el-button
               size="reads"
@@ -85,14 +116,8 @@
                 <a :href="scope.row.parentDirName" download>下载</a>
               </span>
             </el-button>
-            <el-button
-              size="dels"
-              type="text"
-              @click="handledels(scope.row)"
-            >
-              <span>
-                删除
-              </span>
+            <el-button size="dels" type="text" @click="handledels(scope.row)">
+              <span> 删除 </span>
             </el-button>
           </template>
         </el-table-column>
@@ -139,7 +164,6 @@
             prop="subclassification"
           />
           <el-table-column label="文件" align="center" prop="documentsNumber" />
-          <!-- <el-table-column label="更新时间" align="center" prop="updateTime" /> -->
           <el-table-column
             label="更新时间"
             align="center"
@@ -154,7 +178,7 @@
                 <span>添加</span>
               </el-button>
               <el-button
-                size="del"
+                size="dels"
                 type="text"
                 @click="handleDelete(scope.row)"
               >
@@ -176,23 +200,67 @@
       <div class="Ranking">
         <div class="jichu">排行</div>
         <table style="color: white">
-          <tr class="borderBottom">
+          <tr class="borderBottom" v-for="item in Ranking" :key="item.id">
+            <!-- 作战类 documentCategory -->
+            <!-- 上月阅读量 readnumber1 -->
+            <!-- 本月阅读量 readnumber2 -->
+            <!-- 排序 -->
             <td class="numbers">1</td>
-            <td class="find">作战类</td>
-            <td class="readnumber">上周阅读量 2305</td>
-            <td class="thisweek">
-              本周阅读量 <span style="color: red">2306</span>
+            <!-- 作战类类别 -->
+            <td class="find">作战类{{item.documentCategory}}</td>
+            <!-- 上周阅读量 -->
+            <td class="readnumber">
+              上月阅读量 <span style="margin-left: 5px">2305{{item.readnumber1}}</span>
             </td>
-          </tr>
-          <tr class="borderBottom">
-            <td class="numbers">1</td>
-            <td class="find">作战类</td>
-            <td class="readnumber">上周阅读量 2305</td>
-            <td class="thisweek">
-              本周阅读量 <span style="color: red">2306</span>
+            <!-- 本周阅读量 -->
+            <td class="thisweek" style="position:relative">
+              <!-- <img src="../../../images/upRow.png" alt="" style="position:absolute;top:18px;right:158px" > -->
+              <!-- <img src="../../../images/downRow.png" alt=""  style="position:absolute;top:17px;right:158px"> -->
+              本月阅读量 <span style="color: red; margin-left: 5px">2306{{item.readnumber2}}</span>
             </td>
           </tr>
         </table>
+        <!-- <el-table
+          v-loading="loading"
+          :data="list"
+          @selection-change="handleSelectionChange"
+          :header-cell-style="{ background: '#003C69', color: 'white' }"
+          class="RankingTables"
+        >
+          <el-table-column label="排名" type="index" width="50">
+          </el-table-column>
+          <el-table-column label="类别" align="center" prop="directory">
+            <template slot-scope="scope">
+              <div
+                @click="mulus(scope.row)"
+                :class="scope.row.subclassification == 0 ? '' : 'undeline'"
+              >
+                {{ scope.row.directory }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="上周阅读量"
+            align="center"
+            prop="subclassification"
+          />
+          <el-table-column
+            label="本周阅读量"
+            align="center"
+            class-name="small-padding fixed-width"
+          >
+          <template slot-scope="scope">
+            <div style="position:relative"> -->
+              <!-- 阅读量增长箭头 -->
+            <!-- <img src="../../../images/upRow.png" alt="" style="position:absolute;top:5px;right:130px" > 
+            阅读量下降箭头
+            <img src="../../../images/downRow.png" alt=""  style="position:absolute;top:5px;right:130px"> -->
+            <!-- 本周阅读量
+            {{scope.row.read}}
+            </div>
+          </template>
+          </el-table-column>
+        </el-table> -->
       </div>
       <!-- 上传文件弹框 -->
       <div class="big">
@@ -254,21 +322,7 @@
               </el-select>
             </el-form-item>
             <el-form-item style="margin-left: 30px; margin-top: 30px">
-              <FileUpload v-model="form.file" @names="namess(name)" />
-              <!-- <div>
-                <label for="fileInput">
-                  <i aria-hidden="true" class="cursor">上传文件</i>
-                </label>
-                <input
-                  v-show="false"
-                  type="file"
-                  id="fileInput"
-                  @change="handleFileChange"
-                  name="file"
-                  ref="file"
-                />
-              </div> -->
-              <!-- <input type="file" id="people-export" ref="inputer" @change="fileUpload"/> -->
+              <FileUpload v-model="form.file" />
             </el-form-item>
           </el-form>
           <div slot="footer" class="dialog-footer">
@@ -343,26 +397,33 @@
 
 <script>
 import {
+  // 获取文件列表接口
   listFileinfo,
+  // 修改文件列表接口
   getFileinfo,
+  // 删除文件列表接口
   delFileinfo,
   // 上传文件
   addFileinfo,
+  // 修改文件列表接口
   updateFileinfo,
+  // 导出文件列表接口
   exportFileinfo,
+  // 获取排行接口
+  rankList
 } from "@/api/regulations/fileinfo";
-import FileUpload from "../../../components/FileUpload/index.vue"
 import {
+  // 查询目录列表接口
   listDirectoryinfo,
+  // 添加目录列表接口
   addDirectoryinfo,
+  // 删除目录列表接口
   delDirectoryinfo,
 } from "@/api/regulations/directoryinfo";
-import { getToken } from "@/utils/auth";
 export default {
   name: "Fileinfo",
   data() {
     return {
-      props:["name"],
       list: [
         {
           id: 1,
@@ -377,24 +438,10 @@ export default {
           file: "文件",
         },
       ],
-      lists: [
-        {
-          id: 1,
-          name: "李四",
-          age: 20,
-          file: "文件",
-          time: 2020,
-        },
-        {
-          id: 2,
-          name: "张三",
-          age: 20,
-          file: "文件",
-          time: 2020,
-        },
-      ],
-      total: 10,
-      total1: "",
+      // 分页器1
+      total: 0,
+      // 分页器2
+      total1: 0,
       queryParams: {
         pageNum: 1,
         pageSize: 5,
@@ -441,27 +488,39 @@ export default {
       loading1: false,
       // 文件
       file: {},
+      //文件类型判断
+      fileType: 1,
+      // 添加子分类名称
+      title2: "",
+      // 添加新建分类名称
+      title1: "",
+      // 添加上传文件名称
+      title: "",
+      // 排行数据
+      Ranking:[]
     };
   },
-  components:{
-    FileUpload
-  },
   created() {
     this.getList();
     // 获取目录接口
     this.ListDirectoryinfo();
+    // 获取排行目录接口
+    rankList().then(res=>{
+      console.log(res)
+      this.Ranking=res.data
+      console.log(this.Ranking)
+    })
   },
   methods: {
-    handledels(row){
-      console.log(row.id)
-    },
-    namess(name){
-      console.log(name)
+    // 文件删除按钮操作
+    handledels(row) {
+      delFileinfo(row.id).then((res) => {
+        this.getList();
+      });
     },
     // 子分类id
     soncategory(id) {
       this.form.directoryId = id;
-      console.log(id);
     },
     // 获取目录列表
     ListDirectoryinfo() {
@@ -471,22 +530,21 @@ export default {
         this.directory = res.rows;
         this.total1 = res.rows.length;
         this.loading = false;
-        console.log(this.directory);
+        // console.log(this.directory);
       });
     },
-    // 点击目录
+    // 点击目录根据子目录的数量控制他是否可以点进去进行渲染
     mulus(row) {
-      console.log(row.id);
       this.parentId = row.id;
       listDirectoryinfo({ parentId: this.parentId }).then((res) => {
         console.log(res.rows);
-        res.rows.forEach((item)=>{
-            if(item.subclassification==0){
-              this.directory=res.rows
-            }else{
-              return
-            }
-        })
+        res.rows.forEach((item) => {
+          if (item.subclassification == 0) {
+            this.directory = res.rows;
+          } else {
+            return;
+          }
+        });
         // if (res.rows[0].subclassification == 0) {
         //   this.directory = res.rows;
         // } else {
@@ -501,7 +559,6 @@ export default {
     },
     // 选中父目录之后
     chooseDirect(id) {
-      // this.form.subclassification=""
       this.subclassification = [];
       this.parentId = id;
       // 获取到父目录id了
@@ -514,7 +571,7 @@ export default {
       this.loading = true;
       listFileinfo(this.queryParams).then((response) => {
         this.fileinfoList = response.rows;
-        console.log(this.fileinfoList)
+        console.log(this.fileinfoList);
         this.total = response.total;
         this.loading = false;
       });
@@ -574,17 +631,31 @@ export default {
         this.title = "修改规章制度文件记录";
       });
     },
-    /** 提交按钮 */
+    /** 上传文件提交按钮 */
     submitForm() {
       this.$refs["form"].validate((valid) => {
-        console.log(this.form);
+        // console.log(this.form);
         if (valid) {
-          this.form.fileName=this.form.file[0].name
-          this.form.parentDirName=this.form.file[0].url
-          addFileinfo(this.form, this.file).then((response) => {
+          console.log(this.form.file[0]);
+          // 文件名
+          this.form.fileName = this.form.file[0].name;
+          // 路径
+          this.form.parentDirName = this.form.file[0].url;
+          // 后缀
+          this.form.parentDirId = this.form.file[0].houZUI;
+          // 页数
+          this.form.theNumberPages = this.form.file[0].pageCount;
+          // 文件大小
+          this.form.fileSize = this.form.file[0].fileLength;
+          // 目录名称
+          this.form.directoryName = this.form.directory;
+          //输出结果
+          console.log(this.form);
+          // 上传文件接口
+          addFileinfo(this.form).then((response) => {
             this.$modal.msgSuccess("上传成功");
             this.open = false;
-             this.getList()
+            this.getList();
             // this.listDirectoryinfo();
           });
         }
@@ -655,7 +726,7 @@ export default {
       this.reset();
       this.open = true;
       this.title = "上传文件";
-      this.ListDirectoryinfo();
+      // this.ListDirectoryinfo();
     },
     // 目录管理
     mange() {
@@ -680,7 +751,15 @@ export default {
       this.reset();
     },
     // 阅读按钮操作
-    ViewRead() {
+    ViewRead(row) {
+      // console.log(row.id)
+      // console.log(row)
+      row.common = "1";
+      console.log(row);
+      updateFileinfo(row).then((res) => {
+        this.getList();
+      });
+      // console.log(this.fileinfoList);
       // window.open("www.baidu.com","_self");
     },
     // 下载按钮操作
@@ -700,10 +779,12 @@ export default {
 }
 /* 文件表格 */
 .tablesfile {
-  width: 50%;
   height: 100vh;
   background: #00365f;
-  margin-left: 30px;
+  width: calc(100% - 695px);
+  position: absolute;
+  left: 20px;
+  top: 20px;
 }
 /* 弹性布局 */
 .flexlayout {
@@ -711,20 +792,23 @@ export default {
   justify-content: space-around;
   align-items: flex-start;
   height: 100%;
-  width: 100vw;
-  position: fixed;
+  display: flex;
+  width: 100%;
+  margin: 20px 20px 0;
 }
 /* 目录 */
 .catalog {
-  width: 43vw;
+  width: 100%;
   height: 45vh;
   position: relative;
   background-color: #00365f;
 }
-.dialog-footer .el-button{
+/* 弹框按钮 */
+.dialog-footer .el-button {
   width: 60px;
   height: 30px;
 }
+/* 分页器样式 */
 .pagination {
   position: absolute;
   bottom: 20px;
@@ -732,32 +816,23 @@ export default {
 }
 /* 排行 */
 .Ranking {
-  width: 43vw;
+  width: 100%;
   height: 45vh;
   right: 12%;
   top: 45%;
   background-color: #00365f;
   margin-top: 10px;
 }
-/* 下载按钮 */
-/* .downloadfile { */
-/* background-image: url("../../../images/uploads.png"); */
-/* background: rgba(29, 150, 255, 1);
-  display: inline-block;
-  width: 67px;
-  height: 30px;
-  border-radius: 5px;
-  line-height: 30px;
-  text-align: center;
-  font-size: 14px;
-  margin-right: 10px;
-  /* margin-r */
-/* }  */
+/* 右边栏样式 */
 .rights {
-  width: 50%;
   height: 100vh;
-  margin-left: 30px;
+  width: 632px;
+  float: right;
+  position: absolute;
+  top: 20px;
+  right: 20px;
 }
+
 /* 阅读 */
 .el-button--read {
   color: #ffffff;
@@ -769,6 +844,7 @@ export default {
   line-height: 5px;
   margin-right: 10px;
 }
+/* 阅读按钮1样式 */
 .el-button--reads {
   color: #ffffff;
   width: 67px;
@@ -783,6 +859,7 @@ export default {
   line-height: 5px;
   margin-right: 10px;
 }
+/* 删除按钮样式 */
 .el-button--dels {
   color: #ffffff;
   width: 60px;
@@ -796,6 +873,7 @@ export default {
   line-height: 5px;
   margin-right: 10px;
 }
+/* 查看按钮样式 */
 .el-button--reads .chakan {
   margin-left: 7px;
 }
@@ -871,7 +949,7 @@ table {
   border-radius: 4px;
   font-size: 14px;
   text-align: center;
-  margin-left: 480px;
+  margin-left: 300px;
 }
 /* 目录管理 */
 .manage {
@@ -885,6 +963,7 @@ table {
   border-radius: 4px;
   margin-left: 10px;
 }
+/* 弹框样式修改 */
 ::v-deep .el-dialog {
   background-color: #004d86 !important;
 }
@@ -962,10 +1041,10 @@ table {
 }
 /* 添加按钮 */
 .el-button--add {
-  width: 46px !important;
+  width: 55px !important;
   border: 1px solid transparent;
   padding: 3px 8px;
-  font-size: 14px;  
+  font-size: 14px;
   line-height: 1.5;
   border-radius: 3px;
   color: #fff;
@@ -976,7 +1055,7 @@ table {
   width: 46px !important;
   border: 1px solid transparent;
   padding: 3px 8px;
-  font-size: 14px;  
+  font-size: 14px;
   line-height: 1.5;
   border-radius: 3px;
   color: #fff;
@@ -989,7 +1068,7 @@ table {
   cursor: pointer;
 }
 /* 序号居中 */
-::v-deep .el-table_1_column_1 {
+::v-deep .el-table_1_column_1,.el-table_3_column_9 {
   text-align: center;
 }
 ::v-deep .el-table_2_column_4 {
@@ -1018,8 +1097,19 @@ table {
 html,
 body,
 #app {
-    height: 100%;
-    margin: 0;
-    padding: 0;
+  height: 100%;
+  margin: 0;
+  padding: 0;
+}
+/* .el-table td.el-table__cell div {
+  margin: auto;
+} */
+/* 下拉框样式 */
+::v-deep .guizhangzhidu .el-select-dropdown .el-select-dropdown__wrap .el-scrollbar__view{
+  background-color: white !important;
+  text-indent: 1em !important;
+}
+.uploadPeople{
+  /* margin-left: 10px; */
 }
 </style>

+ 5 - 23
src/views/workingArrangements/planTask/index.vue

@@ -123,7 +123,7 @@
         @queryTable="getList"
       ></right-toolbar>
     </el-row>
-
+    <!-- 渲染table表格 -->
     <el-table
       v-loading="loading"
       :data="planTaskList"
@@ -229,7 +229,7 @@
         </template>
       </el-table-column>
     </el-table>
-
+    <!-- 分页器 -->
     <pagination
       v-show="total > 0"
       :total="total"
@@ -469,7 +469,7 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <!-- 进度查看弹框 -->
+    <!-- 单人进度查看弹框 -->
     <el-dialog
       :title="title"
       :visible.sync="open2"
@@ -546,30 +546,13 @@
           />
         </el-form-item> -->
         <div class="thistext">{{ singleTable.contents }}</div>
-        <!-- <div class="jiben">执行人信息</div>
-        <el-table
-          :data="tableData"
-          border
-          style="width: 100%; background: #004d86"
-        >
-          <el-table-column prop="date" label="执行人" width="180">
-          </el-table-column>
-          <el-table-column prop="name" label="任务周期" width="180">
-          </el-table-column>
-          <el-table-column prop="address" label="进度"></el-table-column>
-          <el-table-column prop="date" label="完成时间" width="180">
-          </el-table-column>
-          <el-table-column prop="name" label="状态" width="180">
-          </el-table-column>
-          <el-table-column prop="address" label="下载"></el-table-column>
-        </el-table> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm2">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <!-- 进度查看1弹框 -->
+    <!-- 多人进度查看弹框 -->
     <el-dialog
       :title="title"
       :visible.sync="open3"
@@ -1124,13 +1107,12 @@ export default {
       });
     },
     submitForm1() {
-      console.log(this.Progress)
       this.Progress.fileName=this.Progress.file[0].name
       this.Progress.file=this.Progress.file[0].url
       this.$refs["Progress"].validate((valid) => {
         if (valid) {
-          console.log(this.jinduId);
           this.Progress.schedule = this.Progress.planProgress;
+          console.log(this.Progress)
           uploadProgress(this.Progress).then((res1) => {
             console.log(res1);
             this.$modal.msgSuccess("上传成功");

+ 5 - 19
src/views/workingArrangements/workTask/index.vue

@@ -184,7 +184,7 @@
             @click="handleChakan(scope.row)"
             v-if="scope.row.common == 1"
           >
-            <!-- 单人进度 -->
+            <!-- 单人进度查看 -->
             <span class="chakan">查看</span>
           </el-button>
           <el-button
@@ -193,7 +193,7 @@
             @click="handleChakan1(scope.row)"
             v-if="scope.row.common == 2 || scope.row.common == 0"
           >
-            <!-- 多人进度 -->
+            <!-- 多人进度查看 -->
             <span class="chakan">进度查看</span>
           </el-button>
           <el-button
@@ -420,7 +420,7 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <!-- 进度查看弹框 -->
+    <!-- 单人进度查看弹框 -->
     <el-dialog
       :title="title"
       :visible.sync="open2"
@@ -478,24 +478,9 @@
             >下载附件</a
           >
         </el-form-item>
-        <!-- <a :href="singleTable.planProgress.file" style="color:white">下载附件</a> -->
         <div class="jiben">备注</div>
-        <!-- <el-form-item prop="remark">
-          <el-input
-            v-model="ProgressLook.remark"
-            type="textarea"
-            placeholder="请输入内容"
-          />
-        </el-form-item> -->
         <div class="thistext">{{ singleTable.remark }}</div>
         <div class="jiben">任务描述</div>
-        <!-- <el-form-item prop="contents">
-          <el-input
-            v-model="ProgressLook.contents"
-            type="textarea"
-            placeholder="请输入内容"
-          />
-        </el-form-item> -->
         <div class="thistext">{{ singleTable.contents }}</div>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -503,7 +488,7 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <!-- 进度查看1弹框 -->
+    <!-- 多人进度查看弹框 -->
     <el-dialog
       :title="title"
       :visible.sync="open3"
@@ -1358,4 +1343,5 @@ export default {
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+
 </style>

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است