tongshanglei 3 yıl önce
ebeveyn
işleme
847ece025b

+ 54 - 316
src/views/device/hydraulic/detail.vue

@@ -3,7 +3,7 @@
     title="设备信息"
     :visible.sync="drawerVisible"
     :direction="direction"
-    size="60%"
+    size="45%"
   >
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
       <el-tab-pane label="液压泵信息" name="first">
@@ -15,16 +15,16 @@
               style="margin-top: 10px; font-size: 14px; color: #a0a0a0"
             >
               <div class="detail-item">
-                <span>法兰编号:</span>
-                <span class="item">{{ data.number }}</span>
+                <pre style="display: inline">编    号:</pre>
+                <span class="item">{{ record.number }}</span>
               </div>
               <div class="detail-item">
                 <pre style="display: inline">型    号:</pre>
-                <span class="item">{{ data.model }}</span>
+                <span class="item">{{ record.model }}</span>
               </div>
               <div class="detail-item">
                 <span>所属部门:</span>
-                <span class="item">{{ data.depart_name }}</span>
+                <span class="item">{{ record.depart_name }}</span>
               </div>
             </el-col>
             <el-col
@@ -33,7 +33,7 @@
             >
               <div class="detail-item">
                 <pre style="display: inline">名    称:</pre>
-                <span class="item">{{ data.name }}</span>
+                <span class="item">{{ record.name }}</span>
               </div>
               <div class="detail-item">
                 <span>使用状态:</span>
@@ -41,7 +41,7 @@
               </div>
               <div class="detail-item">
                 <pre style="display: inline">品    牌:</pre>
-                <span class="item">{{ data.brand }}</span>
+                <span class="item">{{ record.brand }}</span>
               </div>
             </el-col>
             <el-col
@@ -50,15 +50,15 @@
             >
               <div class="detail-item">
                 <pre style="display: inline">供 应 商:</pre>
-                <span class="item">{{ data.supplier }}</span>
+                <span class="item">{{ record.supplier }}</span>
               </div>
               <div class="detail-item">
                 <span>出厂日期:</span>
-                <span class="item">{{ data.out_date }}</span>
+                <span class="item">{{ record.out_date }}</span>
               </div>
               <div class="detail-item">
                 <pre style="display: inline">备    注:</pre>
-                <span class="item">{{ data.remark }}</span>
+                <span class="item">{{ record.remark }}</span>
               </div>
             </el-col>
             <el-col :span="6"></el-col>
@@ -73,332 +73,61 @@
             >
               <div class="detail-item">
                 <pre style="display: inline">压力范围(PSI):</pre>
-                <span class="item">{{ data.pressure_range }}</span>
+                <span class="item">{{ record.min_pressure }}~{{ record.max_pressure }}</span>
               </div>
             </el-col>
           </div>
         </el-row>
       </el-tab-pane>
-      <el-tab-pane label="使用扳手" name="second">
-        <el-table
-          :data="AssemblyData"
-          style="width: 100%; margin-left: 20px"
-          :row-class-name="tableRowClassName"
-        >
-          <el-table-column prop="number" label="编号"> </el-table-column>
-          <el-table-column prop="name" label="名称"> </el-table-column>
-          <el-table-column prop="model" label="型号"> </el-table-column>
-        </el-table>
-      </el-tab-pane>
-      <el-tab-pane label="螺栓紧固方案" name="third">
-        <el-divider content-position="left"><span style="color:#1850ef">单同步</span></el-divider>
-        <el-table
-          :data="oneData"
-          style="width: 100%;margin-left: 20px"
-        >
-          <el-table-column prop="step" label="步骤">
-          </el-table-column>
-          <el-table-column prop="number" label="螺栓编号">
-          </el-table-column>
-          <el-table-column prop="preload" label="标准预紧力(N*m)"> </el-table-column>
-        </el-table>
-        <el-divider content-position="left"><span style="color:#1850ef">两同步</span></el-divider>
-        <el-table
-          :data="twoData"
-          style="width: 100%;margin-left: 20px"
-        >
-          <el-table-column prop="step" label="步骤">
-          </el-table-column>
-          <el-table-column prop="number" label="螺栓编号">
-          </el-table-column>
-          <el-table-column prop="preload" label="标准预紧力(N*m)"> </el-table-column>
-        </el-table>
-        <el-divider content-position="left"><span style="color:#1850ef">四同步</span></el-divider>
-        <el-table
-          :data="fourData"
-          style="width: 100%;margin-left: 20px"
-        >
-          <el-table-column prop="step" label="步骤">
-          </el-table-column>
-          <el-table-column prop="number" label="螺栓编号">
-          </el-table-column>
-          <el-table-column prop="preload" label="标准预紧力(N*m)"> </el-table-column>
-        </el-table>
-        <el-divider content-position="left"><span style="color:#1850ef">六同步</span></el-divider>
-        <el-table
-          :data="sixData"
-          style="width: 100%;margin-left: 20px"
-        >
-          <el-table-column prop="step" label="步骤">
-          </el-table-column>
-          <el-table-column prop="number" label="螺栓编号">
-          </el-table-column>
-          <el-table-column prop="preload" label="标准预紧力(N*m)"> </el-table-column>
-        </el-table>
-      </el-tab-pane>
-      <el-tab-pane label="实时维保信息" name="fourth">
-           <el-table
-          :data="nowData"
-          style="width: 100%;margin-left: 20px"
-        >
-          <el-table-column prop="number" label="螺栓编号">
-          </el-table-column>
-          <el-table-column prop="real_preload" label="实际预紧力(N*m)">
-          </el-table-column>
-          <el-table-column prop="stand_preload" label="标准预紧力(N*m)">
-          </el-table-column>
-          <el-table-column prop="end_time" label="预紧结束时间">
-          </el-table-column>
-          <el-table-column prop="beng_no" label="液压泵编号">
-          </el-table-column>
-          <el-table-column prop="banshou_no" label="液压扳手编号">
-          </el-table-column>
-          <el-table-column prop="ways" label="紧固方式">
-          </el-table-column>
-          <el-table-column prop="operator" label="操作员"> </el-table-column>
-        </el-table>
-      </el-tab-pane>
-      <el-tab-pane label="历史维保记录" name="five">
-           <el-table
-          :data="historyData"
-          style="width: 100%;margin-left: 20px"
-        >
-         <el-table-column prop="number" label="螺栓编号">
-          </el-table-column>
-          <el-table-column prop="real_preload" label="实际预紧力(N*m)">
-          </el-table-column>
-          <el-table-column prop="stand_preload" label="标准预紧力(N*m)">
-          </el-table-column>
-          <el-table-column prop="end_time" label="预紧结束时间">
-          </el-table-column>
-          <el-table-column prop="beng_no" label="液压泵编号">
-          </el-table-column>
-          <el-table-column prop="banshou_no" label="液压扳手编号">
-          </el-table-column>
-          <el-table-column prop="ways" label="紧固方式">
-          </el-table-column>
-          <el-table-column prop="operator" label="操作员"> </el-table-column>
+      <el-tab-pane label="维保记录" name="fourth">
+          <el-table
+            :data="data"
+            style="width: 100%;margin-left: 20px"
+          >
+          <el-table-column prop="longitude" label="经度" align="center"></el-table-column>
+          <el-table-column prop="latitude" label="纬度" align="center"></el-table-column>
+          <el-table-column prop="device_state" label="设备状态" align="center"></el-table-column>
+          <el-table-column prop="online_time" label="运行时间" align="center"></el-table-column>
+          <el-table-column prop="info" label="维护信息" align="center"></el-table-column>
+          
         </el-table>
+        <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"
+    />
       </el-tab-pane>
+      
     </el-tabs>
   </el-drawer>
 </template>
 <script>
