叶松
2023-11-21 c163052d4f7e2debfc1cfb14edf85f503b2c7c00
修改地址
已修改22个文件
94 ■■■■■ 文件已修改
web/.env.production 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/components/EditForms.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/components/LookFile.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/components/uploadImage.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/components/uploadPhoto.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/DeviceManage/BigDevice.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/DuctpiecePLM/DuctProduct/ProductIndex.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/DuctpiecePLM/DuctpieceIndex.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/DuctpiecePLM/ReinManage/ReinsProduct.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/QualityManage/components/PatternCheck.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/ReincageManage/ReincageProduct.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/SafetyManage/FireequipmentIndex.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/SafetyManage/components/TrainRecord.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/SecureManage/NipCheck/NipTips.vue 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/SecureManage/NipCheck/components/TrainRecord.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/SystemIndex/PDAIndex.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/SystemIndex/WechatIndex.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/SystemNotice/ChronicleIndex.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/SystemNotice/PublicityNotice.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/SystemNotice/SendFile.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/personnelIndex/PersonnelManager/components/LabourService.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/src/views/personnelIndex/PersonnelManager/components/MortgageePossession.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
web/.env.production
@@ -1,4 +1,4 @@
# VUE_APP_BASE_URL = 'https://pipe.thhy-tj.com:8880'
 VUE_APP_BASE_URL = 'https://szpipe.thhy-tj.com/suapi'
VUE_APP_BASE_URL = 'http://111.30.93.212:8089/suapi'
#VUE_APP_BASE_URL = 'http://111.30.93.212:8089/suapi'
# VUE_APP_BASE_URL = 'http://111.30.93.247:8880'
web/src/components/EditForms.vue
@@ -44,7 +44,7 @@
                        maxNumberOfFiles: 200,
                        server:`/api/file/file/upload`,
                        customInsert:(res,insertFn)=>{
                            insertFn(`https://pipe.thhy-tj.com/${res.data}`)
                            insertFn(`https://szpipe.thhy-tj.com/${res.data}`)
                        }
                        // headers:{
                        //     token:sessionStorage.getItem('token')
web/src/components/LookFile.vue
@@ -24,7 +24,7 @@
                        <img src="../assets/t.png" style="width: 100%; height: 100%;" v-if="item.type == 'txt'">
                        <img src="../assets/ppt.png" style="width: 100%; height: 100%;"
                            v-if="item.type == 'ppt'||item.type == 'pptx'">
                        <img :src="`https://pipe.thhy-tj.com/${item.url}`" style="width: 100%; height: 100%;"
                        <img :src="`https://szpipe.thhy-tj.com/${item.url}`" style="width: 100%; height: 100%;"
                            v-if="['png','jpg','gif'].includes(item.type)">
                        <div class="img-text">{{item.name}}</div>
                    </div>
@@ -44,7 +44,7 @@
                <canvas v-else id="files"></canvas>
            </div>
            <div class="pdf-center" v-if="imgs">
                <img :src="`https://pipe.thhy-tj.com/${imgUrl}`" style="width: 100%; height: 100%;">
                <img :src="`https://szpipe.thhy-tj.com/${imgUrl}`" style="width: 100%; height: 100%;">
            </div>
        </el-dialog>
    </div>
web/src/components/uploadImage.vue
@@ -123,7 +123,7 @@
                    this.fileList.push({
                        id: this.fileList.length + 1,
                        // url:`${process.env.VUE_APP_BASE_URL}${res.data}`,
                        url:`https://pipe.thhy-tj.com/${res.data}`,
                        url:`https://szpipe.thhy-tj.com/${res.data}`,
                        name:res.data,
                        nameImg:file.file.name
                    })
web/src/components/uploadPhoto.vue
@@ -142,7 +142,7 @@
            this.fileList.push({
              id: this.fileList.length + 1,
              // url:`${process.env.VUE_APP_BASE_URL}${res.data}`,
              url: `https://pipe.thhy-tj.com/${res.data}`,
              url: `https://szpipe.thhy-tj.com/${res.data}`,
              name: res.data,
              nameImg: file.file.name,
            });
