Merge remote-tracking branch 'origin/master' into master

lyfO_o

2022-05-24 f15b467c2233ba069459c809fffbe994692e3315

Merge remote-tracking branch 'origin/master' into master

 config/dev.env.js

@@ -18,12 +18,12 @@
  //   IMG_API: '"http://220.171.99.118:4100/upload/"',
      // BASE_API: '"http://192.168.0.35:8006"',
      // // IMG_API: '"http://192.168.0.35:8006/upload/"',
      // BASE_API: '"http://192.168.0.35:8006"',
      // IMG_API: '"http://192.168.0.35:8006/upload/"',
      BASE_API: '"http://192.168.0.35:8006"',
      IMG_API: '"http://192.168.0.35:8006/upload/"',
      // BASE_API: '"http://192.168.0.62:8006"',
      // IMG_API: '"http://192.168.0.62:8006/upload/"',
    BASE_API: '"http://222.92.213.22:8006/zhongtai"',
    IMG_API: '"http://222.92.213.22:8006/zhongtai/upload/"',
    // BASE_API: '"http://222.92.213.22:8006/zhongtai"',
    // IMG_API: '"http://222.92.213.22:8006/zhongtai/upload/"',
    NANO_API: '"http://222.92.213.22:8006/nanoweb"',
    ZT_API:'"http://123.56.127.115:8011"'
    // BASE_API: '"http://localhost:8006"',

 public/wutu3d/cesium-wutu/wutu3d.js

@@ -1961,12 +1961,10 @@
                }, o.ScreenSpaceEventType.LEFT_DOUBLE_CLICK)
            },
            endDraw: function () {
                debugger
                if (!this._enabled) return this;
                this._positions_draw.length < this._minPointNum || (this.updateAttrForDrawing(), this.disable())
            },
            finish: function () {
                debugger
                var e = this.entity;
                e.editing = this.getEditClass(e), e._positions_draw = this.getDrawPosition(), e.polyline.positions = new o.CallbackProperty(function (t) {
                    return e._positions_draw
@@ -18992,4 +18990,4 @@
            }]), e
        }()
    }])
});
});

 src/assets/bg.jpg

 src/components/Tab/Plot.vue

@@ -177,7 +177,6 @@
            },
            removeHandle(label) {
                if (!global.map) return;
                debugger
                for(let i in this.colorMapList){
                    if(JSON.parse(this.colorMapList[i].properties).attr.id === label.attr.id){
                        deleteColorMap({id:this.colorMapList[i].id}).then(res =>{

 src/views/doublePreventAction/hiddenDanger/inspectionRecord/components/detail.vue

@@ -524,7 +524,6 @@
                this.dialogVisible = true;
            },
            handleRemove(file){
                debugger
                return this.$confirm(`确定移除 ${ file.name }？`,'提示',{
                    confirmButtonText:'确定',
                    cancelButtonText:'取消',

 src/views/doublePreventAction/hiddenDanger/inspectionRecord/index.vue

@@ -316,7 +316,6 @@
                }
            },
            downloadFile(value){
                debugger
                if(value.problem.imageInfoList === null){
                    this.$message({
                        type:'warning',

 src/views/doublePreventAction/hiddenDanger/inspectionTask/components/inpectionPoint.vue

@@ -79,7 +79,6 @@
                this.controlActionVisible  = false
                if(this.title === '新建巡检计划设定'){
                    if(value){
                        debugger
                        this.inspectionPointData = JSON.parse(JSON.stringify(value.map( item => {
                            return {
                                id:item.id,
@@ -142,7 +141,6 @@
                this.inspectionPointData = res.data.result.checkContents
            },
            keepValue(value){
                debugger
                this.keepValueList = value
            }
        }

 src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue

@@ -467,7 +467,6 @@
                }else{
                    this.ifShow = true
                    this.title = '编辑巡检计划设定'
                    debugger
                    // this.noticeDepartment = this.handleDepartment(JSON.parse(JSON.stringify(value)).noticeUid)
                    // this.changeNotice()
                    this.execDepartment = this.handleDepartment(JSON.parse(JSON.stringify(value)).execUid)
@@ -482,7 +481,6 @@
                }
            },
            handleDepartment(value){
                debugger
                let department = ''
                for(let i in this.userList){
                    if(this.userList[i].id === value){

 src/views/doublePreventAction/riskLevelManage/analyseUnit/components/departmentChart.vue

@@ -29,7 +29,6 @@
            async getChart() {
                let res = await getDepartmentChart()
                if(res.data.code === '200') {
                    debugger
                    this.numData = res.data.result.map(item =>{
                        return item["count"]
                    })

 src/views/doublePreventAction/riskLevelManage/safetyRiskSpace/index.vue

@@ -241,7 +241,6 @@
            submitSafetyRiskSpace(){
                this.$refs["safetyRiskSpaceForm"].validate((valid) =>{
                    if(valid){
                        debugger
                        addSafetyRiskSpace(this.safetyRiskSpaceForm).then((res)=>{
                            if(res.data.code === '200'){
                                this.safetyRiskSpaceVisible = false
@@ -292,7 +291,6 @@
            },
            onFileSuccess(response){
                if(response.code === '200'){
                    debugger
                    this.safetyRiskSpaceForm.img = response.result.path
                    this.fileList = []
                    this.fileList.push({url:process.env.IMG_API + response.result.path})
@@ -310,7 +308,6 @@
                }
            },
            handleFile(file){
                debugger
                this.dialogImageUrl = file.url;
                this.dialogVisible = true;
            },

 src/views/login/index.vue

@@ -174,7 +174,7 @@
    .login-container {
        min-height: 100%;
        width: 100%;
        background: url("../../assets/bg_login.png") center no-repeat;
        background: url("../../assets/bg.jpg") center no-repeat;
        //background-size: auto 100%;
        // background-color: #2d3a4b;
        overflow: hidden;

 src/views/specialWork/taskCreate/components/reviewInfo/index.vue

@@ -47,7 +47,6 @@
        methods:{
            openReviewInfo(value){
                this.reviewInfoDialog = true
                debugger
                this.activities = JSON.parse(JSON.stringify(value.taskReviews))
                for(let i in this.activities){
                    if(this.activities[i].pictures !== null && this.activities[i].pictures.length !== 0){

 src/views/specialWork/taskCreate/index.vue

@@ -232,7 +232,6 @@
    },
    methods: {
        async getTaskData(){
            debugger
            this.loginForm = JSON.parse(Cookies.get('loginForm'))
            this.listLoading = true
            let params = {}

 src/views/specialWorkManage/specialWork/taskCreate/components/reviewInfo/index.vue

@@ -47,7 +47,6 @@
        methods:{
            openReviewInfo(value){
                this.reviewInfoDialog = true
                debugger
                this.activities = JSON.parse(JSON.stringify(value.taskReviews))
                for(let i in this.activities){
                    if(this.activities[i].pictures !== null && this.activities[i].pictures.length !== 0){