1.做适应平板显示的内容大小

loulijun2021

2022-08-05 d33eacc1f85ac3a736b33ba4713a19aae466d711

1.做适应平板显示的内容大小

 src/layout/components/Sidebar/index.vue

@@ -84,19 +84,19 @@
<style lang="scss">
$main_color: #42b983;

.layoutLogo{
.layoutLogo {
  position: absolute;
  top: 5px;
  z-index:10;
  z-index: 10;
  left: 5px;
  width: 200px;
  height: 90px;
  background:url("../../../assets/images/layout_logo.png") no-repeat;
  background: url("../../../assets/images/layout_logo.png") no-repeat;
}

.scrollbarWrapperClass{
  margin-top:90px;
  height: 85%;
.scrollbarWrapperClass {
  margin-top: 90px;
  height: calc(85% - 45px) !important;
}

.el-button--text, .el-button--text.is-disabled, .el-button--text.is-disabled:focus, .el-button--text.is-disabled:hover, .el-button--text:active {

 src/styles/global.css

@@ -6,6 +6,11 @@
  /*min-width: 1800px;*/
  /*overflow-y: hidden;*/
  /*overflow-x: hidden;*/

  -moz-osx-font-smoothing: grayscale;
  -webkit-font-smoothing: antialiased;
  text-rendering: optimizeLegibility;
  font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
}



 src/views/jcsz/jsqd.vue

@@ -56,7 +56,7 @@
          border
          stripe
          :height="tableHeight+'px'"
          :style="{width: 100+'%',height:tableHeight+'px'}"
          :style="{width: 100+'%',height: tableHeight+'px'}"
          highlight-current-row
          :header-cell-style="this.$headerCellStyle"
          :cell-style="this.$cellStyle"
@@ -134,6 +134,7 @@
          <el-table-column
            label="操作"
            fixed="right"
            width="120"
          >
            <template slot-scope="{row}">
              <div class="operationClass">
@@ -287,10 +288,10 @@
    <el-dialog
      title="角色关联用户"
      :visible.sync="userDialogVisible"
      width="1500px"
      width="900px"
      :close-on-click-modal="false"
      top="15vh"
      :fullscreen="isFullscreen"
      :fullscreen="isIpad"
      class="userDialogVisible"
      @closed="handleCloseUser"
      @close="handleCloseUser"
@@ -305,10 +306,16 @@
      <div style="display: flex;min-height: 50px">
        <el-form ref="dialogFormUser" inline :model="dialogFormUser" label-width="80px">
          <el-form-item label="用户编码">
            <el-input v-model="dialogFormUser.usercode" style="width: 200px" />
            <el-input
              v-model="dialogFormUser.usercode"
              :style="{width:isIpad? '180px':'200px'}"
            />
          </el-form-item>
          <el-form-item label="用户名称">
            <el-input v-model="dialogFormUser.username" style="width: 200px" />
            <el-input
              v-model="dialogFormUser.username"
              :style="{width:isIpad? '180px':'200px'}"
            />
          </el-form-item>
          <el-form-item label="所属组织">
            <el-cascader
@@ -319,7 +326,7 @@
              :append-to-body="false"
              :options="StuOrgArr"
              :props="defaultProps"
              style="width: 200px;"
              :style="{width:isIpad? '180px':'200px'}"

              @change="dialogCascaderChange"
            />
@@ -330,7 +337,7 @@
              v-model="dialogFormUser.isrole"
              filterable
              :popper-append-to-body="false"
              style="width: 200px"
              :style="{width:isIpad? '180px':'200px'}"
              placeholder="请选择"
            >
              <el-option
@@ -362,7 +369,7 @@
        :data="dialogFormUserTable"
        border
        highlight-current-row
        height="300"
        height="370"
        :header-cell-style="this.$headerCellStyle"
        :cell-style="this.$cellStyle"
        :row-key="getRowKey"
@@ -433,7 +440,7 @@
      :visible.sync="dialogVisibleRight"
      width="800px"
      top="15vh"
      :fullscreen="isFullscreen"
      :fullscreen="isIpad"
      :close-on-click-modal="false"
      class="dialogVisibleRight"
      @closed="handleCloseRight"
@@ -544,7 +551,7 @@
      }
    }
    return {
      isFullscreen: false,
      isIpad: false,
      mainHeight: 0,
      tableHeight: 0,
      form: {
@@ -813,11 +820,13 @@
    // 获取页面高度
    getHeight() {
      this.$nextTick(() => {
        console.log(window.innerHeight)
        console.log(window.innerHeight)
        this.mainHeight = window.innerHeight - 250
        this.tableHeight = this.mainHeight - 100
        // this.isFullscreen = window.innerHeight < 800
        this.tableHeight = this.mainHeight - 50
        if (window.innerHeight < 769) {
          this.tableHeight = this.tableHeight - 50
        }

        this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
      })
    },
    /* 设置模块*/

 src/views/jcsz/wldw.vue

@@ -155,6 +155,7 @@
          <el-table-column
            label="操作"
            fixed="right"
            width="120"
          >
            <template slot-scope="{row}">
              <div class="operationClass">
@@ -522,7 +523,10 @@
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 250
        this.tableHeight = this.mainHeight - 100
        this.tableHeight = this.mainHeight - 50
        if (window.innerHeight < 769) {
          this.tableHeight = this.tableHeight - 50
        }
      })
    },
    // 导入按钮

 src/views/jcsz/yhqd.vue

