Skip to content

L
laravelzh
Commit 84ab88cf authored by Administrator's avatar Administrator
Browse files
Options

Merge branch 'master' of ssh://111.61.77.35:15/fengchaopeng/laravelzh

parents aec0f986 92077e22
Pipeline #92 canceled with stages
      Show whitespace changes
      Inline Side-by-side
      Showing with 2 additions and 2 deletions
      resources/js/views/device/index.vue
      View file @ 84ab88cf
      ......@@ -106,8 +106,8 @@
      </div>
      <el-button slot="reference" size="mini" type="danger" :disabled="scope.row.delete == 1 ? true : (scope.row.devicestatus > 1 ? true : false) ">操作</el-button>
      </el-popover>
      <el-button slot="reference" size="mini" type="primary" @click="contactsuser(scope.row.id)">添加联系人</el-button>
      <el-button slot="reference" size="mini" type="primary" @click="updatedevice(scope.row.id)">编辑设备</el-button>
      <el-button slot="reference" size="mini" type="primary" :disabled="scope.row.delete == 1 ? true : (scope.row.devicestatus > 1 ? true : false)" @click="contactsuser(scope.row.id)">添加联系人</el-button>
      <el-button slot="reference" size="mini" type="primary" :disabled="scope.row.delete == 1 ? true : (scope.row.devicestatus > 1 ? true : false)" @click="updatedevice(scope.row.id)">编辑设备</el-button>
      </template>
      </el-table-column>
      </el-table>
      ......
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment