字段调整

Lius

2024-12-16 1c3afa6404643594a4c8158768fdc759a2c718ae

字段调整

 src/views/mdc/base/EquipmentList.vue

@@ -27,20 +27,6 @@
          </a-col>

          <a-col :md="4" :sm="4">
            <a-form-item label="设备级别">
              <j-dict-select-tag placeholder="请选择设备级别" dictCode="device_level" v-model="queryParam.deviceLevel"
                                 allow-clear/>
            </a-form-item>
          </a-col>

          <a-col :md="4" :sm="4">
            <a-form-item label="设备种类">
              <j-dict-select-tag placeholder="请选择设备种类" dictCode="device_category" v-model="queryParam.deviceCategory"
                                 allow-clear/>
            </a-form-item>
          </a-col>

          <a-col :md="4" :sm="4">
            <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
            <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
          </a-col>
@@ -195,23 +181,16 @@
            dataIndex: 'equipmentIp'
          },
          {
            title: '设备功率',
            title: '机床端口',
            align: 'center',
            width: 200,
            dataIndex: 'devicePower'
            dataIndex: 'dataPort'
          },
          {
            title: '部门',
            align: 'center',
            width: 200,
            dataIndex: 'orgCodeTxt'
          },

          {
            title: '系统版本',
            align: 'center',
            width: 200,
            dataIndex: 'systemVersion'
          },
          {
            title: '操作',
@@ -296,16 +275,10 @@
                  dataIndex: 'equipmentIp'
                },
                {
                  title: '设备功率',
                  title: '机床端口',
                  align: 'center',
                  width: 200,
                  dataIndex: 'devicePower'
                },
                {
                  title: '系统版本',
                  align: 'center',
                  width: 200,
                  dataIndex: 'systemVersion'
                  dataIndex: 'dataPort'
                },
                {
                  title: '操作',
@@ -369,23 +342,16 @@
                  dataIndex: 'equipmentIp'
                },
                {
                  title: '设备功率',
                  title: '机床端口',
                  align: 'center',
                  width: 200,
                  dataIndex: 'devicePower'
                  dataIndex: 'dataPort'
                },
                {
                  title: '部门',
                  align: 'center',
                  width: 200,
                  dataIndex: 'orgCodeTxt'
                },

                {
                  title: '系统版本',
                  align: 'center',
                  width: 200,
                  dataIndex: 'systemVersion'
                },
                {
                  title: '操作',

 src/views/mdc/base/modules/DeviceBaseInfo/EquipmentDetailModal.vue

@@ -84,11 +84,11 @@
                <a-descriptions-item label="设备名称">{{resultData.equipmentName}}</a-descriptions-item>
                <a-descriptions-item label="IP地址">{{resultData.equipmentIp}}</a-descriptions-item>
                <a-descriptions-item label="端口号">{{resultData.dataPort}}</a-descriptions-item>
                <a-descriptions-item label="系统版本号">{{resultData.systemVersion}}</a-descriptions-item>
<!--                <a-descriptions-item label="系统版本号">{{resultData.systemVersion}}</a-descriptions-item>-->
                <a-descriptions-item label="驱动类型">{{resultData.driveType}}</a-descriptions-item>
                <a-descriptions-item label="设备型号">{{resultData.equipmentModel}}</a-descriptions-item>
                <a-descriptions-item label="设备类型">{{resultData.driveType}}</a-descriptions-item>
                <a-descriptions-item label="设备功率">{{resultData.devicePower}}</a-descriptions-item>
                <a-descriptions-item label="设备类型">{{resultData.equipmentType}}</a-descriptions-item>
<!--                <a-descriptions-item label="设备功率">{{resultData.devicePower}}</a-descriptions-item>-->
                <a-descriptions-item label="有效轴数">{{resultData.validAxis}}</a-descriptions-item>
                <a-descriptions-item label="最大轴数">{{resultData.maxAxis}}</a-descriptions-item>
                <a-descriptions-item label="备注">{{resultData.remark}}</a-descriptions-item>

 src/views/mdc/base/modules/EquipmentList/UserModal.vue

@@ -62,10 +62,6 @@
        </a-row>
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item v-if="isDepartType == -1" label="系统版本号" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input :disabled="disableSubmit" :readOnly="disableSubmit" allow-clear placeholder="请输入系统版本号"
                       v-model="model.systemVersion"/>
            </a-form-model-item>
            <a-form-model-item v-if="isDepartType == 0" label="设备类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
            <a-select :disabled="disableSubmit" :readOnly="disableSubmit" placeholder="请选择设备类型"
              :triggerChange="true"
@@ -76,12 +72,6 @@
            </a-select>
            </a-form-model-item>

          </a-col>
          <a-col :span="12">
            <a-form-model-item label="设备功率(kw)" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input :disabled="disableSubmit" :readOnly="disableSubmit" allow-clear placeholder="请输入设备功率"
                       v-model="model.devicePower"/>
            </a-form-model-item>
          </a-col>
        </a-row>

@@ -123,31 +113,9 @@
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="设备级别" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <j-dict-select-tag placeholder="请选择设备级别" dictCode="device_level" v-model="model.deviceLevel" allow-clear/>
            </a-form-model-item>
          </a-col>
        </a-row>

        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item label="设备种类" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <j-dict-select-tag placeholder="请选择设备种类" dictCode="device_category" v-model="model.deviceCategory" allow-clear/>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="排序" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input :disabled="disableSubmit" :readOnly="disableSubmit" placeholder="请输入排序"
                       v-model="model.sortNo" style="width: 100%"/>
            </a-form-model-item>
          </a-col>
        </a-row>

        <a-row :gutter="24">
          <a-col :span='12'>
            <a-form-model-item v-if="isDepartType == 0" label="系统版本号" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input :disabled="disableSubmit" :readOnly="disableSubmit" allow-clear placeholder="请输入系统版本号"
                       v-model="model.systemVersion"/>
            </a-form-model-item>
          </a-col>
        </a-row>

 src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue

@@ -43,69 +43,6 @@
                                :allowClear="false"/>
              </a-form-item>
            </a-col>
            <!--            <a-col :md="5" :sm="5" :xs="5">-->
            <!--              <a-form-item label="设备种类">-->
            <!--                <a-select-->
            <!--                  :value="queryParams.deviceCategory"-->
            <!--                  mode="multiple"-->
            <!--                  placeholder="请选择设备种类"-->
            <!--                  allow-clear-->
            <!--                  :maxTagCount="1"-->
            <!--                  @change="selectChange($event,'deviceCategory')"-->
            <!--                >-->
            <!--                  <a-select-option v-for="(item,index) in device_category_list" :value="item.value" :key="index">-->
            <!--                    {{item.label}}-->
            <!--                  </a-select-option>-->
            <!--                </a-select>-->
            <!--              </a-form-item>-->
            <!--            </a-col>-->
            <a-col :md="5" :sm="5" :xs="5">
              <a-form-item label="设备级别">
                <a-select
                  :value="queryParams.deviceLevel"
                  mode="multiple"
                  placeholder="请选择设备级别"
                  allow-clear
                  :maxTagCount="1"
                  @change="selectChange($event,'deviceLevel')"
                >
                  <a-select-option v-for="(item,index) in device_level_list" :value="item.value" :key="index">
                    {{item.label}}
                  </a-select-option>
                </a-select>
              </a-form-item>
            </a-col>
            <a-col :md="2" :sm="2">
              <a
                @click="toggleSearchStatus=!toggleSearchStatus"
                @selectstart="$event.preventDefault()"
                style="display: inline-block;height: 32px;line-height: 32px"
              >
                {{ toggleSearchStatus ? '收起' : '展开' }}
                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
              </a>
            </a-col>
          </a-row>

          <a-row :gutter="24" v-if="toggleSearchStatus">

            <a-col :md="5" :sm="5" :xs="5">
              <a-form-item label="重要程度">
                <a-select
                  :value="queryParams.deviceImportanceLevel"
                  mode="multiple"
                  placeholder="请选择设备重要程度"
                  allow-clear
                  :maxTagCount="1"
                  @change="selectChange($event,'deviceImportanceLevel')"
                >
                  <a-select-option v-for="(item,index) in device_importance_level_list" :value="item.value"
                                   :key="index">
                    {{item.label}}
                  </a-select-option>
                </a-select>
              </a-form-item>
            </a-col>
          </a-row>

          <a-row :gutter="24" type="flex" align="middle">

 src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue

@@ -44,38 +44,6 @@
                                  v-model="dates" :allowClear="false"/>
                </a-form-item>
              </a-col>
              <a-col :md="5" :sm="5" :xs="5">
                <a-form-item label="设备级别">
                  <a-select
                    :value="queryParams.deviceLevel"
                    mode="multiple"
                    placeholder="请选择设备级别"
                    allow-clear
                    :maxTagCount="1"
                    @change="selectChange($event,'deviceLevel')"
                  >
                    <a-select-option v-for="(item,index) in device_level_list" :value="item.value" :key="index">
                      {{item.label}}
                    </a-select-option>
                  </a-select>
                </a-form-item>
              </a-col>
              <a-col :md="5" :sm="5" :xs="5">
                <a-form-item label="设备种类">
                  <a-select
                    :value="queryParams.deviceCategory"
                    mode="multiple"
                    placeholder="请选择设备种类"
                    allow-clear
                    :maxTagCount="1"
                    @change="selectChange($event,'deviceCategory')"
                  >
                    <a-select-option v-for="(item,index) in device_category_list" :value="item.value" :key="index">
                      {{item.label}}
                    </a-select-option>
                  </a-select>
                </a-form-item>
              </a-col>
            </a-row>

            <a-row :gutter="24" type="flex" align="middle">

 src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue

@@ -64,52 +64,8 @@
                  </a-select>
                </a-form-item>
              </a-col>
              <a-col :md="2" :sm="2">
                <a
                  @click="toggleSearchStatus=!toggleSearchStatus"
                  @selectstart="$event.preventDefault()"
                  style="display: inline-block;height: 32px;line-height: 32px"
                >
                  {{ toggleSearchStatus ? '收起' : '展开' }}
                  <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
                </a>
              </a-col>
            </a-row>

            <a-row :gutter="24" v-if="toggleSearchStatus">
              <a-col :md="5" :sm="5" :xs="5">
                <a-form-item label="设备级别">
                  <a-select
                    :value="queryParams.deviceLevel"
                    mode="multiple"
                    placeholder="请选择设备级别"
                    allow-clear
                    :maxTagCount="1"
                    @change="selectChange($event,'deviceLevel')"
                  >
                    <a-select-option v-for="(item,index) in device_level_list" :value="item.value" :key="index">
                      {{item.label}}
                    </a-select-option>
                  </a-select>
                </a-form-item>
              </a-col>
              <a-col :md="5" :sm="5" :xs="5">
                <a-form-item label="设备种类">
                  <a-select
                    :value="queryParams.deviceCategory"
                    mode="multiple"
                    placeholder="请选择设备种类"
                    allow-clear
                    :maxTagCount="1"
                    @change="selectChange($event,'deviceCategory')"
                  >
                    <a-select-option v-for="(item,index) in device_category_list" :value="item.value" :key="index">
                      {{item.label}}
                    </a-select-option>
                  </a-select>
                </a-form-item>
              </a-col>
            </a-row>

            <a-row :gutter="24" type="flex" align="middle">
              <a-col :md="24" :sm="24" :xs="24"