推

attendance-performance-manager-ui/admin/src/assets/less/base.css

@@ -11,8 +11,8 @@ html * {
 }
 html,
 body {
-  height: 100%;
-  min-height: 100%;
+  /* height: 100%; */
+  /* min-height: 100%; */
   font-family: "Microsoft Yahei", "Helvetica Neue", Helvetica, STHeiTi, Arial, sans-serif;
 }
 body {

attendance-performance-manager-ui/admin/src/assets/less/base.less

@@ -13,13 +13,13 @@ html * {
 
 html,
 body {
-  height: 100%;
-  min-height: 100%;
+  // height: 100vh;
+  // min-height: 100%;
   font-family: "Microsoft Yahei", "Helvetica Neue", Helvetica, STHeiTi, Arial,
     sans-serif;
 }
 body {
-  overflow-y: scroll;
+  // overflow-y: scroll;
 }
 body,
 div,

attendance-performance-manager-ui/admin/src/assets/mixins/table.js

@@ -330,7 +330,7 @@ export default {
     },
     // 格式化单元格数据
     formatterDate(row, column) {
-      console.log("date:",row,column)
+      // console.log("date:",row,column)
       return formatterDate(row, column);
     },
     // 格式化单元格数据 只要年月日
@@ -565,7 +565,7 @@ export default {
     },
     // 查看
     toView(row, query) {
-      console.log(this.pageInfo.view);
+      // console.log(this.pageInfo.view);
       this.$router.push({
         path: this.pageInfo.view,
         query: Object.assign({}, { id: row.id }, query),

attendance-performance-manager-ui/admin/src/components/DataTable.vue

@@ -13,7 +13,6 @@
     :empty-text="emptytxt ? emptytxt : emptyText"
     border
     style="width: 100%"
-    height="530"
   >
     <el-table-column
       v-for="column in columns"

attendance-performance-manager-ui/admin/src/components/DataTreeTable.vue

@@ -8,7 +8,6 @@
       :row-class-name="tableRowClassName"
       :default-expand-all="expand"
       :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-      height="520"
     >
 
  <el-table-column

attendance-performance-manager-ui/admin/src/views/Layout.vue

@@ -9,7 +9,7 @@
       :isOpen="isOpen"
       v-if="menuPage === 'left'"
     />
-    <div style="padding:15px">
+    <div class="layout">
       <router-view :class="{ active: !isOpen }" />
     </div>
   </div>
@@ -57,6 +57,10 @@ export default {
 </script>
 
 <style lang="less">
+.layout{
+  padding: 15px 15px 0 15px ;
+  box-sizing: border-box;
+}
 .page {
   min-height: calc(100vh - 100px);
   width: 100%;

attendance-performance-manager-ui/admin/src/views/feedback/addQuestion/list.vue

@@ -4,6 +4,7 @@
         <el-button class="backBtn" size="small" @click="$router.back()">返回上一级</el-button>
         <el-tabs v-model="tabs">
             <el-tab-pane label="设计问卷" name="1">
+                <!-- 步骤1 填写问卷名称 -->
                 <div style="width: 800px;margin: 100px auto;" v-show="step">
                     <el-form :model="titleForm" :rules="titleRules" ref="titleForm">
                         <el-form-item label="问卷名称：" prop="title" label-width="125px">
@@ -20,20 +21,22 @@
                         </div>
                     </el-form>
                 </div>
+                <!-- 动态表单配置 -->
                 <div v-show="!step">
                     <fc-designer style="height: 79vh;" ref="designer">
                         <template slot="handle">
                             <ElButton style="margin-left: 10px;" icon="el-icon-upload" type="primary" size="small"
                                 @click="issueBtn" round>问卷发布
                             </ElButton>
-                            <!-- <ElButton style="margin-left: 10px;" icon="el-icon-upload" type="primary" size="small"
+                            <ElButton style="margin-left: 10px;" icon="el-icon-position" type="warning" size="small"
                                 @click="issueBtn" round>外部链接
-                            </ElButton> -->
-                            <ElButton icon="el-icon-view" type="success" size="small" @click="showDrawer" round>手机模拟预览
+                            </ElButton>
+                            <ElButton icon="el-icon-view" type="success" size="small" @click="showDrawer" round>手机预览
                             </ElButton>
                         </template>
                     </fc-designer>
                 </div>
+                <!-- 手机模拟预览 -->
                 <el-drawer :visible.sync="drawer" title="预览">
                     <div class="showPhone">
                         <div class="phone">
@@ -44,7 +47,7 @@
                         </div>
                     </div>
                 </el-drawer>
-
+                <!-- 问卷发布弹出框 -->
                 <el-dialog title="问卷发布" :visible.sync="issueDialog" width="30%" top="25vh">
                     <el-form :model="issueForm" :rules="issueRules" ref="issueForm">
                         <el-form-item label="问卷封面：" label-width="125px">
@@ -75,8 +78,8 @@
                         </div>
                     </el-form>
                 </el-dialog>
-
-                <el-dialog title="人员选择" :visible.sync="treeDialog">
+                <!-- 人员选择弹出框 -->
+                <el-dialog title="人员选择" :visible.sync="treeDialog" width="40%">
                     <div class="treeDialog">
                         <el-tree class="treeCss" :data="treeData" node-key="id" :props="defaultProps"
                             @node-click="handleNodeClick"></el-tree>