ETA-1.2.1 bug修复

src/views/chartRelevance_manage/components/selectTarget.vue

@@ -15,7 +15,7 @@
       />
     </el-select>
 
-    <div v-else-if="selectStyleType===2">
+    <div v-else-if="selectStyleType===2" class="database-choose">
       <label>选择指标：</label>
       <el-radio-group v-model="targetType" @change="targetTypeChange">
         <el-radio  

src/views/datasheet_manage/addSheet.vue

@@ -3,20 +3,18 @@
     <div class="wrap-top">
       <ul class="form-ul">
         <li style="margin-right:30px;">
-          表格名称：
           <el-input
             v-model="sheetForm.name"
             placeholder="请输入表格名称"
             clearable
-            style="width:300px">
+            style="width:240px">
           </el-input>
         </li>
-        <li>
-          表格分类
-          
+        <li>          
           <el-select 
             v-model="sheetForm.classify" 
             placeholder="请选择表格分类"
+            style="width:240px"
             clearable
           >
 							<el-option
@@ -28,7 +26,7 @@
 						</el-select>
         </li>
       </ul>
-      <div v-if="updateTime" style="color:#999999;margin-right: 40px;">最近保存时间：{{ updateTime }}</div>
+      <div v-if="updateTime" style="color:#999999;margin-right: 30px;">最近保存时间：{{ updateTime }}</div>
       <div>
         <el-button type="primary" size="medium" @click="saveSheetHandle">保存</el-button>
         <el-button type="primary" size="medium" plain @click="backHandle">返回</el-button>
@@ -36,7 +34,13 @@
     </div>
     
     <div class="main">
-      <Sheet ref="sheetRef" :limit="{disabled:false}" :option="this.option" v-if="sheetInit" @updated="autoSaveFun" />
+      <Sheet ref="sheetRef" :limit="{disabled:false}" :option="this.option" v-if="sheetInit" @updated="autoSaveFun"
+      :sheetInfo="{
+        ExcelInfoId: sheetForm.infoId,
+        ExcelName: sheetForm.name,
+        ExcelClassifyId: sheetForm.classify,
+        Source: sheetForm.source
+      }" />
     </div>
   </div>
 </template>
@@ -84,11 +88,11 @@ export default {
   methods: {
 
     backHandle() {
-      if(this.sheetId){
-        this.$router.back()
-      }else{
+      // if(this.sheetId){
+      //   this.$router.back()
+      // }else{
         window.close();
-      }
+      // }
     },
 
     /* 获取分类 */
@@ -121,12 +125,13 @@ export default {
         },1000)
         return 
       }
-      const { ExcelName,ExcelClassifyId,ExcelType,ModifyTime,Content} = res.Data;
-      
+      const { ExcelInfoId,ExcelName,ExcelClassifyId,ExcelType,ModifyTime,Content,Source} = res.Data;
       this.sheetForm = {
+        infoId:ExcelInfoId,
         name: ExcelName,
         classify: ExcelClassifyId,
-        sheetType: ExcelType
+        sheetType: ExcelType,
+        source:Source
       }
       this.updateTime =  this.$moment(ModifyTime).format('YYYY-MM-DD HH:mm:ss')
 
