Merge remote-tracking branch 'origin/master'

zengh

2021-06-11 1dfaa93c1a39933b283341e66e994f935467bfe6

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pages/myself/childen/xinxi.vue

 pages/equipment/equipment.vue

@@ -86,7 +86,8 @@
                tenantNameArray:[],
                tenantNameArrayIndex:0,
                tenantNameArrayType:'请选择客户',
                tenantNameColor:"#808080"
                tenantNameColor:"#808080",
                pathUrl:"http://s16s652780.51mypc.cn/api",
            }
        },
        onLoad() {
@@ -100,7 +101,7 @@
            getTenantList(){
                var that = this;
                uni.request({
                    url: 'https://web.byisf.com/api/blade-system/tenant/page',
                    url: that.pathUrl + '/blade-system/tenant/page',
                    method:'GET',
                    success: (res) => {
                        that.tenantArr = res.data.data.records;
@@ -183,7 +184,7 @@
                    +"&ownerId="+this.ownerId;
                uni.request({
                    // url: 'http://localhost:89/equipment/equipment/AppSubmit?'+params,
                    url: 'https://web.byisf.com/api/blade-jfpts/equipment/equipment/AppSubmit?'+params,
                    url: that.pathUrl + '/blade-jfpts/equipment/equipment/AppSubmit?'+params,
                    method:'POST',
                    success: (res) => {
                        if(res.data.code==200){

 pages/infoRegistration/infoCheck.vue

@@ -60,7 +60,7 @@
                typeArray:["学校","医院","小区"],
                typeArrayIndex:0,
                typeArrayType:'请选择客户类型',
                pathUrl:"https://web.byisf.com/api/blade-system",
                pathUrl:"http://s16s652780.51mypc.cn/api",
                // pathUrl: "http://localhost:8106"
            }
        },
@@ -76,7 +76,7 @@
            getTenantList(){
                var that = this;
                uni.request({
                    url: this.pathUrl + '/tenant/page',
                    url: this.pathUrl + '/blade-system/tenant/page',
                    method:'GET',
                    success: (res) => {
                        that.tenantArr = res.data.data.records;
@@ -147,7 +147,7 @@
            //提交修改
            confirm(){
                uni.request({
                    url: 'https://web.byisf.com/api/blade-system/tenant/submit',
                    url: this.pathUrl +'/blade-system/tenant/submit',
                    method:'POST',
                    data:{
                            "id":this.id,

 pages/infoRegistration/infoRegistration.vue

@@ -56,7 +56,7 @@
                typeArray:["学校","医院","小区"],
                typeArrayIndex:0,
                typeArrayType:'请选择客户类型',
                pathUrl:"https://web.byisf.com/api/blade-system",
                pathUrl:"http://s16s652780.51mypc.cn/api",
                // pathUrl: "http://localhost:8106",
            }
        },
@@ -87,7 +87,7 @@
            //提交修改
            confirm(){
                uni.request({
                    url: this.pathUrl + '/tenant/save',
                    url: this.pathUrl + '/blade-system/tenant/save',
                    method:'POST',
                    data:{
                            // "id":this.id,

 pages/investigation/investigation.vue

@@ -51,7 +51,7 @@
            var longitude = wx.getStorageSync("longitude");

            // alert(wx.getStorageSync("longitude"));
            that.urls = "https://web.byisf.com/xcxjingqingmap_lxdh/lxdhmap.html?data=" + data + "&latitude=" +
            that.urls = "http://s16s652780.51mypc.cn/xcxjingqingmap_lxdh/lxdhmap.html?data=" + data + "&latitude=" +
                latitude + "&longitude=" + longitude;



 pages/map/map.vue

@@ -30,7 +30,7 @@
            }else{
                data = options.data;
            }
            this.urls = "https://web.byisf.com/xcxMapJQ/xcxmap.html?data=" + data;
            this.urls = "http://s16s652780.51mypc.cn/xcxMapJQ/xcxmap.html?data=" + data;
            // this.dataList = data;
            console.log(this.urls);
        },

 pages/myself/childen/aboutUs.vue

@@ -38,13 +38,36 @@
        
        
        <view class="down">
            <view class="title">安防管理系统 Copyright © 江西北邮信息通信技术有限公司</view>
            <view class="title" :style="{left:left}">安防管理系统 Copyright © 江西北邮信息通信技术有限公司</view>
        </view>

    </view>
</template>

<script>
    export default {
        data() {
            return {
                left:'47px',
            };
        },
        onLoad() {
            var that = this;
            //使用延时执行待页面完全渲染再执行
            setTimeout(()=>{
                uni.getSystemInfo({
                  success(res) { 
                      let obj = uni.createSelectorQuery().select('.title')
                      obj.boundingClientRect(function (data) { // data - 各种参数
                        that.left = (res.windowWidth - data.width)/2 + "px";
                      }).exec()
                  }
                })
            },0);
        },
        methods: {
        }
    }
</script>

<style lang="scss" scoped>
@@ -133,12 +156,11 @@
            
            .title{
                // background-color: #0078A8;
                // width: 584rpx;
                position: fixed;
                text-align: center;
                bottom: 1.5%;
                left: calc((100% - 582rpx)/2);
                text-align: center;
                // left: calc((100% - 640rpx)/2);
                // text-align: center;
                font-size: 22rpx;
                color: #808080;
            }

 pages/myself/childen/xinxi.vue

@@ -48,7 +48,6 @@
</template>

<script>
    import WxStorage from "../../../static/lib/wxStorage.js" //微信Storage
export default{
    data(){
        return{
@@ -79,7 +78,8 @@
            var userID = WxStorage.get("ids")
            console.log(userID)
            uni.request({
                url: 'https://web.byisf.com/api/blade-user/details?id='+userID,

                url: 'http://s16s652780.51mypc.cn/api/blade-user/details?id='+this.$store.state.puserID,
                method:'POST',
                success: (res) => {
                    that.user=res.data.data;

 pages/patrol/patrol.vue

@@ -16,7 +16,7 @@
        onLoad: function(options) {
            //long 转换为字符串
            var code = JSON.stringify(this.$store.state.puserID.toString());
            this.urls = "https://web.byisf.com/xcxjingqingmap_patrol/xcxmap.html?snumber="+code;
            this.urls = "http://s16s652780.51mypc.cn/xcxjingqingmap_patrol/xcxmap.html?snumber="+code;
        },
    }
</script>

 pages/riskReporting/riskReporting.vue

@@ -52,7 +52,7 @@
                display1:'none',
                display2:'none',
                display3:'none',
                pathUrl:"https://web.byisf.com/api/blade-jfpts",
                pathUrl:"http://s16s652780.51mypc.cn/api",
                // pathUrl: "http://localhost:89",
                riskClassArray:["一级","二级","三级","四级"],
                riskClassArrayIndex:0,
@@ -82,7 +82,7 @@
            getTenantList(){
                var that = this;
                uni.request({
                    url: 'https://web.byisf.com/api/blade-system/tenant/page',
                    url: this.pathUrl + '/blade-system/tenant/page',
                    method:'GET',
                    success: (res) => {
                        that.tenantArr = res.data.data.records;
@@ -127,7 +127,7 @@
            //提交修改
            confirm(){
                uni.request({
                    url: this.pathUrl + '/riskReporting/save',
                    url: this.pathUrl + '/blade-jfpts/riskReporting/save',
                    method:'POST',
                    data:{
                            "riskTime":this.riskTime,

 pages/visitRecord/visitRecord.vue

@@ -62,7 +62,7 @@
                display1:'none',
                display2:'none',
                display3:'none',
                pathUrl:"https://web.byisf.com/api/blade-jfpts",
                pathUrl:"http://s16s652780.51mypc.cn/api",
                // pathUrl: "http://localhost:89",
                tenantArr:[],
                ynameArray:[],
@@ -90,7 +90,7 @@
            getTenantList(){
                var that = this;
                uni.request({
                    url: 'https://web.byisf.com/api/blade-system/tenant/page',
                    url: this.pathUrl + '/blade-system/tenant/page',
                    method:'GET',
                    success: (res) => {
                        that.tenantArr = res.data.data.records;
@@ -160,7 +160,7 @@
            //提交修改
            confirm(){
                uni.request({
                    url: this.pathUrl + '/visitrecord/visitrecord/save',
                    url: this.pathUrl + '/blade-jfpts/visitrecord/visitrecord/save',
                    method:'POST',
                    data:{
                        // "visitrecord":

 store/state.js

@@ -4,7 +4,7 @@
        useName: '过客 ',
    },
    logPath: '',
    piAPI: 'https://web.byisf.com/api/',
    piAPI: 'http://s16s652780.51mypc.cn/api/',
    puserName: '陈慧英',
    puserID: '1370564873280430082',
    puserIphone:'15649685246',

 xcxjingqingmap_lxdh/js/lxdhmap.js

@@ -404,7 +404,7 @@
        //警情点查询
        axios({
            method: "post",
            url: `https://web.byisf.com/api/blade-jfpts/alarm/alarm/APP-getAlarming`,
            url: `http://s16s652780.51mypc.cn/api/blade-jfpts/alarm/alarm/APP-getAlarming`,
            params: {
                securityId: "1370564873280430082",
            },

 xcxjingqingmap_patrol/js/vueMain.js

@@ -10,7 +10,7 @@

        //基础路径
        // pathUrl: "http://localhost:89",
        pathUrl: "https://web.byisf.com/api/blade-jfpts",
        pathUrl: "http://s16s652780.51mypc.cn/api/blade-jfpts",

        layer: null,