Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

liuyg

2021-04-28 d8bdecf455050bc6ba908cc2e61b07155d41057d

 src/views/clientManagement/clientManagement.vue

@@ -74,9 +74,9 @@
            </el-tag>
          </template>

          <template slot-scope="{ row }" slot="jfzt">
            <i class="el-icon-check client-jf" v-if="row.type == 0"></i>
            <i class="el-icon-close client-qf" v-else-if="row.type == 1"></i>
          <template slot-scope="{ row }" slot="type">
            <i class="el-icon-check client-jf" v-if="row.type == '0' "></i>
            <i class="el-icon-close client-qf" v-else-if="row.type == '1' "></i>
          </template>

        </avue-crud>
@@ -406,10 +406,29 @@
              }],
            }, {
              label: "缴费状态",
              prop: "jfzt",
              prop: "type",
              slot: true,
              sortable:true,
              addDisplay: false,
              editDisplay: false,
            }, {
              label: "设备厂商",
              prop: "manufacturers",
              addDisplay: true,
              editDisplay: true,
              viewDisplay: true,
              dicUrl: "/api/blade-system/dict-biz/dictionary?code=manufacturers",
              props: {
                label: "dictValue",
                value: "dictKey"
              },
              search:true,
              type:"select",
              rules: [{
                required: true,
                message: "请选择设备厂商",
                trigger: "blur"
              }],
            }, {
              label: "布撤防状态",
              prop: "devicestate",
@@ -436,6 +455,7 @@
              label: "设备状态",
              prop: "dxzt",
              slot: true,
              sortable:true,
              addDisplay: false,
              editDisplay: false,
            },
@@ -450,17 +470,6 @@
              prop: "reason",
              addDisplay: false,
              editDisplay: false
            },{
              label: "心跳时间",
              prop: "heartbeat",
              type: "datetime",
              format: "yyyy-MM-dd",
              valueFormat: "yyyy-MM-dd HH:mm:ss",
              width: 130,
              hide: true,
              addDisplay: true,
              editDisplay: true,
              viewDisplay: true,
            },
            {
              label: "省份",
@@ -673,6 +682,18 @@
              editDisplay: true,
              viewDisplay: true,
            },
            {
              label: "心跳时间",
              prop: "heartbeat",
              type: "datetime",
              format: "yyyy-MM-dd",
              valueFormat: "yyyy-MM-dd HH:mm:ss",
              width: 130,
              hide: true,
              addDisplay: true,
              editDisplay: true,
              viewDisplay: true,
            }

          ]
        },