Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

shuishen

2024-01-22 32a7e1f37b2637ff780d757f25fa097d215f6e11

 src/views/resource/distapch.vue

@@ -32,7 +32,7 @@

            <template slot-scope="{type,disabled}" slot="cronForm">
               <el-input  placeholder="请选择cron">
                    <el-button slot="append" icon="el-icon-s-tools"  @click="cronPopover = true"></el-button>
                    <el-button slot="append" icon="el-icon-s-tools"  @click="handlerClick()"></el-button>
              </el-input>
            </template>

@@ -44,7 +44,12 @@
        </el-dialog>


        <el-popover v-model="cronPopover">

        
        <el-dialog title="Cron" append-to-body :visible.sync="cronPopover" width="550px">
        <!-- <el-popover v-model="cronPopover"> -->

            <!-- <div> 测试 </div> -->
        <vueCron @change="changeCron" @close="cronPopover=false" i18n="cn"/>
        <!-- <el-input
          slot="reference"
@@ -52,7 +57,8 @@
          placeholder="定时策略"
          @click="cronPopover=true"
        /> -->
      </el-popover>
      <!-- </el-popover> -->
    </el-dialog>

    </basic-container>
</template>
@@ -524,6 +530,10 @@
                this.loading = false
                this.selectionClear()
            })
        },
        handlerClick(){
            console.log("111")
            this.cronPopover = true;
        }
    }
}