Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

src/styles/transition/common.scss

@@ -191,6 +191,6 @@ table th .is-required::before{
 }
 
 .el-input--medium .el-input__inner {
-  height: 32px  !important;
+  // height: 32px  !important;
   line-height: 32px  !important;
 }

src/views/workforceManagement/team/components/staffSelection.vue

@@ -74,23 +74,23 @@
                       </div>
                     </template>
                   </el-table-column>
-<!--                  <el-table-column width="80" label="操作">-->
+                 <el-table-column width="80" label="操作">
 
 
 
 
-<!--                    <template slot-scope="{ row }">-->
-<!--                      <el-button-->
-<!--                        size="mini"-->
-<!--                        type="primary"-->
-<!--                        @click="choiceAsset(row)"-->
-<!--                        :disabled="row.disabled"-->
-<!--                        icon="el-icon-arrow-right"-->
-<!--                        circle-->
-<!--                      >-->
-<!--                      </el-button>-->
-<!--                    </template>-->
-<!--                  </el-table-column>-->
+                 <template slot-scope="{ row }">
+                    <el-button
+                       size="mini"
+                        type="primary"
+                        @click="choiceAsset(row)"
+                        :disabled="row.disabled"
+                       icon="el-icon-arrow-right"
+                        circle
+                     >
+                     </el-button>
+                 </template>
+                  </el-table-column>
                 </el-table>
 <!--                <div-->
 <!--                  v-if="staffList.length !== 0 && isMore"-->