@@ -145,23 +150,24 @@ export default {
     },
     autoSaveFun:_.debounce(async function(){
       if(!this.sheetId && this.sheetInit) return
-      const { name,classify } = this.sheetForm;
+      const { name,classify,infoId } = this.sheetForm;
       luckysheet.exitEditMode()
       let data = luckysheet.getAllSheets()[0];
       if(!name || !classify) return this.$message.warning(name ? '请选择表格分类' : '请输入表格名称')
       if(!data.celldata.length) return this.$message.warning('请输入表格内容');
       let params={
+        ExcelInfoId:infoId,
         ExcelName: name,
         ExcelClassifyId: classify,
         ExcelImage: "",
         Content: JSON.stringify(data)
       }
-      const res = await sheetInterface.sheetEdit({ ExcelInfoId: Number(this.sheetId),...params })
+      const res = await sheetInterface.sheetEdit(params)
       if(res.Ret !==200) return
       this.updateTime = this.$moment().format('YYYY-MM-DD HH:mm:ss')
 
       // console.log("自动保存");
-    },2000),
+    },1500),
     /* 保存表格 */
     saveSheetHandle: _.debounce(async function() {
       const { name,classify } = this.sheetForm;
@@ -233,6 +239,7 @@ export default {
 *{ box-sizing: border-box; }
 .addSheet-wrap {
   min-height: calc(100vh - 120px);
+  min-width: 1000px;
   .wrap-top {
     display: flex;
     justify-content: space-between;

src/views/datasheet_manage/common/option.js

@@ -3,7 +3,7 @@
   options 其他配置 包括初始化数据 data:[{ celldata:[] }]
   sheetInfo 表格id相关信息 用来内容hooks变化时保存草稿
   limit 限制性数据
-  callbackItems 回调函数
+  callbackItems 回调函数组成的对象
 */
 import * as sheetInterface from '@/api/modules/sheetApi.js';
 import { Message } from 'element-ui';
@@ -21,10 +21,13 @@ export function initSheet(container,options={},sheetInfo={},limit,callbackItems)
       postil:  false, //'批注'
 		},
     cellRightClickConfig: {
+      copy:!limit.disabled,
+      copyAs:!limit.disabled,
       chart: false, // 图表生成
       image: false, // 插入图片
       link: false, // 插入链接
     },
+    allowCopy:!limit.disabled,//没效果
     hook: {
       cellEditBefore:(range)=>{
         if(limit.disabled){
@@ -34,7 +37,14 @@ export function initSheet(container,options={},sheetInfo={},limit,callbackItems)
           },0)
         }
       },
-      
+      // rangeCopyBefore:(range,data)=>{
+      //   // 不触发
+      //   console.log(range,data,'range,data','rangeCopyBefore');
+      // },
+      // rangeCopyAfter:(range,data)=>{
+      //   // 不触发
+      //   console.log(range,data,'range,data','rangeCopyAfter');
+      // },
       updated: (a,b,c,d,e)=> {
         if(limit.disabled){
           Message.warning("当前不可编辑")
@@ -43,20 +53,21 @@ export function initSheet(container,options={},sheetInfo={},limit,callbackItems)
         }
         // console.log(callbackItems);
         callbackItems.updated()
-        // if(sheetInfo.Source&&sheetInfo.Source===1) {
-        //   let data = luckysheet.getAllSheets()[0];
-        //   data.luckysheet_select_save = [];
-        //   const { ExcelInfoId,ExcelName,ExcelClassifyId } = sheetInfo;
-        //   ExcelInfoId && sheetInterface.sheetDrafSave({
-        //     ExcelInfoId,
-        //     ExcelName,
-        //     ExcelClassifyId,
-        //     Content: JSON.stringify(data)
-        //   })
-        // }
+        //草稿
+        if(sheetInfo.Source&&sheetInfo.Source===1) {
+          let data = luckysheet.getAllSheets()[0];
+          data.luckysheet_select_save = [];
+          const { ExcelInfoId,ExcelName,ExcelClassifyId } = sheetInfo;
+          ExcelInfoId && sheetInterface.sheetDrafSave({
+            ExcelInfoId,
+            ExcelName,
+            ExcelClassifyId,
+            Content: JSON.stringify(data)
+          })
+        }
       },
     },
-    ...options
+    ...options,
   }
 
   luckysheet.create(configOpt)

src/views/datasheet_manage/components/SheetExcel.vue

@@ -33,6 +33,15 @@ export default {
       let callbackItems={updated:this.updateEmit}
       initSheet('sheet-container',optionData,this.sheetInfo,this.limit,callbackItems)
     },
+    copyDisable(e){
+      // 变向的禁止复制
+      // console.log(e.target.value && e.target.value.indexOf('lucksheet'));
+      if(e.target.value && e.target.value.indexOf('lucksheet')){
+        luckysheet.enterEditMode();
+        // luckysheet.exitEditMode();
+        return false
+      }
+    },
     updateEmit(){
       this.$emit("updated")
     }
@@ -42,7 +51,15 @@ export default {
   },
   mounted() {
     this.init();
+    if(this.limit.disabled){
+      document.addEventListener('copy',this.copyDisable)
+    }
   },
+  beforeDestroy(){
+    if(this.limit.disabled){
+      document.removeEventListener('copy',this.copyDisable)
+    }
+  }
 }
 </script>
 <style scoped lang="scss">

src/views/datasheet_manage/customAnalysis/edit.vue

@@ -1,9 +1,6 @@
 <template>
   <div class="sheet-detail-wrapper" >
     <div class="detail-top">
