ll
liukangdong
2024-12-23 fbe39da5114ac1f9d9b7d7341e29ed39a3c73535
ll
已添加15个文件
已修改9个文件
1712 ■■■■ 文件已修改
h5/pages/staff/task/index.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
h5/pages/staff/task/vDangetAppr.vue 288 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
screen/index.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
screen/src/api/index.js 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
screen/src/assets/images/LogisticsCenter/ic_cangku@2x.png 补丁 | 查看 | 原始文档 | blame | 历史
screen/src/assets/images/LogisticsCenter/ic_cangku_sel@2x.png 补丁 | 查看 | 原始文档 | blame | 历史
screen/src/assets/images/LogisticsCenter/ic_dangqian@2x.png 补丁 | 查看 | 原始文档 | blame | 历史
screen/src/assets/images/LogisticsCenter/ic_daohuo@2x.png 补丁 | 查看 | 原始文档 | blame | 历史
screen/src/assets/images/LogisticsCenter/ic_daohuo_sel@2x.png 补丁 | 查看 | 原始文档 | blame | 历史
screen/src/assets/images/LogisticsCenter/ic_dingdan@2x.png 补丁 | 查看 | 原始文档 | blame | 历史
screen/src/assets/images/LogisticsCenter/ic_dingdan_sel@2x.png 补丁 | 查看 | 原始文档 | blame | 历史
screen/src/assets/images/LogisticsCenter/ic_fahuodi@2x.png 补丁 | 查看 | 原始文档 | blame | 历史
screen/src/assets/images/LogisticsCenter/ic_hetong.png 补丁 | 查看 | 原始文档 | blame | 历史
screen/src/assets/images/LogisticsCenter/ic_huowu@2x.png 补丁 | 查看 | 原始文档 | blame | 历史
screen/src/assets/images/LogisticsCenter/ic_peizai@2x.png 补丁 | 查看 | 原始文档 | blame | 历史
screen/src/assets/images/LogisticsCenter/ic_peizai_sel@2x.png 补丁 | 查看 | 原始文档 | blame | 历史
screen/src/assets/images/LogisticsCenter/ic_yunshu@2x.png 补丁 | 查看 | 原始文档 | blame | 历史
screen/src/assets/images/LogisticsCenter/ic_yunshu_sel@2x.png 补丁 | 查看 | 原始文档 | blame | 历史
screen/src/components/Map.vue 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
screen/src/views/EnergyConsum.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
screen/src/views/LogisticsCenter.vue 1337 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
screen/src/views/TaskEfficiency.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
screen/src/views/videoUrl/Videos.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
screen/vite.config.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
h5/pages/staff/task/index.vue
@@ -370,6 +370,8 @@
        uni.navigateTo({
          url: `/pages/staff/task/vDangetAppr?id=${objId}&objType=${objType}&info=${info}`
        })
      }else if (objType === 7) {
        window.open('https://atwl.ahzyssl.com/dps/web/wxAuth/loginV2?oaId=atwl&redirectId=index')
      } else if (objType === 6 || objType === 5) {
        uni.navigateTo({
          url: `/pages/staff/task/driver?id=${objId}&objType=${objType}&info=${info}`
h5/pages/staff/task/vDangetAppr.vue
@@ -88,8 +88,8 @@
                            v-if="info.status == 2 && index == flowList.length - 1" />
                        <image v-if="item.avatar != null && item.avatar != ''" :src="item.avatar" class="img" alt="" />
                        <!-- <image v-else src="@/static/default_avatar.png" class="img" mode=""></image> -->
                        <span v-if="item.avatar == null || item.avatar == ''"
                            class="img_name">{{ item.createUserName && item.createUserName.slice(0, 1) }}</span>
                        <span v-if="item.avatar == null || item.avatar == ''" class="img_name">{{ item.createUserName &&
                            item.createUserName.slice(0, 1) }}</span>
                    </view>
                    <view class="content">
                        <view class="head">
@@ -311,8 +311,8 @@
        dealHiddenDanger,
        transferHiddenDanger,
        findListFlowDanger
    } from '@/api';
    import dayjs from 'dayjs';
} from '@/api'
import dayjs from 'dayjs'
    export default {
        data() {
            return {
@@ -375,24 +375,24 @@
                videoPlay: false,
                videoContext: null,
                videoUrl: ''
            };
        }
        },
        onLoad(op) {
            uni.setStorageSync('ywinfo',{})
            this.id = op.id;
            this.getDetail();
        this.id = op.id
        this.getDetail()
        },
        methods: {
            priviewImage(url) {
                uni.previewImage({
                    urls: [url]
                });
            })
            },
            screenChange(e) {
                let fullScreen = e.detail.fullScreen; // å€¼true为进入全屏,false为退出全屏
            let fullScreen = e.detail.fullScreen // å€¼true为进入全屏,false为退出全屏
                if (!fullScreen) {
                    //退出全屏
                    this.videoPlay = false; // éšè—æ’­æ”¾ç›’子
                this.videoPlay = false // éšè—æ’­æ”¾ç›’子
                }
            },
            closeVideo() {
@@ -400,58 +400,57 @@
                this.videoContext = null
            },
            videoClick(item, i) {
                this.videoPlay = true;
                this.videoContext = uni.createVideoContext("myvideo", this); // this这个是实例对象 å¿…ä¼ 
                this.videoUrl = item.fileurlFull;
                this.videoContext.requestFullScreen();
            this.videoPlay = true
            this.videoContext = uni.createVideoContext("myvideo", this) // this这个是实例对象 å¿…ä¼ 
            this.videoUrl = item.fileurlFull
            this.videoContext.requestFullScreen()
                this.$nextTick(() => {
                    this.videoContext.play();
                this.videoContext.play()
                })
            },
            handleOpen() {
                this.isShowHandle = true;
            this.isShowHandle = true
                const submitFileList = this.info.submitFileList || []
                this.dealBeforeFileList = [...submitFileList]
                this.submitFileList = [...submitFileList];
                this.$set(this.handleParam, 'dealTime', dayjs().format('YYYY-MM-DD HH:mm:ss'));
            this.submitFileList = [...submitFileList]
            this.$set(this.handleParam, 'dealTime', dayjs().format('YYYY-MM-DD HH:mm:ss'))
            },
            handleBack() {
                this.isShowBack = true;
            this.isShowBack = true
                // const submitFileList = this.info.submitFileList || []
                // this.submitFileList = [...submitFileList];
                this.dealBeforeFileList = []
                this.$set(this.backParam, 'dealTime', dayjs().format('YYYY-MM-DD HH:mm:ss'));
            this.$set(this.backParam, 'dealTime', dayjs().format('YYYY-MM-DD HH:mm:ss'))
            },
            getDetail() {
                const {
                    id
                } = this;
            } = this
                hiddenDangerDetail(id).then(res => {
                    this.info = res.data;
                });
                this.info = res.data
            })
                findListFlowDanger({
                    hiddenDangerId: id
                }).then(res => {
                    this.flowList = res.data;
                });
                this.flowList = res.data
            })
            },
            onSubmit() {
                const {
                    dealBeforeFileList,
                    dealAfterFileList,
                    handleParam
                } = this;
            } = this
                if (dealBeforeFileList.length === 0)
                    return uni.showToast({
                        title: '请上传整改前图片或视频',
                        icon: 'none'
                    });
                })
                if (dealAfterFileList.length === 0)
                    return uni.showToast({
                        title: '请上传整改后图片或视频',
                        icon: 'none'
                    });
                })
                dealHiddenDanger({
                    ...handleParam,
                    dealBeforeFileList: dealBeforeFileList,
@@ -460,49 +459,49 @@
                    id: this.id
                }).then(res => {
                    if (res.code === 200) {
                        this.isShowHandle = false;
                    this.isShowHandle = false
                        setTimeout(() => {
                            uni.showToast({
                                title: '操作成功',
                                icon: 'success'
                            });
                        });
                        uni.navigateBack();
                        })
                    })
                    uni.navigateBack()
                    }
                });
            })
            },
            enterTransfer() {
                const {
                    transferParam,
                    id
                } = this;
            } = this
                if (!transferParam.id)
                    return uni.showToast({
                        title: '请选择人员',
                        icon: 'none'
                    });
                })
                transferHiddenDanger({
                    checkUserId: transferParam.id,
                    id
                }).then(res => {
                    if (res.code === 200) {
                        this.isShowTransfer = false;
                    this.isShowTransfer = false
                        setTimeout(() => {
                            uni.showToast({
                                title: '操作成功',
                                icon: 'success'
                            });
                        });
                        uni.navigateBack();
                        })
                    })
                    uni.navigateBack()
                    }
                });
            })
            },
            changeMem(e) {
                this.transferParam = e;
            this.transferParam = e
            },
            handleTransfer() {
                this.isShowTransfer = true;
                this.getMemList();
            this.isShowTransfer = true
            this.getMemList()
            },
            getMemList() {
                findHiddenAreaMemberList({
@@ -510,22 +509,22 @@
                    id: this.info.areaId,
                    ...this.pagination
                }).then(res => {
                    this.memberList = res.data || [];
                });
                this.memberList = res.data || []
            })
            },
            confirmBackDate(e) {
                this.$set(this.backParam, 'dealTime', dayjs(e.value).format('YYYY-MM-DD HH:mm:ss'));
                this.isShowBackDate = false;
            this.$set(this.backParam, 'dealTime', dayjs(e.value).format('YYYY-MM-DD HH:mm:ss'))
            this.isShowBackDate = false
            },
            confirmHandleDate(e) {
                this.$set(this.handleParam, 'dealTime', dayjs(e.value).format('YYYY-MM-DD HH:mm:ss'));
                this.isShowHandleDate = false;
            this.$set(this.handleParam, 'dealTime', dayjs(e.value).format('YYYY-MM-DD HH:mm:ss'))
            this.isShowHandleDate = false
            },
            onSubBack() {
                const {
                    dealBeforeFileList,
                    backParam
                } = this;
            } = this
                dealHiddenDanger({
                    ...backParam,
                    dealBeforeFileList,
@@ -533,37 +532,37 @@
                    id: this.id
                }).then(res => {
                    if (res.code === 200) {
                        this.isShowBack = false;
                    this.isShowBack = false
                        setTimeout(() => {
                            uni.showToast({
                                title: '操作成功',
                                icon: 'success'
                            });
                        });
                        uni.navigateBack();
                        })
                    })
                    uni.navigateBack()
                    }
                });
            })
            },
            fileDel(str, i) {
                this[str].splice(i, 1);
            this[str].splice(i, 1)
            },
            uploadBeImage() {
                this.showUploadBe = false;
                let token = uni.getStorageSync('token') || '';
            this.showUploadBe = false
            let token = uni.getStorageSync('token') || ''
                uni.chooseImage({
                    count: 9,
                    success: chooseImageRes => {
                        uni.showLoading({
                            title: '上传中',
                            mask: true
                        });
                        const tempFilePaths = chooseImageRes.tempFilePaths;
                    })
                    const tempFilePaths = chooseImageRes.tempFilePaths
                        let imgs = tempFilePaths.map((value, index) => {
                            return {
                                name: 'file',
                                uri: value
                            };
                        });
                        }
                    })
                        uni.uploadFile({
                            url: `${uploadUrl}`,
                            files: imgs,
@@ -575,41 +574,41 @@
                                Dm_user_token: token
                            },
                            success: uploadFileRes => {
                                let res = JSON.parse(uploadFileRes.data);
                            let res = JSON.parse(uploadFileRes.data)
                                let obj = {
                                    type: '0'
                                };
                            }
                                if (res.data && res.data.length > 0) {
                                    res.data.forEach(i => {
                                        i.type = 0;
                                        i.fileurl = i.imgaddr;
                                        i.fileurlFull = i.url;
                                        this.dealBeforeFileList.push(i);
                                    });
                                    i.type = 0
                                    i.fileurl = i.imgaddr
                                    i.fileurlFull = i.url
                                    this.dealBeforeFileList.push(i)
                                })
                                }
                            },
                            fail(err) {
                                console.log('err', err);
                            console.log('err', err)
                            },
                            complete() {
                                uni.hideLoading();
                            uni.hideLoading()
                                // if (i === chooseImageRes.tempFilePaths.length - 1) {
                                //   uni.hideLoading()
                                // }
                            }
                        });
                    })
                    }
                });
            })
            },
            uploadBeVideo() {
                this.showUploadBe = false;
                let token = uni.getStorageSync('token') || '';
            this.showUploadBe = false
            let token = uni.getStorageSync('token') || ''
                uni.chooseVideo({
                    success: chooseImageRes => {
                        uni.showLoading({
                            title: '上传中',
                            mask: true
                        });
                    })
                        uni.uploadFile({
                            url: `${uploadUrl}`,
                            filePath: chooseImageRes.tempFilePath,
@@ -621,40 +620,40 @@
                                folder: 'HIDDEN_DANGER_FILE'
                            },
                            success: uploadFileRes => {
                                let res = JSON.parse(uploadFileRes.data);
                            let res = JSON.parse(uploadFileRes.data)
                                if (res.data && res.data.length > 0) {
                                    res.data.forEach(i => {
                                        i.type = 1;
                                        i.fileurl = i.imgaddr;
                                        i.fileurlFull = i.url;
                                        this.dealBeforeFileList.push(i);
                                    });
                                    i.type = 1
                                    i.fileurl = i.imgaddr
                                    i.fileurlFull = i.url
                                    this.dealBeforeFileList.push(i)
                                })
                                }
                            },
                            complete() {
                                uni.hideLoading();
                            uni.hideLoading()
                            }
                        });
                    })
                    }
                });
            })
            },
            uploadAfImage() {
                this.showUploadAf = false;
                let token = uni.getStorageSync('token') || '';
            this.showUploadAf = false
            let token = uni.getStorageSync('token') || ''
                uni.chooseImage({
                    count: 9,
                    success: chooseImageRes => {
                        uni.showLoading({
                            title: '上传中',
                            mask: true
                        });
                        const tempFilePaths = chooseImageRes.tempFilePaths;
                    })
                    const tempFilePaths = chooseImageRes.tempFilePaths
                        let imgs = tempFilePaths.map((value, index) => {
                            return {
                                name: 'file',
                                uri: value
                            };
                        });
                        }
                    })
                        uni.uploadFile({
                            url: `${uploadUrl}`,
                            files: imgs,
@@ -666,38 +665,38 @@
                                Dm_user_token: token
                            },
                            success: uploadFileRes => {
                                let res = JSON.parse(uploadFileRes.data);
                            let res = JSON.parse(uploadFileRes.data)
                                if (res.data && res.data.length > 0) {
                                    res.data.forEach(i => {
                                        i.type = 0;
                                        i.fileurl = i.imgaddr;
                                        i.fileurlFull = i.url;
                                        this.dealAfterFileList.push(i);
                                    });
                                    i.type = 0
                                    i.fileurl = i.imgaddr
                                    i.fileurlFull = i.url
                                    this.dealAfterFileList.push(i)
                                })
                                }
                            },
                            fail(err) {
                                console.log('err', err);
                            console.log('err', err)
                            },
                            complete() {
                                uni.hideLoading();
                            uni.hideLoading()
                                // if (i === chooseImageRes.tempFilePaths.length - 1) {
                                //   uni.hideLoading()
                                // }
                            }
                        });
                    })
                    }
                });
            })
            },
            uploadAfVideo() {
                this.showUploadAf = false;
                let token = uni.getStorageSync('token') || '';
            this.showUploadAf = false
            let token = uni.getStorageSync('token') || ''
                uni.chooseVideo({
                    success: chooseImageRes => {
                        uni.showLoading({
                            title: '上传中',
                            mask: true
                        });
                    })
                        uni.uploadFile({
                            url: `${uploadUrl}`,
                            filePath: chooseImageRes.tempFilePath,
@@ -709,40 +708,40 @@
                                folder: 'HIDDEN_DANGER_FILE'
                            },
                            success: uploadFileRes => {
                                let res = JSON.parse(uploadFileRes.data);
                            let res = JSON.parse(uploadFileRes.data)
                                if (res.data && res.data.length > 0) {
                                    res.data.forEach(i => {
                                        i.type = 1;
                                        i.fileurl = i.imgaddr;
                                        i.fileurlFull = i.url;
                                        this.dealAfterFileList.push(i);
                                    });
                                    i.type = 1
                                    i.fileurl = i.imgaddr
                                    i.fileurlFull = i.url
                                    this.dealAfterFileList.push(i)
                                })
                                }
                            },
                            complete() {
                                uni.hideLoading();
                            uni.hideLoading()
                            }
                        });
                    })
                    }
                });
            })
            },
            uploadImage() {
                this.showUpload = false;
                let token = uni.getStorageSync('token') || '';
            this.showUpload = false
            let token = uni.getStorageSync('token') || ''
                uni.chooseImage({
                    count: 9,
                    success: chooseImageRes => {
                        uni.showLoading({
                            title: '上传中',
                            mask: true
                        });
                        const tempFilePaths = chooseImageRes.tempFilePaths;
                    })
                    const tempFilePaths = chooseImageRes.tempFilePaths
                        let imgs = tempFilePaths.map((value, index) => {
                            return {
                                name: 'file',
                                uri: value
                            };
                        });
                        }
                    })
                        uni.uploadFile({
                            url: `${uploadUrl}`,
                            files: imgs,
@@ -754,38 +753,38 @@
                                Dm_user_token: token
                            },
                            success: uploadFileRes => {
                                let res = JSON.parse(uploadFileRes.data);
                            let res = JSON.parse(uploadFileRes.data)
                                if (res.data && res.data.length > 0) {
                                    res.data.forEach(i => {
                                        i.type = 0;
                                        i.fileurl = i.imgaddr;
                                        i.fileurlFull = i.url;
                                        this.submitFileList.push(i);
                                    });
                                    i.type = 0
                                    i.fileurl = i.imgaddr
                                    i.fileurlFull = i.url
                                    this.submitFileList.push(i)
                                })
                                }
                            },
                            fail(err) {
                                console.log('err', err);
                            console.log('err', err)
                            },
                            complete() {
                                uni.hideLoading();
                            uni.hideLoading()
                                // if (i === chooseImageRes.tempFilePaths.length - 1) {
                                //   uni.hideLoading()
                                // }
                            }
                        });
                    })
                    }
                });
            })
            },
            uploadVideo() {
                this.showUpload = false;
                let token = uni.getStorageSync('token') || '';
            this.showUpload = false
            let token = uni.getStorageSync('token') || ''
                uni.chooseVideo({
                    success: chooseImageRes => {
                        uni.showLoading({
                            title: '上传中',
                            mask: true
                        });
                    })
                        uni.uploadFile({
                            url: `${uploadUrl}`,
                            filePath: chooseImageRes.tempFilePath,
@@ -797,25 +796,25 @@
                                folder: 'HIDDEN_DANGER_FILE'
                            },
                            success: uploadFileRes => {
                                let res = JSON.parse(uploadFileRes.data);
                            let res = JSON.parse(uploadFileRes.data)
                                if (res.data && res.data.length > 0) {
                                    res.data.forEach(i => {
                                        i.type = 1;
                                        i.fileurl = i.imgaddr;
                                        i.fileurlFull = i.url;
                                        this.submitFileList.push(i);
                                    });
                                    i.type = 1
                                    i.fileurl = i.imgaddr
                                    i.fileurlFull = i.url
                                    this.submitFileList.push(i)
                                })
                                }
                            },
                            complete() {
                                uni.hideLoading();
                            uni.hideLoading()
                            }
                        });
                    })
                    }
                });
            })
            }
        }
    };
}
</script>
<style lang="scss">
@@ -1299,6 +1298,7 @@
            margin: 0 -30rpx;
        }
    }
    .video_wrap {
            position: relative;
            border: 1px solid;
@@ -1315,6 +1315,7 @@
                transform: translate(-50%, -50%);
            }
        }
    .sel_upload_wrap {
        width: 100%;
        border-top: 1px solid #333333;
@@ -1423,6 +1424,7 @@
        display: flex;
        align-items: center;
        z-index: 9990;
        .bg {
            background-color: rgba(0, 0, 0, .6);
            position: absolute;
screen/index.html
@@ -12,5 +12,7 @@
    <script src="./jsencrypt.min.js"></script>
    <script src="./web-control_1.2.7.min.js"></script>
    <script type="module" src="/src/main.js"></script>
    <script src="https://webapi.amap.com/maps?v=2.0&key=96b8d96e645290f1de14f5229ee030e4"></script>
  </body>
</html>
screen/src/api/index.js
@@ -22,8 +22,42 @@
}
// åº“制管理看板 å½“前运输任务
export const getStoreTaskList = (data) => {
  return request('visitsAdmin/cloudService/board/api/wholeProvince/transportTaskList', data)
  return request('visitsAdmin/cloudService/board/api/wholeProvince/orderList', data, 'POST')
}
// åº“制管理看板 å½“前运输任务
export const kzorderInfo = (data) => {
  return request('visitsAdmin/cloudService/board/api/wholeProvince/orderInfo', data, 'POST')
}
//
// åº“制管理看板 ç´¯è®¡å‡ºåº“量
export const kztotalOutQtyNum = (data) => {
  return request('visitsAdmin/cloudService/board/api/wholeProvince/totalOutQtyNum', data)
}
// åœ°å›¾æœ¬æœˆæœ¬å¹´æ€»å‡ºåº“量统计集合(按省份)
export const mapYearAndMonthOutList = (data) => {
  return request('visitsAdmin/cloudService/board/api/wholeProvince/mapYearAndMonthOutList', data)
}
// ä»“库资源利用率
export const kzinventoryUseRate = (data) => {
  return request('visitsAdmin/cloudService/board/api/wholeProvince/inventoryUseRate', data)
}
// å‡ºåº“能力利用率
export const outAbilityUseRate = (data) => {
  return request('visitsAdmin/cloudService/board/api/wholeProvince/outAbilityUseRate', data)
}
// è¿åŠ›èµ„æºåˆ©ç”¨çŽ‡
export const tranportAbilityUseRate = (data) => {
  return request('visitsAdmin/cloudService/board/api/wholeProvince/tranportAbilityUseRate', data)
}
// çƒŸåŽ‚é›†åˆ
export const kzfactoryList = (data) => {
  return request('visitsAdmin/cloudService/board/api/wholeProvince/factoryList', data)
}
// è¿‘7日到货情况
export const arriveGoodsList = (data) => {
  return request('visitsAdmin/cloudService/board/api/wholeProvince/arriveGoodsList', data)
}
// æ¶ˆé˜²ç®¡æŽ§å¤§å± æŠ¥è­¦ä¿¡æ¯
export const getFightingalarmData = (data) => {
screen/src/assets/images/LogisticsCenter/ic_cangku@2x.png
screen/src/assets/images/LogisticsCenter/ic_cangku_sel@2x.png
screen/src/assets/images/LogisticsCenter/ic_dangqian@2x.png
screen/src/assets/images/LogisticsCenter/ic_daohuo@2x.png
screen/src/assets/images/LogisticsCenter/ic_daohuo_sel@2x.png
screen/src/assets/images/LogisticsCenter/ic_dingdan@2x.png
screen/src/assets/images/LogisticsCenter/ic_dingdan_sel@2x.png
screen/src/assets/images/LogisticsCenter/ic_fahuodi@2x.png
screen/src/assets/images/LogisticsCenter/ic_hetong.png
screen/src/assets/images/LogisticsCenter/ic_huowu@2x.png
screen/src/assets/images/LogisticsCenter/ic_peizai@2x.png
screen/src/assets/images/LogisticsCenter/ic_peizai_sel@2x.png
screen/src/assets/images/LogisticsCenter/ic_yunshu@2x.png
screen/src/assets/images/LogisticsCenter/ic_yunshu_sel@2x.png
screen/src/components/Map.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,33 @@
<template>
  <div>
    <div id="map-container" ref="mapContainer"></div>
  </div>
</template>
<script setup>
import { onMounted, ref } from 'vue'
const mapContainer = ref(null)
onMounted(() => {
  // åˆå§‹åŒ–高德地图
  const map = new AMap.Map(mapContainer.value, {
    zoom: 10, // åˆå§‹ç¼©æ”¾çº§åˆ«
    center: [116.397428, 39.90923], // åˆå§‹ä¸­å¿ƒç‚¹ï¼ˆåŒ—京坐标)
  })
  // æ·»åŠ åŸºç¡€æŽ§ä»¶
  AMap.plugin(['AMap.ToolBar'], () => {
    const toolbar = new AMap.ToolBar()
    map.addControl(toolbar)
  })
});
</script>
<style lang="scss" scoped>
#map-container {
  width: 300px;
  height: 160px;
}
</style>
screen/src/views/EnergyConsum.vue
@@ -142,7 +142,7 @@
                <div class="header">
                  <img class="icon" src="@/assets/images/ic_yongqi@2x.png" alt="" />
                  <div class="content">
                    <div class="name">上月用气(t)</div>
                    <div class="name">上月用气(m³)</div>
                    <div class="num" v-if="data1.gasQuantity">{{ data1.gasQuantity.total.toLocaleString() }}</div>
                  </div>
                </div>
screen/src/views/LogisticsCenter.vue
@@ -24,20 +24,20 @@
            <div class="second_title">
              <div class="title">
                <img src="@/assets/images/LogisticsCenter/ic_title@2x.png" class="icon" alt="" />
                <div>本年累计出库量</div>
                <div>累计出库量</div>
              </div>
              <div class="tabs">
                <div class="tab" :class="{ active: activeTab1 == 0 }" @click="tab1Click(0)">本周</div>
                <div class="tab" :class="{ active: activeTab1 == 1 }" @click="tab1Click(1)">本周</div>
                <div class="separate"></div>
                <div class="tab" :class="{ active: activeTab1 == 1 }" @click="tab1Click(1)">本月</div>
                <div class="tab" :class="{ active: activeTab1 == 0 }" @click="tab1Click(0)">本月</div>
                <div class="separate"></div>
                <div class="tab" :class="{ active: activeTab1 == 2 }" @click="tab1Click(2)">本年</div>
              </div>
            </div>
            <div class="content_wrap">
              <div class="num_wrap">
                <div class="num_list" v-if="cneterData.yearOutTotal">
                  <div class="num" v-for="i in cneterData.yearOutTotal + ''">
                <div class="num_list" v-if="StockOutData.currentNum">
                  <div class="num" v-for="i in StockOutData.currentNum + ''">
                    {{ i }}
                    <img class="bg" src="@/assets/images/LogisticsCenter/bg_number@2x.png" alt="">
                  </div>
@@ -45,11 +45,19 @@
                <div class="content">
                  <div class="unit_wrap">
                    <span class="la">同比</span>
                    <img src="@/assets/images/ic_up.png" class="icon" alt="">
                    <span v-if="cneterData.yearOutTotalOnYear || cneterData.yearOutTotalOnYear == 0">{{
                      cneterData.yearOutTotalOnYear }} %</span>
                    <template v-if="StockOutData.currentNum && StockOutData.lastNum">
                      <img v-if="StockOutData.currentNum >= StockOutData.lastNum" src="@/assets/images/ic_up.png"
                        class="icon" alt="">
                      <img v-else src="@/assets/images/ic_down.webp" class="icon" alt="">
                    </template>
                    <span v-if="StockOutData.lastNum && StockOutData.currentNum">{{ Math.abs((((StockOutData.currentNum
                      -
                      StockOutData.lastNum) /
                      StockOutData.lastNum)
                      * 100).toFixed(2)) }}%</span>
                    <span v-else style="margin-left: 6px;">-</span>
                    <span class="la" style="margin-left: 30px;margin-right: 10px;">累计出库车次</span>
                    <span>{{ cneterData.yearOutTimes || '' }}</span>
                    <span>{{ StockOutData.totalCarNum || '' }}</span>
                  </div>
                </div>
@@ -57,10 +65,10 @@
              <div class="echart_wrap">
                <div class="echart1" id="echart1"></div>
                <div class="list">
                  <div class="item" v-for="item, i in StockOutData" :key="i">
                  <div class="item" v-for="item, i in StockOutData.arr" :key="i">
                    <div :style="{ background: colors[i] }" class="icon"></div>
                    <div class="text">{{ item.name }}</div>
                    <div class="num">{{ item.value }}</div>
                    <div class="num">{{ item.rate }}</div>
                  </div>
                </div>
              </div>
@@ -93,18 +101,19 @@
            <div class="list_wrap">
              <div class="header line">
                <span class="item">运输车辆</span>
                <span class="item">状态</span>
                <span class="item status">状态</span>
                <span class="item">位置</span>
                <span class="item">任务下达时间</span>
              </div>
              <div class="one-swiper list">
                <div class="swiper-wrapper">
                  <div class="line one-swiper-slide swiper-slide item" @click="taskClick(item)"
                  <div :class="{ avtive: modalInfo.contractNumber == item.contractNumber }"
                    class="line one-swiper-slide swiper-slide item" @click="taskClick(item)"
                    v-for="(item, i) in transportTask" :key="i">
                    <span class="item">{{ item.carNo }}</span>
                    <span class="item">{{ item.statusStr }}</span>
                    <span class="item">{{ item.address }}</span>
                    <span class="item">{{ item.taskDate }}</span>
                    <span class="item">{{ item.contractNumber }}</span>
                    <span class="item status">{{ item.statusDesc }}</span>
                    <span class="item">{{ item.receiveEnterprise }}</span>
                    <span class="item">{{ item.transportDate }}</span>
                  </div>
                </div>
              </div>
@@ -133,37 +142,31 @@
                <img src="@/assets/images/LogisticsCenter/ic_jinrijihua@2x.png" alt="">
                <div class="content">
                  <div class="name">当日订单量</div>
                  <div class="num"><span class="blue">{{ cneterData.outPlanTotal }}</span>万支</div>
                  <div class="num"><span class="blue">{{ cneterData.currentOrderNum }}</span>万支</div>
                </div>
              </div>
              <div class="item">
                <img src="@/assets/images/LogisticsCenter/ic_jinrijihua@2.png" alt="">
                <div class="content">
                  <div class="name">当日计划量</div>
                  <div class="num"><span>{{ cneterData.outPlanTotal }}</span>万支</div>
                  <div class="unit">车次:{{ cneterData.outPlanTimes }}</div>
                  <div class="num"><span>{{ cneterData.currentPlanNum }}</span>万支</div>
                  <div class="unit">车次:{{ cneterData.currentPlanCarNum }}</div>
                </div>
              </div>
              <div class="item">
                <img src="@/assets/images/LogisticsCenter/ic_jinrichuku@2x.png" alt="">
                <div class="content">
                  <div class="name">今日出库量</div>
                  <div class="num" v-if="cneterData.outPlanTotal && cneterData.outTotal"><span class="finish">{{
                    cneterData.outPlanTotal - cneterData.outTotal }}</span>万支</div>
                  <div class="unit" v-if="cneterData.outPlanTotal && cneterData.outTotal">车次:{{ cneterData.outPlanTimes
                    -
                    cneterData.outTimes }}</div>
                  <div class="num"><span class="finish">{{ cneterData.crrentOutNum }}</span>万支</div>
                  <div class="unit">车次:{{ cneterData.crrentOutCarNum }}</div>
                </div>
              </div>
              <div class="item">
                <img src="@/assets/images/LogisticsCenter/ic_jinriweichu@2x.png" alt="">
                <div class="content">
                  <div class="name">剩余任务量</div>
                  <div class="num" v-if="cneterData.outPlanTotal && cneterData.outTotal"><span class="today">{{
                    cneterData.outPlanTotal - cneterData.outTotal }}</span>万支</div>
                  <div class="unit" v-if="cneterData.outPlanTotal && cneterData.outTotal">车次:{{ cneterData.outPlanTimes
                    -
                    cneterData.outTimes }}</div>
                  <div class="num"><span class="today">{{ cneterData.crrentRestNum }}</span>万支</div>
                  <div class="unit">车次:{{ cneterData.crrentRestCarNum }}</div>
                </div>
              </div>
            </div>
@@ -171,6 +174,13 @@
              <div class="wrap">
                <div class="content">
                  <div class="scale">0</div>
                  <!-- <div class="node">
                    <div>8h</div>
                    <div class="node_icon">
                      <div class="icon icon1"></div>
                      <div class="icon icon2"></div>
                    </div>
                  </div> -->
                  <div class="box">
                    <div class="tag">
                      <div class="icon"></div>
@@ -184,17 +194,31 @@
                    </div>
                  </div>
                </div>
                <div class="side">
                <!-- <div class="side">
                  <div class="box"></div>
                  <div class="scale" style="left: -12px;">8h</div>
                  <div class="scale scale1">最大</div>
                </div>
                </div> -->
              </div>
            </div>
          </div>
          <div class="center_box_two">
            <div class="echart_map" ref="mapEchart" id="echart_map"></div>
            <div v-if="showModal1" @click="showModal1 = false" class="modal1">
            <div class="list">
                <div class="head line">
                  <div class="item">车牌号</div>
                  <div class="item contract">合同号</div>
                  <div class="item">目的地</div>
                </div>
                <div class="line" v-for="item in active1List">
                  <div class="item">{{ item.platNumber }}</div>
                  <div class="item contract">{{ item.contractNumber }}</div>
                  <div class="item">{{ item.repertotyName }}</div>
                </div>
              </div>
            </div>
            <!-- <div class="list">
              <div class="item">
                <div class="icon"></div>
                <div class="text">出库量10w以上</div>
@@ -211,7 +235,7 @@
                <div class="icon icon4"></div>
                <div class="text">出库量2w以下</div>
              </div>
            </div>
            </div> -->
          </div>
        </div>
        <div class="right_box">
@@ -226,9 +250,14 @@
            <div class="second_title">
              <div class="title">
                <img src="@/assets/images/LogisticsCenter/ic_title@2x.png" class="icon" alt="" />
                <div>库存利用率</div>
                <div>仓库资源利用率</div>
              </div>
              <div class="side">全省:<span>100<span class="unit">万支 |</span> 40.6%</span></div>
              <div class="side">
                å…¨çœï¼š
                <span>{{ data5.totalNum }}</span>
                <span class="unit">万支 | </span>
                <span v-if="data5.totalNum">{{ ((data5.currentNum / data5.totalNum) * 100).toFixed(1) }}%</span>
              </div>
            </div>
            <div class="echart5_wrap">
              <div class="echart5" id="echart5"></div>
@@ -264,66 +293,88 @@
      <div class="modal_wrap" v-if="showModal">
        <div class="title_head">
          <img src="@/assets/images/energy_ef/chuku_ic_car@2x.png" alt="">
          <span>皖a222</span>
          <span>合同号:{{ modalInfo.contractNumber }}</span>
        </div>
        <div class="info">
          <div class="item">
            <div class="dian"></div>
            <div class="la">运输单号:</div>
            <div class="val">471342</div>
          </div>
          <div class="item">
            <div class="dian"></div>
            <div class="la">司机信息:</div>
            <div class="val">孙文武 17493932936</div>
            <div class="val">{{ modalInfo.driverName }} {{ modalInfo.driverTel }}</div>
          </div>
          <div class="item">
            <div class="dian"></div>
            <div class="la">总运输量:</div>
            <div class="val">22万支</div>
            <div class="la">车牌号:</div>
            <div class="val">{{ modalInfo.plateName }}</div>
          </div>
          <div class="item">
            <div class="dian"></div>
            <div class="la">当前位置:</div>
            <div class="val">安徽省合肥市包河区繁华大道123米处</div>
          </div>
        </div>
        <div class="tabs">
          <div :class="{ active: modalTab == 0 }" @click="modalTabClick(0)" class="tab">合同1:1231231</div>
          <div :class="{ active: modalTab == 1 }" @click="modalTabClick(1)" class="tab">合同2:1231231</div>
        </div>
        <div class="ht_info">
          <div class="item">
            <div class="la">发货仓库:</div>
            <div class="val">芜湖成品</div>
            <div class="la">发货地点:</div>
            <div class="val">{{ modalInfo.deliveryEnterprise }}</div>
          </div>
          <div class="item">
            <div class="la">预计到达:</div>
            <div class="val">2024-12-04 14:00</div>
          </div>
          <div class="item">
            <div class="dian"></div>
            <div class="la">到货地点:</div>
            <div class="val">江门烟草物流配送中心</div>
            <div class="val">{{ modalInfo.receiveEnterprise }}</div>
          </div>
          <div class="item">
            <div class="la">运输量:</div>
            <div class="val">300万支</div>
            <div class="dian"></div>
            <div class="la">车辆位置:</div>
            <div class="val">{{ modalInfo.aa || '-' }}</div>
          </div>
          <div class="item">
            <div class="dian"></div>
            <div class="la">预计到达:</div>
            <div class="val" v-if="modalInfo.plannedArrivedDate">{{ modalInfo.plannedArrivedDate.slice(0, 11) }}</div>
          </div>
        </div>
        <div class="tab1">
          <div class="title">
        <div class="logistics_wrap">
          <div class="m_title">
            <img src="@/assets/images/LogisticsCenter/ic_title@2x.png" alt="">
            <span>物流信息</span>
          </div>
          <div class="item" v-for="item, i in 3">
            <div class="icon_wrap">
              <img v-if="i !== 0" class="dian" src="@/assets/images/ic_dangqian@2x.png" alt="">
              <img v-else src="@/assets/images/ic_jindu@2x.png" class="dian_ac" alt="">
              <div class="line"></div>
          <div id="map-container" ref="mapContainer"></div>
          <div class="fu_list">
            <div class="fu_item" v-for="item, i in modalInfo.cicleStatusList">
              <div class="item_title">
                <div class="icon">
                  <img v-if="item.key == 0 && k != 0" src="@/assets/images/LogisticsCenter/ic_dingdan@2x.png"
                    class="icon"></img>
                  <img v-if="item.key == 0 && k == 0" src="@/assets/images/LogisticsCenter/ic_dingdan_sel@2x.png"
                    class="icon"></img>
                  <img v-if="item.key == 1 && k != 0" src="@/assets/images/LogisticsCenter/ic_peizai@2x.png"
                    class="icon"></img>
                  <img v-if="item.key == 1 && k == 0" src="@/assets/images/LogisticsCenter/ic_peizai_sel@2x.png"
                    class="icon"></img>
                  <img v-if="item.key == 2 && k != 0" src="@/assets/images/LogisticsCenter/ic_cangku@2x.png"
                    class="icon"></img>
                  <img v-if="item.key == 2 && k == 0" src="@/assets/images/LogisticsCenter/ic_cangku_sel@2x.png"
                    class="icon"></img>
                  <img v-if="item.key == 3 && k != 0" src="@/assets/images/LogisticsCenter/ic_yunshu@2x.png"
                    class="icon"></img>
                  <img v-if="item.key == 3 && k == 0" src="@/assets/images/LogisticsCenter/ic_yunshu_sel@2x.png"
                    class="icon"></img>
                  <img v-if="item.key == 4 && k != 0" src="@/assets/images/LogisticsCenter/ic_daohuo@2x.png"
                    class="icon"></img>
                  <img v-if="item.key == 4 && k == 0" src="@/assets/images/LogisticsCenter/ic_daohuo_sel@2x.png"
                    class="icon"></img>
                  <img v-if="item.key == 5" src="@/assets/images/LogisticsCenter/ic_dangqian@2x.png" class="icon"></img>
            </div>
            <div class="content">
              <div class="status">车辆启运-电子锁气运</div>
              <div class="time">2024-04-02 12:00</div>
                <div>{{ item.name }}</div>
              </div>
              <div class="item" v-for="ite, i in item.secondList">
                <div class="h2" v-if="ite.orderStatusDes">
                  <div class="icon_wrap" v-if="i != 0">
                    <image src="@/static/driver/ic_mostarted.png" class="icon"></image>
                  </div>
                  <div v-else class="icon_wrap"></div>
                  <div class="text" :class="{ placeholder3: k == 0 && i == 0 }">
                    {{ ite.orderStatusDes }}
                    <text v-if="ite.tel">,发货仓库电话:</text>
                    <text v-if="ite.tel" class="primaryColor">{{ ite.tel }}</text>
                  </div>
                </div>
                <div class="time">{{ ite.recordDate }}</div>
              </div>
            </div>
          </div>
        </div>
@@ -341,7 +392,10 @@
import * as echarts from 'echarts'
import 'swiper/css/swiper.min.css'
import Swiper from 'swiper'
import Map from '@/components/Map.vue'
import chinaJSON from '@/assets/china.json'
import fahuoImg from '@/assets/images/LogisticsCenter/ic_fahuodi@2x.png'
import shouImg from '@/assets/images/LogisticsCenter/ic_huowu@2x.png'
import {
  getStoreOperationList,
  getStorearriveGoodsList,
@@ -349,6 +403,15 @@
  getStoreenergyDataList,
  getStorelastMonthOil,
  getStoreTaskList,
  kztotalOutQtyNum,
  kzorderInfo,
  mapYearAndMonthOutList,
  kzinventoryUseRate,
  outAbilityUseRate,
  tranportAbilityUseRate,
  kzfactoryList,
  arriveGoodsList
} from '@/api'
const weekMap = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六',]
@@ -422,153 +485,167 @@
  })
}
//
const mapList = ref([])
const mapEchart = ref()
const initMap = () => {
  var myChart = echarts.init(mapEchart.value)
  echarts.registerMap('china', chinaJSON)
  var points = [
    // ç‚¹åæ ‡
    { value: [117.1582, 36.8701], itemStyle: { color: '#6ae5e0' }, name: '山东', total: 2, bj: 0, yj: 0, yx: 0, tj: 0, dw: 0 },
    { value: [117.29, 32.0581], itemStyle: { color: '#6ae5e0' }, name: '安徽', total: 2, bj: 0, yj: 0, yx: 0, tj: 0, dw: 0 },
    { value: [114.3896, 30.6628], itemStyle: { color: '#6ae5e0' }, name: '湖北', total: 5, bj: 0, yj: 0, yx: 5, tj: 0, dw: 0 },
    { value: [119.5313, 29.8773], itemStyle: { color: '#6ae5e0' }, name: '浙江', total: 10, bj: 0, yj: 0, yx: 10, tj: 0, dw: 0 },
    { value: [113.12244, 23.009505], itemStyle: { color: '#6ae5e0' }, name: '广东', total: 8, bj: 0, yj: 0, yx: 8, tj: 0, dw: 0 },
    { value: [103.9526, 30.7617], itemStyle: { color: '#6ae5e0' }, name: '四川', total: 18, bj: 0, yj: 0, yx: 18, tj: 0, dw: 0 }
    { value: [117.1582, 36.8701, 100], itemStyle: { color: '#6ae5e0' }, name: '山东', total: 2, bj: 0, yj: 0, yx: 0, tj: 0, dw: 0 },
    { value: [117.29, 32.0581, 90], itemStyle: { color: '#6ae5e0' }, name: '安徽', total: 2, bj: 0, yj: 0, yx: 0, tj: 0, dw: 0 },
    { value: [114.3896, 30.6628, 1999], itemStyle: { color: '#6ae5e0' }, name: '湖北', total: 5, bj: 0, yj: 0, yx: 5, tj: 0, dw: 0 },
    { value: [119.5313, 29.8773, 2], itemStyle: { color: '#6ae5e0' }, name: '浙江', total: 10, bj: 0, yj: 0, yx: 10, tj: 0, dw: 0 },
    { value: [113.12244, 23.009505, 12], itemStyle: { color: '#6ae5e0' }, name: '广东', total: 8, bj: 0, yj: 0, yx: 8, tj: 0, dw: 0 },
    { value: [103.9526, 30.7617, 1901], itemStyle: { color: '#fff' }, name: '四川', total: 18, bj: 0, yj: 0, yx: 18, tj: 0, dw: 0 }
  ]
  var lineToLf = [
    { name: '11', coords: [[110.81, 33.40], [116.55, 40.01]], lineStyle: { color: '#c1bb1f' } },
    { name: '22', coords: [[113.11, 28.40], [116.55, 40.01]], lineStyle: { color: '#6ae5e0' } },
    { name: '33', coords: [[106.44, 29.50], [116.55, 40.01]], lineStyle: { color: '#6ae5e0' } },
    { name: '44', coords: [[112.85, 38.95], [116.55, 40.01]], lineStyle: { color: '#6ae5e0' } },
    { name: '55', coords: [[82.78, 43.27], [116.55, 40.01]], lineStyle: { color: '#6ae5e0' } }
  const mapData = [
    { name: '北京市', value: 0 },
    { name: '天津市', value: 0 },
    { name: '上海市', value: 0 },
    { name: '重庆市', value: 0 },
    { name: '河北省', value: 0 },
    { name: '河南省', value: 0 },
    { name: '云南省', value: 0 },
    { name: '辽宁省', value: 0 },
    { name: '黑龙江省', value: 0 },
    { name: '湖南省', value: 0 },
    { name: '安徽省', value: 0 },
    { name: '山东省', value: 0 },
    { name: '新疆维吾尔自治区', value: 0 },
    { name: '江苏省', value: 0 },
    { name: '浙江省', value: 0 },
    { name: '江西省', value: 0 },
    { name: '湖北省', value: 0 },
    { name: '广西壮族自治区', value: 0 },
    { name: '甘肃省', value: 0 },
    { name: '山西省', value: 0 },
    { name: '内蒙古自治区', value: 0 },
    { name: '陕西省', value: 0 },
    { name: '吉林省', value: 0 },
    { name: '福建省', value: 0 },
    { name: '贵州省', value: 0 },
    { name: '广东省', value: 0 },
    { name: '青海省', value: 0 },
    { name: '西藏自治区', value: 0 },
    { name: '宁夏回族自治区', value: 0 },
    { name: '四川省', value: 0 },
    { name: '宁夏省', value: 0 },
    { name: '海南省', value: 0 },
    { name: '台湾省', value: 0 },
    { name: '香港特别行政区', value: 0 },
    { name: '澳门特别行政区', value: 0 },
  ]
  mapData.forEach(item => {
    item.monthNum = 0
    item.yearNum = 0
    mapList.value.forEach(ite => {
      if (item.name == ite.name) {
        item.value = ite.value
        item.monthNum = ite.monthNum
        item.yearNum = ite.yearNum
      }
    })
  })
  const option = {
    backgroundColor: 'transparent', // è®¾ç½®èƒŒæ™¯è‰²é€æ˜Ž
    // å¿…须设置
    tooltip: {
      show: false
    //数据分段
    visualMap: {
      type: 'piecewise',
      pieces: [
        { min: 100000, max: 99999999999, label: '出库量10w以上', color: '#be6f2b' },
        { min: 50000, max: 100000, label: '出库量5-10w', color: '#c39332' },
        { min: 20000, max: 50000, label: '出库量2-5w', color: '#5ecbaf' },
        { min: -1, max: 20000, label: '出库量2w以下', color: '#325a9b' },
      ],
      itemWidth: 22,
      itemHeight: 22,
      textStyle: {
        color: '#fff', // æ–‡æœ¬é¢œè‰²
        fontSize: 14, // å­—体大小
    },
    // åœ°å›¾é˜´å½±é…ç½®
    geo: {
      map: 'china',
      // è¿™é‡Œå¿…须定义,不然后面series里面不生效
    },
    // æ‚¬æµ®çª—
      tooltip: {
        show: false
      trigger: 'item',
      backgroundColor: 'rgba(0,0,0,0.8)', //设置背景图片 rgba格式
      color: '#fff',
      borderWidth: '1', //边框宽度设置1
      borderColor: 'gray', //设置边框颜色
      textStyle: {
        color: '#fff', //设置文字颜色
      },
      extraCssText: 'width:120px;height:40px', // è®¾ç½®æç¤ºæ¡†å®½é«˜ç­‰css样式
      formatter: function (params) {
        return `${params.name}: <br /> ${params.value || 0}辆`
      },
    },
    geo: {
      // è¿™ä¸ªæ˜¯é‡ç‚¹ â€”— è¿™é‡Œè®¾ç½®ä¸ºåœ°å›¾çš„阴影
      map: 'china', // è¡¨ç¤ºä¸­å›½åœ°å›¾
      roam: false, // ç¦æ­¢æ‹–拽
      label: {
        // æ ‡å¿—信息
        show: false, // æ˜¯å¦æ˜¾ç¤ºå¯¹åº”地名
      },
      silent: true, // ç¦æ­¢hover效果
      zoom: 1.4, // åœ°å›¾æ¯”例
      aspectScale: 0.9, // æ¯”例
      center: [105.194115019531, 36.582111640625], // åœ°å›¾ä¸­å¿ƒä½ç½®ï¼Œ æ­¤å¤„的纬度与下面的center相差1度是形成阴影的距离,可自己随意调整
      itemStyle: {
        areaColor: '#152e4a', //地图阴影的颜色
        borderColor: '#f7f7f7', // çœä»½è¾¹æ¡†é¢œè‰²
        borderWidth: 0.1, // çœä»½è¾¹æ¡†å®½åº¦
        // shadowBlur: 5, // çœä»½è¾¹æ¡†èšç„¦
      },
      emphasis: {
        show: false,
      },
      //地图的阴影不显示南沙诸岛
      regions: [
        {
          name: '南海诸岛',
          itemStyle: {
            // éšè—åœ°å›¾
            normal: {
              opacity: 0, // ä¸º 0 æ—¶ä¸ç»˜åˆ¶è¯¥å›¾å½¢
            },
            emphasis: {
              opacity: 0,
            },
      },
      label: {
        show: false
            show: false, // éšè—æ–‡å­—
      },
      zoom: 1.6,
      silent: true, // ä¸å“åº”鼠标时间
      show: true,
      roam: false, // åœ°å›¾ç¼©æ”¾å’Œå¹³ç§»
      aspectScale: 0.75, // scale åœ°å›¾çš„长宽比
      itemStyle: {
        borderColor: '#2d5f9c',
        borderWidth: 1,
        areaColor: '#2d5f9c',
        shadowColor: 'rgba(1,34,73,0.48)',
        shadowBlur: 10,
        shadowOffsetX: -10, //
        shadowOffsetY: 10
      },
      select: {
        disabled: true
      ],
      },
      emphasis: {
        disabled: true,
        areaColor: '#00F1FF'
      },
      // åœ°å›¾åŒºåŸŸçš„多边形 å›¾å½¢æ ·å¼ é˜´å½±æ•ˆæžœ
      // z值小的图形会被z值大的图形覆盖
      top: '30.2%',
      left: 'center',
      // åŽ»é™¤å—æµ·è¯¸å²›é˜´å½± series map里面没有此属性
      regions: [{
        name: '南海诸岛',
        selected: false,
        emphasis: {
          disabled: true
        },
        itemStyle: {
          areaColor: '#00000000',
          borderColor: '#00000000'
        }
      }],
      z: 1
    },
    //配置属性
    series: [
      // åœ°å›¾é…ç½®
      {
        type: 'map',
        map: 'china',
        zoom: 1.6,
        tooltip: {
          show: false
        },
        zoom: 1.4,
        aspectScale: 0.9, // æ¯”例
        zlevel: 1, // è®¾ç½®åœ°å›¾çš„层级,将该地图上移(类似z-index)
        emphasis: {
          // é¼ æ ‡hover是否显示内容,可自己调节
        label: {
          show: true, // æ˜¾ç¤ºçœä»½åç§°
            show: true,
          color: '#fff',
          fontSize: 13,
          shadowColor: '#fff',
          shadowBlur: 10,
          shadowOffsetX: 2,
          shadowOffsetY: 2,
          textBorderColor: '#fff',
          // rotate: 90,
          align: 'center'
        },
        top: '28%',
        left: 'center',
        aspectScale: 0.75,
        roam: false, // åœ°å›¾ç¼©æ”¾å’Œå¹³ç§»
        itemStyle: {
          borderColor: '#4278a3', // çœåˆ†ç•Œçº¿é¢œè‰²  é˜´å½±æ•ˆæžœçš„
          borderWidth: 1,
          areaColor: '#1d3f71',
          opacity: 1
        },
        // åŽ»é™¤é€‰ä¸­çŠ¶æ€
        select: {
          disabled: true
        },
        emphasis: { // èšç„¦åŽé¢œè‰²
          disabled: false, // å¼€å¯é«˜äº®
          label: {
            align: 'center',
            color: '#04CFF5'
          },
          itemStyle: {
            color: '#ffffff',
            areaColor: '#3c87b2'// é˜´å½±æ•ˆæžœ é¼ æ ‡ç§»åŠ¨ä¸ŠåŽ»çš„é¢œè‰²
          }
            show: true,
            color: '#00114F', // é«˜äº®æ–‡å­—颜色
            borderColor: '#a4d0ec', // é«˜äº®è¾¹æ¡†é¢œè‰²
            areaColor: '#63d5c1', //高亮区域颜色
        },
        z: 2
      },
      // ç‚¹
      {
        name: 'companyPoint',
        type: 'effectScatter',
        coordinateSystem: 'geo',
        showEffectOn: 'render',
        // zlevel: 2, // zlevel用于 Canvas åˆ†å±‚ ç›¸åŒçš„绘制在同一个canvas上
        rippleEffect: {
          number: 3, // æ³¢çº¹æ•°é‡
          period: 10, // åŠ¨ç”»å‘¨æœŸ æ•°å€¼è¶Šå¤§ï¼Œæ³¢åŠ¨è¶Šæ…¢
          scale: 3.5, // åŠ¨ç”»ä¸­æ³¢çº¹çš„æœ€å¤§ç¼©æ”¾æ¯”ä¾‹
          brushType: 'stroke' // æ³¢çº¹çš„绘制方式 stroke fill
        },
        label: {
          // åœ°å›¾æ ‡æ³¨
          show: false,
          triggerOn: 'click',
          position: 'right',
          formatter: '{b}',
          color: '#97e9e1',
          fontSize: 14
        },
        symbol: 'circle',
        symbolSize: 8,
        data: points,
        tooltip: {
          show: true,
          triggerOn: 'click',
@@ -586,50 +663,49 @@
                          <span class="dot bj"></span>
                          <span class="item-state-num">
                            <span class="text">本月出库量:</span>
                            <span class="num">${params.data.total}万支</span>
                            <span class="num">${params.data.monthNum}万支</span>
                          </span>
                        </div>
                         <div class="item-state-con">
                          <span class="dot yj"></span>
                          <span class="item-state-num">
                           <span class="text">本年出库量</span>
                            <span class="num">${params.data.yx}万支</span>
                           <span class="text">本年出库量:</span>
                            <span class="num">${params.data.yearNum}万支</span>
                          </span>
                        </div>
                       </div>`
          }
        },
        z: 4
        itemStyle: {
          borderColor: '#a4d0ec', // çœä»½è¾¹æ¡†é¢œè‰²
          borderWidth: 1, // çœä»½è¾¹æ¡†å®½åº¦
          // shadowBlur: 5, // çœä»½è¾¹æ¡†èšç„¦
          areaColor: '#3c5997',
      },
      // åœ°å›¾çº¿çš„动画效果
      // {
      //   name: 'arrowline',
      //   type: 'lines',
      //   // zlevel: 1,
      //   effect: {
      //     show: true,
      //     period: 3, // ç®­å¤´æŒ‡å‘速度,值越小速度越快
      //     trailLength: 0.1, // ç‰¹æ•ˆå°¾è¿¹é•¿åº¦[0,1]值越大,尾迹越长重
      //     symbol: 'arrow', // ç®­å¤´å›¾æ ‡
      //     symbolSize: 6 // å›¾æ ‡å¤§å°
      //   },
      //   lineStyle: {
      //     color: '#1DE9B6',
      //     width: 2, // çº¿æ¡å®½åº¦
      //     opacity: 0.1, // å°¾è¿¹çº¿æ¡é€æ˜Žåº¦
      //     curveness: 0.2 // å°¾è¿¹çº¿æ¡æ›²ç›´åº¦
      //   },
      //   data: lineToLf,
      //   z: 3
      // }
    ]
        center: [105.194115019531, 35.582111640625], // è®¾ç½®åœ°å›¾ä¸­å¿ƒ
        data: mapData,
      },
    ],
  }
  myChart.setOption(option)
  window.addEventListener('resize', function () {//执行
    myChart.resize()
  })
}
const initEnergy = (list) => {
const getMap = () => {
  mapYearAndMonthOutList({
    factoryCode: activeCity.value.code
  }).then(res => {
    const temp = res.data || []
    mapList.value = temp.map(item => {
      item.value = item.monthNum
      item.name = item.provinceName
      return item
    })
    initMap()
  })
}
const initEnergy = () => {
  var myChart = echarts.init(document.querySelector('.energyRef'))
  // ç»˜åˆ¶å›¾è¡¨
  myChart.setOption({
@@ -678,7 +754,7 @@
      axisLine: {
        show: false
      },
      data: list.map(i => i.dateStr)
      data: dataList1.value.map(i => i.dateStr)
    },
    series: [
      {
@@ -696,7 +772,7 @@
        emphasis: {
          focus: 'series'
        },
        data: list.map(i => i.inTransitNum),
        data: dataList1.value.map(i => i.waitNum),
        itemStyle: {
          normal: {
            color: {
@@ -735,7 +811,7 @@
          color: '#000000',
          fontSize: 10
        },
        data: list.map(i => i.inTransitNum),
        data: dataList1.value.map(i => i.ingNum),
        itemStyle: {
          normal: {
            color: {
@@ -788,20 +864,32 @@
        emphasis: {
          focus: 'series'
        },
        data: list.map(i => i.arriveNum)
        data: dataList1.value.map(i => i.doneNum)
      }
    ]
  })
  myChart.on('click', function (params) {
    console.log(params.name)
    // console.log(params.seriesName)
    // console.log(params.name)
    const item = dataList1.value.find(i => i.dateStr == params.name)
    // console.log(params);
    active1List.value = params.seriesName == '在途' ? item.ingList : params.seriesName == '到货' ? item.doneList : item.waitList
    showModal1.value = true
  })
  window.addEventListener('resize', function () {//执行
    myChart.resize()
  })
}
const showModal1 = ref(false)
const active1List = ref([])
const dataList1 = ref([])
const getData1 = () => {
  getStorearriveGoodsList().then(res => {
    initEnergy(res.data || [])
  getStorearriveGoodsList({
    factoryCode: activeCity.value.code
  }).then(res => {
    dataList1.value = res.data || []
    initEnergy()
  })
}
@@ -810,19 +898,118 @@
const showModal = ref(false)
const modalInfo = ref({})
const modalTab = ref(0)
const pager = ref({
  page: 0,
  rows: 10
})
const modalTabClick = (val) => {
  modalTab.value = val
}
const taskClick = (item) => {
  modalInfo.value = item
  kzorderInfo({ contractNumber: item.contractNumber }).then(res => {
    modalInfo.value = res.data
  showModal.value = true
    console.log('modalInfo.value', modalInfo.value)
    nextTick(() => {
      initGdMap()
    })
  })
}
const mapContainer = ref(null)
function distance(obj) {
  const lat1 = obj.deliveryLat
  const lng1 = obj.deliveryLon
  const lat2 = obj.receiveLat
  const lng2 = obj.receiveLon
  const radLat1 = rad(lat1)
  const radLat2 = rad(lat2)
  const a = radLat1 - radLat2
  const b = rad(lng1) - rad(lng2)
  const Haversin = Math.pow(Math.sin(a / 2), 2) + Math.cos(radLat1) * Math.cos(radLat2) * Math.pow(Math.sin(b / 2),
    2)
  const radius = 6378137 // åœ°çƒåŠå¾„
  return 2 * radius * Math.asin(Math.sqrt(Haversin))
}
function rad(d) {
  return d * Math.PI / 180.0
}
const initGdMap = () => {
  const obj = modalInfo.value
  let scale = 5
  console.log((obj.deliveryLon + obj.receiveLon))
  const distancet = distance(obj)
  if (distancet > 1200000) {
    scale = 3
  } else if (distancet < 1200000 && distancet > 500000) {
    scale = 4
  } else if (distancet < 500000) {
    scale = 5
  } else {
    scale = 5
  }
  console.log('distancet', distancet)
  const map = new AMap.Map(mapContainer.value, {
    zoom: scale, // åˆå§‹ç¼©æ”¾çº§åˆ«
    center: [(Number(obj.deliveryLon) + Number(obj.receiveLon)) / 2, (Number(obj.deliveryLat) + Number(obj.receiveLat)) / 2], // åˆå§‹ä¸­å¿ƒç‚¹ï¼ˆåŒ—京坐标)
  })
  AMap.plugin(['AMap.ToolBar'], () => {
    const toolbar = new AMap.ToolBar()
    map.addControl(toolbar)
  })
  const marker1 = new AMap.Marker({
    position: [obj.deliveryLon, obj.deliveryLat], // æ ‡è®°ç‚¹1坐标
    icon: new AMap.Icon({
      size: new AMap.Size(28, 32), // å›¾æ ‡å¤§å°
      image: fahuoImg, // å›¾æ ‡å›¾ç‰‡URL
      imageSize: new AMap.Size(28, 32), // å›¾æ ‡å®žé™…大小
    }),
    title: '标记点1', // é¼ æ ‡æ‚¬åœæ—¶æ˜¾ç¤ºçš„æ ‡é¢˜
  })
  map.add(marker1)
  const marker2 = new AMap.Marker({
    position: [obj.receiveLon, obj.receiveLat], // æ ‡è®°ç‚¹1坐标
    icon: new AMap.Icon({
      size: new AMap.Size(28, 32), // å›¾æ ‡å¤§å°
      image: shouImg, // å›¾æ ‡å›¾ç‰‡URL
      imageSize: new AMap.Size(28, 32), // å›¾æ ‡å®žé™…大小
    }),
    title: '标记点1', // é¼ æ ‡æ‚¬åœæ—¶æ˜¾ç¤ºçš„æ ‡é¢˜
  })
  map.add(marker2)
  // ç»˜åˆ¶è½¨è¿¹
  const polylineList = obj.gisList[0].gisList || []
  const polyline = new AMap.Polyline({
    path: [
      polylineList.map(i => {
        return [i.lon, i.lat]
      })
    ],
    strokeColor: 'red', // çº¿çš„颜色
    strokeWeight: 3, // çº¿çš„宽度
    strokeOpacity: 0.8, // çº¿çš„透明度
    strokeStyle: 'solid', // çº¿çš„æ ·å¼
    lineJoin: 'round', // æŠ˜çº¿æ‹ç‚¹çš„æ ·å¼
  })
  map.add(polyline)
}
const getData2 = () => {
  getStoreTaskList({ code: taskCode.value }).then(res => {
    let temp = res.data || []
    // temp = temp.splice(0, 5)
  getStoreTaskList({
    pager: pager.value,
    parameters: {
      contractNumber: taskCode.value,
      facrotyCodeList: activeCity.value.code ? [activeCity.value.code] : []
    }
  }).then(res => {
    let temp = res.data.rows || []
    transportTask.value = temp.map(item => {
      item.taskDate = item.taskDate.slice(5, 16)
      if (item.transportDate) {
        item.transportDate = item.transportDate.slice(5, 16)
      }
      return item
    })
  })
@@ -830,27 +1017,22 @@
const cneterData = ref({})
const showPro = ref(false)
const cityList = ref([
  { name: '全省', id: 0 },
  { name: '合肥仓', id: 1 },
  { name: '芜湖仓', id: 2 },
  { name: '滁州仓', id: 3 },
  { name: '蚌埠仓', id: 4 },
])
const activeCity = ref({ name: '全省', id: 0 })
const activeTab1 = ref(0)
const cityList = ref()
const getCity = () => {
  kzfactoryList().then(res => {
    cityList.value = res.data
  })
}
const activeCity = ref({ name: '全省', code: '' })
const colors = ['#0193FE', '#FFB642']
const StockOutData = ref([])
const cityClick = (item) => {
  activeCity.value = item
  showPro.value = false
  cneterData.value = {}
  setTimeout(() => {
    getData3()
  }, 400)
  changeCity()
}
const initEchart1 = () => {
  const myChart = echarts.init(document.getElementById('echart1'))
  const option = {
    tooltip: {
      trigger: 'item'
@@ -867,7 +1049,7 @@
        labelLine: {
          show: false
        },
        data: StockOutData.value
        data: StockOutData.value.arr
      }
    ]
  }
@@ -876,274 +1058,40 @@
    myChart.resize()
  })
}
const activeTab1 = ref(0)
const StockOutData = ref({})
const getStockOut = () => {
  kztotalOutQtyNum({ type: activeTab1.value, factoryCode: activeCity.value.code }).then(res => {
    if (res.code == 200) {
      let obj = res.data
      obj.currentNum = (obj.currentOutNum + obj.currentInNum).toFixed(0) * 1
      obj.lastNum = (obj.lastOutNum + obj.lastInNum).toFixed(0) * 1
      // obj.sameNum = (obj.sameOutNum + obj.sameInNum).toFixed(0)
  let arr = []
  arr.push({ name: '省内', value: (cneterData.value.yearProvinceRata * 100).toFixed(0) + '%' })
  arr.push({ name: '省外', value: ((1 - cneterData.value.yearProvinceRata) * 100).toFixed(0) + '%' })
  arr.sort((a, b) => b.value - a.value)
  StockOutData.value = arr
      arr.push({ name: '省内', value: obj.currentInNum, rate: obj.currentInNum == 0 && obj.currentOutNum == 0 ? 0 : (obj.currentInNum / (obj.currentInNum + obj.currentOutNum) * 100).toFixed(0) + '%' })
      arr.push({ name: '省外', value: obj.currentOutNum, rate: obj.currentInNum == 0 && obj.currentOutNum == 0 ? 0 : (obj.currentOutNum / (obj.currentInNum + obj.currentOutNum) * 100).toFixed(0) + '%' })
      obj.arr = arr
      StockOutData.value = obj
  initEchart1()
}
const tab1Click = () => {
  activeTab1.value = val
  })
}
const tab1Click = (val) => {
  activeTab1.value = val
  getStockOut()
}
const getData3 = () => {
  getStorecenterData().then(res => {
    cneterData.value = res.data || {}
    getStockOut()
  })
}
const activeTabs = ref(0)
const dataList4 = ref([])
const initEchart4 = () => {
  // åŸºäºŽå‡†å¤‡å¥½çš„dom,初始化echarts实例
  const myChart = echarts.init(document.getElementById('echart4'))
  // ç»˜åˆ¶å›¾è¡¨
  myChart.setOption({
    tooltip: {
      trigger: 'axis',
      backgroundColor: '#091123',
      axisPointer: {
        type: 'line'
      },
      // formatter: function (params) {
      //   setTimeout(() => {
      //   })
      //   return `
      //     <div style="background-color: #091123;margin: -12px;padding: 14px;border: 2px solid rgba(1,217,254,0.5);color: #fff;">
      //       <div>${params[0].name}总销售额(万元)</div>
      //       <div style="display: flex;align-items: center;">
      //         <div style="width: 10px;height: 10px;border-radius: 50%;background-color: #ebbf40;"></div>
      //         <div style="margin: 0 4px 0 6px;">总销售</div>
      //         <span style="color: #ebbf40;">${params[0].value}</span>
      //       </div>
      //     </div>
      //   `
      // }
    },
    xAxis: {
      type: 'category',
      boundaryGap: false,
      data: dataList4.value.map(i => i.dateStr)
    },
    yAxis: {
      type: 'value',
      name: '万支',
      nameTextStyle: {
        padding: [0, 0, 0, -16]    // å››ä¸ªæ•°å­—分别为上右下左与原位置距离
      },
      splitLine: {
        show: true,
        lineStyle: {
          //这里输入线条的样式
          color: 'rgba(255,255,255,0.14)',
          type: 'dashed',
        },
        splitNumber: 4
      }
    },
    legend: {
      itemGap: 24,
      icon: 'rect',
      right: '12px',
      top: '0',
      itemWidth: 16,
      itemHeight: 2,
      textStyle: {
        color: '#fff',
        borderColor: '#fff'
      },
      data: ['总入库量', '总出库量', '库存量']
    },
    grid: {
      top: '18%',
      left: '0%',
      right: '2%',
      bottom: '2%',
      containLabel: true
    },
    series: [
      {
        name: '总入库量',
        data: dataList4.value.map(item => {
          return {
            name: item.dateStr,
            value: item.totalInNum,
          }
        }),
        type: 'line',
        areaStyle: {
          normal: {
            color: {
              x: 0,
              y: 0,
              x2: 0,
              y2: 1,
              colorStops: [
                {
                  offset: 0,
                  color: "#4191f6" // 0% å¤„的颜色
                },
                {
                  offset: .4,
                  color: "#203d79" // 0% å¤„的颜色
                },
                {
                  offset: 1,
                  color: "#1b1b12" // 100% å¤„的颜色
                }],
              globalCoord: false // ç¼ºçœä¸º false
            }
          }
        },
        lineStyle: { // çº¿æ¡æ ·å¼
          color: {
            type: 'linear',
            x: 0,
            y: 0,
            x2: 0,
            y2: 1,
            colorStops: [{
              offset: 0, color: '#4191f6' // 0% å¤„的颜色
            }, {
              offset: 1, color: '#4191f6' // 100% å¤„的颜色
            }],
          },
          width: 1.5, // çº¿æ¡ç²—细
        },
        symbol: 'circle',
        symbolSize: 4,
        itemStyle: {
          color: "#4190f4",
          borderColor: "rgba(255,255,255,.3)",
          borderWidth: 4,
        },
        smooth: true
      },
      {
        name: '总出库量',
        data: dataList4.value.map(item => {
          return {
            name: item.dateStr,
            value: item.totalOutNum,
          }
        }),
        type: 'line',
        areaStyle: {
          normal: {
            color: {
              x: 0,
              y: 0,
              x2: 0,
              y2: 1,
              colorStops: [{
                offset: 0,
                color: "rgba(192, 156, 53,.7)" // 0% å¤„的颜色
              }, {
                offset: 1,
                color: "#1b1b12" // 100% å¤„的颜色
              }],
              globalCoord: false // ç¼ºçœä¸º false
            }
          }
        },
        lineStyle: { // çº¿æ¡æ ·å¼
          color: {
            type: 'linear',
            x: 0,
            y: 0,
            x2: 0,
            y2: 1,
            colorStops: [{
              offset: 0, color: '#F3BD00' // 0% å¤„的颜色
            }, {
              offset: 1, color: '#F3BD00' // 100% å¤„的颜色
            }],
          },
          width: 2, // çº¿æ¡ç²—细
        },
        symbol: 'circle',
        symbolSize: 4,
        itemStyle: {
          color: "#F3BD00",
          borderColor: "rgba(255,255,255,.3)",
          borderWidth: 4,
        },
        smooth: true
      },
      {
        name: '库存量',
        data: dataList4.value.map(item => {
          return {
            name: item.dateStr,
            value: item.stockNum,
          }
        }),
        type: 'line',
        areaStyle: {
          normal: {
            color: {
              x: 0,
              y: 0,
              x2: 0,
              y2: 1,
              colorStops: [{
                offset: 0,
                color: "rgba(218, 233, 250)" // 0% å¤„的颜色
              }, {
                offset: 1,
                color: "#1b1b12" // 100% å¤„的颜色
              }],
              globalCoord: false // ç¼ºçœä¸º false
            }
          }
        },
        lineStyle: { // çº¿æ¡æ ·å¼
          color: {
            type: 'linear',
            x: 0,
            y: 0,
            x2: 0,
            y2: 1,
            colorStops: [{
              offset: 0, color: '#fff' // 0% å¤„的颜色
            }, {
              offset: 1, color: '#fff' // 100% å¤„的颜色
            }],
          },
          width: 2, // çº¿æ¡ç²—细
        },
        symbol: 'circle',
        symbolSize: 4,
        itemStyle: {
          color: "#fff",
          borderColor: "rgba(255,255,255,.3)",
          borderWidth: 4,
        },
        smooth: true
      },
    ]
  })
  window.addEventListener('resize', function () {//执行
    myChart.resize()
  })
}
const tabsClick4 = (tab) => {
  activeTabs.value = tab
  getData4()
}
const getData4 = () => { // è¿›é”€å­˜è¿è¥
  getStoreOperationList({ queryType: activeTabs.value }).then(res => {
    console.log('res', res)
    dataList4.value = res.data || []
    // initEchart4()
  })
}
const dataList5 = ref([])
const data5 = ref({})
const data6 = ref({})
const data7 = ref({})
const initEchart5 = () => {
  // åŸºäºŽå‡†å¤‡å¥½çš„dom,初始化echarts实例
  const myChart = echarts.init(document.getElementById('echart5'))
@@ -1153,7 +1101,7 @@
      itemGap: 12,
      // icon: 'circle',
      right: '16%',
      top: '1%',
      top: '0%',
      data: ['总库存', '当前库存', '库存利用率'],
      itemWidth: 20,
      itemHeight: 10,
@@ -1188,7 +1136,7 @@
      axisTick: {
        show: false,
      },
      data: dataList5.value.map(i => i.placeName),
      data: data5.value.detailList.map(i => i.factoryName),
    }],
    yAxis: [
      {
@@ -1196,7 +1144,7 @@
          color: '#869CC9',
        },
        name: '万支',
        nameGap: 24,
        nameGap: 16,
        type: 'value',
        axisLabel: {
          show: true,
@@ -1217,7 +1165,7 @@
      {
        type: 'value',
        name: '%',
        nameGap: 24,
        nameGap: 16,
        min: 0,
        max: 100,
        interval: 25,
@@ -1256,7 +1204,7 @@
          },
          barBorderRadius: [30, 30, 0, 0],
        },
        data: dataList5.value.map(i => i.totalStockNum)
        data: data5.value.detailList.map(i => i.totalNum)
      },
      {
        name: '当前库存',
@@ -1289,7 +1237,7 @@
          },
          barBorderRadius: [30, 30, 0, 0],
        },
        data: dataList5.value.map(i => i.nowStockNum)
        data: data5.value.detailList.map(i => i.currentNum)
      },
      {
        name: '库存利用率',
@@ -1307,7 +1255,7 @@
          color: '#fff',
          // formatter: '{c}' + '%',
        },
        data: dataList5.value.map(i => i.stockRataNum)
        data: data5.value.detailList.map(i => i.useRate)
      }
    ]
  })