@@ -195,6 +195,7 @@
          <el-table-column
            label="操作"
            fixed="right"
            width="120"
          >
            <template slot-scope="{row}">
              <div class="operationClass">
@@ -318,8 +319,8 @@
      title="关联角色"
      :visible.sync="dialogVisibleRoles"
      width="800px"
      top="15vh"
      :fullscreen="isFullscreen"
      :top="isIpad?'3vh':'15vh'"
      :fullscreen="isIpad"
      :close-on-click-modal="false"
      class="dialogVisibleRoles"
      @closed="handleCloseRoles"
@@ -550,7 +551,7 @@
    }

    return {
      isFullscreen: false,
      isIpad: false,
      mainHeight: 0,
      tableHeight: 0,
      form: {
@@ -845,15 +846,13 @@
    },
    // 获取页面高度
    getHeight() {
      console.log(window.innerHeight)
      console.log(window.innerWidth)
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 250
        this.tableHeight = this.mainHeight - 100
        // this.isFullscreen = window.innerHeight < 800
        if (window.innerHeight < 800) {
        this.tableHeight = this.mainHeight - 50
        if (window.innerHeight < 769) {
          this.tableHeight = this.tableHeight - 50
        }
        this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
      })
    },
    // 关联角色点击事件

 src/views/jcsz/zzjg.vue

@@ -116,6 +116,7 @@
          <el-table-column
            fixed="right"
            label="操作"
            width="120"
          >
            <template slot-scope="{row}">
              <div class="operationClass">
@@ -445,7 +446,10 @@
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 250
        this.tableHeight = this.mainHeight - 100
        this.tableHeight = this.mainHeight - 50
        if (window.innerHeight < 769) {
          this.tableHeight = this.tableHeight - 50
        }
      })
    }
  }

 src/views/login/index.vue

@@ -103,7 +103,7 @@
        <el-button
          :loading="loading"
          type="primary"
          style="width:100%;margin-top:20px;"
          style="width:100%;margin-top:20px;letter-spacing: 10px"
          @click.native.prevent="handleLogin"
        >登录
        </el-button>

 src/views/sbgl/sbqd.vue

@@ -203,7 +203,7 @@
          <el-table-column
            label="操作"
            fixed="right"
            width="100"
            width="120"
          >
            <template slot-scope="{row}">
              <div class="operationClass">
@@ -853,9 +853,6 @@
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 250
        this.tableHeight = this.mainHeight - 100
        if (window.innerHeight < 800) {
          this.tableHeight = this.tableHeight - 50
        }
      })
    },


 src/views/scgl/gd.vue

