fix: 优化表格宽度

c9c39049 · 郑艺斌 · 9ad87360 · c9c39049 · c9c39049 · c9c39049
Commit c9c39049 authored Sep 02, 2022 by 郑艺斌
Showing with 23 additions and 22 deletions
.env.development
.env.production
src/views/modules/equipmentAdmin/equipmentAccount/index.vue
src/views/modules/siteAdmin/factoryAdmin/index.vue
src/views/modules/siteAdmin/mapAdmin/index.vue
src/views/modules/siteAdmin/positionAdmin/index.vue
src/views/modules/siteAdmin/siteConfig/add.vue
src/views/modules/siteAdmin/siteConfig/index.vue
src/views/modules/siteAdmin/siteConfigTemplate/add.vue
src/views/modules/siteAdmin/siteConfigTemplate/index.vue
src/views/modules/siteAdmin/siteTaskType/index.vue
src/views/modules/taskPlan/taskChainList/index.vue
src/views/modules/taskPlan/taskChainTemplate/index.vue
src/views/modules/taskPlan/taskPlanTemplate/index.vue
--- a/.env.development
+++ b/.env.development
@@ -5,8 +5,8 @@ ENV = 'development'
 VUE_APP_BASE_API = '/api'
 # Jeeplus快速开发平台/后台地址
-VUE_APP_SERVER_URL = 'http://10.10.10.123:8080/jianlin-tms/'
+VUE_APP_SERVER_URL1 = 'http://10.10.10.44:8080/jianlin-tms/'
-VUE_APP_SERVER_URL1 = 'http://jltms.meiqicloud.com/api/'
+VUE_APP_SERVER_URL = 'http://jltms.meiqicloud.com/api/'
 #单点登录设置
 VUE_APP_SSO_LOGIN  = 'false'

--- a/.env.production
+++ b/.env.production
@@ -3,11 +3,11 @@ ENV = 'production'
 #Jeeplus快速开发平台/后台地址
 # 建霖内外地址
-VUE_APP_SERVER_URL = 'http://192.168.202.93:3000/api'
+VUE_APP_SERVER_URL1 = 'http://192.168.202.93:3000/api'
 # 美契公司地址
-VUE_APP_SERVER_URL1 = 'http://jltms.meiqicloud.com/api'
+VUE_APP_SERVER_URL = 'http://jltms.meiqicloud.com/api'
-#单点登录设置
+#单点登录设置 
 VUE_APP_SSO_LOGIN  = 'false'
 VUE_APP_CAS_SERVER = 'https://www.cainiao.com:8443/cas'
 VUE_APP_CLIENT_HOST = 'http://localhost:3000'
--- a/src/views/modules/equipmentAdmin/equipmentAccount/index.vue
+++ b/src/views/modules/equipmentAdmin/equipmentAccount/index.vue
@@ -54,7 +54,7 @@
        </el-row>
        <vxe-table border="inner" ref="xTable" show-overflow auto-resize resizable height="auto" :loading="loading"
          :tree-config="{ transform: true, rowField: 'id', parentField: 'parentId' }" :data="tableData"
-          header-align="center">
+          header-align="center" :column-config="{ width: '130px' }">
          <vxe-column field="equipmentType_dictText" title="设备类型" align="center" width="100px"></vxe-column>
          <vxe-column field="equipmentNo" title="设备ID" align="center" width="100px"></vxe-column>
          <vxe-column field="name" title="设备名称" align="center" width="180px"></vxe-column>

--- a/src/views/modules/siteAdmin/factoryAdmin/index.vue
+++ b/src/views/modules/siteAdmin/factoryAdmin/index.vue
@@ -42,7 +42,8 @@
      </vxe-toolbar>
      <div style="height: calc(100% - 80px);">
        <vxe-table border="inner" ref="xTable" show-overflow auto-resize resizable height="auto" :loading="loading"
-          :tree-config="{ key: 'id', children: 'child' }" :data="tableData" header-align="center">
+          :tree-config="{ key: 'id', children: 'child' }" :data="tableData" header-align="center"
+          :column-config="{ width: '130px' }">
          <vxe-column type="seq" width="60" title="序号" align="center"></vxe-column>
          <vxe-column field="company_dictText" title="公司名称" align="center"></vxe-column>
          <vxe-column field="name" title="厂区名称" align="center"></vxe-column>

--- a/src/views/modules/siteAdmin/mapAdmin/index.vue
+++ b/src/views/modules/siteAdmin/mapAdmin/index.vue
@@ -29,7 +29,7 @@
        </vxe-toolbar>
        <div style="height: calc(100% - 80px);">
          <vxe-table border="inner" ref="xTable" show-overflow auto-resize resizable height="auto" :loading="loading"
