Merge remote-tracking branch 'origin/master'

linwei

2024-01-16 6131772a952245f065f6d6bba272ce8dec1f5511

Merge remote-tracking branch 'origin/master'

 package-lock.json

@@ -25,6 +25,7 @@
        "script-loader": "^0.7.2",
        "vue": "^2.6.10",
        "vue-axios": "^2.1.2",
        "vue-cron": "^1.0.9",
        "vue-i18n": "^8.7.0",
        "vue-router": "^3.0.1",
        "vuex": "^3.1.1"
@@ -15587,6 +15588,17 @@
        "vue": ">= 1.0.0"
      }
    },
    "node_modules/vue-cron": {
      "version": "1.0.9",
      "resolved": "https://registry.npmjs.org/vue-cron/-/vue-cron-1.0.9.tgz",
      "integrity": "sha512-r8JnAjqpDsDj3a545156m7bca1xkrnIktks+N94KQA80OuKAiqhoz3Cq1JCyO+0ONXAOnLwvkjHiVCfL38XNbA==",
      "dependencies": {
        "babel-polyfill": "^6.26.0",
        "babel-runtime": "^6.26.0",
        "element-ui": "^2.0.7",
        "vue": "^2.5.9"
      }
    },
    "node_modules/vue-eslint-parser": {
      "version": "2.0.3",
      "resolved": "https://registry.npmmirror.com/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz",
@@ -29741,6 +29753,17 @@
      "integrity": "sha512-th5xVbInVoyIoe+qY+9GCflEVezxAvztD4xpFF39SRQYqpoKD2qkmX8yv08jJG9a2SgNOCjirjJGSwg/wTrbmA==",
      "requires": {}
    },
    "vue-cron": {
      "version": "1.0.9",
      "resolved": "https://registry.npmjs.org/vue-cron/-/vue-cron-1.0.9.tgz",
      "integrity": "sha512-r8JnAjqpDsDj3a545156m7bca1xkrnIktks+N94KQA80OuKAiqhoz3Cq1JCyO+0ONXAOnLwvkjHiVCfL38XNbA==",
      "requires": {
        "babel-polyfill": "^6.26.0",
        "babel-runtime": "^6.26.0",
        "element-ui": "^2.0.7",
        "vue": "^2.5.9"
      }
    },
    "vue-eslint-parser": {
      "version": "2.0.3",
      "resolved": "https://registry.npmmirror.com/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz",

 package.json

@@ -28,6 +28,7 @@
    "script-loader": "^0.7.2",
    "vue": "^2.6.10",
    "vue-axios": "^2.1.2",
    "vue-cron": "^1.0.9",
    "vue-i18n": "^8.7.0",
    "vue-router": "^3.0.1",
    "vuex": "^3.1.1"

 sh.exe.stackdump

New file
@@ -0,0 +1,11 @@
Stack trace:
Frame        Function    Args
000FFFFB540  00180064365 (00180275F10, 00180266FD1, 000FFFFCA60, 000FFFFBA20)
000FFFFBA70  001800499D2 (00100002000, 0018034EB10, 00000000001, 00000000150)
000FFFFCA80  00180049A11 (00000000001, 0018034EE20, 000FFFFCA60, 00000000008)
000FFFFCB10  0018005CFCD (00000000000, 000FFFFCC40, 001800DC3EF, 00000000000)
000FFFFCBF0  0018005D12B (000FFFFCDF0, 00000000000, FFFFFFFFFFFFFFD7, 00000000000)
000FFFFCCE0  0018004A1A8 (00000000000, 00000000000, 00000000000, 00000000000)
000FFFFCDA0  00180048A2A (00000000000, 00000000000, 00000000000, 00000000000)
000FFFFCE50  00180048AEC (00000000000, 00000000000, 00000000000, 00000000000)
End of stack trace

 src/views/cGovernance/gridWorkLog.vue

@@ -28,7 +28,7 @@
import website from '@/config/website'

export default {
    data () {
    data() {
        return {
            form: {},
            query: {},
@@ -188,7 +188,7 @@
                        prop: "workTime",
                        searchLabelWidth: 120,
                        type: "date",
                        row:true,
                        row: true,
                        format: "yyyy-MM-dd HH:mm:ss",
                        valueFormat: "yyyy-MM-dd HH:mm:ss",
                        rules: [
@@ -239,7 +239,7 @@
                        prop: "createUserName",
                    },

                    


                    {
                        display: false,
@@ -266,7 +266,7 @@

    watch: {
        "form.householdId": {
            handler (val) {
            handler(val) {
                if (val) {

                    householdDetail(val).then(res => {
@@ -281,7 +281,7 @@
        },

        'form.personType': {
            handler (newData) {
            handler(newData) {
                let householdIdColumn = this.findObject(
                    this.option.column,
                    'householdId'
@@ -296,7 +296,7 @@
        },

        'form.type': {
            handler (newData) {
            handler(newData) {
                let householdIdColumn = this.findObject(
                    this.option.column,
                    'householdId'
@@ -320,7 +320,7 @@

    computed: {
        ...mapGetters(["permission", "userInfo"]),
        permissionList () {
        permissionList() {
            return {
                addBtn: this.vaildData(this.permission.gridWorkLog_add, true),
                viewBtn: this.vaildData(this.permission.gridWorkLog_view, true),
@@ -328,7 +328,7 @@
                editBtn: this.vaildData(this.permission.gridWorkLog_edit, true),
            }
        },
        ids () {
        ids() {
            let ids = []
            this.selectionList.forEach((ele) => {
                ids.push(ele.id)
@@ -336,7 +336,7 @@
            return ids.join(",")
        },

        showNamePhone () {
        showNamePhone() {
            return (data) => {
                if (data.phoneNumber && data.phoneNumber.trim() != '') {
                    return `${data.name}(${data.phoneNumber})`
@@ -347,18 +347,18 @@
        }
    },

    created () {
    created() {
        this.getUserList()
    },

    methods: {
        getUserList (param = '') {
        getUserList(param = '') {
            let dicUrl = `/api/blade-household/household/selectHouseholdList?labelId=${param}&searchKey={{key}}&limit=20`
            const column = this.findObject(this.option.column, "householdId")
            column.dicUrl = dicUrl
        },

        rowSave (row, done, loading) {
        rowSave(row, done, loading) {
            if (row.url.length > 0) {
                var urls = []
                var split = row.url.split(",")
@@ -383,7 +383,7 @@
                }
            )
        },
        rowUpdate (row, index, done, loading) {
        rowUpdate(row, index, done, loading) {
            if (row.url.length > 0) {
                var urls = []
                var split = row.url.split(",")
@@ -408,7 +408,7 @@
                }
            )
        },
        rowDel (row) {
        rowDel(row) {
            this.$confirm("确定将选择数据删除?", {
                confirmButtonText: "确定",
                cancelButtonText: "取消",
@@ -425,24 +425,24 @@
                    })
                })
        },
        searchReset () {
        searchReset() {
            this.query = {}
            this.onLoad(this.page)
        },
        searchChange (params, done) {
        searchChange(params, done) {
            this.query = params
            this.page.currentPage = 1
            this.onLoad(this.page, params)
            done()
        },
        selectionChange (list) {
        selectionChange(list) {
            this.selectionList = list
        },
        selectionClear () {
        selectionClear() {
            this.selectionList = []
            this.$refs.crud.toggleSelection()
        },
        handleDelete () {
        handleDelete() {
            if (this.selectionList.length === 0) {
                this.$message.warning("请选择至少一条数据")
                return
@@ -464,19 +464,20 @@
                    this.$refs.crud.toggleSelection()
                })
        },
        beforeOpen (done, type) {
        beforeOpen(done, type) {
            if (["edit", "view"].includes(type)) {
                getGridWorkLog(this.form.id).then((res) => {
                    this.form = res.data.data
                    if (this.form.url.length > 0) {
                        var urls = []
                        var names = this.form.url.split(",")
                        names.forEach(name => {
                            urls.push(website.minioUrl + name)
                        })
                        this.form.url = urls.join(",")
                    if (this.form.url) {
                        if (this.form.url.length > 0) {
                            var urls = []
                            var names = this.form.url.split(",")
                            names.forEach(name => {
                                urls.push(website.minioUrl + name)
                            })
                            this.form.url = urls.join(",")
                        }
                    }

                    getPersonPublicSelect({
                        id: this.form.householdId
                    }).then(res => {
@@ -488,16 +489,16 @@
            // con
            done()
        },
        currentChange (currentPage) {
        currentChange(currentPage) {
            this.page.currentPage = currentPage
        },
        sizeChange (pageSize) {
        sizeChange(pageSize) {
            this.page.pageSize = pageSize
        },
        refreshChange () {
        refreshChange() {
            this.onLoad(this.page, this.query)
        },
        onLoad (page, params = {}) {
        onLoad(page, params = {}) {
            const { dateTime } = this.query
            let values = {
                ...params,
@@ -517,13 +518,15 @@
                this.page.total = data.total
                this.data = data.records
                this.data.forEach(item => {
                    if (item.url.length > 0) {
                        var urls = []
                        var names = item.url.split(",")
                        names.forEach(name => {
                            urls.push(website.minioUrl + name)
                        })
                        item.url = urls.join(",")
                    if (item.url) {
                        if (item.url.length > 0) {
                            var urls = []
                            var names = item.url.split(",")
                            names.forEach(name => {
                                urls.push(website.minioUrl + name)
                            })
                            item.url = urls.join(",")
                        }
                    }
                })
                this.loading = false

 src/views/resource/distapch.vue

@@ -26,11 +26,34 @@
            <template slot-scope="{row, size}" slot="category">
                <el-tag :size="size">{{ row.categoryName }}</el-tag>
            </template>
            <template slot-scope="{row, size}" slot="category">
                <el-tag :size="size">{{ row.categoryName }}</el-tag>
            </template>

            <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-input>
            </template>


        </avue-crud>

        <el-dialog title="对象存储上传调试" append-to-body :visible.sync="box" width="550px">
            <avue-form ref="form" :option="debugOption" v-model="debugForm" @submit="handleSubmit" />
        </el-dialog>


        <el-popover v-model="cronPopover">
        <vueCron @change="changeCron" @close="cronPopover=false" i18n="cn"/>
        <!-- <el-input
          slot="reference"
          v-model="ruleForm.execTime"
          placeholder="定时策略"
          @click="cronPopover=true"
        /> -->
      </el-popover>

    </basic-container>
</template>

@@ -38,14 +61,18 @@
import { getList, getDetail, add, update, remove, enable } from "@/api/resource/oss"
import { mapGetters } from "vuex"
import func from "@/util/func"

import vueCron from 'vue-cron'
export default {
    components:{
        vueCron
    },
    data () {
        return {
            form: {},
            query: {},
            loading: true,
            box: false,
            cronPopover:false,
            page: {
                pageSize: 10,
                currentPage: 1,
@@ -227,7 +254,8 @@
              },
              {
                label: 'Cron',
                prop: ''
                prop: 'cron',
                formslot:true,
              }
            ]
          }, 
@@ -236,12 +264,12 @@
            prop: 'jbxx',
            column: [
              {
                label: '调度类型',
                label: '运行模式',
                prop: '',
                type: 'select',
              },
              {
                label: 'Cron',
                label: 'JobHandler',
                prop: ''
              },
              {
@@ -353,6 +381,11 @@
        }
    },
    methods: {

        changeCron(val){
             console.log("===>",val);
        },

        rowSave (row, done, loading) {
            add(row).then(() => {
                this.onLoad(this.page)

 src/views/userHouse/houseHoldList.vue

@@ -695,13 +695,16 @@
              value: '#EBEDF0'
            }, {
              label: '绿',
              value: '#30D17C'
              // value: '#30D17C'
              value:'green'
            }, {
              label: '黄',
              value: '#FFB42B'
              // value: '#FFB42B'
              value:'yellow'
            }, {
              label: '红',
              value: '#EA1F1F'
              // value: '#EA1F1F'
              value:'red'
            }],
            rules: [{
              required: true,

 src/views/userHouse/houseList.vue

@@ -162,16 +162,19 @@
                    row: true,
                    dicData: [{
                        label: '撤销',
                        value: '#EBEDF0'
                        // value: '#EBEDF0'
                    }, {
                        label: '绿',
                        value: '#30D17C'
                        // value: '#30D17C'
                        value:'green'
                    }, {
                        label: '黄',
                        value: '#FFB42B'
                        // value: '#FFB42B'
                        value:'yellow'
                    }, {
                        label: '红',
                        value: '#EA1F1F'
                        // value: '#EA1F1F'
                        value:'red'
                    }],
                    rules: [{
                        required: true,

 vue.config.js

@@ -26,9 +26,9 @@
    proxy: {
      "/api": {
        //本地服务接口地址
        // target: "https://srgdjczzxtpt.com:2080/api",
        target: "https://srgdjczzxtpt.com:2080/api",
        // target: "http://z4042833u6.wicp.vip",
        target: "http://localhost:9528",
        // target: "http://localhost:9528",
        // target:"http://192.168.0.109:9528",
        //远程演示服务地址,可用于直接启动项目
        //target: 'https://saber.bladex.cn/api',