web/src/views/DeviceManage/BigDevice.vue
@@ -337,7 +337,7 @@
                res.data.tbigPaths.filter(iten=>iten.fileType ===1).map(item=>{
                    this.imageList.push({
                        id: this.imageList.length + 1,
                        url:`https://pipe.thhy-tj.com/${item.filePath}`,
                        url:`https://szpipe.thhy-tj.com/${item.filePath}`,
                        name:item.filePathName,
                        nameImg:item.filePathName
                    })
@@ -459,7 +459,7 @@
                res.data.tbigPaths.filter(iten=>iten.fileType ===1).map(item=>{
                    this.imageList.push({
                        id: this.imageList.length + 1,
                        url:`https://pipe.thhy-tj.com/${item.filePath}`,
                        url:`https://szpipe.thhy-tj.com/${item.filePath}`,
                        name:item.filePathName,
                        nameImg:item.filePathName
                    })
web/src/views/DuctpiecePLM/DuctProduct/ProductIndex.vue
@@ -453,7 +453,7 @@
            this.fileList = res.data.files.map((item, index) => {
              return {
                id: index + 1,
                url: `https://pipe.thhy-tj.com/${item}`
                url: `https://szpipe.thhy-tj.com/${item}`
              }
            })
          }
web/src/views/DuctpiecePLM/DuctpieceIndex.vue
@@ -453,7 +453,7 @@
            this.fileList = res.data.files.map((item, index) => {
              return {
                id: index + 1,
                url: `https://pipe.thhy-tj.com/${item}`
                url: `https://szpipe.thhy-tj.com/${item}`
              }
            })
          }
web/src/views/DuctpiecePLM/ReinManage/ReinsProduct.vue
@@ -168,7 +168,7 @@
              :preview-src-list="phoneList"
              fit="contain">
              <div slot="error" class="image-slot">
                <img src="https://pipe.thhy-tj.com/group1/M00/00/03/bx5d1GRlfmCAEmAPAAAFoOEW2dU397.png" style="width:50px;height:50px">
                <img src="https://szpipe.thhy-tj.com/group1/M00/00/03/bx5d1GRlfmCAEmAPAAAFoOEW2dU397.png" style="width:50px;height:50px">
              </div>
          </el-image>
        </el-form-item>
@@ -422,7 +422,7 @@
                this.$set(this.ruleForm,'checkFaildReason',res.data[0].remark)
                this.$set(this.ruleForm,'checkResult',res.data[0].checkResult)
                res.data[0].checkFile.map(item=>{
                    this.phoneList.push(`https://pipe.thhy-tj.com/${item}`)
                    this.phoneList.push(`https://szpipe.thhy-tj.com/${item}`)
                })
                this.showPhone = true
              }else{
web/src/views/QualityManage/components/PatternCheck.vue
@@ -367,7 +367,7 @@
                res.data.tbigPaths.filter(iten=>iten.fileType ===1).map(item=>{
                    this.imageList.push({
                        id: this.imageList.length + 1,
                        url:`https://pipe.thhy-tj.com/${item.filePath}`,
                        url:`https://szpipe.thhy-tj.com/${item.filePath}`,
                        name:item.filePathName,
                        nameImg:item.filePathName
                    })
web/src/views/ReincageManage/ReincageProduct.vue
@@ -168,7 +168,7 @@
              :preview-src-list="phoneList"
              fit="contain">
              <div slot="error" class="image-slot">
                <img src="https://pipe.thhy-tj.com/group1/M00/00/03/bx5d1GRlfmCAEmAPAAAFoOEW2dU397.png" style="width:50px;height:50px">
                <img src="https://szpipe.thhy-tj.com/group1/M00/00/03/bx5d1GRlfmCAEmAPAAAFoOEW2dU397.png" style="width:50px;height:50px">
              </div>
          </el-image>
        </el-form-item>
@@ -422,7 +422,7 @@
                this.$set(this.ruleForm,'checkFaildReason',res.data[0].remark)
                this.$set(this.ruleForm,'checkResult',res.data[0].checkResult)
                res.data[0].checkFile.map(item=>{
                    this.phoneList.push(`https://pipe.thhy-tj.com/${item}`)
                    this.phoneList.push(`https://szpipe.thhy-tj.com/${item}`)
                })
                this.showPhone = true
              }else{
web/src/views/SafetyManage/FireequipmentIndex.vue
@@ -170,7 +170,7 @@
            this.$set(this.formFireequipment, 'fileList', res.data.map(item => {
              return {
                id: item.id,
                url:`https://pipe.thhy-tj.com/${item.file}`,
                url:`https://szpipe.thhy-tj.com/${item.file}`,
                name: item.file,
                nameImg:item.fileName
              }
web/src/views/SafetyManage/components/TrainRecord.vue
@@ -40,7 +40,7 @@
                <div>
                    <el-image
                        style="width: 50px; height: 50px;"
                        src="https://pipe.thhy-tj.com/group1/M00/00/03/bx5d1GRlfmCAEmAPAAAFoOEW2dU397.png"
                        src="https://szpipe.thhy-tj.com/group1/M00/00/03/bx5d1GRlfmCAEmAPAAAFoOEW2dU397.png"
                        fit="contain">
                    </el-image>
                </div>
web/src/views/SecureManage/NipCheck/NipTips.vue
@@ -114,7 +114,7 @@
<script>
import { buttonPinia } from '../../../pinia/index';
import UploadImage from '../../../components/uploadImage.vue'
import { throttle, changeSize } from '../../../plugins/public'; // 导入节流、动态切换组件尺寸方法
import { throttle, changeSize,downFiles } from '../../../plugins/public'; // 导入节流、动态切换组件尺寸方法
  export default {
    components:{
       UploadImage,
@@ -241,7 +241,7 @@
                res.data.imgEntities.map(item=>{
                    this.imageList.push({
                        id: this.imageList.length + 1,
                        url:`https://pipe.thhy-tj.com/${item.imgPath}`,
                        url:`https://szpipe.thhy-tj.com/${item.imgPath}`,
                        name:item.imgPath,
                        nameImg:item.imgName
                    })
@@ -251,8 +251,30 @@
            }
        })
      },
    // 转圈圈
      functionLoading() {
          this.loadingView = this.$loading({
              lock: true,
              text: '请稍后...',
              spinner: 'el-icon-loading',
              background: 'rgba(0, 0, 0, 0.7)'
          });
      },
      //导出excel
      exportFiles(){},
      exportFiles(){
        let params = {}
        params.startTime = this.search.time&&this.search.time[0]
        params.endTime = this.search.time&&this.search.time[1]
        delete params.time
        this.functionLoading();
        this.$api.Analyse.exportAuxilliaryCost(params).then(res => {
            downFiles(res, '举报信息', 'xls')
            this.loadingView.close()
        })
        .catch(() => {
            this.loadingView.close();
        })
      },
      // 修改按钮信息
      updateProp(row) {
        this.imageList = []
@@ -265,7 +287,7 @@
                res.data.imgEntities.map(item=>{
                    this.imageList.push({
                        id: this.imageList.length + 1,
                        url:`https://pipe.thhy-tj.com/${item.imgPath}`,
                        url:`https://szpipe.thhy-tj.com/${item.imgPath}`,
                        name:item.imgPath,
                        nameImg:item.imgName
                    })
web/src/views/SecureManage/NipCheck/components/TrainRecord.vue
@@ -40,7 +40,7 @@
                <div>
                    <el-image
                        style="width: 50px; height: 50px;"
                        src="https://pipe.thhy-tj.com/group1/M00/00/03/bx5d1GRlfmCAEmAPAAAFoOEW2dU397.png"
                        src="https://szpipe.thhy-tj.com/group1/M00/00/03/bx5d1GRlfmCAEmAPAAAFoOEW2dU397.png"
                        fit="contain">
                    </el-image>
                </div>
web/src/views/SystemIndex/PDAIndex.vue
@@ -209,7 +209,7 @@
        this.$set(this.formPDAIndex, 'menuUrl', row.menuUrl);
        this.$set(this.formPDAIndex, 'menuIcon', row.menuIcon ? [{
          id: 1,
          url:`https://pipe.thhy-tj.com/${row.menuIcon}`,
          url:`https://szpipe.thhy-tj.com/${row.menuIcon}`,
          name:row.menuIcon
        }] : []);
        this.asyncTitle = false;
web/src/views/SystemIndex/WechatIndex.vue
@@ -258,7 +258,7 @@
        this.$set(this.formWechat, 'menuType', row.menuType);
        this.$set(this.formWechat, 'menuIcon', row.menuIcon ? [{
          id: 1,
          url:`https://pipe.thhy-tj.com/${row.menuIcon}`,
          url:`https://szpipe.thhy-tj.com/${row.menuIcon}`,
          name:row.menuIcon
        }] : []);
        this.asyncTitle = false;
web/src/views/SystemNotice/ChronicleIndex.vue
@@ -39,11 +39,11 @@
                <div>
                    <el-image
                        style="width:50px;height:50px; cursor: pointer;"
                        :src="`https://pipe.thhy-tj.com/${row.paths[0]}`"
                        :src="`https://szpipe.thhy-tj.com/${row.paths[0]}`"
                        :preview-src-list="showImgLists(row)"
                        fit="contain">
                        <div slot="error" class="image-slot">
                          <img src="https://pipe.thhy-tj.com/group1/M00/00/03/bx5d1GRlfmCAEmAPAAAFoOEW2dU397.png" style="width:50px;height:50px;">
                          <img src="https://szpipe.thhy-tj.com/group1/M00/00/03/bx5d1GRlfmCAEmAPAAAFoOEW2dU397.png" style="width:50px;height:50px;">
                        </div>
                    </el-image>
                </div>
@@ -188,7 +188,7 @@
      showImgLists(val){
        let imgList = []
        val.paths.map(item=>{
            imgList.push(`https://pipe.thhy-tj.com/${item}`)
            imgList.push(`https://szpipe.thhy-tj.com/${item}`)
        })
        return imgList
      },
@@ -232,7 +232,7 @@
                res.data.paths.map(item=>{
                    this.imageList.push({
                        id: this.imageList.length + 1,
                        url:`https://pipe.thhy-tj.com/${item}`,
                        url:`https://szpipe.thhy-tj.com/${item}`,
                        name:item
                    })
                })
web/src/views/SystemNotice/PublicityNotice.vue
@@ -39,11 +39,11 @@
                <div>
                    <el-image
                        style="width:50px;height:50px; cursor: pointer;"
                        :src="`https://pipe.thhy-tj.com/${row.paths[0]}`"
                        :src="`https://szpipe.thhy-tj.com/${row.paths[0]}`"
                        :preview-src-list="showImgLists(row)"
                        fit="contain">
                        <div slot="error" class="image-slot">
                          <img src="https://pipe.thhy-tj.com/group1/M00/00/03/bx5d1GRlfmCAEmAPAAAFoOEW2dU397.png" style="width:50px;height:50px">
                          <img src="https://szpipe.thhy-tj.com/group1/M00/00/03/bx5d1GRlfmCAEmAPAAAFoOEW2dU397.png" style="width:50px;height:50px">
                        </div>
                    </el-image>
                </div>
@@ -188,7 +188,7 @@
      showImgLists(val){
        let imgList = [] 
        val.paths.map(item=>{
            imgList.push(`https://pipe.thhy-tj.com/${item}`)
            imgList.push(`https://szpipe.thhy-tj.com/${item}`)
        })
        return imgList
      },
@@ -232,7 +232,7 @@
                res.data.paths.map(item=>{
                    this.imageList.push({
                        id: this.imageList.length + 1,
                        url:`https://pipe.thhy-tj.com/${item}`,
                        url:`https://szpipe.thhy-tj.com/${item}`,
                        name:item
                    })
                })
web/src/views/SystemNotice/SendFile.vue
@@ -207,7 +207,7 @@
                res.data.paths.map(item=>{
                    this.imageList.push({
                        id: this.imageList.length + 1,
                        url:`https://pipe.thhy-tj.com/${item}`,
                        url:`https://szpipe.thhy-tj.com/${item}`,
                        name:item
                    })
                })
web/src/views/personnelIndex/PersonnelManager/components/LabourService.vue
@@ -485,7 +485,7 @@
        if(row.photo) {
          this.$set(this.formFace, 'photo', [{
            id: 1,
            url: `https://pipe.thhy-tj.com/${row.photo}`,
            url: `https://szpipe.thhy-tj.com/${row.photo}`,
            name: row.photo,
            nameImg: row.realName,
          }]);
web/src/views/personnelIndex/PersonnelManager/components/MortgageePossession.vue
@@ -509,7 +509,7 @@
        if(row.photo) {
          this.$set(this.formFace, 'photo', [{
            id: 1,
            url: `https://pipe.thhy-tj.com/${row.photo}`,
            url: `https://szpipe.thhy-tj.com/${row.photo}`,
            name: row.photo,
            nameImg: row.realName,
          }]);