+import rlListOperate from "@/layout/rl-list-operate/rlListOperate";
 export default {
-  props: ["detailVisible", "data"],
+  props: ["detailVisible", "record"],
+  mixins: [rlListOperate],
   data() {
     return {
       drawer: false,
       direction: "rtl",
       activeName: "first",
-      AssemblyData: [
-        {
-          model: "v23300",
-          name: "测试工具1",
-          number: "2022030301",
-        },
-        {
-          model: "v23301",
-          name: "测试工具2",
-          number: "2022030302",
-        },
-        {
-          model: "v23302",
-          name: "测试工具3",
-          number: "2022030303",
-        },
-        {
-          model: "v23303",
-          name: "测试工具4",
-          number: "2022030304",
-        },
-      ],
-       oneData: [
-        {
-          step: 1,
-          preload: "2120",
-          number: "01",
-        },
-        {
-          step: 2,
-          preload: "2126",
-          number: "02",
-        }
-      ],
-      twoData: [
-        {
-          step: 1,
-          preload: "2128",
-          number: "03",
-        },
-        {
-          step: 2,
-          preload: "2100",
-          number: "04",
-        }
-      ],
-       fourData: [
-        {
-          step: 1,
-          preload: "2128",
-          number: "05",
-        },
-        {
-          step: 2,
-          preload: "2100",
-          number: "06",
-        }
-      ],
-       sixData: [
-        {
-          step: 1,
-          preload: "2128",
-          number: "07",
-        },
-        {
-          step: 2,
-          preload: "2100",
-          number: "08",
-        }
-      ],
-       nowData: [
-        {
-          number: '09',
-          real_preload: "2128",
-          stand_preload: "3000",
-          end_time:'2022-03-02 15:31:54',
-          beng_no:'200001',
-          banshou_no:'300001',
-          ways:'单同步',
-          operator:'张速'
-        },
-        {
-          number: 10,
-          real_preload: "2129",
-          stand_preload: "3001",
-          end_time:'2022-03-02 16:31:44',
-          beng_no:'200002',
-          banshou_no:'300002',
-          ways:'两同步',
-          operator:'张速'
-        },
-         {
-          number: 11,
-          real_preload: "2139",
-          stand_preload: "3002",
-          end_time:'2022-03-02 16:31:44',
-          beng_no:'200002',
-          banshou_no:'300002',
-          ways:'四同步',
-          operator:'张速'
-        },
-         {
-          number: 12,
-          real_preload: "2129",
-          stand_preload: "3003",
-          end_time:'2022-03-02 16:31:44',
-          beng_no:'200002',
-          banshou_no:'300002',
-          ways:'六同步',
-          operator:'张速'
-        }
-      ],
-       historyData: [
-        {
-          number: 13,
-          real_preload: "2128",
-          stand_preload: "3005",
-          end_time:'2022-03-02 15:31:54',
-          beng_no:'200001',
-          banshou_no:'300001',
-          ways:'单同步',
-          operator:'张速'
-        },
-        {
-          number: 14,
-          real_preload: "2129",
-          stand_preload: "3006",
-          end_time:'2022-03-02 16:31:44',
-          beng_no:'200002',
-          banshou_no:'300002',
-          ways:'两同步',
-          operator:'张速'
-        },
-         {
-          number: 15,
-          real_preload: "2139",
-          stand_preload: "3007",
-          end_time:'2022-03-02 16:31:44',
-          beng_no:'200002',
-          banshou_no:'300002',
-          ways:'四同步',
-          operator:'张速'
-        },
-         {
-          number: 16,
-          real_preload: "2129",
-          stand_preload: "3008",
-          end_time:'2022-03-02 16:31:44',
-          beng_no:'200002',
-          banshou_no:'300002',
-          ways:'六同步',
-          operator:'张速'
-        },
-         {
-          number: 17,
-          real_preload: "2128",
-          stand_preload: "3009",
-          end_time:'2022-03-02 15:31:54',
-          beng_no:'200001',
-          banshou_no:'300001',
-          ways:'单同步',
-          operator:'张速'
-        },
-        {
-          number: 18,
-          real_preload: "2129",
-          stand_preload: "3010",
-          end_time:'2022-03-02 16:31:44',
-          beng_no:'200002',
-          banshou_no:'300002',
-          ways:'两同步',
-          operator:'张速'
-        },
-         {
-          number: 19,
-          real_preload: "2139",
-          stand_preload: "3012",
-          end_time:'2022-03-02 16:31:44',
-          beng_no:'200002',
-          banshou_no:'300002',
-          ways:'四同步',
-          operator:'张速'
-        },
-         {
-          number: 20,
-          real_preload: "2129",
-          stand_preload: "3013",
-          end_time:'2022-03-02 16:31:44',
-          beng_no:'200002',
-          banshou_no:'300002',
-          ways:'六同步',
-          operator:'张速'
-        }
-      ],
+      nowData: [],
+      url:'maintainLog',
+      queryParam: {
+        device_number: "",
+      }
     };
   },
   methods: {
-    handleClick(tab, event) {
-      console.log(tab, event);
-    },
-    tableRowClassName({ row, rowIndex }) {
-      if (rowIndex === 1) {
-        return "warning-row";
-      } else if (rowIndex === 3) {
-        return "success-row";
-      }
-      return "";
-    },
+    handleClick(){
+
+    }
   },
   computed: {
     drawerVisible: {
@@ -406,6 +135,11 @@ export default {
         this.$emit("sendVal", val); // 表示将子组件改变的值传递给父组件
       },
       get() {
+        if(this.detailVisible){
+          //获取维护记录
+          this.queryParam.device_number=this.record.number
+          this.getList()
+        }
         return this.detailVisible; // 表示获取父组件的值
       },
     },
@@ -430,4 +164,8 @@ export default {
 .el-table .success-row {
   background: #f0f9eb !important;
 }
+.pagination-container{
+  padding-left:25px;
+  padding-right:25px;
+}
 </style>

+ 23 - 6
src/views/device/hydraulic/formModel.vue

@@ -20,6 +20,7 @@ export default {
   data() {
     return {
       formData: {},
+      deviceTypes:[],
       formFieldsData: {
         department_id: "",
         number: "",
@@ -27,7 +28,9 @@ export default {
         model: "",
         brand:"",
         supplier:"",
-        out_date:"",
+        max_pressure:"",
+        min_pressure:"",
+        out_date:null,
         remark: ""
       },
       url: "hydraulic",
@@ -59,19 +62,29 @@ export default {
             required:true
           },
           model: {
-            type: "input",
+            type: "select",
             label: "型号",
-            required:true
+            required:true,
+     
+             options: [],
           },
            brand: {
             type: "input",
             label: "品牌"
           },
-           supplier: {
+          supplier: {
             type: "input",
             label: "供应商"
           },
-            out_date: {
+          max_pressure: {
+            type: "input",
+            label: "最大压力"
+          },
+          min_pressure: {
+            type: "input",
+            label: "最小压力"
+          },
+          out_date: {
             type: "date",
             label: "出厂日期"
           },
@@ -80,7 +93,7 @@ export default {
             label: "备注"
           }
         },
-        order: ["department_id","number", "name", "model","brand","supplier","out_date","remark"]
+        order: ["department_id","number", "name", "model","brand","supplier","max_pressure","min_pressure","out_date","remark"]
       }
     };
   },
@@ -88,6 +101,10 @@ export default {
     this.$http.get("departments").then(response => {
       this.formConfig.formDesc.department_id.options = response.data;
     });
+     // 0-液压泵
+    this.$http.get("get_device_mold",{ params: {type:0} }).then(resp => {
+        this.formConfig.formDesc.model.options = resp.data
+     });
   },
   methods: {
     handleFormSubmit(data) {

+ 65 - 22
src/views/device/hydraulic/index.vue

@@ -35,23 +35,30 @@
           />
         </div>
         <div class="search-item">
-          <el-input
+
+          <el-select
             v-model="queryParam.model"
-            placeholder="型号"
-            clearable
+            placeholder="设备型号"
             class="filter-item form-search-input fl"
-            @keyup.enter.native="handleSearch"
-          />
+            clearable
+          >
+          <el-option
+                v-for="item in deviceTypes"
+                :key="item.value"
+                :label="item.text"
+                :value="item.value">
+              </el-option>
+          </el-select>
         </div>
         <div class="search-item">
           <el-select
             v-model="queryParam.is_used"
-            placeholder="使用状态"
+            placeholder="用状态"
             class="filter-item form-search-input fl"
             clearable
           >
-            <el-option value="0" label="未使用">未使用</el-option>
-            <el-option value="1" label="已使用">已使用</el-option>
+            <el-option value="0" label="未使用">用</el-option>
+            <el-option value="1" label="已使用">用</el-option>
           </el-select>
         </div>
       </div>
@@ -117,7 +124,7 @@
         :show-overflow-tooltip="true"
         width="150"
       />
-      <el-table-column
+      <!-- <el-table-column
         prop="alarm_state_text"
         label="告警状态"
         align="center"
@@ -133,7 +140,7 @@
               >{{ record.row.alarm_state_text }}</el-tag
             >
         </template>
-      </el-table-column>
+      </el-table-column> -->
 
       <el-table-column
         prop="net_state"
@@ -184,10 +191,24 @@
         width="120"
       />
       <el-table-column
-        prop="model"
+        prop="model_name"
         label="型号"
         align="center"
-        v-if="showColumn.model"
+        v-if="showColumn.model_name"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        prop="max_pressure"
+        label="最大压力"
+        align="center"
+        v-if="showColumn.max_pressure"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        prop="min_pressure"
+        label="最小压力"
+        align="center"
+        v-if="showColumn.min_pressure"
         :show-overflow-tooltip="true"
       />
       <el-table-column
@@ -200,17 +221,23 @@
       />
       <el-table-column
         prop="is_used"
-        label="使用状态"
+        label="用状态"
         align="center"
         v-if="showColumn.is_used"
         :show-overflow-tooltip="true"
         width="120"
       >
         <template slot-scope="record">
-          <el-tag type="danger" v-if="record.row.is_used == 0"
+          <el-switch
+            v-model="record.row.is_used"
+            active-color="#13ce66"
+            @change="changeUsedEvent(record.row,$event)"
+            inactive-color="#ff4949">
+          </el-switch>
+          <!-- <el-tag type="danger" v-if="record.row.is_used == 0"
             >未使用</el-tag
           >
-          <el-tag type="success" v-else>已使用</el-tag>
+          <el-tag type="success" v-else>已使用</el-tag> -->
         </template>
       </el-table-column>
        <el-table-column
@@ -239,7 +266,7 @@
       />
        <el-table-column
         prop="remark"
-        label="备注"
+        label="显示信息"
         align="center"
         v-if="showColumn.remark"
         width="100"
@@ -290,13 +317,15 @@
             <el-checkbox v-model="checkList.name">名称</el-checkbox>
             <el-checkbox v-model="checkList.brand">品牌</el-checkbox>
             <el-checkbox v-model="checkList.supplier">供应商</el-checkbox>
-            <el-checkbox v-model="checkList.model">型号</el-checkbox>
+            <el-checkbox v-model="checkList.max_pressure">最大压力</el-checkbox>
+            <el-checkbox v-model="checkList.min_pressure">最小压力</el-checkbox>
+            <el-checkbox v-model="checkList.model_name">型号</el-checkbox>
             <el-checkbox v-model="checkList.out_date">出厂日期</el-checkbox>
             <el-checkbox v-model="checkList.is_used">使用状态</el-checkbox>
             <el-checkbox v-model="checkList.online_time">在线时间</el-checkbox>
             <el-checkbox v-model="checkList.creator_user">导入用户</el-checkbox>
             <el-checkbox v-model="checkList.created_at">添加时间</el-checkbox>
-            <el-checkbox v-model="checkList.remark">备注</el-checkbox>
+            <el-checkbox v-model="checkList.remark">显示信息</el-checkbox>
           </div>
           <div class="footer">
             <el-button size="small" type="primary" plain @click="saveColumn"
@@ -342,7 +371,7 @@
     <detail
       :detailVisible="detailVisible"
        @sendVal="closeDrawer"
-       :data="detail"
+       :record="detail"
     />
   </div>
 </template>
@@ -369,9 +398,8 @@ export default {
         name: "",
         model: "",
         is_used: "",
-        type:0,
       },
-      defaultQueryParam:['type'],
+      deviceTypes:[],
       current_type: {
         0: "success",
         1: "danger",
@@ -397,7 +425,7 @@ export default {
         name: true,
         brand: true,
         supplier: true,
-        model: true,
+        model_name: true,
         online_time: true
       }
     };
@@ -406,6 +434,11 @@ export default {
     this.$http.get("departments").then((response) => {
       this.departments = response.data;
     });
+
+    // 0-液压泵
+    this.$http.get("get_device_mold",{ params: {type:0} }).then(resp => {
+        this.deviceTypes = resp.data
+     });
   },
   methods: {
    
@@ -446,6 +479,16 @@ export default {
     },
     closeDrawer(){
       this.detailVisible = false
+    },
+    changeUsedEvent(row,value){
+
+      this.$http.put('hydraulic/' + row.id, { is_used: value }).then(resp => {
+          if (resp.code === 10000) {
+              this.$message.success('操作成功')
+              // row[field] = val
+              // this.$emit('rowClick', row)
+          }
+      })
     }
   },
   watch: {

+ 44 - 15
src/views/device/mold/index.vue

@@ -1,14 +1,23 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <el-input v-model="queryParam.name" placeholder="型号名称" clearable class="filter-item form-search-input" />
-      <el-button class="filter-item search" icon="el-icon-search" @click="handleSearch">
+      <el-input v-model="queryParam.name" placeholder="型号名称" clearable class="filter-item form-search-input fl" />
+       <el-select  v-model="queryParam.device_type"  clearable class="filter-item form-search-input fl"  placeholder="请选择设备类型" >
+              <el-option
+                v-for="item in deviceTypes"
+                :key="item.value"
+                :label="item.text"
+                :value="item.value">
+              </el-option>
+        </el-select>
+      <el-button class="filter-item search fl" icon="el-icon-search" @click="handleSearch">
         搜索
       </el-button>
-      <el-button class="filter-item" icon="el-icon-refresh" @click="handleRefresh">
+      <el-button class="filter-item fl" icon="el-icon-refresh" @click="handleRefresh">
         重置
       </el-button>
-      <el-button class="filter-item fr" type="primary" icon="el-icon-plus" @click="handleCreate()">
+
+      <el-button class="filter-item" type="primary" icon="el-icon-plus" @click="handleCreate()">
         新增
       </el-button>
       <el-button v-if="this.selectedIds.length" size="small" class="filter-item mb-5" type="danger" icon="el-icon-delete" @click="handleMultiDelete">
@@ -16,12 +25,13 @@
       </el-button>
     </div>
     <el-table ref="multipleTable" :data="data" tooltip-effect="dark" style="width: 100%" border fit @selection-change="handleSelectMulti">
-      <el-table-column type="selection" width="55" />
-      <el-table-column label="型号名称" prop="name" />
-      <el-table-column prop="creator" label="创建人" />
-      <el-table-column prop="created_at" label="创建时间" />
-      <el-table-column prop="updated_at" label="更新时间" />
-      <el-table-column label="操作">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="型号名称" prop="name" align="center"/>
+      <el-table-column label="设备类型" prop="device_type_name" align="center"/>
+      <el-table-column prop="creator_name" label="创建人" align="center"/>
+      <el-table-column prop="created_at" label="创建时间" align="center"/>
+      <el-table-column prop="updated_at" label="更新时间" align="center"/>
+      <el-table-column label="操作" width="200px" align="center">
         <template slot-scope="word">
           <el-button type="primary" icon="el-icon-edit" @click="handleUpdate(word.row)" />
           <el-button type="danger" icon="el-icon-delete" @click="handleDelete(word.row.id)" />
@@ -33,16 +43,28 @@
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
       :current-page="paginate.current"
-      
+       class="pagination-container"
       :page-sizes="paginate.sizes"
       :page-size="paginate.limit"
       :layout="paginate.layout"
       :total="paginate.total"/>
     <!----------------------------------- 部门 ---------------------------------------------->
-    <el-dialog :title="title" :visible.sync="formVisible" @close="handleCancel">
+    <el-dialog :title="title" :visible.sync="formVisible" @close="handleCancel" width="500px">
+      <el-form :ref="formName" :model="formFieldsData" :rules="rules">
+        <el-form-item label="设备类型" :label-width="formLabelWidth" prop="device_type">
+          <el-select  v-model="formFieldsData.device_type"  clearable  style="width: 250px"  placeholder="请选择设备类型" >
+              <el-option
+                v-for="item in deviceTypes"
+                :key="item.value"
+                :label="item.text"
+                :value="item.value">
+              </el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
       <el-form :ref="formName" :model="formFieldsData" :rules="rules">
         <el-form-item label="型号名称" :label-width="formLabelWidth" prop="name">
-          <el-input v-model="formFieldsData.name" placeholder="请输入名称" autocomplete="off" clearable />
+          <el-input v-model="formFieldsData.name" placeholder="请输入名称" style="width: 250px" autocomplete="off" clearable />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -66,9 +88,11 @@ export default {
       queryParam: {
         name: '',
       },
+      deviceTypes:[],
       formVisible: false,
       formFieldsData: {
-        name: ''
+        name: '',
+        device_type:'',
       },
       url: 'deviceMold',
       // 表单验证
@@ -78,6 +102,11 @@ export default {
         ]
       }
     }
-  }
+  },
+  created() {
+    this.$http.post("sysDictData/getOptions", { type: "DeviceType" }).then(resp => {
+        this.deviceTypes = resp.data
+     });
+  },
 }
 </script>