@@ -1324,8 +1272,8 @@
    legend: {
      itemGap: 12,
      // icon: 'circle',
      right: '16%',
      top: '1%',
      right: '10%',
      top: '0',
      data: ['出库能力', '当日出库量', '库存利用率'],
      itemWidth: 20,
      itemHeight: 10,
@@ -1360,7 +1308,7 @@
      axisTick: {
        show: false,
      },
      data: dataList5.value.map(i => i.placeName),
      data: data6.value.detailList.map(i => i.factoryName),
    }],
    yAxis: [
      {
@@ -1368,7 +1316,7 @@
          color: '#869CC9',
        },
        name: '万支',
        nameGap: 24,
        nameGap: 16,
        type: 'value',
        axisLabel: {
          show: true,
@@ -1389,7 +1337,7 @@
      {
        type: 'value',
        name: '%',
        nameGap: 24,
        nameGap: 16,
        min: 0,
        max: 100,
        interval: 25,
@@ -1403,7 +1351,7 @@
      {
        name: '出库能力',
        type: 'bar',
        barWidth: 10,
        barWidth: 14,
        barGap: '60%',
        label: {
          show: false,
@@ -1428,14 +1376,14 @@
          },
          barBorderRadius: [30, 30, 0, 0],
        },
        data: dataList5.value.map(i => i.totalStockNum),
        data: data6.value.detailList.map(i => i.totalNum),
        barGap: '-100%' // è®¾ç½®æŸ±å­å®Œå…¨é‡å 
      },
      {
        name: '当日出库量',
        type: 'bar',
        barWidth: 10,
        barWidth: 14,
        label: {
          show: false,
          position: 'top',
@@ -1463,7 +1411,7 @@
          },
          barBorderRadius: [30, 30, 0, 0],
        },
        data: dataList5.value.map(i => i.nowStockNum),
        data: data6.value.detailList.map(i => i.currentNum),
        barGap: '-100%' // è®¾ç½®æŸ±å­å®Œå…¨é‡å 
      },
      {
@@ -1482,7 +1430,7 @@
          color: '#fff',
          // formatter: '{c}' + '%',
        },
        data: dataList5.value.map(i => i.stockRataNum)
        data: data6.value.detailList.map(i => i.useRate)
      }
    ]
  })
