1、增加关于我们菜单

industry-admin/src/layout/components/Navbar.vue

@@ -41,12 +41,62 @@
           <el-dropdown-item
             @click.native="updatePwd"
           >修改密码</el-dropdown-item>
+          <el-dropdown-item divided
+            @click.native="checkApplicationUpdate"
+          >关于我们</el-dropdown-item>
+          <el-dropdown-item
+            @click.native="helpEvent"
+          >系统帮助</el-dropdown-item>
           <el-dropdown-item divided @click.native="logout">
             <span style="display: block">退出登录</span>
           </el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
 
+      <!-- 关于我们 -->
+      <el-dialog
+        title=""
+        width="500px"
+        center
+        v-if="dialogAboutVisible"
+        :before-close="dialogClose"
+        :visible.sync="dialogAboutVisible"
+        :close-on-click-modal="true"
+        :append-to-body="true">
+        <div style="text-align: center;">
+          <div class="cy-about-us">
+            <div style="width: 50px;">
+              <el-image :src="require('@/assets/images/logo.png')" fit="contain" class="c-logo"></el-image>
+            </div>
+            <div style="margin-left: 10px;">
+              <span style="font-size: 18px; font-weight: bold; font-family: '微软雅黑';">Easy Industrial Report</span>
+            </div>
+          </div>
+          <div style="margin-top: 50px;">当前版本：{{ appVersion }}</div>
+        </div>
+      </el-dialog>
+
+      <!-- 帮助 -->
+      <el-dialog
+        title="帮助"
+        width="80%"
+        center
+        v-dialog-drag
+        v-if="dialogHelpVisible"
+        :before-close="dialogClose"
+        :visible.sync="dialogHelpVisible"
+        :close-on-click-modal="true"
+        :append-to-body="true">
+        <div style="height: 60vh;">
+          <template v-if="helpData">
+            <div v-html="helpData"></div>
+          </template>
+          <template v-else>
+            <div style="display: flex; justify-content: center; align-content: center; align-items: center; height: 100%;">暂无数据</div>
+          </template>
+        </div>
+      </el-dialog>
+
       <el-dialog
         title="修改密码"
         :visible.sync="dialogVisible"
@@ -158,6 +208,9 @@ export default {
       }
     }
     return {
+      appVersion:"V1.0.0",
+      dialogAboutVisible:false,
+      dialogHelpVisible:false,
       avatarDefault: avatarDefault,
       // 修改密码弹框
       dialogVisible: false,
@@ -196,6 +249,26 @@ export default {
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')
     },
+    checkApplicationUpdate() {
+      //this.appVersion = 'V' + pkg.version
+      this.dialogAboutVisible = true
+    },
+    helpEvent() {
+      // const loading = showLoading(this, '加载中，请稍候···')
+      // getTextEditorNew().then(res => {
+      //   loading.close()
+      //   this.helpData = res.data.content
+      //   this.dialogHelpVisible = true
+      // }).catch((e) => {
+      //   loading.close()
+      //   showAlertWin(this, null, e)
+      // })
+    },
+    /** 弹出层关闭事件 */
+    dialogClose(done) {
+      this.dialogAboutVisible = false
+      this.dialogHelpVisible = false
+    },
     updatePwd() {
       this.dialogVisible = true
       this.resetForm()
@@ -398,4 +471,12 @@ export default {
   display: flex;
   align-items: center;
 }
+.cy-about-us {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-content: center;
+  justify-content: center;
+  align-items: center;
+}
 </style>

industry-system/industry-da/src/main/resources/static/reportSheet/js/src/model/sheet-util.js

@@ -167,7 +167,7 @@ layui.define(function(exports) {
 				cellMousedown:function(cell,position,sheet,ctx){
 					//console.log('r='+position.r+','+'c='+position.c);
 					//console.log(position.c);
-					//console.log(cell);
+					console.log(cell);
 				},
 				rangePasteAfter:function(range,data){
 					 //console.log('rangePasteAfter')