Merge remote-tracking branch 'origin/master'

guoshilong

2022-11-23 998b75f0d4aaed03001ec4246cd4f3b4b0743b7e

Merge remote-tracking branch 'origin/master'

 src/config/website.js

@@ -43,7 +43,7 @@
  // 第三方系统授权地址
  authUrl: 'http://localhost/blade-auth/oauth/render',
  // 报表设计器地址(cloud端口为8108,boot端口为80)
  reportUrl: 'http://localhost:8108/ureport',
  reportUrl: 'http://localhost:80/ureport',
  // 单点登录系统认证(blade-auth服务的地)
  ssoUrl: 'http://localhost:8100/oauth/authorize?client_id=saber&response_type=code&redirect_uri=',
  // 单点登录回调地址(Saber服务的地址)

 src/views/eventgm/eventgmDetail.vue

@@ -124,7 +124,7 @@
                ></el-image>

              <video
                v-for="(item) in videoUrls"
                v-for="(item) in videoUrls" :key="item.id"
                :src="item"
                style="width: 145px; height: 145px; object-fit: fill; margin-right: 10px"
                controls

 src/views/repairsorder/repairsorder.vue

@@ -223,7 +223,7 @@
          this.selectionClear();
        });
      },
      uploadBefore(file, done, loading,column) {
      uploadBefore(file, done, loading) {
        if (["image","video"].includes(file.type.split("/")[0])){
          done()
        }else {

 src/views/repairsorder/repairsorderDetail.vue

@@ -101,7 +101,7 @@
              ></el-image>

              <video
                v-for="(item) in videoUrls"
                v-for="(item) in videoUrls" :key="item.id"
                :src="item"
                style="width: 145px; height: 145px; object-fit: fill; margin-right: 10px"
                controls