@@ -76,12 +76,12 @@
              <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
              <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
            </div>
            <!--            <div v-if="!isFullscreen" style="display: flex;align-items: start; margin-top: 15px;z-index: 2">-->
            <!--            <div v-if="!isIpad" style="display: flex;align-items: start; margin-top: 15px;z-index: 2">-->
            <!--              <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>-->
            <!--              <el-button type="primary" icon="el-icon-connection" @click="send('send')">派发</el-button>-->
            <!--              <el-button type="primary" icon="el-icon-switch-button">订单关闭</el-button>-->
            <!--            </div>-->
            <!--            <div v-if="isFullscreen" style="display: flex;flex-direction: column;align-items: end">-->
            <!--            <div v-if="isIpad" style="display: flex;flex-direction: column;align-items: end">-->
            <!--              <div style="display: flex;margin: 10px 0">-->
            <!--                <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>-->
            <!--                <el-button type="primary" icon="el-icon-connection" @click="send('send')">派发</el-button>-->
@@ -230,7 +230,7 @@
          />
          <el-table-column
            label="操作"
            width="120"
            width="140"
            fixed="right"
          >
            <template slot-scope="{row}">
@@ -732,7 +732,7 @@
      }
    }
    return {
      isFullscreen: false,
      isIpad: false,
      mainHeight: 0,
      tableHeight: 0,
      username: '',
@@ -1187,10 +1187,10 @@
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 250
        this.tableHeight = this.mainHeight - 100
        // this.isFullscreen = window.innerHeight < 800
        if (this.isFullscreen) {
          this.tableHeight = this.tableHeight - 50
        this.tableHeight = this.mainHeight - 110
        this.isIpad = window.innerHeight < 769
        if (this.isIpad) {
          this.tableHeight = this.tableHeight - 30
        }
      })
    },

 src/views/scgl/scdd.vue

@@ -84,7 +84,7 @@
              <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
              <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
            </div>
            <!--                      <div v-if="!isFullscreen" style="display: flex;align-items: start; margin-top: 15px;z-index: 2">-->
            <!--                      <div v-if="!isIpad" style="display: flex;align-items: start; margin-top: 15px;z-index: 2">-->
            <!--                        <el-button-->
            <!--                          type="primary"-->
            <!--                          icon="el-icon-refresh-right"-->
@@ -98,7 +98,7 @@
            <!--                        >关闭订单-->
            <!--                        </el-button>-->
            <!--                      </div>-->
            <!--                      <div v-if="isFullscreen" style="display: flex;flex-direction: column;align-items: end">-->
            <!--                      <div v-if="isIpad" style="display: flex;flex-direction: column;align-items: end">-->
            <!--                        <el-button-->
            <!--                          type="primary"-->
            <!--                          icon="el-icon-refresh-right"-->
@@ -249,6 +249,7 @@
          <el-table-column
            label="操作"
            fixed="right"
            width="80"
          >
            <template slot-scope="{row}">
              <div class="operationClass">
@@ -388,7 +389,7 @@
      }
    }
    return {
      isFullscreen: false,
      isIpad: false,
      mainHeight: 0,
      tableHeight: 0,
      form: {
@@ -680,10 +681,10 @@
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 250
        this.tableHeight = this.mainHeight - 100
        // this.isFullscreen = window.innerHeight < 800
        if (this.isFullscreen) {
          this.tableHeight = this.tableHeight - 50
        this.tableHeight = this.mainHeight - 110
        this.isIpad = window.innerHeight < 769
        if (this.isIpad) {
          this.tableHeight = this.tableHeight - 30
        }
      })
    }

 src/views/scgl/sckbg.vue

@@ -30,7 +30,7 @@
          <div class="elTableDiv">
            <el-table
              :data="tableData"
              :height="tableHeight+'px'"
              :height="isIpad? (tableHeight+50):tableHeight"
              border
              stripe
              :style="{width: 100+'%',height:tableHeight+'px',}"
