现场问题修改

qushaowei

2023-09-21 6c7ca8b4290cd6afecb680c39be00fc2480a2dca

现场问题修改

 src/views/eam/RiskPreventionList.vue

@@ -1,26 +1,65 @@
<template>
  <a-card :bordered='false' title='危险防控'>
  <a-card
    :bordered='false'
    title='危险防控'
  >
    <!-- 查询区域 -->
    <div class='table-page-search-wrapper'>
      <a-form layout='inline' @keyup.enter.native='searchQuery'>
      <a-form
        layout='inline'
        @keyup.enter.native='searchQuery'
      >
        <a-row :gutter='24'>

          <a-col :xl='6' :lg='7' :md='8' :sm='24'>
          <a-col
            :xl='6'
            :lg='7'
            :md='8'
            :sm='24'
          >
            <a-form-item label='危险源编码'>
              <j-input placeholder='请输入危险源编码' v-model='queryParam.num'></j-input>
              <j-input
                placeholder='请输入危险源编码'
                v-model='queryParam.num'
              ></j-input>
            </a-form-item>
          </a-col>
          <template>
            <a-col :xl='6' :lg='7' :md='8' :sm='24'>
            <a-col
              :xl='6'
              :lg='7'
              :md='8'
              :sm='24'
            >
              <a-form-item label='危险源'>
                <j-input placeholder='请输入危险源' v-model='queryParam.name'></j-input>
                <j-input
                  placeholder='请输入危险源'
                  v-model='queryParam.name'
                ></j-input>
              </a-form-item>
            </a-col>
          </template>
          <a-col :xl='6' :lg='7' :md='8' :sm='24'>
            <span style='float: left;overflow: hidden;' class='table-page-search-submitButtons'>
              <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
            :xl='6'
            :lg='7'
            :md='8'
            :sm='24'
          >
            <span
              style='float: left;overflow: hidden;'
              class='table-page-search-submitButtons'
            >
              <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 @click="handleToggleSearch" style="margin-left: 8px">-->
              <!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
              <!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
@@ -34,16 +73,36 @@

    <!-- 操作按钮区域 -->
    <div class='table-operator'>
      <a-button @click='handleAdd' type='primary' icon='plus'>新增</a-button>
      <a-button type='primary' icon='download' @click="handleExportXls('危险防控')">导出</a-button>
      <a-upload name='file' :showUploadList='false' :multiple='false' :headers='tokenHeader' :action='importExcelUrl'
                @change='handleImportExcel'>
        <a-button type='primary' icon='import'>导入</a-button>
      <a-button
        @click='handleAdd'
        type='primary'
        icon='plus'
      >新增</a-button>
      <a-button
        type='primary'
        icon='download'
        @click="handleExportXls('危险防控')"
      >导出</a-button>
      <a-upload
        name='file'
        :showUploadList='false'
        :multiple='false'
        :headers='tokenHeader'
        :action='importExcelUrl'
        @change='handleImportExcel'
      >
        <a-button
          type='primary'
          icon='import'
        >导入</a-button>
      </a-upload>

      <a-dropdown v-if='selectedRowKeys.length > 0'>
        <a-menu slot='overlay'>
          <a-menu-item key='1' @click='batchDel'>
          <a-menu-item
            key='1'
            @click='batchDel'
          >
            <a-icon type='delete' />
            删除
          </a-menu-item>
@@ -56,10 +115,15 @@

    <!-- table区域-begin -->
    <div>
      <div class='ant-alert ant-alert-info' style='margin-bottom: 16px;'>
        <i class='anticon anticon-info-circle ant-alert-icon'></i> 已选择 <a
        style='font-weight: 600'>{{ selectedRowKeys.length }}</a>项
        <a style='margin-left: 24px' @click='onClearSelected'>清空</a>
      <div
        class='ant-alert ant-alert-info'
        style='margin-bottom: 16px;'
      >
        <i class='anticon anticon-info-circle ant-alert-icon'></i> 已选择 <a style='font-weight: 600'>{{ selectedRowKeys.length }}</a>项
        <a
          style='margin-left: 24px'
          @click='onClearSelected'
        >清空</a>
      </div>

      <a-table
@@ -74,25 +138,47 @@
        :loading='loading'
        :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
        class='j-table-force-nowrap'
        @change='handleTableChange'>
        <template slot="description" slot-scope="text" >
          <a-tooltip placement="top" :title="text" trigger="hover">
        @change='handleTableChange'
      >
        <template
          slot="description"
          slot-scope="text"
        >
          <a-tooltip
            placement="top"
            :title="text"
            trigger="hover"
          >
            <div>
              <template slot="title"> </template>
              <p style="cusor:pointer; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; width: 130px;">{{ text }}</p>
            </div>
          </a-tooltip>
        </template>
        <template slot="num" slot-scope="text" >
          <a-tooltip placement="top" :title="text" trigger="hover">
        <template
          slot="num"
          slot-scope="text"
        >
          <a-tooltip
            placement="top"
            :title="text"
            trigger="hover"
          >
            <div>
              <template slot="title"> </template>
              <p style="cusor:pointer; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; width: 130px;">{{ text }}</p>
            </div>
          </a-tooltip>
        </template>
        <template slot="measure" slot-scope="text" >
          <a-tooltip placement="top" :title="text" trigger="hover">
        <template
          slot="measure"
          slot-scope="text"
        >
          <a-tooltip
            placement="top"
            :title="text"
            trigger="hover"
          >
            <div>
              <template slot="title"> </template>
              <p style="cusor:pointer; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; width: 130px;">{{ text }}</p>
@@ -100,28 +186,53 @@
          </a-tooltip>
        </template>

        <template slot='htmlSlot' slot-scope='text'>
        <template
          slot='htmlSlot'
          slot-scope='text'
        >
          <div v-html='text'></div>
        </template>
        <template slot='imgSlot' slot-scope='text,record'>
          <span v-if='!text' style='font-size: 12px;font-style: italic;'>无图片</span>
          <img v-else :src='getImgView(text)' :preview='record.id' height='25px' alt=''
               style='max-width:80px;font-size: 12px;font-style: italic;' />
        <template
          slot='imgSlot'
          slot-scope='text,record'
        >
          <span
            v-if='!text'
            style='font-size: 12px;font-style: italic;'
          >无图片</span>
          <img
            v-else
            :src='getImgView(text)'
            :preview='record.id'
            height='25px'
            alt=''
            style='max-width:80px;font-size: 12px;font-style: italic;'
          />
        </template>
        <template slot='fileSlot' slot-scope='text'>
          <span v-if='!text' style='font-size: 12px;font-style: italic;'>无文件</span>
        <template
          slot='fileSlot'
          slot-scope='text'
        >
          <span
            v-if='!text'
            style='font-size: 12px;font-style: italic;'
          >无文件</span>
          <a-button
            v-else
            :ghost='true'
            type='primary'
            icon='download'
            size='small'
            @click='downloadFile(text)'>
            @click='downloadFile(text)'
          >
            下载
          </a-button>
        </template>

        <span slot='action' slot-scope='text, record'>
        <span
          slot='action'
          slot-scope='text, record'
        >
          <a @click='handleEdit(record)'>编辑</a>

          <a-divider type='vertical' />
@@ -132,7 +243,10 @@
                <a @click='handleDetail(record)'>详情</a>
              </a-menu-item>
              <a-menu-item>
                <a-popconfirm title='确定删除吗?' @confirm='() => handleDelete(record.id)'>
                <a-popconfirm
                  title='确定删除吗?'
                  @confirm='() => handleDelete(record.id)'
                >
                  <a>删除</a>
                </a-popconfirm>
              </a-menu-item>
@@ -143,7 +257,10 @@
      </a-table>
    </div>

    <risk-prevention-modal ref='modalForm' @ok='modalFormOk'></risk-prevention-modal>
    <risk-prevention-modal
      ref='modalForm'
      @ok='modalFormOk'
    ></risk-prevention-modal>
  </a-card>
</template>

