likang

src/styles/detail.scss

@@ -0,0 +1,24 @@
+::v-deep .el-drawer{
+  overflow: scroll !important;
+}
+.detail-item {
+  width: 100%;
+  padding: 15px 0px;
+  list-style-type: none;
+}
+.item {
+  font-size: 14px;
+  color: black;
+  margin-top: 5px;
+}
+.el-table .warning-row {
+  background: oldlace !important;
+}
+
+.el-table .success-row {
+  background: #f0f9eb !important;
+}
+.search_title {
+  font-size: 12px;
+  color: #6a6a6a;
+}

src/views/device/hyd_equipment/alarm.vue

@@ -1,11 +1,11 @@
 <template>
 
-    <!-- 设备数量 -->
-    <div class="layout-1">
-      <el-row :gutter="8">
-        <el-col class="gutter-row item item1" :span="4" v-show="is_show" >
-         <a href="javascript:void(0);" @click="search()"> 
-           <div class="gutter-box" :style="item1Style">
+  <!-- 设备数量 -->
+  <div class="layout-1">
+    <el-row :gutter="8">
+      <el-col class="gutter-row item item1" :span="4" v-if="is_show">
+        <a href="javascript:void(0);" @click="search()">
+          <div class="gutter-box" :style="item1Style">
             <div class="today-add">
               <span>总设备数量</span>
             </div>
@@ -19,13 +19,13 @@
               <span class="text">设备总数</span>
             </div>
           </div>
-          </a>
-        </el-col>
-        <el-col class="gutter-row item item1" :span="4" v-for="(item,index) in list" :key="index" >
-          <a href="javascript:void(0);" @click="search(item.id)"> 
-           <div class="gutter-box" :style="item.style">
+        </a>
+      </el-col>
+      <el-col class="gutter-row item item1" :span="4" v-for="(item, index) in list" :key="index">
+        <a href="javascript:void(0);" @click="search(item.id)">
+          <div class="gutter-box" :style="item.style">
             <div class="today-add">
-              <span>{{item.name}}设备数量</span>
+              <span>{{ item.name }}设备数量</span>
             </div>
             <div class="count">
               <div>
@@ -34,13 +34,13 @@
                   <countTo v-else :startVal="startVal" :endVal="item.total" :duration="duration"></countTo>
                 </span>
               </div>
-              <span class="text">{{item.name}}总数</span>
+              <span class="text">{{ item.name }}总数</span>
             </div>
           </div>
-          </a>
-        </el-col>
-      </el-row>
-    </div>
+        </a>
+      </el-col>
+    </el-row>
+  </div>
 </template>
 
 <script>