@@ -192,7 +192,7 @@
          <div class="elTableDiv">
            <el-table
              :data="WXtableData"
              :height="tableHeight+'px'"
              :height="isIpad? (tableHeight+50):tableHeight"
              border
              stripe
              :style="{width: 100+'%',height:tableHeight+'px',}"
@@ -320,7 +320,7 @@
    <el-dialog
      :title="dialogTitle"
      :visible.sync="dialogVisible"
      width="800"
      width="850px"
      class="dialogVisible"
      :top="dialogTitle==='自制报工'?'5vh':'15vh'"
      :close-on-click-modal="false"
@@ -661,6 +661,7 @@
      title="预览"
      :visible.sync="dialogVisible2"
      width="1140"
      :close-on-click-modal="false"
      @close="dialogVisible2Close"
    >
      <!-- 要打印的区域 -->
@@ -769,6 +770,7 @@
    return {
      mainHeight: 0,
      tableHeight: 0,
      isIpad: false,
      // produceCode: '', // 工序码
      // WXproduceCode: '', // 外协工序码
      radioSelected: '', // 工序选中
@@ -1503,7 +1505,11 @@
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 250
        this.tableHeight = this.mainHeight - 80
        this.tableHeight = this.mainHeight - 50
        this.isIpad = window.innerHeight < 769
        if (window.innerHeight < 769) {
          this.tableHeight = this.tableHeight - 50
        }
      })
    }
  }

 src/views/wlgl/ckdy.vue

@@ -90,6 +90,7 @@
          />
          <el-table-column
            label="操作"
            width="120"
          >
            <template slot-scope="{row}">
              <div class="operationClass">
@@ -357,7 +358,10 @@
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 250
        this.tableHeight = this.mainHeight - 100
        this.tableHeight = this.mainHeight - 50
        if (window.innerHeight < 769) {
          this.tableHeight = this.tableHeight - 50
        }
      })
    }
  }

 src/views/wlgl/kwdy.vue

@@ -105,6 +105,7 @@
          />
          <el-table-column
            label="操作"
            width="120"
          >
            <template slot-scope="{row}">
              <div class="operationClass">
@@ -372,8 +373,8 @@
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 250
        this.tableHeight = this.mainHeight - 100
        if (window.innerHeight < 800) {
        this.tableHeight = this.mainHeight - 50
        if (window.innerHeight < 769) {
          this.tableHeight = this.tableHeight - 50
        }
      })

 src/views/xtsy/index.vue

@@ -81,19 +81,23 @@
    <div class="center">
      <div class="title" style="margin-top: 20px"><i class="el-icon-s-fold" style="margin-right: 5px" />用户概况</div>
      <div class="center_content">
        <div class="content">
        <div class="content" :style="{height: isIpad?'300px':'400px'}">
          <div class="content_title">活跃时段</div>
          <div>
            <div style="width: 100%;height: 300px;margin: 20px 0 0 10px">
              <div id="line01" style="width: 100%;height:100%" />
            </div>
            <div
              id="line01"
              style="width: 100%;"
              :style="{height:isIpad?'200px':'300px'}"
            />
          </div>
        </div>
        <div class="content">
        <div class="content" :style="{height: isIpad?'300px':'400px'}">
          <div class="content_title">Top用户</div>
          <div style="width: 100%;height: 300px;margin: 20px 0 0 10px">
            <div id="bar01" style="width: 100%;height:100%" />
          </div>
          <div
            id="bar01"
            style="width: 100%;"
            :style="{height:isIpad?'200px':'300px'}"
          />
        </div>
      </div>
    </div>