-            :data="tableData" header-align="center">
+            :data="tableData" header-align="center" :column-config="{ width: '130px' }">
            <vxe-column type="seq" width="60" title="序号" align="center"></vxe-column>
            <vxe-column field="equipmentType_dictText" title="设备类型" align="center"></vxe-column>
            <vxe-column field="name" title="地图名称" align="center"></vxe-column>

--- a/src/views/modules/siteAdmin/positionAdmin/index.vue
+++ b/src/views/modules/siteAdmin/positionAdmin/index.vue
@@ -44,7 +44,7 @@
        </el-row>
        <vxe-table border="inner" ref="xTable" show-overflow auto-resize resizable height="auto" :loading="loading"
          :tree-config="{ transform: true, rowField: 'id', parentField: 'parentId' }" :data="tableData"
-          header-align="center">
+          header-align="center" :column-config="{ width: '130px' }">
          <vxe-column field="equipmentType_dictText" title="设备类型" align="center"></vxe-column>
          <vxe-column field="mapId_dictText" title="地图名称" align="center"></vxe-column>
          <vxe-column field="name" title="点位编号" align="center"></vxe-column>

--- a/src/views/modules/siteAdmin/siteConfig/add.vue
+++ b/src/views/modules/siteAdmin/siteConfig/add.vue
@@ -80,7 +80,7 @@
              <el-form-item :prop="`entities[${$rowIndex}].pointId`"
                :rules="[{ required: true, message: '请选择点位类型', trigger: 'change' },]"
                v-if="row.configMap && row.configMap !== ''" :inline-message="true">
-                <el-select v-model="row.pointId" placeholder="点位">
+                <el-select v-model="row.pointId" filterable placeholder="点位">
                  <el-option v-for="item in row.pointOptions" :key="item.id" :label="item.name" :value="item.id">
                  </el-option>
                </el-select>

--- a/src/views/modules/siteAdmin/siteConfig/index.vue
+++ b/src/views/modules/siteAdmin/siteConfig/index.vue
@@ -52,7 +52,7 @@
            <div v-for="item in $dictUtils.getDictList('tms_site_type')"
              :class="{ rowItem: true, rowActive: item.value == tabsActive }" :key="item.value"
              @click="clickTabsItem(item)">{{
-               item.label 
+                  item.label
              }}</div>
          </el-col>
          <el-col :span="2" class="rowBtn">
@@ -61,7 +61,7 @@
        </el-row>
        <vxe-table border="full" ref="xTable" show-overflow auto-resize resizable height="auto" :loading="loading"
          :scroll-y="{ enabled: false }" :span-method="mergeRowMethod" :data="tableData" header-align="center"
-          :seq-config="{ seqMethod: seqMethod }">
+          :seq-config="{ seqMethod: seqMethod }" :column-config="{ width: '130px' }">
          <!-- <vxe-column type="seq" width="60" title="序号" align="center"></vxe-column> -->
          <vxe-column field="company_dictText" title="公司" align="center" width="130px"></vxe-column>
          <vxe-column field="factoryId_dictText" title="厂区" align="center" width="130px"></vxe-column>

--- a/src/views/modules/siteAdmin/siteConfigTemplate/add.vue
+++ b/src/views/modules/siteAdmin/siteConfigTemplate/add.vue
@@ -28,7 +28,7 @@
                :rules="[
                  { required: true, message: '请选择设备类型', trigger: 'change' },
                ]" :inline-message="true">
-                <el-select v-model="row.deviceType" placeholder="请选择" style="width: 100%;"
+                <el-select v-model="row.deviceType" placeholder="设备类型" style="width: 100%;"
                  @change="(value) => { getTaskDeviceType(value, row) }">
                  <el-option v-for="item in $dictUtils.getDictList('tms_equipment_type')" :key="item.value"
                    :label="item.label" :value="item.value">
@@ -44,7 +44,7 @@
                :rules="[
                  { required: true, message: '请选择任务名称', trigger: 'change' },
                ]" :inline-message="true">
-                <el-select v-model="row.taskTempId" placeholder="请选择" style="width: 100%;"
+                <el-select v-model="row.taskTempId" placeholder="任务名称" filterable style="width: 100%;"
                  @change="(value) => { getTaskTempId(value, row) }">
                  <el-option v-for="item in row.options" :key="item.value" :label="item.label" :value="item.value">
                  </el-option>