-      <span class="author"
-        >作者：{{ sheetDetailInfo.SysUserRealName }}</span
-      >
       <el-input
         ref="sheetEditTitRef"
         style="width: 400px"
@@ -21,23 +18,33 @@
         {{ sheetDetailInfo.ExcelName }}
         <i class="el-icon-edit"/>
       </span>
-      <ul class="action-ul" v-if="sheetDetailInfo.Button">
-        <div v-if="updateTime" style="color:#999999;">最近保存时间：{{ updateTime }}</div>
-        <el-tooltip effect="dark" content="在当前表格选择日期列和数据列生成指标" placement="top-start">
-            <li class="editsty" @click="HandleToPath" v-if="isSheetBtnShow('createedb')&&sheetDetailInfo.Button.OpEdbButton">生成指标</li>
-        </el-tooltip>
+      <div class="sheet-anothor-info">
+        <span class="author">作者：{{ sheetDetailInfo.SysUserRealName }}</span>
+        <ul class="action-ul" v-if="sheetDetailInfo.Button">
+          <div v-if="updateTime" style="color:#999999;">最近保存时间：{{ updateTime }}</div>
+          <el-tooltip effect="dark" content="在当前表格选择日期列和数据列生成指标" placement="top-start">
+              <li class="editsty" @click="HandleToPath" v-if="isSheetBtnShow('createedb')&&sheetDetailInfo.Button.OpEdbButton">
+                <img src="~@/assets/img/icons/choose_bluebg_new.png"/>
+                <span>生成指标</span>
+              </li>
+          </el-tooltip>
 
-        <el-tooltip effect="dark" content="根据表格保存的最新内容，更新当前表格生成的所有指标" placement="top-start">
-            <li class="editsty" @click="refreshSheet" v-if="isSheetBtnShow('refresh')&&sheetDetailInfo.Button.RefreshEdbButton">刷新指标</li>
-        </el-tooltip>
-        <li class="editsty" @click="saveHandle" v-if="isSheetBtnShow('save')&&sheetDetailInfo.Button.OpButton">保存</li>
-        <li
-          class="editsty"
-          @click="backHandle"
-        >
-          返回
-        </li>
-      </ul>
+          <el-tooltip effect="dark" content="根据表格保存的最新内容，更新当前表格生成的所有指标" placement="top-start">
+              <li class="editsty" @click="refreshSheet" v-if="isSheetBtnShow('refresh')&&sheetDetailInfo.Button.RefreshEdbButton">
+                <img src="~@/assets/img/icons/refresh_blue_new.png"/>
+                <span>刷新指标</span>
+              </li>
+          </el-tooltip>
+          <li class="editsty" @click="saveHandle" v-if="isSheetBtnShow('save')&&sheetDetailInfo.Button.OpButton">
+            <img src="~@/assets/img/icons/save_blue_new.png"/>
+            <span>保存</span>
+          </li>
+          <li class="editsty" @click="backHandle">
+            <img src="~@/assets/img/icons/back_arrow_blue_new.png"/>
+            <span>返回</span>
+          </li>
+        </ul>
+      </div>
     </div>
 
     <dataLoading :loading="isSheetLoading"/>