@@ -108,23 +112,24 @@
  name: 'Index',
  data() {
    return {
      isIpad: false,
      mainHeight: 0,
      tableHeight: 0,
      barTopColor01: ['42,197,137', '187,236,218'],
      barTopColor02: ['248,216,76', '255,250,238'],
      barTopColor03: ['42,197,137', '187,236,218'],
      barTopColor04: ['232,103,103', '253,240,240']

    }
  },
  created() {
    console.log(document.documentElement.clientHeight, 1)
    console.log(document.documentElement.clientWidth, 2)

  },
  mounted() {
    window.addEventListener('resize', this.getHeight)
    this.getHeight()
    this.handleEcharts()
    setTimeout(() => {
      this.handleEcharts()
    }, 10)
  },
  methods: {
    // 获取页面高度
@@ -133,6 +138,9 @@
        this.mainHeight = window.innerHeight - 120
        // this.mainHeight = window.innerHeight - 200
        // this.tableHeight = this.mainHeight - 100

        // this.isIpad = this.mainHeight <= 768
        this.isIpad = window.innerHeight < 769
      })
    },
    handleEcharts() {
@@ -168,6 +176,12 @@
      loadEcharts('bar01', bar01(data))
    },
    async getLine01() {
      // if (this.isIpad) {
      //   document.getElementById('line01').style.height = '200px'
      // } else {
      //   document.getElementById('line01').style.height = '300px'
      // }
      // console.log(document.getElementById('line01'))
      const data2 = [
        { key: '2', value: 0 },
        { key: '4', value: 0.2 },
@@ -258,7 +272,8 @@

    .content {
      width: 49%;
      height: 400px;
      //height: 400px;

      background-color: #fff;
      border-radius: 5px;


 src/views/zlgl/gxjy.vue

@@ -15,7 +15,7 @@
          />
        </div>
        <!--        六项信息      -->
        <div style="display:flex;margin-top: 10px;align-items: center; line-height: 50px">
        <div v-if="!isIpad" style="display:flex;margin-top: 10px;align-items: center; line-height: 50px">
          <div style="display: flex;">
            <div style="display: flex;margin-right: 50px">
              <div style="width: 90px">工单编码：</div>
@@ -39,14 +39,46 @@
          <div style=" display: flex;margin-left: 30px;">
            <div style="display: flex;margin-right: 50px">
              <div style="width: 90px">工序编码：</div>
              <div>{{ form.stepcode }}</div>
              <div style="width: 100px">{{ form.stepcode }}</div>
            </div>
            <div style="display: flex;">
              <div style="width: 90px">工序名称：</div>
              <div>{{ form.stepname }}</div>
              <div style="width: 100px">{{ form.stepname }}</div>
            </div>
          </div>
        </div>
        <div v-if="isIpad" style="display:flex;margin-top: 10px;align-items: center;line-height: 30px; flex-direction: column">
          <div style="display: flex; justify-content: flex-start;width: 100%">
            <div style="display: flex;margin-right: 50px">
              <div style="width: 90px">工单编码：</div>
              <div style="width: 200px">{{ form.wo_code }}</div>
            </div>
            <div style="display: flex;margin-right: 50px">
              <div style="width: 90px">产品编码：</div>
              <div style="width: 200px">{{ form.partcode }}</div>
            </div>
            <div style="display: flex;">
              <div style="width: 90px">产品名称：</div>
              <div style="width: 200px">{{ form.partname }}</div>
            </div>
          </div>

          <div style=" display: flex; justify-content: flex-start;margin-top: 10px;width: 100%">
            <div style="display: flex;margin-right: 50px">
              <div style="width: 90px">产品规格：</div>
              <div style="width: 200px">{{ form.partspec }}</div>
            </div>
            <div style="display: flex;margin-right: 50px">
              <div style="width: 90px">工序编码：</div>
              <div style="width: 200px">{{ form.stepcode }}</div>
            </div>
            <div style="display: flex;">
              <div style="width: 90px">工序名称：</div>
              <div style="width: 200px">{{ form.stepname }}</div>
            </div>
          </div>
        </div>

        <div style="margin: 15px 0;font-size: 14px">
          <i class="el-icon-s-operation" style="color:#42b983; margin-right: 5px" />检验标准信息
        </div>
@@ -266,6 +298,7 @@
  // },
  data() {
    return {
      isIpad: false,
      mainHeight: 0,
      tableHeight: 0,
      form: { // 工序
@@ -585,6 +618,8 @@
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 250
        this.tableHeight = this.mainHeight - 100

        this.isIpad = window.innerHeight < 769
      })
    }
  }

 src/views/zlgl/gxjybz.vue

@@ -29,7 +29,7 @@
      <el-divider />
      <div style="margin-left: 10px;display: flex">
        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>
        <el-button type="primary" icon="el-icon-upload2" @click="upload">导入</el-button>
        <!--        <el-button type="primary" icon="el-icon-upload2" @click="upload">导入</el-button>-->
      </div>
      <el-divider />
      <div class="elTableDiv">
@@ -107,8 +107,8 @@
    <el-dialog
      :title="operation==='add'?'新增':(operation==='edit'?'编辑':'查看')"
      :visible.sync="dialogVisible"
      width="800"
      top="15vh"
      width="800px"
      :top="isIpad?'5vh':'15vh'"
      :close-on-click-modal="false"
      @closed="handleClose"
      @close="handleClose"
@@ -279,6 +279,7 @@
      }
    }
    return {
      isIpad: false,
      mainHeight: 0,
      tableHeight: 0,
      form: {
@@ -460,7 +461,11 @@
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 250
        this.tableHeight = this.mainHeight - 100
        this.tableHeight = this.mainHeight - 50
        this.isIpad = window.innerHeight < 769
        // if (window.innerHeight < 769) {
        //   this.tableHeight = this.tableHeight - 50
        // }
      })
    },
    // 获取检验项目下拉列表

 src/views/zlgl/gxjyxm.vue

