likang

src/views/device/flange/formModel.vue

@@ -21,20 +21,45 @@ export default {
     return {
       formData: {},
       formFieldsData: {
+        is_used:"",
         department_id: "",
         number: "",
         name: "",
         model: "",
+        torque:"",
+        stress:"",
+        bolt_size:"",
+        bolt_number:"",
+        install_position:"",
         brand:"",
         supplier:"",
         out_date:"",
         remark: "",
-        type:2
       },
-      url: "hydraulic",
+      url: "flange",
       formConfig: {
         formDesc: {
-          department_id: {
+           is_used: {
+            type: "select",
+            label: "使用状态",
+            isOptions: true,
+            options: [
+              {
+                text: "使用",
+                value: 1
+              },
+              {
+                text: "未使用",
+                value: -1
+              },
+              {
+                text: "已废弃",
+                value: -2
+              }
+            ]
+          },
+          
+           department_id: {
             type: "cascader",
             label: "所属部门",
             isOptions: true,
@@ -46,13 +71,35 @@ export default {
                 value: "id",
                 emitPath: false,
                 checkStrictly: true
+
               }
             }
           },
+          //风场id
+          fan_id:{
+              type: "cascader",
+              label: "风机编号",
+              isOptions: true,
+              options: [],
+              required: true,
+              attrs: {
+                //查询
+                filterable:true,
+                props: {
+                  label: "text",
+                  value: "value",
+                  emitPath: false,
+                  checkStrictly: false,
+                  multiple:false
+
+                }
+            }
+
+          },
           number: {
             type: "input",
             label: "编号",
-            required:true,
+           
           },
            name: {
             type: "input",
@@ -72,14 +119,13 @@ export default {
               {
                 type: "number",
                 trigger: "blur",
-                message: "必须是数字"
+
               }
             ]
           },
           stress:{
              type: "number",
              label: "压力",
-             required:true,
               rules: [
               {
                 type: "number",
@@ -88,10 +134,9 @@ export default {
               }
             ]
           },
-          bolts_size: {
+          bolt_size: {
              type: "number",
              label: "螺栓尺寸",
-             required:true,
              rules: [
               {
                 type: "number",
@@ -100,10 +145,9 @@ export default {
               }
             ]
           },
-           bolts_num: {
+           bolt_number: {
              type: "number",
              label: "螺栓数量",
-             required:true,
              rules: [
               {
                 type: "number",
@@ -112,6 +156,10 @@ export default {
               }
             ]
           },
+          install_position:{
+            type: "input",
+            label: "安装位置"
+          },
            brand: {
             type: "input",
             label: "品牌"
@@ -129,7 +177,7 @@ export default {
             label: "备注"
           }
         },
-        order: ["department_id","number", "name", "model","torque","stress","bolts_size","bolts_num","brand","supplier","out_date","remark"]
+        order: ["is_used","department_id","fan_id","number", "name", "model","torque","stress","bolt_size","bolt_number","install_position","brand","supplier","out_date","remark"]
       }
     };
   },
@@ -137,10 +185,15 @@ export default {
     this.$http.get("departments").then(response => {
       this.formConfig.formDesc.department_id.options = response.data;
     });
+  
+     this.$http.get("getwindfan").then(response => {
+      this.formConfig.formDesc.fan_id.options = response.data;
+    });
+
   },
   methods: {
     handleFormSubmit(data) {
-      data.type = 2;
+
       this.$parent.handleSubmit();
     },
     handleRequest(data) {

src/views/device/flange/index.vue

@@ -3,6 +3,7 @@
     <div class="filter-container" style="padding-bottom: 0px">
       <div class="search-box-area" id="searchBox">
         <div class="search-item">
+          
           <el-cascader
             class="filter-item form-search-input fl"
             v-model="queryParam.department_id"
@@ -50,7 +51,8 @@
             class="filter-item form-search-input fl"
             clearable
           >
-            <el-option value="0" label="未使用">未使用</el-option>
+             <el-option value="-2" label="未使用">已报废</el-option>
+            <el-option value="-1" label="未使用">未使用</el-option>
             <el-option value="1" label="已使用">已使用</el-option>
           </el-select>
         </div>
@@ -118,42 +120,6 @@
         width="150"
       />
       <el-table-column
-        prop="alarm_state_text"
-        label="告警状态"
-        align="center"
-        v-if="showColumn.alarm_state_text"
-        width="120"
-      >
-        <template slot-scope="record">
-            <el-tag
-              effect="dark"
-              slot="reference"
-              :type="current_type[record.row.alarm_state] || ''"
-              size="small"
-              >{{ record.row.alarm_state_text }}</el-tag
-            >
-        </template>
-      </el-table-column>
-
-      <el-table-column
-        prop="net_state"
-        label="在线状态"
-        align="center"
-        v-if="showColumn.net_state"
-        :show-overflow-tooltip="true"
-        width="120"
-      >
-        <template slot-scope="record">
-          <el-tag type="success" v-if="record.row.net_state == '0'"
-            >在线</el-tag
-          >
-          <el-tag type="gray" v-else-if="record.row.net_state == '1'"
-            >离线</el-tag
-          >
-          <el-tag type="danger" v-else>从未上线</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column
         prop="number"
         label="编号"
         align="center"
@@ -207,20 +173,14 @@
         width="120"
       >
         <template slot-scope="record">
-          <el-tag type="danger" v-if="record.row.is_used == 0"
-            >未使用</el-tag
-          >
-          <el-tag type="success" v-else>已使用</el-tag>
+          <el-tag type="danger" v-if="record.row.is_used == -1"
+            >未使用</el-tag>
+           <el-tag type="info" v-if="record.row.is_used == -2"
+            >报废</el-tag>
+          <el-tag type="success" v-if="record.row.is_used == 1"
+            >使用中</el-tag>
         </template>
       </el-table-column>
-       <el-table-column
-        prop="online_time"
-        label="在线时间"
-        align="center"
-        v-if="showColumn.online_time"
-        width="200"
-        sortable
-      />
       <el-table-column
         prop="creator_user"
         label="导入用户"
@@ -284,8 +244,6 @@
           <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.net_state">在线状态</el-checkbox>
             <el-checkbox v-model="checkList.number">编号</el-checkbox>
             <el-checkbox v-model="checkList.name">名称</el-checkbox>
             <el-checkbox v-model="checkList.brand">品牌</el-checkbox>
@@ -293,7 +251,6 @@
             <el-checkbox v-model="checkList.model">型号</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>
@@ -353,7 +310,7 @@ import { action } from "@/directive/permission/index.js";
 import detail from "./detail.vue"
 import formModel from './formModel.vue'
 export default {
-  name: "hydraulic",
+  name: "flange",
   directives: { action },
   mixins: [rlListOperate],
   components: {
@@ -362,14 +319,13 @@ export default {
   },
   data() {
     return {
-      url: "hydraulic",
+      url: "flange",
       queryParam: {
         number: "",
         department_id: [],
         name: "",
         model: "",
         is_used: "",
-        type:2
       },
       defaultQueryParam:['type'],
       current_type: {
@@ -408,9 +364,8 @@ export default {
     });
   },
   methods: {
-   
+    //重置
     handleChange(val) {
-      //  console.log(val)
       this.queryParam.department_id = val;
       this.handleSearch();
     },
@@ -437,7 +392,7 @@ export default {
       this.isShowColumn = true;
     },
     saveColumn() {
-      localStorage.setItem("hydColumnSet", JSON.stringify(this.checkList));
+      localStorage.setItem("flangeSet", JSON.stringify(this.checkList));
       this.isShowColumn = false;
     },
     handleDetail(row){
@@ -479,8 +434,8 @@ export default {
       this.searchDis();
     });
     // 发请求得到checkListInitData的列的名字
-    if (localStorage.getItem("hydColumnSet")) {
-      this.checkList = JSON.parse(localStorage.getItem("hydColumnSet"));
+    if (localStorage.getItem("flangeSet")) {
+      this.checkList = JSON.parse(localStorage.getItem("flangeSet"));
     } else {
       this.checkList = {
         depart_name: true,