Merge branch 'luckysheet' of http://120.46.222.128:10021/elink-star/epmet-work-pc into Luckysheet-mk

src/views/modules/base/smartExcel/cpts/data-excel.vue

@@ -11,7 +11,7 @@
               @click="handleClickCurrencyEvent('submit')">下载</el-button>
           </div>
         </div>
-        <div id="luckysheet"></div>
+        <div id="luckysheet" :style="{ height: tableHeight }" ></div>
       </div>
       
       <el-dialog title="数据列表导出" v-if="showUploadData" :visible.sync="showUploadData" width="60%"
@@ -123,6 +123,11 @@
         }
       },
       uploadExcel(files) {
+        // if (this.infoObj.createByName === this.$store.state.user.realName) {
+        //   options.allowEdit = true
+        // } else {
+        //   options.allowEdit = false
+        // }
             console.log(files,"afkljlafisd");
             let that = this
             // console.log(exportJson,'获取到导入的JSON');

src/views/modules/base/smartExcel/cpts/share-excel.vue

@@ -1,6 +1,6 @@
 <template>
     <div class='flex'>
-      <div :class="['flex', 'flex-y', 'flex1', sheetTotal ? 'luckysheet-wrap' : 'luckysheet-wrap-all']">
+      <div :class="['flex', 'flex-y', 'flex1', sheetTotal ? 'luckysheet-wrap' : 'luckysheet-wrap-all']" >
         <div class="top_btn flex flex-end">
           <div>
             <el-button type="text" round @click="handelClickBack" 
@@ -11,7 +11,7 @@
               @click="handleClickCurrencyEvent('submit')">下载</el-button>
           </div>
         </div>
-        <div id="luckysheet"  :style="{ height: tableHeight }"></div>
+        <div id="luckysheet"></div>
       </div>
       <el-dialog title="数据列表导出" v-if="showUploadData" :visible.sync="showUploadData" width="60%"
         :close-on-click-modal="false">

src/views/modules/base/smartExcel/sharedSpace.vue

@@ -1,18 +1,18 @@
 <template>
-  <div class="g-main" >
+  <div class="g-main"  :style="{ height: tableHeight }">
     <div v-show="pageType == 'list'">
       <div class="m-table" :style="{ height: tableHeight }">
         <div class="flex f-endpoint" v-if="showTitle">
-          <div class="flex" >
+          <div class="flex">
             <div style="align-items: center;justify-items: center;" class="f-align_item flex"
-            :class="selectedIndex === index ? 'f-align_item' : 'f-align_item_active'" v-for="(item, index) in titleList" :key="item.value"
-              @click="selectItem(index)">
+              :class="selectedIndex === index ? 'f-align_item' : 'f-align_item_active'"
+              v-for="(item, index) in titleList" :key="item.value" @click="selectItem(index)">
               <span>{{ item.label }}</span>
             </div>
           </div>
-          <div class="flex  " style="align-items: center;">  
-            <el-button @click="handeleUpdate" v-if="selectedIndex==1"  size="small" type="primary">上传共享数据
-                    </el-button>
+          <div class="flex  " style="align-items: center;">
+            <el-button @click="handeleUpdate" v-if="selectedIndex==1" size="small" type="primary">上传共享数据
+            </el-button>
             <el-button v-if="selectedIndex==2" type="primary" style="" size="small"
               @click="onClick('add')">新建图片集</el-button>
             <el-input @blur="onSelect" v-model="name" :placeholder="searchBox" class="oval-input"
@@ -24,19 +24,19 @@
           <el-table-column prop="excelName" align="center" label="文件名称" :show-overflow-tooltip="true">
             <template slot-scope="scope">
               <div class="flex">
-                <img style=" width: 25px; height: 25px; left: 10px;"
-                :src="require(`@/assets/images/index/Excel.png`)" alt="">
-              <span  style="margin-left: 10px">{{ scope.row.excelName
-                }}</span>
+                <img style=" width: 25px; height: 25px; left: 10px;" :src="require(`@/assets/images/index/Excel.png`)"
+                  alt="">
+                <span style="margin-left: 10px">{{ scope.row.excelName
+                  }}</span>
               </div>
-        
+
             </template>
           </el-table-column>
-          <el-table-column prop="taskTitle" label="所属任务"  align="center" :show-overflow-tooltip="true" />
-          <el-table-column prop="taskPeriodName" align="center"  label="任务周期" :show-overflow-tooltip="true">
-    
+          <el-table-column prop="taskTitle" label="所属任务" align="center" :show-overflow-tooltip="true" />
+          <el-table-column prop="taskPeriodName" align="center" label="任务周期" :show-overflow-tooltip="true">
+
           </el-table-column>
-          <el-table-column prop="taskStateName" align="center"  label="状态" :show-overflow-tooltip="true">
+          <el-table-column prop="taskStateName" align="center" label="状态" :show-overflow-tooltip="true">
             <template slot-scope="scope">
               <span
                 :class="scope.row.taskStateName==='未提交'?'yellow':scope.row.taskStateName==='已提交'?'blue':scope.row.taskStateName=='(已驳回)未提交'?'red':'green'">{{
@@ -44,14 +44,15 @@
                 }}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="redDot" label="下载人数" align="center" :show-overflow-tooltip="true" >
+          <el-table-column prop="redDot" label="下载人数" align="center" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-              <el-button type="text" @click="onClickRecord(scope.row)">{{ scope.row.recordNum?scope.row.recordNum:"0"}}</el-button>
+              <el-button type="text" @click="onClickRecord(scope.row)">{{
+                scope.row.recordNum?scope.row.recordNum:"0"}}</el-button>
             </template>
           </el-table-column>
           <el-table-column prop="agencyName" align="center" label="所属组织" :show-overflow-tooltip="true">
           </el-table-column>
-          <el-table-column prop="createByName" align="center"  label="创建人" :show-overflow-tooltip="true">
+          <el-table-column prop="createByName" align="center" label="创建人" :show-overflow-tooltip="true">
           </el-table-column>
           <el-table-column prop="createdTime" align="center" width="140" :show-overflow-tooltip="true" label="创建时间">
           </el-table-column>
@@ -68,31 +69,38 @@
             layout="sizes, prev, pager, next, total" :total="total">
           </el-pagination>
         </div>
-        <div >
-          <data-sharing ref="dataSharing":name="name"v-if="selectedIndex==1" @pictureClose="pictureClose" @pictureOpen="pictureOpen"></data-sharing>
+        <div>
+          <data-sharing ref="dataSharing" :name="name" v-if="selectedIndex==1" @pictureClose="pictureClose"
+            @pictureOpen="pictureOpen"></data-sharing>
         </div>
         <div>
-          <picture-collection  :name="name" @pictureOpen="pictureOpen" @pictureClose="pictureClose"  ref="picture_collection" v-if="selectedIndex==2"></picture-collection>
+          <picture-collection :name="name" @pictureOpen="pictureOpen" @pictureClose="pictureClose"
+            ref="picture_collection" v-if="selectedIndex==2"></picture-collection>
         </div>
-
+     
       </div>
+
+
     </div>
-    <el-dialog :visible.sync="formShow" :close-on-click-modal="false" :close-on-press-escape="false" :title="pictureTitle"
-      width="950px" top="15vh" class="dialog-h" @closed="closeAdd">
-      <picture-add  v-if="formShow" ref="ref_form" @closeAdd="closeAdd"></picture-add>
+    <div  class="m-table" :style="{ height: tableHeight }"  v-if="pageType == 'info'">
+          <share-excel v-if="pageType == 'info'" @handleShowPage="handleShowPage" :infoObj="infoObj"
+            :workbookId=task></share-excel>
+        </div>
+    <el-dialog :visible.sync="formShow" :close-on-click-modal="false" :close-on-press-escape="false"
+      :title="pictureTitle" width="950px" top="15vh" class="dialog-h" @closed="closeAdd">
+      <picture-add v-if="formShow" ref="ref_form" @closeAdd="closeAdd"></picture-add>
     </el-dialog>
     <el-dialog :visible.sync="showUpdate" :close-on-click-modal="false" :close-on-press-escape="false" title="上传共享数据"
       width="950px" top="15vh" class="dialog-h" @closed="closeUpdataAdd">
-      <upload-data-add  v-if="showUpdate" ref="ref_form" @closeUpdataAdd="closeUpdataAdd"></upload-data-add>
+      <upload-data-add v-if="showUpdate" ref="ref_form" @closeUpdataAdd="closeUpdataAdd"></upload-data-add>
     </el-dialog>
     <div v-if="showdownloadRecord">
       <el-dialog title="下载记录" :visible.sync="showdownloadRecord" width="50%" :close-on-click-modal="false">
-        <export-shared v-if="showdownloadRecord" :showType="showdownloadRecord" :taskName="downloadRecord.excelName" :taskId="downloadRecord.id"></export-shared>
+        <export-shared v-if="showdownloadRecord" :showType="showdownloadRecord" :taskName="downloadRecord.excelName"
+          :taskId="downloadRecord.id"></export-shared>
       </el-dialog>
     </div>
-    <div v-if="pageType == 'info'" >
-      <share-excel v-if="pageType == 'info'"  @handleShowPage="handleShowPage"  :infoObj="infoObj" :workbookId=task></share-excel>
-    </div>
+
   </div>
 </template>
   <script>