@@ -29,7 +29,7 @@
      <el-divider />
      <div style="margin-left: 10px;display: flex">
        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>
        <el-button type="primary" icon="el-icon-upload2" @click="upload">导入</el-button>
        <!--        <el-button type="primary" icon="el-icon-upload2" @click="upload">导入</el-button>-->
      </div>
      <el-divider />
      <div class="elTableDiv">
@@ -297,7 +297,10 @@
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 250
        this.tableHeight = this.mainHeight - 100
        this.tableHeight = this.mainHeight - 50
        // if (window.innerHeight < 769) {
        //   this.tableHeight = this.tableHeight - 50
        // }
      })
    }
  }

 src/views/zlgl/qxdy.vue

@@ -30,7 +30,7 @@
      <el-divider />
      <div style="margin-left: 10px;display: flex">
        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>
        <el-button type="primary" icon="el-icon-upload2" @click="upload">导入</el-button>
        <!--        <el-button type="primary" icon="el-icon-upload2" @click="upload">导入</el-button>-->
      </div>
      <el-divider />
      <div class="elTableDiv">
@@ -297,7 +297,10 @@
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 250
        this.tableHeight = this.mainHeight - 100
        this.tableHeight = this.mainHeight - 50
        // if (window.innerHeight < 769) {
        //   this.tableHeight = this.tableHeight - 50
        // }
      })
    }
  }

 src/views/zzmx/chda.vue

@@ -204,6 +204,7 @@
          <el-table-column
            label="操作"
            fixed="right"
            width="120"
          >
            <template slot-scope="{row}">
              <div class="operationClass">
@@ -463,7 +464,7 @@
      :visible.sync="dialogVisibleRoute"
      width="800px"
      top="15vh"
      :fullscreen="isFullscreen"
      :fullscreen="isIpad"
      class="dialogVisibleRoute"
      @closed="handleCloseRoute"
      @close="handleCloseRoute"
@@ -520,11 +521,11 @@
      <div style="margin-bottom: 10px">
        <i class="el-icon-s-operation" style="color:#42b983;" /> 工序列表
      </div>
      <div style="height: 400px;overflow-y: scroll">
      <div style="overflow-y: scroll">
        <el-table
          :data="projectTableData"
          border
          height="300"
          height="280"
          highlight-current-row
          :header-cell-style="this.$headerCellStyle"
          :cell-style="this.$cellStyle"