@@ -1500,7 +1448,7 @@
      itemGap: 12,
      // icon: 'circle',
      right: '16%',
      top: '1%',
      top: '0%',
      data: ['总库存', '当前库存', '库存利用率'],
      itemWidth: 20,
      itemHeight: 10,
@@ -1535,7 +1483,7 @@
      axisTick: {
        show: false,
      },
      data: dataList5.value.map(i => i.placeName),
      data: data7.value.detailList.map(i => i.factoryName),
    }],
    yAxis: [
      {
@@ -1543,7 +1491,7 @@
          color: '#869CC9',
        },
        name: '万支',
        nameGap: 24,
        nameGap: 16,
        type: 'value',
        axisLabel: {
          show: true,
@@ -1564,7 +1512,7 @@
      {
        type: 'value',
        name: '%',
        nameGap: 24,
        nameGap: 16,
        min: 0,
        max: 100,
        interval: 25,
@@ -1603,7 +1551,7 @@
          },
          barBorderRadius: [30, 30, 0, 0],
        },
        data: dataList5.value.map(i => i.totalStockNum)
        data: data7.value.detailList.map(i => i.totalNum)
      },
      {
        name: '当前库存',
@@ -1636,7 +1584,7 @@
          },
          barBorderRadius: [30, 30, 0, 0],
        },
        data: dataList5.value.map(i => i.nowStockNum)
        data: data7.value.detailList.map(i => i.currentNum)
      },
      {
        name: '库存利用率',
@@ -1654,7 +1602,7 @@
          color: '#fff',
          // formatter: '{c}' + '%',
        },
        data: dataList5.value.map(i => i.stockRataNum)
        data: data7.value.detailList.map(i => i.useRate)
      }
    ]
  })