@@ -235,28 +242,46 @@ import { getSheetImage } from "../common/option";
     background: #fff;
     .detail-top {
       padding: 20px;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
+      // display: flex;
+      // justify-content: space-between;
+      // align-items: center;
       border-bottom: 1px solid #ececec;
       .sheet-name {
-        font-size: 17px;
+        font-size: 18px;
+        color: #333333;
+        margin-bottom: 6px;
         cursor: pointer;
         max-width: 450px;
         &:hover {
           text-decoration: underline;
         }
       }
-      .action-ul {
+      .sheet-anothor-info{
         display: flex;
-        li {
-          margin: 0 10px;
+        justify-content: space-between;
+        align-items: center;
+        .author{
+          color: #666666;
+          font-size: 16px;
+        }
+        .action-ul {
+          display: flex;
+          li {
+            margin: 0 10px;
+            display: flex;
+            align-items: center;
+            img{
+              height: 16px;
+              width: 16px;
+              margin-right: 4px;
+            }
+          }
         }
       }
     }
     .sheet-wrap {
       position: relative;
-      height: calc(100vh - 190px);
+      height: calc(100vh - 210px);
     }
   }
 </style>

src/views/datasheet_manage/customAnalysis/list.vue

@@ -142,9 +142,6 @@
         <!-- 表格详情 -->
         <div class="sheet-detail-wrapper" v-if="select_id" >
           <div class="detail-top">
-            <span class="author"
-              >作者：{{ sheetDetailInfo.SysUserRealName }}</span
-            >
             <!-- <el-input
               ref="sheetEditTitRef"
               style="width: 400px"
@@ -154,49 +151,60 @@
               v-if="sheetDetailInfo.isEditTit"
               @blur="changeValue(sheetDetailInfo, 'edit-tit')"
             /> -->
-            <span
-              class="sheet-name"
-            >
+            <div class="sheet-name">
               {{ sheetDetailInfo.ExcelName }}
               <!-- <i class="el-icon-edit"/> -->
-            </span>
-            <ul class="action-ul" v-if="sheetDetailInfo.Button">
-              <li style="color:#999999 ;">最近保存时间：{{ saveTime }}</li>
-              <el-tooltip effect="dark" content="在当前表格选择日期列和数据列生成指标" placement="top-start">
-                  <li class="editsty" @click="HandleToPath" v-if="isSheetBtnShow('createedb')&&sheetDetailInfo.Button.OpEdbButton">生成指标</li>
-              </el-tooltip>
-
-              <el-tooltip effect="dark" content="根据表格保存的最新内容，更新当前表格生成的所有指标" placement="top-start">
-                  <li class="editsty" @click="refreshSheet" v-if="isSheetBtnShow('refresh')&&sheetDetailInfo.Button.RefreshEdbButton">刷新指标</li>
-              </el-tooltip>
-              <!-- <li class="editsty" @click="saveHandle" v-if="isSheetBtnShow('save')&&sheetDetailInfo.Button.OpButton">保存</li> -->
-              <li
-                class="editsty"
-                @click="goEdit"
-                v-if="isCreator || 
-                (sheetDetailInfo.Button && sheetDetailInfo.Button.OpButton&&isSheetBtnShow('edit'))"
-              >
-                {{ editButtonText?editButtonText:'编辑' }}
-              </li>
-              <li
-                class="editsty"
-                @click="saveOtherHandle"
-                v-if="isSheetBtnShow('otherSave')&&sheetDetailInfo.Button.CopyButton"
-              >
-                另存为
-              </li>
-              <li class="editsty" @click="downloadExcel
-              (sheetDetailInfo)" v-if="isSheetBtnShow('download')&&sheetDetailInfo.Button.DownloadButton">
-                下载
-              </li>
-              <li
-                class="deletesty"
-                v-if="isCreator || (isSheetBtnShow('del')&&sheetDetailInfo.Button&&sheetDetailInfo.Button.DeleteButton)"
-                @click="delSheetHandle({cell:sheetDetailInfo, type:'del'})"
-              >
-                删除
-              </li>
-            </ul>
+            </div>
+            <div class="sheet-anothor-info">
+              <span class="author">作者：{{ sheetDetailInfo.SysUserRealName }}</span>
+              <ul class="action-ul" v-if="sheetDetailInfo.Button">
+                <li style="color:#999999 ;">最近保存时间：{{ saveTime }}</li>
+                <el-tooltip effect="dark" content="在当前表格选择日期列和数据列生成指标" placement="top-start">
+                    <li class="editsty" @click="HandleToPath" v-if="isSheetBtnShow('createedb')&&sheetDetailInfo.Button.OpEdbButton">
+                      <img src="~@/assets/img/icons/choose_bluebg_new.png"/>
+                      <span>生成指标</span>
+                    </li>
+                </el-tooltip>
+
+                <el-tooltip effect="dark" content="根据表格保存的最新内容，更新当前表格生成的所有指标" placement="top-start">
+                    <li class="editsty" @click="refreshSheet" v-if="isSheetBtnShow('refresh')&&sheetDetailInfo.Button.RefreshEdbButton">
+                      <img src="~@/assets/img/icons/refresh_blue_new.png"/>
+                      <span>刷新指标</span>
+                    </li>
+                </el-tooltip>
+                <!-- <li class="editsty" @click="saveHandle" v-if="isSheetBtnShow('save')&&sheetDetailInfo.Button.OpButton">保存</li> -->
+                <li
+                  class="editsty"
+                  @click="goEdit"
+                  v-if="isCreator || 
+                  (sheetDetailInfo.Button && sheetDetailInfo.Button.OpButton&&isSheetBtnShow('edit'))"
+                >
+                  <img src="~@/assets/img/icons/edit_blue_new.png" v-if="!editButtonText"/>
+                  <span>{{ editButtonText?editButtonText:'编辑' }}</span> 
+                </li>
+                <li
+                  class="editsty"
+                  @click="saveOtherHandle"
+                  v-if="isSheetBtnShow('otherSave')&&sheetDetailInfo.Button.CopyButton"
+                >
+                  <img src="~@/assets/img/icons/save_as_blue_new.png"/>
+                  <span>另存为</span>
+                </li>
+                <li class="editsty" @click="downloadExcel
+                (sheetDetailInfo)" v-if="isSheetBtnShow('download')&&sheetDetailInfo.Button.DownloadButton">
+                  <img src="~@/assets/img/icons/download_blue.png"/>
+                  <span>下载</span>
+                </li>
+                <li
+                  class="deletesty"
+                  v-if="isCreator || (isSheetBtnShow('del')&&sheetDetailInfo.Button&&sheetDetailInfo.Button.DeleteButton)"
+                  @click="delSheetHandle({cell:sheetDetailInfo, type:'del'})"
+                >
+                  <img src="~@/assets/img/icons/delete-red.png"/>
+                  <span>删除</span>
+                </li>
+              </ul>
+            </div>
           </div>
 
           <!-- <dataLoading :loading="isSheetLoading"/> -->
@@ -896,7 +904,7 @@ $normal-font: 14px;
 
     .main-left {
       width: 400px;
-      min-width: 350px;
+      min-width: 300px;
       background: #fff;
       margin-right: 20px;
       border: 1px solid #ececec;
@@ -966,6 +974,7 @@ $normal-font: 14px;
 
     .main-right {
       width: 80%;
+      min-width: 900px;
       position: relative;
       .sheet-detail-wrapper {
         height: 100%;
@@ -976,28 +985,46 @@ $normal-font: 14px;
         background: #fff;
         .detail-top {
           padding: 20px;
-          display: flex;
-          justify-content: space-between;
-          align-items: center;
+          // display: flex;
+          // justify-content: space-between;
+          // align-items: center;
           border-bottom: 1px solid #ececec;
           .sheet-name {
-            font-size: 17px;
+            font-size: 18px;
+            color: #333333;
+            margin-bottom: 6px;
             // cursor: pointer;
-            max-width: 450px;
+            // max-width: 450px;
             // &:hover {
             //   text-decoration: underline;
             // }
           }
-          .action-ul {
+          .sheet-anothor-info{
             display: flex;
-            li {
-              margin: 0 10px;
+            justify-content: space-between;
+            align-items: center;
+            .author{
+              color: #666666;
+              font-size: 16px;
+            }
+            .action-ul {
+              display: flex;
+              li {
+                margin: 0 10px;
+                display: flex;
+                align-items: center;
+                img{
+                  height: 16px;
+                  width: 16px;
+                  margin-right: 4px;
+                }
+              }
             }
           }
         }
         .sheet-wrap {
           position: relative;
-          height: calc(100vh - 190px);
+          height: calc(100vh - 210px);
           padding: 15px;
           /* min-height: 500px; */
         }

src/views/datasheet_manage/customSheetEdit.vue

@@ -1,72 +1,72 @@
 <template>
   <div class="customSheet-wrap">
     <div class="wrap-top">
-      <ul class="form-ul">
-        <li>
-          <selectTarget
-            ref="selectRef"
-            @select="handleSelectTarget"
-            :selectStyleType="2"
-          />
-        </li>
-        <li>
-          表格名称
-          <el-input
-            v-model="sheetForm.name"
-            placeholder="请输入表格名称"
-            style="width:200px"
-            clearable>
-          </el-input>
-        </li>
-        <li>
-          表格分类
-          <el-select 
-            v-model="sheetForm.classify" 
-            placeholder="请选择表格分类"
-            clearable
-          >
-							<el-option
-								v-for="item in classifyArr"
-								:key="item.ExcelClassifyId"
-								:label="item.ExcelClassifyName"
-								:value="item.ExcelClassifyId"
-              />
-						</el-select>
-        </li>
-        <li>
-          表格类型
-          <el-select 
-            v-model="sheetForm.sheetType"
-            style="width:150px;"
-          >
-							<el-option
-								v-for="item in sheetTypeOption"
-								:key="item.key"
-								:label="item.label"
-								:value="item.key"
-              />
-						</el-select>
-        </li>
-        <li>
-          表格说明
-          <el-tooltip
-            effect="dark"
-          >
-            <div
-              slot="content"
-              v-html="rules"
-              style="line-height: 20px;width:350px"
-            ></div>
-            <i class="el-icon-question" />
-          </el-tooltip>
-        </li>
-        <li v-if="saveTime" style="color:#999999 ;">
-          最近保存时间：{{ saveTime }}
-        </li>
-      </ul>
-      <div>
-        <el-button type="primary" size="medium" @click="saveSheetHandle">保存</el-button>
-        <el-button type="primary" size="medium" plain @click="backHandle">返回</el-button>
+      <div class="database-select">
+        <selectTarget
+          ref="selectRef"
+          @select="handleSelectTarget"
+          :selectStyleType="2"
+        />
+        <div>
+          <div v-if="saveTime" style="color:#999999;margin-right:30px ;">
+            最近保存时间：{{ saveTime }}
+          </div>
+          <el-button type="primary" size="medium" @click="saveSheetHandle">保存</el-button>
+          <el-button type="primary" size="medium" plain @click="backHandle">返回</el-button>
+        </div>
+      </div>
+      <div class="wrap-top-bottom">
+        <ul class="form-ul">
+          <li>
+            <el-input
+              v-model="sheetForm.name"
+              placeholder="请输入表格名称"
+              style="width:240px"
+              clearable>
+            </el-input>
+          </li>
+          <li>
+            <el-select 
+              v-model="sheetForm.classify" 
+              placeholder="请选择表格分类"
+              style="width:240px;"
+              clearable
+            >
+                <el-option
+                  v-for="item in classifyArr"
+                  :key="item.ExcelClassifyId"
+                  :label="item.ExcelClassifyName"
+                  :value="item.ExcelClassifyId"
+                />
+              </el-select>
+          </li>
+          <li>
+            <el-select 
+              v-model="sheetForm.sheetType"
+              style="width:240px;"
+            >
+                <el-option
+                  v-for="item in sheetTypeOption"
+                  :key="item.key"
+                  :label="item.label"
+                  :value="item.key"
+                />
+              </el-select>
+          </li>
+          <li>
+            表格说明
+            <el-tooltip
+              effect="dark"
+            >
+              <div
+                slot="content"
+                v-html="rules"
+                style="line-height: 20px;width:350px"
+              ></div>
+              <i class="el-icon-question" />
+            </el-tooltip>
+          </li>
+        </ul>
       </div>
     </div>
     
@@ -222,7 +222,7 @@ export default {
       console.log("自动保存");
       const res = await sheetInterface.sheetEdit({ ExcelInfoId: Number(this.sheetId),...params })
       if(res.Ret !==200) return
-      this.updateTime = this.$moment().format('YYYY-MM-DD HH:mm:ss')
+      this.saveTime = this.$moment().format('YYYY-MM-DD HH:mm:ss')
     },1500),
     /* 保存表格 */
     saveSheetHandle: _.debounce(async function() {
@@ -299,30 +299,65 @@ export default {
 *{ box-sizing: border-box; }
 .customSheet-wrap {
   min-height: calc(100vh - 120px);
+  min-width: 1020px;
   .wrap-top {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
+    // display: flex;
+    // justify-content: space-between;
+    // align-items: center;
     margin-bottom: 20px;
     padding: 20px;
     background: #fff;
     border: 1px solid #ececec;
     border-radius: 4px;
     box-shadow: 0 3px 6px rgba(0, 0, 0, 0.05);
-    display: flex;
+    // display: flex;
     z-index: 1;
-    .form-ul {
-      flex: 1;
+    .database-select{
       display: flex;
       align-items: center;
-      li {
-        margin: 0 10px;
-        padding-top: 40px;
-        &:first-child {
-          padding-top: 0;
+      margin-bottom: 16px;
+      div{
+        display: flex;
+        align-items: center;
+      }
+    }
+    .wrap-top-bottom{
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      .form-ul {
+        flex: 1;
+        display: flex;
+        align-items: center;
+        li {
+          margin: 0 10px;
+          // padding-top: 40px;
+          &:first-child {
+            padding-top: 0;
+            margin:0
+          }
         }
       }
     }
+
   }
 }
+</style>
+<style lang="scss">
+  .database-select{
+    .el-select{
+      margin-top: 0!important;
+      margin-left: 20px;
+      .el-input{
+        width: 240px;
+      }
+    }
+    .database-choose{
+      display: flex;
+      align-items: center;
+      label,div{
+        white-space: nowrap;
+      }
+    }
+  }
 </style>

src/views/datasheet_manage/mixedSheetEdit.vue

@@ -3,20 +3,19 @@
     <div class="wrap-top">
       <ul class="form-ul">
         <li>
-          表格名称
           <el-input
             v-model="sheetForm.name"
             placeholder="请输入表格名称"
-            style="width:200px"
+            style="width:240px"
             clearable>
           </el-input>
         </li>
         <li>
-          表格分类
           <el-select 
             v-model="sheetForm.classify" 
             placeholder="请选择表格分类"
             clearable
+            style="min-width:240px"
           >
 							<el-option
 								v-for="item in classifyArr"
@@ -241,6 +240,7 @@ export default {
 <style scoped lang="scss">
 *{ box-sizing: border-box; }
 .customSheet-wrap {
+  min-width: 1070px;
   min-height: calc(100vh - 120px);
   .wrap-top {
     display: flex;

src/views/datasheet_manage/sheetList.vue

@@ -136,9 +136,6 @@
         <!-- 表格详情 -->
         <div class="sheet-detail-wrapper" v-if="select_id">
           <div class="detail-top">
-            <span class="author"
-              >作者：{{ sheetDetailInfo.SysUserRealName }}</span
-            >
             <!-- <el-input
               ref="sheetEditTitRef"
               style="width: 400px"
@@ -156,50 +153,59 @@
               {{ sheetDetailInfo.ExcelName }}
               <i class="el-icon-edit" v-if="sheetDetailInfo.Source === 1" />
             </span> -->
-            <span class="sheet-name">
+            <div class="sheet-name">
               {{ sheetDetailInfo.ExcelName }}
-            </span>
-            <ul class="action-ul">
-              <li style="color:#999999 ;">最近保存时间：{{ saveTime }}</li>
-              <li
-                class="editsty"
-                @click="goEditHandle"
-                v-if="isCreator || 
-                (sheetDetailInfo.Button && sheetDetailInfo.Button.OpButton&&isSheetBtnShow('edit'))"
-              >
-                {{ editButtonText?editButtonText:'编辑' }}
-              </li>
-              <template v-if="[2, 3].includes(sheetDetailInfo.Source)">
+            </div>
+            <div class="sheet-anothor-info">
+              <span class="author">作者：{{ sheetDetailInfo.SysUserRealName }}</span>
+              <ul class="action-ul">
+                <li style="color:#999999 ;">最近保存时间：{{ saveTime }}</li>
                 <li
                   class="editsty"
-                  @click="refreshSheetEdb"
-                  v-if="sheetDetailInfo.Button.RefreshButton&&isSheetBtnShow('refresh')"
+                  @click="goEditHandle"
+                  v-if="isCreator || 
+                  (sheetDetailInfo.Button && sheetDetailInfo.Button.OpButton&&isSheetBtnShow('edit'))"
                 >
-                  刷新
+                  <img src="~@/assets/img/icons/edit_blue_new.png" v-if="!editButtonText"/>
+                  <span>{{ editButtonText?editButtonText:'编辑' }}</span> 
+                </li>
+                <template v-if="[2, 3].includes(sheetDetailInfo.Source)">
+                  <li
+                    class="editsty"
+                    @click="refreshSheetEdb"
+                    v-if="sheetDetailInfo.Button.RefreshButton&&isSheetBtnShow('refresh')"
+                  >
+                  <img src="~@/assets/img/icons/refresh_blue_new.png"/>
+                    <span>刷新</span>
+                  </li>
+                  <li
+                    class="editsty"
+                    @click="saveOtherHandle"
+                    v-if="sheetDetailInfo.Button.CopyButton&&isSheetBtnShow('otherSave')"
+                  >
+                    <img src="~@/assets/img/icons/save_as_blue_new.png"/>
+                    <span>另存为</span>
+                  </li>
+                </template>
+                <li v-if="isDownLoadShow(sheetDetailInfo)"
+                  class="editsty" @click="downloadExcel(sheetDetailInfo)">
+                  <img src="~@/assets/img/icons/download_blue.png"/>
+                  <span>下载</span>
                 </li>
                 <li
-                  class="editsty"
-                  @click="saveOtherHandle"
-                  v-if="sheetDetailInfo.Button.CopyButton&&isSheetBtnShow('otherSave')"
+                  class="deletesty"
+                  v-if="
+                    isCreator || (sheetDetailInfo.Button && sheetDetailInfo.Button.DeleteButton
+                    &&isDeleteShow(sheetDetailInfo))
+                  "
+                  @click="delSheetHandle({cell:sheetDetailInfo, type:'del'})"
                 >
-                  另存为
+                  <img src="~@/assets/img/icons/delete-red.png"/>
+                  <span>删除</span>
                 </li>
-              </template>
-              <li v-if="isDownLoadShow(sheetDetailInfo)"
-                class="editsty" @click="downloadExcel(sheetDetailInfo)">
-                下载
-              </li>
-              <li
-                class="deletesty"
-                v-if="
-                  isCreator || (sheetDetailInfo.Button && sheetDetailInfo.Button.DeleteButton
-                  &&isDeleteShow(sheetDetailInfo))
-                "
-                @click="delSheetHandle({cell:sheetDetailInfo, type:'del'})"
-              >
-                删除
-              </li>
-            </ul>
+              </ul>
+            </div>
+
           </div>
 
           <!-- 表格 -->
@@ -214,12 +220,6 @@
                   scrollLeft: 0
                 }]
               }"
-              :sheetInfo="{
-                ExcelInfoId: sheetDetailInfo.ExcelInfoId,
-                ExcelName: sheetDetailInfo.ExcelName,
-                ExcelClassifyId: sheetDetailInfo.ExcelClassifyId,
-                Source: sheetDetailInfo.Source
-              }"
               :limit="{disabled:true}"
             />
 
@@ -751,8 +751,12 @@ export default {
           this.saveTime = this.$moment(this.sheetDetailInfo.ModifyTime).format('YYYY-MM-DD HH:mm:ss')||''
           this.excelAdminId = this.sheetDetailInfo.SysUserId
           this.editButtonText = this.sheetDetailInfo.CanEdit?'':`${this.sheetDetailInfo.Editor}编辑中`
+          //从nextTick里面拉出来 更多功能按钮 才显示的出来
+          this.sheetDetailInfo.Source === 1 && this.$refs.sheetRef && this.$refs.sheetRef.init();
+
           this.$nextTick(() => {
-            this.sheetDetailInfo.Source === 1 && this.$refs.sheetRef.init();
+
+            // this.sheetDetailInfo.Source === 1 && this.$refs.sheetRef.init();
 
             this.sheetDetailInfo.Source === 2 &&
               this.$refs.customTableRef.initSheetData(res.Data.TableData);
@@ -907,7 +911,7 @@ $normal-font: 14px;
 
     .main-left {
       width: 400px;
-      min-width: 350px;
+      min-width: 300px;
       background: #fff;
       margin-right: 20px;
       border: 1px solid #ececec;
@@ -977,6 +981,7 @@ $normal-font: 14px;
 
     .main-right {
       width: 80%;
+      min-width: 800px;
       .sheet-detail-wrapper {
         height: 100%;
         border: 1px solid #ececec;
@@ -986,28 +991,47 @@ $normal-font: 14px;
         background: #fff;
         .detail-top {
           padding: 20px;
-          display: flex;
-          justify-content: space-between;
-          align-items: center;
+          // display: flex;
+          // justify-content: space-between;
+          // align-items: center;
           border-bottom: 1px solid #ececec;
           .sheet-name {
-            font-size: 17px;
+            font-size: 18px;
+            color: #333333;
+            margin-bottom: 6px;
             // cursor: pointer;
-            max-width: 450px;
+            // max-width: 450px;
             // &:hover {
             //   text-decoration: underline;
             // }
           }
-          .action-ul {
+          .sheet-anothor-info{
             display: flex;
-            li {
-              margin: 0 10px;
+            justify-content: space-between;
+            align-items: center;
+            .author{
+              color: #666666;
+              font-size: 16px;
+            }
+            .action-ul {
+              display: flex;
+              li {
+                margin: 0 10px;
+                display: flex;
+                align-items: center;
+                img{
+                  height: 16px;
+                  width: 16px;
+                  margin-right: 4px;
+                }
+              }
             }
           }
+
         }
         .sheet-wrap {
           position: relative;
-          height: calc(100vh - 190px);
+          height: calc(100vh - 210px);
           padding: 15px;
           /* min-height: 500px; */
         }