Merge branch 'master' of http://gogs.renlianiot.com:4000/zmcoding/smart-tool-ui

src/views/device/hyd_equipment/formModel.vue

@@ -218,10 +218,23 @@ export default {
               return false;
             }
           },
-          pressure:{
+          angular_resolution: {
             layout: 12,
             type: "input",
-            label: "压力",
+            label: "角度分辨率",
+            required: true,
+            vif(data) {
+              if (data.equipment_type == 3 || data.equipment_type == 4) {
+                return true;
+              }
+              return false;
+            }
+          },
+          min_torque:{
+            layout: 12,
+            type: "input",
+            label: "最小扭矩",
+            required:true,
             vif(data)
             {
               if(data.equipment_type==3||data.equipment_type==4)
@@ -231,10 +244,11 @@ export default {
               return false;
             }
           },
-           torque:{
+          max_torque:{
             layout: 12,
             type: "input",
-            label: "扭矩",
+            label: "最大扭矩",
+            required: true,
             vif(data)
             {
               if(data.equipment_type==3||data.equipment_type==4)
@@ -251,7 +265,7 @@ export default {
             label: "最大压力",
             vif(data)
             {
-              if(data.equipment_type&&data.equipment_type==2)
+              if (data.equipment_type && data.equipment_type < 5)
               {
                 
                 return true;
@@ -267,7 +281,7 @@ export default {
             label: "最小压力",
             vif(data)
             {
-              if(data.equipment_type&&data.equipment_type==2)
+              if (data.equipment_type && data.equipment_type < 5)
               {
                 return true;
               }
@@ -307,7 +321,7 @@ export default {
             }
           }
         },
-        order: ['equipment_type','equipment_model',"name","material_number",'issue_unit','fixed_asset_number','fixed_asset_number2',"serial_number",'factory_number','check_last_time','check_next_time','check_status','status',"number","department_id","pressure","pressure","torque",'angle_sensor',"imei","min_pressure","max_pressure", "effective_period","remark"]
+        order: ['equipment_type', 'equipment_model', "name", "material_number", 'issue_unit', 'fixed_asset_number', 'fixed_asset_number2', "serial_number", 'factory_number', 'check_last_time', 'check_next_time', 'check_status', 'status', "number", "department_id","angular_resolution","imei", "min_pressure", "max_pressure", "min_torque", "max_torque", 'angle_sensor', "effective_period","remark"]
       }
     };
   },
@@ -341,20 +355,21 @@ export default {
         this.formFieldsData.number = this.formFieldsData.list.number;
         this.formFieldsData.remark = this.formFieldsData.list.remark;
         this.formFieldsData.department_id = this.formFieldsData.list.department_id;
+        this.formFieldsData.max_pressure = this.formFieldsData.list.max_pressure;
+        this.formFieldsData.min_pressure = this.formFieldsData.list.min_pressure;
         if(this.formFieldsData.equipment_type==2)
         {
           //泵
            this.formFieldsData.imei = this.formFieldsData.list.imei;
-           this.formFieldsData.max_pressure= this.formFieldsData.list.max_pressure;
-           this.formFieldsData.min_pressure= this.formFieldsData.list.min_pressure;
            this.formFieldsData.effective_period = this.formFieldsData.list.effective_period
         }
         else
         {
           //扳手
-           this.formFieldsData.angle_sensor = this.formFieldsData.list.angle_sensor;
-           this.formFieldsData.pressure= this.formFieldsData.list.pressure;
-           this.formFieldsData.torque= this.formFieldsData.list.torque;
+          this.formFieldsData.angle_sensor = this.formFieldsData.list.angle_sensor;
+          this.formFieldsData.min_torque = this.formFieldsData.list.min_torque;
+          this.formFieldsData.max_torque = this.formFieldsData.list.max_torque;
+          this.formFieldsData.angular_resolution = this.formFieldsData.list.angular_resolution;
           
         }
 

src/views/device/hyd_equipment/wrench_detail.vue

@@ -84,6 +84,11 @@
                 <span class="item">{{ record.list.angle_sensor ?'开启':'关闭'}}</span>
               </div>
               <div class="detail-item">
+                <span>最大扭矩：</span>
+                <span class="item">{{ record.list.max_torque}}</span>
+              </div>
+
+              <div class="detail-item">
                 <pre style="display: inline">备注：</pre>
                 <span class="item">{{ record.list.remark }}</span>
               </div>
@@ -94,8 +99,12 @@
                 <span class="item">{{ record.list.alarm_state ? record.list.alarm_state:'未知' }}</span>
               </div>
               <div class="detail-item">
-                <span>压力：</span>
-                <span class="item">{{ record.list.pressure}}</span>
+                <span>最大压力：</span>
+                <span class="item">{{ record.list.max_pressure}}</span>
+              </div>
+              <div class="detail-item">
+                <span>最小扭矩：</span>
+                <span class="item">{{ record.list.min_torque}}</span>
               </div>
 
 
@@ -106,9 +115,14 @@
                 <span class="item">{{ record.list.department_name}}</span>
               </div>
               <div class="detail-item">
-                <span>扭矩：</span>
-                <span class="item">{{ record.list.pressure}}</span>
+                <span>最小压力：</span>
+                <span class="item">{{ record.list.min_pressure}}</span>
+              </div>
+              <div class="detail-item">
+                <span>角度分辨率：</span>
+                <span class="item">{{ record.list.angular_resolution }}</span>
               </div>
+
             </el-col>
             <el-col :span="8"></el-col>
           </div>