@@ -1664,14 +1612,33 @@
  })
}
const getData5 = () => {
  getStoreenergyDataList({ queryType: activeTabs.value }).then(res => {
    console.log('res', res)
    dataList5.value = res.data || []
  kzinventoryUseRate().then(res => {
    data5.value = res.data
    data5.value.detailList.forEach(item => {
      item.useRate = item.useRate * 100
    })
    initEchart5()
  })
  outAbilityUseRate().then(res => {
    data6.value = res.data
    data6.value.detailList.forEach(item => {
      item.useRate = item.useRate * 100
    })
    initEchart6()
  })
  tranportAbilityUseRate().then(res => {
    data7.value = res.data
    data7.value.detailList.forEach(item => {
      item.useRate = item.useRate * 100
    })
    initEchart7()
  })
  // initEchart6()
  // initEchart7()
}
const autoplayFlag = (list = [], leng = 4, time = 2000) => {
  if (list.length > leng) {
@@ -1690,22 +1657,18 @@
  })
}
const initData = () => {
const changeCity = () => {
  getData1()
  getStockOut()
  getMap()
  getData2()
  getData3()
  getData4()
  getData5()
}
onMounted(() => {
  initData()
  initMap()
  // initEchart2()
  // initEchart3()
  // initEchart4()
  // initEchart5()
  getCity()
  changeCity()
  getData5()
  setTimeout(() => {
    loopFn1()
  }, 12000)
@@ -1878,6 +1841,10 @@
      .second_title {
        margin-bottom: 10px;
        input {
          font-size: 12px;
        }
      }
      .list_wrap {
@@ -1905,6 +1872,15 @@
            text-overflow: ellipsis;
          }
          .status {
            flex: 5;
          }
        }
        .avtive {
          background: rgba(1, 171, 254, 0.2);
          color: #01D9FE;
          font-weight: 600;
        }
        .header {
@@ -2072,6 +2048,36 @@
            margin-right: 4px;
            display: flex;
            position: relative;
            .node {
              position: absolute;
              left: 69%;
              top: -20px;
              width: 22px;
              height: 70px;
              z-index: 999;
              overflow: hidden;
              .node_icon {
                background-color: #051623;
                height: 16px;
                .icon {
                  background-color: #25333f;
                  height: 16px;
                  width: 16px;
                  position: absolute;
                  top: 20px;
                  right: -8px;
                  border-radius: 50%;
                  overflow: hidden;
                }
                .icon2 {
                  right: 12px;
                }
              }
            }
          }
          .box {
@@ -2082,7 +2088,7 @@
            position: absolute;
            top: 0;
            left: 0;
            z-index: 99;
            z-index: 9999;
            .tag {
              position: absolute;
@@ -2159,34 +2165,44 @@
        /* transform: scale(.2); */
      }
      .list {
      .modal1 {
        width: 500px;
        height: 224px;
        background: rgba(0, 86, 255, 0.1);
        backdrop-filter: blur(5px);
        padding: 12px 30px;
        position: absolute;
        left: 24px;
        bottom: 10px;
        top: 36px;
        left: 12px;
        border: 1px solid #4ba7f7;
        .item {
        .list {
          height: 192px;
          overflow: auto;
          .line {
          display: flex;
          align-items: center;
          font-size: 15px;
          color: #D2E0FF;
          margin-top: 20px;
          .icon {
            width: 22px;
            height: 22px;
            background: rgba(255, 125, 9, 0.8);
            margin-right: 12px;
          }
          .icon2{
            background: rgba(254,175,1,0.8);
          }
          .icon3{
            background: rgba(9,250,205,0.8);
          }
          .icon4{
            background: #225BA1;
            height: 32px;
            color: #fff;
            font-size: 12px;
            &:nth-of-type(2n) {
              background: rgba(134, 156, 201, 0.05);
          }
            .item {
              flex: 2;
        }
          }
          .head {
            font-weight: 500;
            font-size: 13px;
            color: #01D9FE;
          }
        }
      }
    }
  }
@@ -2323,8 +2339,21 @@
  top: 20%;
  left: 50%;
  transform: translate(-50%, 0);
  z-index: 999;
  z-index: 99999;
  padding: 24px;
  #map-container {
    width: 300px;
    height: 180px;
    position: absolute;
    top: 220px;
    right: 10px;
    z-index: 999999;
    :deep(.amap-markers){
      left: -12px !important;
      top: -32px !important;
    }
  }
  .title_head {
    display: flex;
@@ -2342,6 +2371,10 @@
  .info {
    display: flex;
    flex-wrap: wrap;
    background-color: #0d2845;
    border-radius: 4px;
    padding: 10px 20px 0;
    margin-bottom: 16px;
    .item {
      display: flex;
@@ -2368,59 +2401,8 @@
    }
  }
  .tabs {
    display: flex;
    border-bottom: 1px solid rgba(255, 255, 255, 0.16);
    margin: 0 -24px;
    margin-bottom: 20px;
    padding-left: 12px;
    .tab {
      color: #869CC9;
      font-size: 14px;
      margin-left: 12px;
      height: 42px;
      display: flex;
      align-items: center;
      justify-content: center;
      border-bottom: 2px solid #06182e;
      cursor: pointer;
    }
    .active {
      font-weight: 500;
      font-size: 15px;
      color: #00F2F3;
      border-bottom: 2px solid #00F2F3;
    }
  }
  .ht_info {
    display: flex;
    flex-wrap: wrap;
    padding: 10px 10px 0;
    background-color: #0d2845;
    margin-bottom: 20px;
    .item {
      display: flex;
      align-items: center;
      font-size: 13px;
      width: 55%;
      margin-bottom: 8px;
      &:nth-of-type(2n+1) {
        width: 45%;
      }
      .la {
        color: #01D9FE;
      }
    }
  }
  .tab1 {
    .title {
  .logistics_wrap {
    .m_title {
      display: flex;
      align-items: center;
      font-style: 16px;
@@ -2433,64 +2415,115 @@
      }
    }
    .item {
      display: flex;
      margin-left: 6px;
    .fu_list {
      height: 310px;
      margin-top: 20px;
      overflow: auto;
      &:nth-last-child(1) {
        .content {
          .time {
            padding-bottom: 0;
      .fu_item {
        .item_title {
          margin-bottom: 6px;
          .icon {
            width: 36px;
            display: flex;
            img {
              width: 20px;
              height: 20px;
          }
        }
        }
      }
      .separate {
        height: calc(100% - 125px);
        width: 1px;
        border: 1px dashed #CCCCCC;
        position: absolute;
        left: 26px;
        top: 51px;
        z-index: -1;
      }
      .title {
        font-weight: 500;
        font-size: 16px;
        color: #222222;
        margin-bottom: 10px;
      }
      .line {
        display: flex;
        margin-bottom: 12px;
        .label {
          color: #becbe9;
          margin-right: 20px;
        }
        .val {}
      }
      .item_title {
        font-weight: 600;
        font-size: 16px;
        display: flex;
        align-items: center;
        display: flex;
        .icon {}
      }
      .icon_wrap {
        width: 24px;
        margin-right: 10px;
        margin-right: 15px;
        display: flex;
        flex-direction: column;
        align-items: center;
        justify-content: center;
        .dian {
          width: 12px;
          height: 12px;
        .icon {
          width: 24px;
          height: 24px;
          position: relative;
          z-index: 2;
        }
        }
        .dian_ac {
          width: 24px;
      .item {
        position: relative;
        color: #b1bfdc;
        margin-bottom: 15px;
        .text {
          color: #b1bfdc;
        }
        .icon {
          width: 10px;
          height: 10px;
          position: relative;
          z-index: 2;
        }
        .h2 {
          display: flex;
          align-items: center;
          height: 24px;
        }
        .line {
          width: 1px;
          height: 100%;
          border: 1px dashed #8a9bc5;
        }
      }
      .content {
        font-size: 13px;
        color: #D2E0FF;
        .status {
          font-weight: 500;
          font-size: 14px;
          margin-bottom: 5px;
          color: #fff;
        }
        .text {
          margin-bottom: 4px;
        }
        .h1 {}
        .time {
          padding-left: 39px;
          font-size: 12px;
          padding-bottom: 12px;
          margin-top: 3px;
        }
      }
    }
  }
}
@@ -2500,7 +2533,7 @@
  height: 100%;
  top: 0;
  left: 0;
  z-index: 99;
  z-index: 9999;
  background-color: rgba(0, 0, 0, 0.1);
  /* background-color: red; */
}
@@ -2548,7 +2581,7 @@
    align-items: center;
    font-size: 14px;
    color: #869CC9;
    width: 96px;
    width: 110px;
    height: 28px;
    border-radius: 14px;
    border: 1px solid #869CC9;
screen/src/views/TaskEfficiency.vue
@@ -165,9 +165,9 @@
            <div class="modal_bg" v-if="showWorkModal" @click="showWorkModal = false"></div>
          </div>
          <div class="center_box_two">
            <!-- <div v-if="data4.videoIndexCodes && data4.videoIndexCodes.length > 0" class="videos">
            <div v-if="data4.videoIndexCodes && data4.videoIndexCodes.length > 0" class="videos">
              <Videos :href="data4.videoPluginUrl" :indexCodes="data4.videoIndexCodes" />
            </div> -->
            </div>
            <div class="list">
              <div class="line header">
                <div>月台名称</div>
screen/src/views/videoUrl/Videos.vue
@@ -127,7 +127,7 @@
    let layout = "1x4"                                //playMode指定模式的布局
    let enableHTTPS = 1                               //是否启用HTTPS协议与综合安防管理平台交互,这里总是填1
    let encryptedFields = 'secret'                    //加密字段,默认加密领域为secret
    let showToolbar = 1                               //是否显示工具栏,0-不显示,非0-显示
    let showToolbar = 0                               //是否显示工具栏,0-不显示,非0-显示
    let showSmart = 0                                 //是否显示智能信息(如配置移动侦测后画面上的线框),0-不显示,非0-显示
    // let buttonIDs = "0,16,256,257,258,259,260,513,514,515,516,517,768"  //自定义工具条按钮
    oWebControl.value.JS_RequestInterface({
@@ -145,7 +145,7 @@
        encryptedFields: encryptedFields,          //加密字段
        showToolbar: showToolbar,                  //是否显示工具栏
        showSmart: showSmart,                      //是否显示智能信息
        buttonIDs: buttonIDs                       //自定义工具条按钮
        // buttonIDs: buttonIDs                       //自定义工具条按钮
      })
    }).then(function (oData) {
      console.log('初始化成功')
screen/vite.config.js
@@ -25,8 +25,8 @@
  server: {
    proxy: {
      "/gateway_interface": {
        // target: "http://192.168.0.103:10010",
        target: "http://10.50.250.253:8088/gateway_interface",
        target: "http://192.168.0.104:10010",
        // target: "http://10.50.250.253:8088/gateway_interface",
        // target: "http://192.168.0.173/gateway_interface",
        changeOrigin: true,
        rewrite: (path) => path.replace(/^\/gateway_interface/, ""),