--- a/src/views/modules/siteAdmin/siteConfigTemplate/index.vue
+++ b/src/views/modules/siteAdmin/siteConfigTemplate/index.vue
@@ -27,7 +27,7 @@
      <div style="height: calc(100% - 80px);">
        <vxe-table border="full" ref="xTable" show-overflow auto-resize resizable height="auto" :loading="loading"
          :scroll-y="{ enabled: false }" :span-method="mergeRowMethod" :data="tableData" header-align="center"
-          :seq-config="{ seqMethod: seqMethod }">
+          :seq-config="{ seqMethod: seqMethod }" :column-config="{ width: '150px' }">
          <vxe-column type="seq" width="60" title="序号" align="center"></vxe-column>
          <vxe-column field="tempName" title="模板名称" align="center"></vxe-column>
          <vxe-column field="typeName" title="任务类型" align="center"></vxe-column>

--- a/src/views/modules/siteAdmin/siteTaskType/index.vue
+++ b/src/views/modules/siteAdmin/siteTaskType/index.vue
@@ -39,15 +39,15 @@
          <vxe-column field="typeName" title="类型名称" tree-node align="center" width="160px"></vxe-column>
          <vxe-column field="command" title="指令标识" align="center" width="160px"></vxe-column>
          <vxe-column field="company" title="公司" align="center" width="130px"></vxe-column>
-          <vxe-column field="factoryName" title="厂区" align="center"></vxe-column>
+          <vxe-column field="factoryName" title="厂区" align="center" width="130px"></vxe-column>
-          <vxe-column field="remark" title="备注" align="center"></vxe-column>
+          <vxe-column field="remark" title="备注" align="center" width="130px"></vxe-column>
-          <vxe-column field="status" title="状态" align="center">
+          <vxe-column field="status" title="状态" align="center" width="130px">
            <template slot-scope="scope">
              <span v-if="scope.row.status === '1'" style="color: #249601;">启用</span>
              <span v-else-if="scope.row.status === '0'" style="color: #FF0000;">禁用</span>
            </template>
          </vxe-column>
-          <vxe-column field="sort" title="排序" align="center">
+          <vxe-column field="sort" title="排序" align="center" width="130px">
          </vxe-column>
          <vxe-column field="createDate" title="创建时间" align="center" width="180px"></vxe-column>
          <vxe-column field="updateDate" title="更新时间" align="center" width="180px"></vxe-column>

--- a/src/views/modules/taskPlan/taskChainList/index.vue
+++ b/src/views/modules/taskPlan/taskChainList/index.vue
@@ -40,7 +40,7 @@
        </el-row>
        <vxe-table border="inner" show-overflow ref="xTable" auto-resize resizable height="auto" :loading="loading"
          :tree-config="{ transform: true, rowField: 'id', parentField: 'parentId' }" :data="tableData"
-          header-align="center">
+          header-align="center" :column-config="{ width: '130px' }">
          <vxe-column type="seq" width="60" title="序号" align="center"></vxe-column>
          <vxe-column field="taskId" title="任务编号" align="center"></vxe-column>
          <vxe-column field="taskName" title="任务名称" align="center"></vxe-column>

--- a/src/views/modules/taskPlan/taskChainTemplate/index.vue
+++ b/src/views/modules/taskPlan/taskChainTemplate/index.vue
@@ -30,7 +30,7 @@
      <div style="height: calc(100% - 80px);">
        <vxe-table border="inner" ref="xTable" show-overflow auto-resize resizable height="auto" :loading="loading"
          :tree-config="{ transform: true, rowField: 'id', parentField: 'parentId' }" :data="tableData"
-          header-align="center">
+          header-align="center" :column-config="{ width: '140px' }">
          <vxe-column type="seq" width="60" title="序号" align="center"></vxe-column>
          <vxe-column field="number" title="任务链编号" align="center"></vxe-column>
          <vxe-column field="name" title="任务链名称" align="center"></vxe-column>

--- a/src/views/modules/taskPlan/taskPlanTemplate/index.vue
+++ b/src/views/modules/taskPlan/taskPlanTemplate/index.vue
@@ -51,7 +51,7 @@
        </el-row>
        <vxe-table border="inner" ref="xTable" show-overflow auto-resize resizable height="auto" :loading="loading"
          :tree-config="{ transform: true, rowField: 'id', parentField: 'parentId' }" :data="tableData"
-          header-align="center">
+          header-align="center" :column-config="{ width: '130px' }">
          <vxe-column type="seq" width="60" title="序号" align="center"></vxe-column>
          <vxe-column field="createdByName_dictText" title="设备类型" align="center"></vxe-column>
          <vxe-column field="taskId" title="任务编号" align="center"></vxe-column>