Merge remote-tracking branch 'origin/master'

lin

2024-03-01 b026ec37b15e64f5305c1d3f20d5c04f6a74ad37

Merge remote-tracking branch 'origin/master'

 src/styles/avue-ui.css

New file
@@ -0,0 +1,133 @@
body .avue--disabled {
  color: #777 !important;
  cursor: not-allowed;
}

.place-info-box .el-dialog {
  display: flex;
  flex-direction: column;
  height: 72% !important;
}

.place-info-box .el-dialog .el-dialog__header {
  padding-top: 10px !important;
  padding-bottom: 10px !important;
}

.place-info-box .el-dialog .el-dialog__header .el-dialog__headerbtn {
  top: 10px !important;
}

.place-info-box .el-dialog .el-dialog__body {
  padding: 0px !important;
  padding-bottom: 10px !important;
  height: 0 !important;
  flex: 1;
}

.place-info-box .el-dialog .el-dialog__body .el-tabs {
  display: flex;
  flex-direction: column;
  height: 100% !important;
}

.place-info-box .el-dialog .el-dialog__body .el-tabs .el-tabs__content {
  flex: 1;
}

.audit-info-box .el-dialog {
  height: auto !important;
}

.turn-over-popup .el-dialog {
  width: 520px !important;
}

.cur-house-hold-box .avue-crud__left {
  flex: 1;
}

.cur-resident-supervision-page .echarts-wrap {
  display: flex;
  flex-wrap: wrap;
  padding: 0 0 10px 0;
  justify-content: space-between;
}

.cur-resident-supervision-page .echarts-wrap .echarts-cell {
  height: 300px;
  width: calc(33.3% - 10px);
  display: flex;
  flex-direction: column;
  background: #fff;
}

.cur-resident-supervision-page .echarts-wrap .echarts-cell .echarts-item {
  box-sizing: border-box;
  padding: 10px;
  width: 100%;
  height: 0;
  flex: 1;
}

.cur-resident-supervision-page .cur-from-box {
  margin-top: 10px;
  padding: 10px;
  background: #fff;
}

.cur-resident-supervision-page .echarts-cell:first-child {
  margin-left: 0;
}

.cur-resident-supervision-page .echarts-cell:last-child {
  margin-right: 0;
}

.cur-house-hold-supervision-page .echarts-wrap {
  display: flex;
  flex-wrap: wrap;
  padding: 0;
  justify-content: space-between;
}

.cur-house-hold-supervision-page .echarts-wrap .echarts-cell {
  margin: 0 5px;
  height: 300px;
  width: calc(20% - 10px);
  display: flex;
  flex-direction: column;
  background: #fff;
}

.cur-house-hold-supervision-page .echarts-wrap .echarts-cell .echarts-item {
  box-sizing: border-box;
  padding: 10px;
  width: 100%;
  height: 0;
  flex: 1;
}

.cur-house-hold-supervision-page .cur-from-box {
  margin-top: 10px;
  padding: 10px;
  background: #fff;
}

.cur-house-hold-supervision-page .echarts-cell:first-child {
  margin-left: 0;
}

.cur-house-hold-supervision-page .echarts-cell:last-child {
  margin-right: 0;
}

.cur-house-hold-supervision-page .echarts-cell:nth-child(1) {
  width: 0;
  flex: 1;
}

.cur-house-hold-supervision-page .echarts-cell:nth-child(2) {
  width: 0;
  flex: 2;
}

 src/styles/avue-ui.min.css

New file
@@ -0,0 +1 @@
body .avue--disabled{color:#777 !important;cursor:not-allowed}.place-info-box .el-dialog{display:flex;flex-direction:column;height:72% !important}.place-info-box .el-dialog .el-dialog__header{padding-top:10px !important;padding-bottom:10px !important}.place-info-box .el-dialog .el-dialog__header .el-dialog__headerbtn{top:10px !important}.place-info-box .el-dialog .el-dialog__body{padding:0px !important;padding-bottom:10px !important;height:0 !important;flex:1}.place-info-box .el-dialog .el-dialog__body .el-tabs{display:flex;flex-direction:column;height:100% !important}.place-info-box .el-dialog .el-dialog__body .el-tabs .el-tabs__content{flex:1}.audit-info-box .el-dialog{height:auto !important}.turn-over-popup .el-dialog{width:520px !important}.cur-house-hold-box .avue-crud__left{flex:1}.cur-resident-supervision-page .echarts-wrap{display:flex;flex-wrap:wrap;padding:0 0 10px 0;justify-content:space-between}.cur-resident-supervision-page .echarts-wrap .echarts-cell{height:300px;width:calc(33.3% - 10px);display:flex;flex-direction:column;background:#fff}.cur-resident-supervision-page .echarts-wrap .echarts-cell .echarts-item{box-sizing:border-box;padding:10px;width:100%;height:0;flex:1}.cur-resident-supervision-page .cur-from-box{margin-top:10px;padding:10px;background:#fff}.cur-resident-supervision-page .echarts-cell:first-child{margin-left:0}.cur-resident-supervision-page .echarts-cell:last-child{margin-right:0}.cur-house-hold-supervision-page .echarts-wrap{display:flex;flex-wrap:wrap;padding:0;justify-content:space-between}.cur-house-hold-supervision-page .echarts-wrap .echarts-cell{margin:0 5px;height:300px;width:calc(20% - 10px);display:flex;flex-direction:column;background:#fff}.cur-house-hold-supervision-page .echarts-wrap .echarts-cell .echarts-item{box-sizing:border-box;padding:10px;width:100%;height:0;flex:1}.cur-house-hold-supervision-page .cur-from-box{margin-top:10px;padding:10px;background:#fff}.cur-house-hold-supervision-page .echarts-cell:first-child{margin-left:0}.cur-house-hold-supervision-page .echarts-cell:last-child{margin-right:0}.cur-house-hold-supervision-page .echarts-cell:nth-child(1){width:0;flex:1}.cur-house-hold-supervision-page .echarts-cell:nth-child(2){width:0;flex:2}

 src/styles/avue-ui.scss

@@ -57,7 +57,47 @@
    }
}