@@ -179,8 +296,8 @@
          title: ' 危险源编码',
          align: 'center',
          dataIndex: 'num',
          scopedSlots: { customRender: 'num' },
          ellipsis: true,
          // scopedSlots: { customRender: 'num' },
          // ellipsis: true,
        },
        {
          title: '危险源名称',
@@ -191,17 +308,17 @@
          title: '危险描述',
          align: 'center',
          dataIndex: 'description',
          scopedSlots: { customRender: 'description' },
          width: 100,
          ellipsis: true,
          // scopedSlots: { customRender: 'description' },
          // width: 100,
          // ellipsis: true,
        },
        {
          title: '防控措施',
          align: 'center',
          dataIndex: 'measure',
          scopedSlots: { customRender: 'measure' },
          width: 100,
          ellipsis: true,
          // scopedSlots: { customRender: 'measure' },
          // width: 100,
          // ellipsis: true,
        },
        {
          title: '创建人',

 src/views/eam/modules/equipmentCategory/EquipmentCategory2List.vue

@@ -69,7 +69,10 @@
        icon="download"
        @click="handleExportXls('设备分类报表')"
      >导出</a-button>
      <a-dropdown v-if="selectedRowKeys.length > 0" v-has="'equipmentCategory:add&Edit&delete'">
      <a-dropdown
        v-if="selectedRowKeys.length > 0"
        v-has="'equipmentCategory:add&Edit&delete'"
      >
        <a-button style="margin-left: 8px">
          批量操作
          <a-icon type="down" />
@@ -95,8 +98,15 @@
      @change="handleTableChange"
      :scroll="{ x: true}"
    >
      <template slot="num" slot-scope="text" >
        <a-tooltip placement="top" :title="text" trigger="hover">
      <template
        slot="num"
        slot-scope="text"
      >
        <a-tooltip
          placement="top"
          :title="text"
          trigger="hover"
        >
          <div>
            <template slot="title"> </template>
            <p style="cusor:pointer; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; width: 130px;">{{ text }}</p>
@@ -247,9 +257,9 @@
          title: '分类编码',
          align: "center",
          dataIndex: 'num',
          scopedSlots: { customRender: 'num' },
          width: 100,
          ellipsis: true,
          // scopedSlots: { customRender: 'num' },
          // width: 100,
          // ellipsis: true,
          // scopedSlots: {
          //   customRender: 'num',
          // },
@@ -266,33 +276,38 @@
          // },
          // sorter: true,
        },
        {
          title: '分类标识',
        // {
        //   title: '分类标识',

          align: "center",
          dataIndex: 'equipmentCategoryUda1_dictText',
          // scopedSlots: {
          //   customRender: 'name',
        //   align: "center",
        //   dataIndex: 'equipmentCategoryUda1_dictText',
        //   // scopedSlots: {
        //   //   customRender: 'name',
        //   // },
        //   // sorter: true,

          // },
          // sorter: true,
        // {
        //   title: '技术状态鉴定周期',

        },
        {
          title: '技术状态鉴定周期',
        //   align: "center",
        //   dataIndex: 'equipmentCategoryUda2_dictText',
        //   // scopedSlots: {
        //   //   customRender: 'name',
        //   // },
        //   // sorter: true,

          align: "center",
          dataIndex: 'equipmentCategoryUda2_dictText',
          // scopedSlots: {
          //   customRender: 'name',
          // },
          // sorter: true,

        },
        {
          title: '创建人',
          align: "center",
          dataIndex: 'createBy',

        },
        {
          title: '创建时间',
          align: "center",
          dataIndex: 'createTime',
        },
        {
          title: '修改人',
@@ -301,17 +316,9 @@

        },
        {
          title: '创建时间',
          align: "center",
          dataIndex: 'createTime',

        },

        {
          title: '修改时间',
          align: "center",
          dataIndex: 'updateTime',

        },

        // {

 src/views/eam/modules/equipmentCategory/EquipmentCategoryModel.vue

@@ -60,7 +60,10 @@
              />
            </a-form-item>
          </a-col>
          <a-col :span="12" v-if="parentId!='-1'">
          <a-col
            :span="12"
            v-if="parentId!='-1'"
          >
            <a-form-item
              label="设备分类名称"
              :labelCol="labelCol"
@@ -74,7 +77,10 @@
              />
            </a-form-item>
          </a-col>
          <a-col :span="12" v-if="parentId=='-1'">
          <a-col
            :span="12"
            v-if="parentId=='-1'"
          >
            <a-form-item
              label="设备分类名称"
              :labelCol="labelCol"
@@ -91,7 +97,10 @@
            </a-form-item>
          </a-col>
        </a-row>
          <a-row :gutter="24">
        <!-- <a-row
          hidden
          :gutter="24"
        >
          <a-col :span="12">
            <a-form-item
              :labelCol="labelCol"
@@ -124,7 +133,7 @@
              />
            </a-form-item>
          </a-col>
        </a-row>
        </a-row> -->
          <a-row :gutter="24">
          <a-col :span="12">
            <a-form-item
@@ -142,7 +151,11 @@
          </a-col>
        </a-row>
      </a-form>
      <a-divider  v-if="title!='新增'" orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 选择子设备分类使其跟随父设备分类属性 </a-divider>
      <a-divider
        v-if="title!='新增'"
        orientation="center"
        style="font-size: large;font-style: italic;color: #66aeed;"
      > 选择子设备分类使其跟随父设备分类属性 </a-divider>
      <a-tabs
        type="card"
        defaultActiveKey="1"
@@ -151,11 +164,16 @@
      <a-tab-pane
          tab='子设备分类'
          key='1'

        >
      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
          <div
            class="ant-alert ant-alert-info"
            style="margin-bottom: 16px;"
          >
        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
            <a
              style="margin-left: 24px"
              @click="onClearSelected"
            >清空</a>
      </div>
      <a-table
      ref="table"
@@ -170,8 +188,15 @@
      @change="handleTableChange"
      :scroll="{ x: true}"
     >
        <template slot="num" slot-scope="text" >
          <a-tooltip placement="top" :title="text" trigger="hover">
            <template
              slot="num"
              slot-scope="text"
            >
              <a-tooltip
                placement="top"
                :title="text"
                trigger="hover"
              >
            <div>
              <template slot="title"> </template>
              <p style="cusor:pointer; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; width: 130px;">{{ text }}</p>
@@ -180,7 +205,6 @@
        </template>

      </a-table>


    </a-tab-pane>
    </a-tabs>

 src/views/eam/modules/equipmentNew/EquipmentModal.vue

@@ -128,24 +128,7 @@
            orientation="center"
            style="font-size: large;font-style: italic;color: #66aeed;"
          >维护及使用信息</a-divider>
          <a-col :span="6">
            <a-form-model-item
              label="维护部门"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="manageId"
            >
              <a-tree-select
                :disabled="formDisabled"
                style="width: 100%"
                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                :tree-data="treeData"
                placeholder="请选择维护部门"
                tree-default-expand-all
                v-model="model.manageId"
              />
            </a-form-model-item>
          </a-col>

          <a-col :span="6">
            <a-form-model-item
              label="使用部门"
@@ -166,6 +149,41 @@
          </a-col>
          <a-col :span="6">
            <a-form-model-item
              label="车间"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="factoryModelId"
            >
              <j-dict-select-tag
                allow-clear
                :disabled="formDisabled"
                placeholder="请选择车间"
                :triggerChange="true"
                dictCode="mom_base_area,name,id,del_flag!='1'"
                v-model="model.factoryModelId"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item
              label="维修部门"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="manageId"
            >
              <a-tree-select
                :disabled="formDisabled"
                style="width: 100%"
                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                :tree-data="treeData"
                placeholder="请选择维修部门"
                tree-default-expand-all
                v-model="model.manageId"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item
              label="维修班组"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
@@ -181,26 +199,10 @@
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item
              label="车间"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="factoryModelId"
            >
              <j-dict-select-tag
                allow-clear
                :disabled="formDisabled"
                placeholder="请选择资车间"
                :triggerChange="true"
                dictCode="mom_base_factory_model,name,id,del_flag!='1'"
                v-model="model.factoryModelId"
              />
            </a-form-model-item>
          </a-col>

        </a-row>
        <a-row>
          <a-col :span="6">
          <!-- <a-col :span="6">
            <a-form-model-item
              label="产线"
              :labelCol="labelCol"