@@ -598,7 +599,7 @@
      }
    }
    return {
      isFullscreen: false,
      isIpad: false,
      mainHeight: 0,
      tableHeight: 0,
      form: {
@@ -643,9 +644,9 @@
        materialname: [
          { required: true, message: '请输入物料名称', trigger: ['blur', 'change'] }
        ],
        materialspec: [
          { required: true, message: '请输入物料规格', trigger: ['blur', 'change'] }
        ],
        // materialspec: [//物料规格暂时改为非必填
        //   { required: true, message: '请输入物料规格', trigger: ['blur', 'change'] }
        // ],
        uomcode: [
          { required: true, message: '请选择使用单位', trigger: ['blur', 'change'] }
        ],
@@ -865,6 +866,7 @@
        this.dialogForm.minstockqty = row.maxqty
        this.dialogForm.maxstockqty = row.minqty
      })
      await this.getuomSelect()
    },
    // 删除按钮
    async del(row) {
@@ -937,11 +939,11 @@
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 250
        this.tableHeight = this.mainHeight - 100
        // this.isFullscreen = window.innerHeight < 800
        if (window.innerHeight < 800) {
        this.tableHeight = this.mainHeight - 50
        if (window.innerHeight < 769) {
          this.tableHeight = this.tableHeight - 50
        }
        this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
      })
    },
    /* 点击关联工艺路线模块*/

 src/views/zzmx/gxdy.vue

@@ -147,7 +147,12 @@
            <template slot-scope="{row}">
              <div class="operationClass">
                <i v-if="row.is_eqp==='Y'" class="el-icon-share" @click="workClick(row)" />
                <i v-if="row.is_eqp==='N'" class="el-icon-share" style="color: rgb(180 ,181, 185)" @click="workClick(row)" />
                <i
                  v-if="row.is_eqp==='N'"
                  class="el-icon-share"
                  style="color: rgb(180 ,181, 185)"
                  @click="workClick(row)"
                />
              </div>
            </template>
          </el-table-column>
@@ -159,13 +164,19 @@
            <template slot-scope="{row}">
              <div class="operationClass">
                <i v-if="row.is_defect==='Y'" class="el-icon-share" @click="defectClick(row)" />
                <i v-if="row.is_defect==='N'" class="el-icon-share" style="color:rgb(180 ,181, 185);" @click="defectClick(row)" />
                <i
                  v-if="row.is_defect==='N'"
                  class="el-icon-share"
                  style="color:rgb(180 ,181, 185);"
                  @click="defectClick(row)"
                />
              </div>
            </template>
          </el-table-column>
          <el-table-column
            label="操作"
            fixed="right"
            width="120"
          >
            <template slot-scope="{row}">
              <div class="operationClass">
@@ -267,8 +278,7 @@
      title="关联工作站"
      :visible.sync="workDialogVisible"
      width="50%"
      top="15vh"
      :fullscreen="isFullscreen"
      :top="isIpad?'5vh': '15vh'"
      :close-on-click-modal="false"
      class="workDialogVisible"
      @closed="workHandleClose"
@@ -315,7 +325,7 @@
          :data="workDialogForm.workTreeArr"
          show-checkbox
          node-key="code"
          style="height: 300px;"
          style="height: 280px;"
          default-expand-all
          :props="workTreeDefaultProps"
          @check="checkBoxClick"
@@ -336,8 +346,7 @@
      title="工序关联缺陷"
      :visible.sync="defectDialogVisible"
      width="50%"
      top="15vh"
      :fullscreen="isFullscreen"
      :top="isIpad?'5vh':'15vh'"
      :close-on-click-modal="false"
      class="defectDialogVisible"
      @closed="defectHandleClose"
@@ -358,7 +367,7 @@
          :data="defectTree"
          show-checkbox
          node-key="code"
          style="height: 500px;"
          style="height: 400px;"
          default-expand-all
          :props="workTreeDefaultProps"
        />