@@ -56,72 +56,73 @@ export default {
   directives: { action },
   components: {
     countTo,
+
   },
-    props:[
-        'countList',
-    ],
+  props: [
+    'countList',
+  ],
   data() {
     return {
       duration: 3000,
       showLoading: true,
       startVal: 0,
-      list:[],
-      is_show:false,
-    
+      list: [],
+      is_show: false,
+
       item1Style: { "background-color": "#32c5d2" },
-      itemStyleList:[
-         { "background-color": "#4caf50" },
-         { "background-color": "#7ba7bd" },
-         { "background-color": "#e7505a" },
-         { "background-color": "#4cb563" },
+      itemStyleList: [
+        { "background-color": "#4caf50" },
+        { "background-color": "#7ba7bd" },
+        { "background-color": "#e7505a" },
+        { "background-color": "#4cb563" },
       ]
-      
+
     };
   },
   computed: {
 
-    total: function() {
-        let list = this.list;
-        let total =0;
-        list.forEach((item) => {
-            
-            total = total+item.total;
-            
-        });
+    total: function () {
+      let list = this.list;
+      let total = 0;
+      list.forEach((item) => {
+
+        total = total + item.total;
+
+      });
       return total;
     },
-    online: function() {
+    online: function () {
       return this.statusCount.alarm + this.statusCount.normal;
     }
   },
-  created(){
+  created() {
+    this.getEquTotal();
   },
   mounted() {
-    this.getEquTotal();
+   
   },
   methods: {
     //获取设备类别
-    getEquTotal(){
-        this.$http.get("getTotalByEquipmentType",{params: {id:1}}).then(response => {
-            this.list =[];
-          let list =response.data;
-          list.forEach((item,index,array)=>{
-              item.style = this.itemStyleList[index];
-              this.list.push(item);
-          });
-           this.is_show=true;
-        }); 
-        this.showLoading=false;
+    getEquTotal() {
+      this.$http.get("getTotalByEquipmentType", { params: { id: 1 } }).then(response => {
+        this.list = [];
+        let list = response.data;
+        list.forEach((item, index, array) => {
+          item.style = this.itemStyleList[index];
+          this.list.push(item);
+        });
+        this.is_show = true;
+      });
+      this.showLoading = false;
     },
-    search(name)
-    {
-       
-        this.$emit('eq_type',name)
+    search(name) {
+
+      this.$emit('eq_type', name)
     }
 
   },
 
-  
+
 };
 </script>
 

src/views/device/hyd_equipment/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="min">
     <alarm @eq_type="eqSelect"></alarm>
 
     <div class="app-container">
@@ -681,7 +681,12 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+
  @import "@/views/device/hyd_equipment/index.scss";
  @import "@/views/device/hyd_equipment/alarm.scss";
+ .min {
+   width: 100%;
+   min-width: 1600px;
+ }
 
 </style>

src/views/device/storage_equipment/alarm.vue

@@ -1,11 +1,11 @@
 <template>
 
-    <!-- 设备数量 -->
-    <div class="layout-1">
-      <el-row :gutter="8">
-        <el-col class="gutter-row item item1" :span="4" v-show="is_show" >
-         <a href="javascript:void(0);" @click="search()"> 
-           <div class="gutter-box" :style="item1Style">
+  <!-- 设备数量 -->
+  <div class="layout-1">
+    <el-row :gutter="8">
+      <el-col class="gutter-row item item1" :span="4" v-if="is_show">
+        <a href="javascript:void(0);" @click="search()">
+          <div class="gutter-box" :style="item1Style">
             <div class="today-add">
               <span>总设备数量</span>
             </div>
@@ -19,11 +19,11 @@
               <span class="text">设备总数</span>
             </div>
           </div>
-          </a>
-        </el-col>
-        <el-col class="gutter-row item item1" :span="4" v-for="(item,index) in list" :key="index" >
-          <a href="javascript:void(0);" @click="search(item.id)"> 
-           <div class="gutter-box" :style="item.style">
+        </a>
+      </el-col>
+      <el-col class="gutter-row item item1" :span="4" v-for="(item,index) in list" :key="index">
+        <a href="javascript:void(0);" @click="search(item.id)">
+          <div class="gutter-box" :style="item.style">
             <div class="today-add">
               <span>{{item.name}}设备数量</span>
             </div>
@@ -37,10 +37,10 @@
               <span class="text">{{item.name}}总数</span>
             </div>
           </div>
-          </a>
-        </el-col>
-      </el-row>
-    </div>
+        </a>
+      </el-col>
+    </el-row>
+  </div>
 </template>
 
 <script>
@@ -95,10 +95,10 @@ export default {
       return this.statusCount.alarm + this.statusCount.normal;
     }
   },
-  created(){
+  created() {
+    this.getEquTotal();
   },
   mounted() {
-    this.getEquTotal();
   },
   methods: {
     //获取设备类别

src/views/device/storage_equipment/index.vue

@@ -1,375 +1,148 @@
 <template>
-  <div>
+  <div class="min">
     <alarm @eq_type="eqSelect"></alarm>
 
     <div class="app-container">
-    <div class="filter-container" style="padding-bottom: 0px">
-      <div class="search-box-area" id="searchBox">
-        <div class="search-item">
-          <el-select
-            class="filter-item form-search-input fl"
-            v-model="queryParam.equipment_type"
-            placeholder="请选择设备类别"
-            clearable
-            @change="handleChange"
-          >
-           <el-option
-              v-for="item in equ_types"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          
-          </el-select>
-        </div>
-        <div class="search-item">
-          <el-input
-            v-model="queryParam.material_number"
-            placeholder="请输入物料号"
-            clearable
-            class="filter-item form-search-input fl"
-            @keyup.enter.native="handleSearch"
-          />
+      <div class="filter-container" style="padding-bottom: 0px">
+        <div class="search-box-area" id="searchBox">
+          <div class="search-item">
+            <el-select class="filter-item form-search-input fl" v-model="queryParam.equipment_type"
+              placeholder="请选择设备类别" clearable @change="handleChange">
+              <el-option v-for="item in equ_types" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+
+            </el-select>
+          </div>
+          <div class="search-item">
+            <el-input v-model="queryParam.material_number" placeholder="请输入物料号" clearable
+              class="filter-item form-search-input fl" @keyup.enter.native="handleSearch" />
+          </div>
+          <div class="search-item">
+            <el-input v-model="queryParam.name" placeholder="请输入设备名称" clearable class="filter-item form-search-input fl"
+              @keyup.enter.native="handleSearch" />
+          </div>
+          <div class="search-item">
+            <el-input v-model="queryParam.number" placeholder="请输入固定资产/类固资产/序列" clearable
+              class="filter-item form-search-input fl" @keyup.enter.native="handleSearch" />
+          </div>
+
         </div>
-        <div class="search-item">
-          <el-input
-            v-model="queryParam.name"
-            placeholder="请输入设备名称"
-            clearable
-            class="filter-item form-search-input fl"
-            @keyup.enter.native="handleSearch"
-          />
+        <div class="search-operate-area">
+          <!-- <el-input v-model="queryParam.code" placeholder="唯一编码" clearable class="filter-item form-search-input fl" /> -->
+          <el-button class="filter-item search fl" icon="el-icon-search" @click="handleSearch">搜索</el-button>
+          <el-button class="filter-item fl" icon="el-icon-refresh" @click="handleRefresh">重置</el-button>
+          <el-button class="filter-item search fl"
+            :icon="this.searchDisplay ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" @click="searchDis">{{ word }}
+          </el-button>
         </div>
-          <div class="search-item">
-          <el-input
-            v-model="queryParam.number"
-            placeholder="请输入固定资产/类固资产/序列"
-            clearable
-            class="filter-item form-search-input fl"
-            @keyup.enter.native="handleSearch"
-          />
+        <div class="list-operate-area">
+          <!-- <el-button size="mini" class="filter-item search fl" icon="el-icon-plus" @click="handleCreate">添加</el-button> -->
+          <el-button class="filter-item search fl" icon="el-icon-setting" @click="showColumnOption">列设置</el-button>
+          <el-button class="filter-item search fl" icon="el-icon-refresh-right" @click="refresh">刷新</el-button>
         </div>
-
-      </div>
-      <div class="search-operate-area">
-        <!-- <el-input v-model="queryParam.code" placeholder="唯一编码" clearable class="filter-item form-search-input fl" /> -->
-        <el-button
-          class="filter-item search fl"
-          icon="el-icon-search"
-          @click="handleSearch"
-          >搜索</el-button
-        >
-        <el-button
-          class="filter-item fl"
-          icon="el-icon-refresh"
-          @click="handleRefresh"
-          >重置</el-button
-        >
-        <el-button
-          class="filter-item search fl"
-          :icon="this.searchDisplay ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"
-          @click="searchDis"
-          >{{ word }}</el-button
-        >
-      </div>
-      <div class="list-operate-area">
-        <!-- <el-button size="mini" class="filter-item search fl" icon="el-icon-plus" @click="handleCreate">添加</el-button> -->
-        <el-button
-          class="filter-item search fl"
-          icon="el-icon-setting"
-          @click="showColumnOption"
-          >列设置</el-button
-        >
-        <el-button
-          class="filter-item search fl"
-          icon="el-icon-refresh-right"
-          @click="refresh"
-          >刷新</el-button
-        >
       </div>
-    </div>
-    <el-table
-      :data="data"
-      v-loading="loading"
-      ref="multipleTable"
-      @selection-change="hydraulicSelectMulti"
-      @sort-change="sortChange"
-      :dynamicColumnSetting="true"
-      tooltip-effect="dark"
-      style="width: 100%"
-      border
-      fit
-    >
-      <el-table-column
-        type="selection"
-        fixed="left"
-        width="55"
-      ></el-table-column>
-      <el-table-column
-        prop="material_number"
-        label="物料号"
-        align="center"
-        v-if="showColumn.material_number"
-
-        width="120"
-      />
-      <el-table-column
-        prop="classification"
-        label="设备分类"
-        align="center"
-        v-if="showColumn.classification"
-       
-      />
-      <el-table-column
-        prop="equ_type_name"
-        label="设备类别"
-        align="center"
-        v-if="showColumn.equ_type_name"
-       
-        width="120"
-      />
-       <el-table-column
-        prop="name"
-        label="设备名称"
-        align="center"
-        v-if="showColumn.name"
-       
-        width="120"
-      />
-      <el-table-column
-        prop="equipment_model"
-        label="设备型号"
-        align="center"
-        v-if="showColumn.equipment_model"
-      />
-      <el-table-column
-        prop="issue_unit"
-        label="发放单位"
-        align="center"
-        v-if="showColumn.issue_unit"
-       
-      />
-      <el-table-column
-        prop="fixed_asset_number"
-        label="固定资产编号"
-        align="center"
-        v-if="showColumn.fixed_asset_number"
-      />
-       <el-table-column
-        prop="fixed_asset_number2"
-        label="类固资产编号"
-        align="center"
-        v-if="showColumn.fixed_asset_number"
-      />
+      <el-table :data="data" v-loading="loading" ref="multipleTable" @selection-change="hydraulicSelectMulti"
+        @sort-change="sortChange" :dynamicColumnSetting="true" tooltip-effect="dark" style="width: 100%" border fit>
+        <el-table-column type="selection" fixed="left" width="55"></el-table-column>
+        <el-table-column prop="material_number" label="物料号" align="center" v-if="showColumn.material_number"
+          width="120" />
+        <el-table-column prop="classification" label="设备分类" align="center" v-if="showColumn.classification" />
+        <el-table-column prop="equ_type_name" label="设备类别" align="center" v-if="showColumn.equ_type_name" width="120" />
+        <el-table-column prop="name" label="设备名称" align="center" v-if="showColumn.name" width="120" />
+        <el-table-column prop="equipment_model" label="设备型号" align="center" v-if="showColumn.equipment_model" />
+        <el-table-column prop="issue_unit" label="发放单位" align="center" v-if="showColumn.issue_unit" />
+        <el-table-column prop="fixed_asset_number" label="固定资产编号" align="center" v-if="showColumn.fixed_asset_number" />
+        <el-table-column prop="fixed_asset_number2" label="类固资产编号" align="center"
+          v-if="showColumn.fixed_asset_number" />
 
-      <el-table-column
-        prop="serial_number"
-        label="序列号"
-        align="center"
-        v-if="showColumn.serial_number"
-  
-      />
-      <el-table-column
-        prop="factory_number"
-        label="出厂编号"
-        align="center"
-       
-        v-if="showColumn.factory_number"
-      />
-      <el-table-column
-        prop="check_last_time"
-        label="上次校验时间"
-        align="center"
-        v-if="showColumn.check_last_time"
-       
-        width="100"
-      />
-      <el-table-column
-        prop="check_next_time"
-        label="下次校验时间"
-        align="center"
-       
-        width="100"
-        v-if="showColumn.check_next_time"
-      />
-      <el-table-column
-        prop="check_status1"
-        label="校验状态"
-        align="center"
-        v-if="showColumn.check_status1"
-      />
-       <el-table-column
-        prop="status1"
-        label="状态"
-        align="center"
-        v-if="showColumn.status1"
-       
-      />
-      <el-table-column
-        label="操作"
-        width="180"
-        align="center"
-        fixed="right"
-      >
-        <template slot-scope="record">
-          <el-tooltip
-            content="修改"
-            placement="top"
-            :enterable="false"
-          >
-            <el-button
-              type="primary"
-              size="mini"
-              icon="el-icon-edit"
-              @click="handleUpdate(record.row)"
-            ></el-button>
-          </el-tooltip>
-          <el-tooltip
-            content="查看"
-            placement="top"
-            :enterable="false"
-          >
-            <el-button
-              type="primary"
-              size="mini"
-              icon="el-icon-view"
-              @click="handleDetail(record.row)"
-            ></el-button>
-          </el-tooltip>
-          <el-button type="danger" size="mini" icon="el-icon-delete" @click="handleDelete(record.row.id)" />
-        </template>
-      </el-table-column>
-    </el-table>
-    <transition name="fade">
-      <div class="columnOption" v-show="isShowColumn">
-        <div class="content">
-          <div class="head">选择显示字段</div>
-          <div class="body">
-            <el-checkbox v-model="checkList.depart_name" disabled>所属部门</el-checkbox>
-            <!-- <el-checkbox v-model="checkList.alarm_state_text" disabled>告警状态</el-checkbox> -->
-            <el-checkbox v-model="checkList.material_number">物料号</el-checkbox>
-            <el-checkbox v-model="checkList.classification">设备分类</el-checkbox>
-            <el-checkbox v-model="checkList.equ_type_name">设备类别</el-checkbox>
-            <el-checkbox v-model="checkList.name">名称</el-checkbox>
-            <el-checkbox v-model="checkList.equipment_model">设备型号</el-checkbox>
-            <el-checkbox v-model="checkList.fixed_asset_number">固定资产编号</el-checkbox>
-            <el-checkbox v-model="checkList.fixed_asset_number2">类固定资产编号</el-checkbox>
-            <el-checkbox v-model="checkList.serial_number">序列号</el-checkbox>
-            <el-checkbox v-model="checkList.factory_number">出厂编号</el-checkbox>
-            <el-checkbox v-model="checkList.check_last_time">上次校验时间</el-checkbox>
-            <el-checkbox v-model="checkList.check_next_time">下次校验时间</el-checkbox>
-            <el-checkbox v-model="checkList.check_status1">校验状态</el-checkbox>
-            <el-checkbox v-model="checkList.status1">状态</el-checkbox>
-          </div>
-          <div class="footer">
-            <el-button size="small" type="primary" plain @click="saveColumn"
-              >保存列配置</el-button
-            >
+        <el-table-column prop="serial_number" label="序列号" align="center" v-if="showColumn.serial_number" />
+        <el-table-column prop="factory_number" label="出厂编号" align="center" v-if="showColumn.factory_number" />
+        <el-table-column prop="check_last_time" label="上次校验时间" align="center" v-if="showColumn.check_last_time"
+          width="100" />
+        <el-table-column prop="check_next_time" label="下次校验时间" align="center" width="100"
+          v-if="showColumn.check_next_time" />
+        <el-table-column prop="check_status1" label="校验状态" align="center" v-if="showColumn.check_status1" />
+        <el-table-column prop="status1" label="状态" align="center" v-if="showColumn.status1" />
+        <el-table-column label="操作" width="180" align="center" fixed="right">
+          <template slot-scope="record">
+            <el-tooltip content="修改" placement="top" :enterable="false">
+              <el-button type="primary" size="mini" icon="el-icon-edit" @click="handleUpdate(record.row)"></el-button>
+            </el-tooltip>
+            <el-tooltip content="查看" placement="top" :enterable="false">
+              <el-button type="primary" size="mini" icon="el-icon-view" @click="handleDetail(record.row)"></el-button>
+            </el-tooltip>
+            <el-button type="danger" size="mini" icon="el-icon-delete" @click="handleDelete(record.row.id)" />
+          </template>
+        </el-table-column>
+      </el-table>
+      <transition name="fade">
+        <div class="columnOption" v-show="isShowColumn">
+          <div class="content">
+            <div class="head">选择显示字段</div>
+            <div class="body">
+              <el-checkbox v-model="checkList.depart_name" disabled>所属部门</el-checkbox>
+              <!-- <el-checkbox v-model="checkList.alarm_state_text" disabled>告警状态</el-checkbox> -->
+              <el-checkbox v-model="checkList.material_number">物料号</el-checkbox>
+              <el-checkbox v-model="checkList.classification">设备分类</el-checkbox>
+              <el-checkbox v-model="checkList.equ_type_name">设备类别</el-checkbox>
+              <el-checkbox v-model="checkList.name">名称</el-checkbox>
+              <el-checkbox v-model="checkList.equipment_model">设备型号</el-checkbox>
+              <el-checkbox v-model="checkList.fixed_asset_number">固定资产编号</el-checkbox>
+              <el-checkbox v-model="checkList.fixed_asset_number2">类固定资产编号</el-checkbox>
+              <el-checkbox v-model="checkList.serial_number">序列号</el-checkbox>
+              <el-checkbox v-model="checkList.factory_number">出厂编号</el-checkbox>
+              <el-checkbox v-model="checkList.check_last_time">上次校验时间</el-checkbox>
+              <el-checkbox v-model="checkList.check_next_time">下次校验时间</el-checkbox>
+              <el-checkbox v-model="checkList.check_status1">校验状态</el-checkbox>
+              <el-checkbox v-model="checkList.status1">状态</el-checkbox>
+            </div>
+            <div class="footer">
+              <el-button size="small" type="primary" plain @click="saveColumn">保存列配置</el-button>
+            </div>
           </div>
         </div>
-      </div>
-    </transition>
-    <el-button
-      type="primary"
-      icon="el-icon-plus"
-      :loading="downloadLoading"
-      style="margin-top: 15px"
-      @click="handleCreate"
-      >添加</el-button
-    >
-    <el-button
-      type="danger"
-      icon="el-icon-delete"
-      v-if="selectedIds.length > 0"
-      style="margin-top: 15px"
-      @click="handleMultiDelete()"
-      >删除</el-button
-    >
-    <el-button
-      type="warning"
-      icon="el-icon-download"
-      :loading="downloadLoading"
-      style="margin-top: 15px"
-      @click="exportExcel"
-      >导出</el-button
-    >
-    <el-button
-      type="success"
-      icon="el-icon-upload"
-      :loading="downloadLoading"
-      style="margin-top: 15px"
-      @click="importExcel"
-      >导入</el-button
-    >
-    <el-pagination
-      background
-      class="pagination-container"
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-      :current-page="paginate.current"
-      :page-sizes="paginate.sizes"
-      :page-size="paginate.limit"
-      :layout="paginate.layout"
-      :total="paginate.total"
-    />
-     <form-model
-      @sendVal="closeDialog"
-      :formModelVisible="formVisible"
-      :title="title"
-      :ref="formName"
-    />
-    <detail
-      :detailVisible="detailVisible"
-       @sendVal="closeDrawer"
-       :record="detail"
-    />
-   
+      </transition>
+      <el-button type="primary" icon="el-icon-plus" :loading="downloadLoading" style="margin-top: 15px"
+        @click="handleCreate">添加</el-button>
+      <el-button type="danger" icon="el-icon-delete" v-if="selectedIds.length > 0" style="margin-top: 15px"
+        @click="handleMultiDelete()">删除</el-button>
+      <el-button type="warning" icon="el-icon-download" :loading="downloadLoading" style="margin-top: 15px"
+        @click="exportExcel">导出</el-button>
+      <el-button type="success" icon="el-icon-upload" :loading="downloadLoading" style="margin-top: 15px"
+        @click="importExcel">导入</el-button>
+      <el-pagination background class="pagination-container" @size-change="handleSizeChange"
+        @current-change="handleCurrentChange" :current-page="paginate.current" :page-sizes="paginate.sizes"
+        :page-size="paginate.limit" :layout="paginate.layout" :total="paginate.total" />
+      <form-model @sendVal="closeDialog" :formModelVisible="formVisible" :title="title" :ref="formName" />
+      <detail :detailVisible="detailVisible" @sendVal="closeDrawer" :record="detail" />
 
-    <!-- 导入弹框 -->
-    <el-dialog
-      title="导入液压设备"
-      append-to-body
-      width="400px"
-      :visible.sync="uploadDialogVisible"
-      custom-class="upload-dialog"
-    >
 
-      <el-upload
-        class="upload-demo"
-        drag
-        :action="actionUrl"
-        :headers="headers"
-        :before-upload="beforeUpload"
-        :show-file-list="true"
-        :on-change="onchange"
-        :on-remove="onremove"
-        :on-exceed="onexeced"
-        :limit="1"
-        ref="upload"
-      >
-        <i class="el-icon-upload"></i>
-        <div class="el-upload__text">
-          将文件拖到此处，或
-          <em>点击上传</em>
-        </div>
-        <div class="el-upload__tip upload-tips" slot="tip">
-          只能上传xls/xlsx文件
-        </div>
-      </el-upload>
-      <el-link
-        type="primary"
-        href="https://rlfd.oss-cn-hangzhou.aliyuncs.com/smart_tool/import_pump.xls"
-        style="margin-top: 10px"
-        >下载模板</el-link
-      >
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="uploadDialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="importCards" :loading="loadings">{{
-          submitText
-        }}</el-button>
-      </span>
-    </el-dialog>
-  </div>
+      <!-- 导入弹框 -->
+      <el-dialog title="导入液压设备" append-to-body width="400px" :visible.sync="uploadDialogVisible"
+        custom-class="upload-dialog">
+
+        <el-upload class="upload-demo" drag :action="actionUrl" :headers="headers" :before-upload="beforeUpload"
+          :show-file-list="true" :on-change="onchange" :on-remove="onremove" :on-exceed="onexeced" :limit="1"
+          ref="upload">
+          <i class="el-icon-upload"></i>
+          <div class="el-upload__text">
+            将文件拖到此处，或
+            <em>点击上传</em>
+          </div>
+          <div class="el-upload__tip upload-tips" slot="tip">
+            只能上传xls/xlsx文件
+          </div>
+        </el-upload>
+        <el-link type="primary" href="https://rlfd.oss-cn-hangzhou.aliyuncs.com/smart_tool/import_pump.xls"
+          style="margin-top: 10px">下载模板</el-link>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="uploadDialogVisible = false">取 消</el-button>
+          <el-button type="primary" @click="importCards" :loading="loadings">{{
+            submitText
+            }}</el-button>
+        </span>
+      </el-dialog>
+    </div>
   </div>
 </template>
 
@@ -637,7 +410,13 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+
+
  @import "@/views/device/hyd_equipment/index.scss";
  @import "@/views/device/hyd_equipment/alarm.scss";
+ .min{
+  width:100%;
+  min-width: 1600px;
+ }
 
 </style>

src/views/equipment/equipment_type/index.vue

@@ -1,12 +1,7 @@
 <template>
   <div class="app-container">
     <el-table :data="data" style="width: 100%;margin-bottom: 20px;" row-key="id" border default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
-      <el-table-column
-      prop="id"
-      label="id"
-      sortable
-      width="180">
-    </el-table-column>
+
        <el-table-column
       prop="name"
       label="名称"
@@ -60,7 +55,7 @@
       <el-form :ref="formName" :model="formFieldsData" :rules="rules">
         <el-form-item label="设备分类" :label-width="formLabelWidth" prop="pid" required>
           <el-select   v-model="formFieldsData.pid"  clearable  style="width: 250px"  placeholder="请选择设备类型">
-               <el-option  label="无设备类别" value='0'></el-option>
+               <!-- <el-option  label="无设备类别" value='0'></el-option> -->
               <el-option
                 v-for="item in deviceTypes"
                 :key="item.id"
@@ -117,16 +112,16 @@ export default {
       // 表单验证
       rules: {
         name: [
-          { required: true, message: '请输入名称', trigger: ['change','blur'] }
+          { required: true, message: '请输入名称', trigger: ['change'] }
         ],
         pid:[
-          {required:true,message: '请选择类别', trigger: ['change','blur']}
+          {required:true,message: '请选择类别', trigger: ['change']}
         ],
         status:[
-           { required: true,message: '请选择状态', trigger: ['change','blur'] }
+           { required: true,message: '请选择状态', trigger: ['change'] }
         ],
         order:[
-           { required: true, message: '请输入顺序',trigger: ['change','blur']  },
+           { required: true, message: '请输入顺序',trigger: ['change']  },
            {
               required: true,
               pattern: /^[1-9]\d*$/,
@@ -139,7 +134,9 @@ export default {
   },
   created() {
     this.$http.get("findParentEquipmentTyp").then(resp => {
-        this.deviceTypes = resp.data
+      let data = resp.data;
+      data.unshift({ id: 0, name: '无设备类型' });
+        this.deviceTypes = data
      });
   },
 }