@@ -216,7 +218,7 @@
                v-model="model.workCenterId"
              />
            </a-form-model-item>
          </a-col>
          </a-col> -->
          <a-col :span="6">
            <a-form-model-item
              label="资产制造商"
@@ -304,7 +306,13 @@
              :wrapperCol="wrapperCol"
              prop="warrantyStart"
            >
            <j-date  :disabled="formDisabled" style="width: 100%;" placeholder="请选择开始日期" class="query-group-cust" v-model="model.warrantyStart"></j-date>
              <j-date
                :disabled="formDisabled"
                style="width: 100%;"
                placeholder="请选择开始日期"
                class="query-group-cust"
                v-model="model.warrantyStart"
              ></j-date>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
@@ -314,7 +322,13 @@
              :wrapperCol="wrapperCol"
              prop="warrantyEnd"
            >
            <j-date  :disabled="formDisabled" style="width: 100%;" placeholder="请选择结束日期" class="query-group-cust" v-model="model.warrantyEnd"></j-date>
              <j-date
                :disabled="formDisabled"
                style="width: 100%;"
                placeholder="请选择结束日期"
                class="query-group-cust"
                v-model="model.warrantyEnd"
              ></j-date>
            </a-form-model-item>
          </a-col>
        </a-row>
@@ -384,7 +398,7 @@
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="6">
          <!-- <a-col :span="6">
            <a-form-model-item
              label="工区"
              :labelCol="labelCol"
@@ -397,7 +411,7 @@
                :disabled="formDisabled"
              ></a-input>
            </a-form-model-item>
          </a-col>
          </a-col> -->
          <a-col :span="6">
            <a-form-model-item
              label="重量"
@@ -749,7 +763,10 @@
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6" v-if="needSpecific">
          <a-col
            :span="6"
            v-if="needSpecific"
          >
            <a-form-model-item
              label="关键设备标识"
              :labelCol="labelCol"

 src/views/eam/modules/faultCause/FaultCause2List.vue

@@ -94,16 +94,30 @@
      @change="handleTableChange"
      :scroll="{ x: true}"
    >
      <template slot="num" slot-scope="text" >
        <a-tooltip placement="top" :title="text" trigger="hover">
      <template
        slot="num"
        slot-scope="text"
      >
        <a-tooltip
          placement="top"
          :title="text"
          trigger="hover"
        >
          <div>
            <template slot="title"> </template>
            <p style="cusor:pointer; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; width: 130px;">{{ text }}</p>
          </div>
        </a-tooltip>
      </template>
      <template slot="name" slot-scope="text" >
        <a-tooltip placement="top" :title="text" trigger="hover">
      <template
        slot="name"
        slot-scope="text"
      >
        <a-tooltip
          placement="top"
          :title="text"
          trigger="hover"
        >
          <div>
            <template slot="title"> </template>
            <p style="cusor:pointer; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; width: 130px;">{{ text }}</p>
@@ -240,27 +254,27 @@
          title: '故障原因编码',
          align: "center",
          dataIndex: 'num',
          width: 100,
          scopedSlots: {
            customRender: 'num'
          },
          ellipsis: true,
          // width: 100,
          // scopedSlots: {
          //   customRender: 'num'
          // },
          // ellipsis: true,
        },
        {
          title: '故障原因名称',
          width: 100,
          align: "center",
          dataIndex: 'name',
          scopedSlots: {
            customRender: 'name'
          // width: 100,
          // scopedSlots: {
          //   customRender: 'name'
          // },
          // ellipsis: true,
          },
          ellipsis: true,
        },
        {
          title: '故障原因分类',
          align: "center",
          dataIndex: 'parentName',
        },
        // {
        //   title: '故障原因分类',
        //   align: "center",
        //   dataIndex: 'parentName',
        // },
        {
          title: '创建人',
          align: "center",

 src/views/eam/modules/faultCause/FaultCauseModel.vue

@@ -53,8 +53,8 @@
              :wrapperCol="wrapperCol"
            >
              <a-input
                :disabled="disableSubmit"
                allow-clear
                :disabled="codeDisable"
                :placeholder="disableSubmit?'':'请输入故障原因编号'"
                v-decorator="['num', validatorRules.num ]"
              />