.cur-resident-supervision-page,
.cur-resident-supervision-page {
  .echarts-wrap {
    display: flex;
    flex-wrap: wrap;
    padding: 0 0 10px 0;
    justify-content: space-between;

    .echarts-cell {
      //   margin: 0 5px;
      height: 300px;
      width: calc(33.3% - 10px);
      display: flex;
      flex-direction: column;
      background: #fff;

      .echarts-item {
        box-sizing: border-box;
        padding: 10px;
        width: 100%;
        height: 0;
        flex: 1;
      }
    }

  }

  .cur-from-box {
    margin-top: 10px;
    padding: 10px;
    background: #fff;
  }

  .echarts-cell:first-child {
    margin-left: 0;
  }

  .echarts-cell:last-child {
    margin-right: 0;
  }
}

.cur-house-hold-supervision-page {
    .echarts-wrap {
        display: flex;
@@ -89,6 +129,7 @@
            background: #fff;

            .echarts-item {
        box-sizing: border-box;
                padding: 10px;
                width: 100%;
                height: 0;

 src/views/article/components/deitDiscussion.vue

@@ -22,7 +22,8 @@
          </template>
          <template #menu="{ row, size }">
            <el-button v-if="row.level === 1" :size="size" text type="primary" @click="edit(row)">编辑</el-button>
            <el-button v-if="row.level === 1" :size="size" text type="danger" @click="deletes(row)">删除</el-button>
                        <el-button v-if="row.level === 1" :size="size" text type="danger"
                            @click="deletes(row)">删除</el-button>
            <el-button v-if="row.level === 2" :size="size" text type="primary" @click="openUser(row, 1)">
              选择此项人数：{{ row.number }} 详情</el-button>
          </template>
@@ -93,7 +94,7 @@

        ontitle: '编辑议题',
        editFlag: false,

            disCussFromListClone: {},
        disCussFrom: {
          discussContent: '',
          optionRange: 0,
@@ -210,7 +211,7 @@
          searchShow: true,
          searchMenuSpan: 3,
          // menuWidth: 500,
          menu: true,
                menu: false,
          height: "auto",
          calcHeight: 54,
          dialogWidth: 950,
@@ -379,7 +380,17 @@
      handleSubmit(form, done) {
        done()
        form.articleId = this.articleId

            if (this.disCussFromListClone.length > 0) {
                this.disCussFromListClone.forEach(item => {
                    if (form.children.length > 0) {
                        let same = form.children.find(array => array.id === item.id)
                        if (!same) {
                            item.deleteFlag = 1
                            form.children.push(item)
                        }
                    }
                })
            }
        add(form).then(
          () => {
            this.$message({
@@ -456,6 +467,7 @@

      edit(row) {
        this.disCussFrom = row
            this.disCussFromListClone = [].concat(row.children)
        this.editFlag = true
      },


 src/views/propertySupervision/residentSupervision.vue

@@ -8,14 +8,14 @@
    </div>

    <div class="cur-from-box">
      <avue-crud :option="option" :search.sync="search" :table-loading="loading" :data="data" ref="crud" v-model="form"
        :permission="permissionList" @row-del="rowDel" @row-update="rowUpdate" @row-save="rowSave"
            <avue-crud :option="option" :search.sync="search" :table-loading="loading" :data="data" ref="crud"
                v-model="form" :permission="permissionList" @row-del="rowDel" @row-update="rowUpdate" @row-save="rowSave"
        :before-open="beforeOpen" :page.sync="page" @search-change="searchChange" @search-reset="searchReset"
        @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
        @refresh-change="refreshChange" @on-load="onLoad">
        <template slot-scope="{row, size}" slot="menu">
          <el-button :size="size" type="text" icon="el-icon-circle-plus-outline" v-if="permission.househould_manager"
            @click="manageLabel(row)">标签
                    <el-button :size="size" type="text" icon="el-icon-circle-plus-outline"
                        v-if="permission.househould_manager" @click="manageLabel(row)">标签
          </el-button>
        </template>
        <template slot-scope="{row, size}" slot="phoneNumber">
@@ -800,7 +800,7 @@
          },
          legend: {
            orient: 'vertical',
            right: 20,
                    right: 40,
            bottom: 0,
            padding: [30, 0],
            formatter: function(name) {
@@ -814,7 +814,7 @@
          },
          series: [{
            type: 'pie',
            center: ['26%', '50%'],
                    center: ['36%', '50%'],
            radius: '60%', //修改大小
            data: [],
            label: {