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

.env.development

@@ -3,5 +3,5 @@ ENV = 'development'
 
 # base api
 #VUE_APP_BASE_API = 'http://wxt.rltest.cn:8102'
-VUE_APP_BASE_API = 'http://127.0.0.1'
+VUE_APP_BASE_API = 'http://192.168.1.77'
 #VUE_APP_BASE_API = 'http://192.168.1.63:8000'

src/views/device/wrench/formModel.vue

@@ -96,6 +96,8 @@ export default {
         min_torque: "",
         max_pressure: "",
         min_pressure: "",
+        angle_sensor:"",
+
       },
       url: "wrench",
       formConfig: {
@@ -155,6 +157,11 @@ export default {
             type: "input",
             label: "最小扭矩"
           },
+          angle_sensor:{
+            type: 'switch',
+            label: "角度传感器",
+   
+          },
           out_date: {
             type: "date",
             label: "出厂日期"
@@ -167,7 +174,7 @@ export default {
           max_torque:  { validator: validateMaxTorque, trigger: 'blur' } ,
           min_torque:  { validator: validateMinTorque, trigger: 'blur' } ,
         },
-        order: ["department_id","number", "name", "model","brand","supplier","min_pressure","max_pressure","min_torque","max_torque","out_date"]
+        order: ["department_id","number", "name", "model","brand","supplier","min_pressure","max_pressure","min_torque","max_torque","angle_sensor","out_date"]
       }
     };
   },

src/views/device/wrench/index.vue

@@ -161,7 +161,7 @@
         align="center"
         v-if="showColumn.number"
         :show-overflow-tooltip="true"
-        min-width="120"
+    
       />
       <el-table-column
         prop="name"
@@ -183,7 +183,7 @@
         align="center"
         v-if="showColumn.supplier"
         :show-overflow-tooltip="true"
-        min-width="120"
+      
       />
       <el-table-column
         prop="model_name"
@@ -198,21 +198,21 @@
         align="center"
         v-if="showColumn.out_date"
         :show-overflow-tooltip="true"
-        width="150"
+      
       />
-      <!-- <el-table-column
+      <el-table-column
         prop="is_used"
-        label="使用状态"
+        label="角度传感器"
         align="center"
-        v-if="showColumn.is_used"
+        v-if="showColumn.angle_sensor"
         :show-overflow-tooltip="true"
-        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="success" v-if="record.row.angle_sensor">已含有</el-tag>
+          <el-tag type="danger" v-else>未含有</el-tag>
         </template>
-      </el-table-column> -->
+      </el-table-column>
       <el-table-column
         prop="online_time"
         label="在线时间"
@@ -227,7 +227,7 @@
         label="最大压力"
         align="center"
         v-if="showColumn.max_pressure"
-        width="120"
+      
         sortable
       />
        <el-table-column
@@ -235,7 +235,7 @@
         label="最小压力"
         align="center"
         v-if="showColumn.min_pressure"
-         width="120"
+         
         sortable
       />
        <el-table-column
@@ -243,7 +243,7 @@
         label="最大扭矩"
         align="center"
         v-if="showColumn.max_torque"
-         width="120"
+    
         sortable
       />
        <el-table-column
@@ -251,7 +251,7 @@
         label="最小扭矩"
         align="center"
         v-if="showColumn.min_torque"
-         width="120"
+      
         sortable
       />
 
@@ -268,7 +268,7 @@
         align="center"
         v-if="showColumn.created_at"
         :show-overflow-tooltip="true"
-        width="200"
+      
         sortable
       />
        <el-table-column
@@ -280,7 +280,7 @@
       />
       <el-table-column
         label="操作"
-        width="190"
+        width="150"
         align="center"
         fixed="right"
       >
@@ -326,6 +326,7 @@
             <el-checkbox v-model="checkList.supplier">供应商</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.angle_sensor">角度传感器</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.max_pressure">最大压力</el-checkbox>
@@ -535,6 +536,7 @@ export default {
         supplier: true,
          max_pressure:true,
         min_pressure:true,
+        angle_sensor:true,
         min_torque:true,
         max_torque:true,
         model: true,