@@ -408,7 +417,7 @@
      }
    }
    return {
      isFullscreen: false,
      isIpad: false,
      mainHeight: 0,
      tableHeight: 0,
      form: {
@@ -601,11 +610,11 @@
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 250
        this.tableHeight = this.mainHeight - 100
        // this.isFullscreen = window.innerHeight < 800
        if (window.innerHeight < 800) {
        this.tableHeight = this.mainHeight - 50
        if (window.innerHeight < 769) {
          this.tableHeight = this.tableHeight - 50
        }
        this.isIpad = window.innerHeight < 769
      })
    },
    /* 关联工作站模块*/

 src/views/zzmx/gylx.vue

@@ -94,6 +94,7 @@
          />
          <el-table-column
            label="操作"
            width="120"
          >
            <template slot-scope="{row}">
              <div class="operationClass">
@@ -121,10 +122,9 @@
    <el-dialog
      :title="operation==='add'?'新增':'预览'"
      :visible.sync="dialogVisible"
      width="1200px"
      width="1000px"
      :close-on-click-modal="false"
      top="15vh"
      :fullscreen="isFullscreen"
      :top="isIpad?'5vh':'15vh'"
      @closed="handleClose"
      @close="handleClose"
    >
@@ -280,7 +280,7 @@
      }
    }
    return {
      isFullscreen: false,
      isIpad: false,
      mainHeight: 0,
      tableHeight: 0,
      form: {
@@ -657,8 +657,11 @@
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 250
        this.tableHeight = this.mainHeight - 100
        // this.isFullscreen = window.innerHeight < 800
        this.tableHeight = this.mainHeight - 50
        if (window.innerHeight < 769) {
          this.tableHeight = this.tableHeight - 50
        }
        this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
      })
    }
  }

 src/views/zzmx/jpgj.vue

@@ -144,7 +144,7 @@
            prop="route_name"
            label="工艺路线"
            sortable="custom"
            min-width="110"
            min-width="120"
          />
          <el-table-column
            prop="stepname"
@@ -186,6 +186,7 @@
          <el-table-column
            label="操作"
            fixed="right"
            width="120"
          >
            <template slot-scope="{row}">
              <div class="operationClass">
@@ -212,9 +213,8 @@
    <el-dialog
      :title="operation==='add'?'新增':'编辑'"
      :visible.sync="dialogVisible"
      width="1200px"
      top="15vh"
      :fullscreen="isFullscreen"
      width="1000px"
      :top="isIpad?'5vh':'15vh'"
      :close-on-click-modal="false"
      @closed="handleClose"
      @close="handleClose"
@@ -299,7 +299,8 @@

        <el-table
          :data="eqpDialogArr"
          height="400"
          :height="tableHeight"
          :style="{width: 100+'%',height:tableHeight-50+'px',}"
          border
          stripe
          highlight-current-row
@@ -414,12 +415,13 @@
          :page.sync="eqpTable.page"
          :limit.sync="eqpTable.rows"
          align="right"
          style="padding-top: 20px"
          style="padding-top: 20px;"
          layout="prev, pager, next,sizes"
          popper-class="select_bottom"
          @pagination="getEqpTable"
        />
      </div>
      <div v-if="eqpTableLength===0" style="width: 100px;height: 84px;" />

      <span slot="footer" class="dialog-footer">
        <div class="footerButton">
@@ -469,7 +471,7 @@
      }
    }
    return {
      isFullscreen: false,
      isIpad: false,
      mainHeight: 0,
      tableHeight: 0,
      form: {
@@ -800,6 +802,7 @@
      this.dialogForm.stand_value = ''
      this.dialogForm.cavity_qty = ''
      this.dialogForm.unprice = ''
      this.eqpTableLength = 0
      this.routeDialogArr = []
      this.stepDialogArr = []
      this.eqpDialogArr = []
@@ -836,8 +839,11 @@
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 250
        this.tableHeight = this.mainHeight - 100
        // this.isFullscreen = window.innerHeight < 800
        this.tableHeight = this.mainHeight - 50
        if (window.innerHeight < 769) {
          this.tableHeight = this.tableHeight - 50
        }
        this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
      })
    }
  }