Merge branch 'master' of http://111.30.93.211:10101/r/supipe

李旭东

2023-11-23 4f3e4f496ff1b643ee94dd91b8b84e52980a4658

Merge branch 'master' of http://111.30.93.211:10101/r/supipe

 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/rebarprint/entity/TSteelPrint.java

@@ -78,6 +78,8 @@
    //班组
    private String groupName;

    private String platUserId;
    private String platUserName;
    /**
     * This field was generated by MyBatis Generator.
     * This field corresponds to the database table t_steel_print

 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/rebarprint/entity/dto/ProduceDto.java

@@ -81,4 +81,6 @@
    //打印时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private String printTime;

    private String platUserName;
}

 hd/pipe/materialsManage/src/main/resources/mapping/TSteelPrintMapper.xml

@@ -57,6 +57,9 @@
      <if test="isUse != null">
        is_use,
      </if>
        <if test="platUserId != null">
            plat_user_id,
        </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="steelPrintId != null">
@@ -92,28 +95,34 @@
      <if test="isUse != null">
        #{isUse,jdbcType=INTEGER},
      </if>
        <if test="platUserId != null">
            #{platUserId,jdbcType=VARCHAR},
        </if>
    </trim>
  </insert>
  <select id="steelPrintList" resultType="com.thhy.materials.modules.biz.rebarprint.entity.TSteelPrint">
        select tsp.steel_print_id as steelPrintId,
        tsp.pro_id as proId,
        tsp.size_id as sizeId,
        tsp.reinforcement_id as reinforcementId,
        tsp.block_num as blockNum,
        tsp.print_num as printNum,
        tsp.create_user as createUser,
        tsp.create_time as createTime,
        sp.pro_name as proName,sd.dict_name as sizeName,
        sd1.dict_name as reinforcementName,
        sd2.dict_name as blockName,
        su.real_name as  realName
         from  t_steel_print tsp
        left join sys_project sp on tsp.pro_id=sp.pro_id
        left join sys_dict sd on  tsp.size_id=sd.dict_id
        left join sys_dict sd1 on  tsp.reinforcement_id=sd1.dict_id
        left join sys_dict sd2 on  tsp.block_num=sd2.dict_id
        left join sys_users su on tsp.create_user=su.user_id
        where tsp.is_use=1
      select
      tsp.steel_print_id as steelPrintId,
      tsp.pro_id as proId,
      tsp.size_id as sizeId,
      tsp.reinforcement_id as reinforcementId,
      tsp.block_num as blockNum,
      tsp.print_num as printNum,
      tsp.create_user as createUser,
      tsp.create_time as createTime,
      sp.pro_name as proName,sd.dict_name as sizeName,
      sd1.dict_name as reinforcementName,
      sd2.dict_name as blockName,
      su.real_name as  realName,
      spu.real_name as platUserName
      from  t_steel_print tsp
      left join sys_plat_user spu on spu.user_id = tsp.plat_user_id
      left join sys_project sp on tsp.pro_id=sp.pro_id
      left join sys_dict sd on  tsp.size_id=sd.dict_id
      left join sys_dict sd1 on  tsp.reinforcement_id=sd1.dict_id
      left join sys_dict sd2 on  tsp.block_num=sd2.dict_id
      left join sys_users su on tsp.create_user=su.user_id
      where tsp.is_use=1
        <if test="proId!=null and proId!='' ">
            and tsp.pro_id=#{proId}
        </if>

 hd/pipe/materialsManage/src/main/resources/mapping/TSteelProduceMapper.xml

@@ -21,24 +21,37 @@
    <result column="is_user" jdbcType="INTEGER" property="isUser" />
  </resultMap>
  <select id="steelProduceList" resultType="com.thhy.materials.modules.biz.rebarprint.entity.dto.ProduceDto">
        select tsp.steel_produce_id as steelProduceId,
        tsp.produce_number as produceNumber,
        tsp.pro_id as proId,sp.pro_name as proName,
         sd.dict_name as sizeName,sd1.dict_name as reinforcementName,
         sd2.dict_name as blockName,su.real_name as realName,
         sg.group_name as groupName,su1.real_name as qualityUserName,
         tsp.quality_time as qualityTime,tsp.is_qualified as isQualified,
         tsp.is_model as isModel,tsp.print_time as printTime
         from t_steel_produce tsp
         left join sys_project sp  on tsp.pro_id=sp.pro_id
         left join sys_dict  sd on tsp.size_id=sd.dict_id
         left join sys_dict  sd1 on tsp.reinforcement_id=sd1.dict_id
         left join sys_dict  sd2 on tsp.block_num=sd2.dict_id
         left join sys_users su  on tsp.create_user=su.user_id
         left join sys_group_user sgu on su.plat_id=sgu.user_id
         left join sys_group sg on sgu.group_id=sg.group_id
         left join sys_users su1 on tsp.quality_user=su1.user_id
        where tsp.is_use=1
      select
      DISTINCT tsp.steel_produce_id as steelProduceId,
              tsp.size_id as sizeId,
              tsp.reinforcement_id reinforcementId,
              tsp.block_num blockNum,
              tsp.produce_number as produceNumber,
              tsp.pro_id as proId,
              sp.pro_name as proName,
              sd.dict_name as sizeName,
              sd1.dict_name as reinforcementName,
              sd2.dict_name as blockName,
              su.real_name as realName,
              sg.group_name as groupName,
              su1.real_name as qualityUserName,
              tsp.quality_time as qualityTime,
              tsp.is_qualified as isQualified,
              tsp.is_model as isModel,
              tsp.print_time as printTime,
              spu.real_name as platUserName
      from t_steel_produce tsp
      left join sys_project sp  on tsp.pro_id=sp.pro_id
      left join sys_dict  sd on tsp.size_id=sd.dict_id
      left join sys_dict  sd1 on tsp.reinforcement_id=sd1.dict_id
      left join sys_dict  sd2 on tsp.block_num=sd2.dict_id
      left join sys_users su  on tsp.create_user=su.user_id
      left join sys_users su1 on tsp.quality_user=su1.user_id
      left join t_steel_print stp on stp.steel_print_id = tsp.steel_print_id
      left join sys_plat_user spu on spu.user_id = stp.plat_user_id
      left join sys_group_user sgu on spu.user_id=sgu.user_id
      left join sys_group sg on sgu.group_id=sg.group_id
      where tsp.is_use=1
        <if test="produceNumber!=null and produceNumber!='' ">
           and  tsp.produce_number like concat('%',#{produceNumber},'%')
        </if>
@@ -75,26 +88,33 @@
        <if test="isModel!=null and isModel!='' ">
            and tsp.is_model=#{isModel}
        </if>
      <if test="isModel!=null and isModel!='' ">
          and tsp.size_id=#{sizeId}
      </if>
        order by tsp.produce_number desc
  </select>
    <select id="steelProduceInfo" parameterType="java.lang.String" resultType="com.thhy.materials.modules.biz.rebarprint.entity.dto.ProduceDto">
        select tsp.steel_produce_id as steelProduceId,
        tsp.produce_number as produceNumber,
        tsp.pro_id as proId,sp.pro_name as proName,
         sd.dict_name as sizeName,sd1.dict_name as reinforcementName,
         sd2.dict_name as blockName,su.real_name as realName,
         sg.group_name as groupName,su1.real_name as qualityUserName,
         tsp.quality_time as qualityTime,tsp.is_qualified as isQualified,
         tsp.is_model as isModel,tsp.print_time as printTime
         from t_steel_produce tsp
         left join sys_project sp  on tsp.pro_id=sp.pro_id
         left join sys_dict  sd on tsp.size_id=sd.dict_id
         left join sys_dict  sd1 on tsp.reinforcement_id=sd1.dict_id
         left join sys_dict  sd2 on tsp.block_num=sd2.dict_id
         left join sys_users su  on tsp.create_user=su.user_id
         left join sys_group_user sgu on su.plat_id=sgu.user_id
         left join sys_group sg on sgu.group_id=sg.group_id
         left join sys_users su1 on tsp.quality_user=su1.user_id
        select
                DISTINCT tsp.steel_produce_id as steelProduceId,
                         tsp.produce_number as produceNumber,
                         tsp.pro_id as proId,sp.pro_name as proName,
                         sd.dict_name as sizeName,sd1.dict_name as reinforcementName,
                         sd2.dict_name as blockName,su.real_name as realName,
                         sg.group_name as groupName,su1.real_name as qualityUserName,
                         tsp.quality_time as qualityTime,tsp.is_qualified as isQualified,
                         tsp.is_model as isModel,tsp.print_time as printTime,
                         spu.real_name as platUserName
        from t_steel_produce tsp
                     left join sys_project sp  on tsp.pro_id=sp.pro_id
                     left join sys_dict  sd on tsp.size_id=sd.dict_id
                     left join sys_dict  sd1 on tsp.reinforcement_id=sd1.dict_id
                     left join sys_dict  sd2 on tsp.block_num=sd2.dict_id
                     left join sys_users su  on tsp.create_user=su.user_id
                     left join sys_users su1 on tsp.quality_user=su1.user_id
                     left join t_steel_print stp on stp.steel_print_id = tsp.steel_print_id
                     left join sys_plat_user spu on spu.user_id = stp.plat_user_id
                     left join sys_group_user sgu on spu.user_id=sgu.user_id
                     left join sys_group sg on sgu.group_id=sg.group_id
        where tsp.is_use=1 and tsp.steel_produce_id=#{steelProduceId}
    </select>
    <select id="produceInventory" resultType="com.thhy.materials.modules.biz.rebarprint.entity.dto.ProduceInventoryDto">

 hd/pipe/mobile/src/main/resources/mapping/PipeInfoMapper.xml

@@ -246,32 +246,39 @@
    </select>

    <select id="queryPipeInfoByPipeId" resultType="com.thhy.mobile.modules.biz.pipeinfo.entity.PipeInfoVo">
        select tsp.produce_number as produceNumber,sp.pro_name as proName,su1.real_name as createUserName,su2.real_name as steelCheckUserName,tsp.quality_time as steelCheckTime,tsp.is_qualified as steelCheckResult,tsp.print_time as printTime,

               sm.mould_num as mouldNum,sm.current_cycle_time as currentCycleTime,sm.max_cycle_time as maxCycleTime,sm.mould_code as mouldCode,

               tpi.ring_num as ringNum,tpi.pipe_num as pipeNum,tpi.into_mod_time as intoModTime,
               tpi.check_user as checkUser,su.real_name as pipeCheckUserName,tpi.check_time as pipeCheckTime,
               sd1.dict_name as turnName,
               sd2.dict_name as reinforcementName,
               sd3.dict_name as groutingHolesName,
               sd4.dict_name as blockNumName,
               sd5.dict_name as sizeName,
               sd6.dict_name as mouldTypeName
        select
            tsp.produce_number as produceNumber,
            sp.pro_name as proName,
            spu.real_name as createUserName,
            su2.real_name as steelCheckUserName,
            tsp.quality_time as steelCheckTime,
            tsp.is_qualified as steelCheckResult,
            tsp.print_time as printTime,
            sm.mould_num as mouldNum,sm.current_cycle_time as currentCycleTime,sm.max_cycle_time as maxCycleTime,sm.mould_code as mouldCode,
            tpi.ring_num as ringNum,tpi.pipe_num as pipeNum,tpi.into_mod_time as intoModTime,
            tpi.check_user as checkUser,su.real_name as pipeCheckUserName,tpi.check_time as pipeCheckTime,
            sd1.dict_name as turnName,
            sd2.dict_name as reinforcementName,
            sd3.dict_name as groutingHolesName,
            sd4.dict_name as blockNumName,
            sd5.dict_name as sizeName,
            sd6.dict_name as mouldTypeName

        from t_pipe_info tpi
                 left join sys_dict sd1 on sd1.dict_id = tpi.turn
                 left join sys_dict sd2 on sd2.dict_id = tpi.reinforcement
                 left join sys_dict sd3 on sd3.dict_id = tpi.grouting_holes
                 left join sys_dict sd4 on sd4.dict_id = tpi.block_num
                 left join sys_dict sd5 on sd5.dict_id = tpi.size
                 left join sys_mould sm on sm.mould_id = tpi.mod_id
                 left join sys_dict sd6 on sd6.dict_id = sm.mould_type
                 left join t_steel_produce tsp on tsp.produce_number = tpi.produce_number
                 left join sys_project sp on sp.pro_id = tpi.pro_id
                 left join sys_users su on su.user_id = tpi.check_user
                 left join sys_users su1 on su1.user_id = tsp.create_user
                 left join sys_users su2 on su2.user_id = tsp.quality_user
        left join sys_dict sd1 on sd1.dict_id = tpi.turn
        left join sys_dict sd2 on sd2.dict_id = tpi.reinforcement
        left join sys_dict sd3 on sd3.dict_id = tpi.grouting_holes
        left join sys_dict sd4 on sd4.dict_id = tpi.block_num
        left join sys_dict sd5 on sd5.dict_id = tpi.size
        left join sys_mould sm on sm.mould_id = tpi.mod_id
        left join sys_dict sd6 on sd6.dict_id = sm.mould_type
        left join t_steel_produce tsp on tsp.produce_number = tpi.produce_number
        left join sys_project sp on sp.pro_id = tpi.pro_id
        left join sys_users su on su.user_id = tpi.check_user
        left join sys_users su1 on su1.user_id = tsp.create_user
        left join sys_users su2 on su2.user_id = tsp.quality_user
        left join t_steel_print stp on stp.steel_print_id = tsp.steel_print_id
        left join sys_plat_user spu on spu.user_id = stp.plat_user_id
        where 1=1
        <if test="pipeId != null">
           and tpi.pipe_id = #{pipeId}

 hd/pipe/mobile/src/main/resources/mapping/SteelProduceMapper.xml

@@ -353,13 +353,13 @@
                sd5.dict_name AS sizeName,
                sd2.dict_name AS reinforcementName,
                sd4.dict_name AS blockNumName,
                su1.real_name AS createUserName,
                spu.real_name AS createUserName,
                su2.real_name AS steelCheckUserName,

                tsp.quality_time AS pipeCheckTime,
                tsp.print_time AS printTime,
                tpi.into_mod_time AS intoModTime,
                su.real_name AS pipeCheckUserName
                su.real_name AS pipeCheckUserName,
                tsp.steel_print_id steelPrintId
        FROM
                t_steel_produce tsp
                        LEFT JOIN t_pipe_info tpi ON tsp.produce_number = tpi.produce_number
@@ -370,6 +370,8 @@
                        LEFT JOIN sys_users su ON su.user_id = tpi.check_user
                        LEFT JOIN sys_users su1 ON su1.user_id = tsp.create_user
                        LEFT JOIN sys_users su2 ON su2.user_id = tsp.quality_user
                        LEFT JOIN t_steel_print stp on stp.steel_print_id = tsp.steel_print_id
                        LEFT JOIN sys_plat_user spu on spu.user_id = stp.plat_user_id

        where tsp.produce_number =#{num}
    </select>

 web/src/views/DuctpiecePLM/ProductTerminal/ReinsInfoPrint.vue

@@ -55,6 +55,7 @@
        <el-table-column prop="blockName" label="块号" align="center"></el-table-column>
        <el-table-column prop="printNum" label="数量（个）" align="center"></el-table-column>
        <el-table-column prop="realName" label="创建人" align="center"></el-table-column>
        <el-table-column prop="platUserName" label="制作人" align="center"></el-table-column>
        <el-table-column prop="createTime" label="创建时间" align="center" show-overflow-tooltip></el-table-column>
        <el-table-column label="操作" align="center" width="300">
          <template #default="{ row }">
@@ -124,6 +125,16 @@
                :key="item.dictId"
                :label="item.dictName"
                :value="item.dictId">
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="制作人：" prop="platUserId">
          <el-select v-model="ruleForm.platUserId" placeholder="请选择制作人" clearable filterable>
            <el-option
                v-for="item in optionsPerson"
                :key="item.userId"
                :label="item.realName"
                :value="item.userId">
            </el-option>
          </el-select>
        </el-form-item>
@@ -198,10 +209,16 @@
            message: '请输入数量',
            trigger: 'blur'
          }],
          platUserId: [{
            required: true,
            message: '请选择制作人',
            trigger: 'change'
          }],
        },
        optionsSize:[],//尺寸
        optionsHass:[],//配筋
        optionsBlocks:[],//块号
        optionsPerson:[],//制作人
        numLists:[5,10,15,20,25,30,40,50,60,70,80,90],//数字列表
      }
    },
@@ -221,6 +238,7 @@
      }
      that.searchButtonInfo(true);
      that.getAllProjects()
      that.getAllPersons()
    },
    methods: {
      //执行去打印
@@ -235,6 +253,16 @@
        this.rowsData = row
        this.showPrint = true
      },
      //获取所有制作人
      getAllPersons(){
        this.$api.Personnerl.GETSTAFFALLDATA().then(res=>{
          if(res.statusMsg==='ok'){
            this.optionsPerson = res.data
          }else{
            this.$message.warning(res.statusMsg)
          }
        })
      },
     //选择个数
     changeNum(value){
        this.$set(this.ruleForm,'printNum',value)

 web/src/views/DuctpiecePLM/ProductTerminal/SegmentPrint.vue

@@ -30,7 +30,12 @@
            </div>
            <div class="main_item_header">
                <div class="main_item_title">项目名称：</div>
                <div class="main_item_datas">{{item.proName}}</div>
                <div class="main_item_datas">
                    <el-tooltip v-if="item.proName.length>2" effect="light" :content="item.proName" placement="top-start">
                        <span>{{item.proName}}</span>
                    </el-tooltip>
                    <span v-else>{{item.proName}}</span>
                </div>
            </div>
        </div>
        <div :class="{'main_item_contents':pitchIf !==item.pipeId,'main_item_contents_pitch':pitchIf === item.pipeId}">
@@ -257,7 +262,7 @@
            display: flex;
            align-items: center;
            justify-content: space-between;
            overflow: auto hidden;
            overflow: hidden;
            border-top-left-radius: 6px;
            border-top-right-radius: 6px;
            background-color: rgba(57,181,254,0.3);

 web/src/views/DuctpiecePLM/ProductTerminal/components/ReinsPrint.vue

@@ -51,7 +51,7 @@
                <div class="main_item_right_rows">
                    <div class="main_item_rhom"></div>
                    <div class="main_item_name">制作人：</div>
                    <div class="main_item_info">{{item.realName}}</div>
                    <div class="main_item_info">{{item.platUserName}}</div>
                </div>
                <div class="main_item_right_rows">
                    <div class="main_item_rhom"></div>
@@ -259,7 +259,7 @@
            border-bottom-left-radius: 4px;
            border-bottom-right-radius: 4px;
            display: flex;
            overflow: auto;
            // overflow: auto;

            .main_item_left{
                width: 260px;

 web/src/views/DuctpiecePLM/ReinManage/ReinsProduct.vue

@@ -18,7 +18,7 @@
      </div>
      <div class="header_item">
        <span class="header_label">制作人：</span>
        <el-input v-model="search.realName" :size="size" clearable placeholder="请输入制作人"></el-input>
        <el-input v-model="search.platUserName" :size="size" clearable placeholder="请输入制作人"></el-input>
      </div>
      <div class="header_item">
        <span class="header_label">生产班组：</span>
@@ -115,7 +115,7 @@
        <el-table-column prop="blockName" label="块号" align="center"></el-table-column>
        <el-table-column prop="groupName" label="生产班组" align="center"></el-table-column>
        <el-table-column prop="printTime" label="打印时间" align="center" width="150"></el-table-column>
        <el-table-column prop="realName" label="制作人" align="center" show-overflow-tooltip></el-table-column>
        <el-table-column prop="platUserName" label="制作人" align="center" show-overflow-tooltip></el-table-column>
        <el-table-column prop="qualityUserName" label="质检人" align="center"></el-table-column>
        <el-table-column prop="qualityTime" label="质检时间" align="center" width="150"></el-table-column>
        <el-table-column prop="isQualified" label="质量标注" align="center">
@@ -212,7 +212,7 @@
            </div>
            <div class="reins_info_items">
                <div class="reins_info_titles">制作人</div>  
                <div class="reins_info_datas">{{rebarInfos.realName}}</div>  
                <div class="reins_info_datas">{{rebarInfos.platUserName}}</div>  
            </div>
            <div class="reins_info_items">
                <div class="reins_info_titles">质检人</div>  

 xcx/api/http.js

@@ -1,7 +1,7 @@
function Request() {}
export const basrUrl = 'https://pipe.thhy-tj.com/api';
// export const basrUrl = 'https://pipe.thhy-tj.com:8880';
// export const basrUrl = 'http://111.30.93.212:8089/api';
// export const basrUrl = 'https://szpipe.thhy-tj.com/api';
 export const basrUrl = 'http://192.168.0.100:8880';
//export const basrUrl = 'http://111.30.93.212:8089/suapi';
Request.prototype = {
    post: function(url, params) {
        return new Promise(function(resolve, reject) {

 xcx/labourPages/punishRecord/recordIndex.vue

@@ -128,7 +128,7 @@
            position: relative;
            height: calc(100vh - 110rpx);
            .home_top_bg{
                background: url('https://pipe.thhy-tj.com/group1/M00/00/02/bx5d1GSihIGAcLm2AAH16Fc_aMk207.png') no-repeat;
                background: url('https://szpipe.thhy-tj.com/group1/M00/00/02/bx5d1GSihIGAcLm2AAH16Fc_aMk207.png') no-repeat;
                background-size: 100% 100%;
                height: 30vh;
                position: absolute;

 xcx/labourPages/rectificationNotice/noticeDetails.vue

@@ -22,8 +22,8 @@
                    </view>
                    <view style="height:450px;overflow: auto;">
                        <view class="notice_matter_phone" v-for="(item,index) in ArrNotice" :key="index">
                            <!-- <u-image :src="`https://pipe.thhy-tj.com/${item.imgPath}`" ></u-image> -->
                            <u-album :urls="[`https://pipe.thhy-tj.com/${item.imgPath}`]"></u-album>
                            <!-- <u-image :src="`https://szpipe.thhy-tj.com/${item.imgPath}`" ></u-image> -->
                            <u-album :urls="[`https://szpipe.thhy-tj.com/${item.imgPath}`]"></u-album>
                        </view>
                    </view>
                    <view class="items_tyle" style="margin:10px 0">
@@ -60,8 +60,8 @@
                    </view>
                    <view style="height:450px;overflow: auto;">
                        <view class="notice_matter_phone" v-for="(item,index) in ArrNotice" :key="index">
                            <!-- <u-image :src="`https://pipe.thhy-tj.com/${item.imgPath}`" @click="clickImgs"></u-image> -->
                            <u-album :urls="[`https://pipe.thhy-tj.com/${item.imgPath}`]"></u-album>
                            <!-- <u-image :src="`https://szpipe.thhy-tj.com/${item.imgPath}`" @click="clickImgs"></u-image> -->
                            <u-album :urls="[`https://szpipe.thhy-tj.com/${item.imgPath}`]"></u-album>
                        </view>
                    </view>
                    <view class="notice_matter_items" style="margin-top:10px">
@@ -70,8 +70,8 @@
                    </view>
                    <view style="overflow: auto;height:100%">
                        <view class="notice_matter_phone" v-for="(item,index) in overArrNotice" :key="index">
                            <!-- <u-image :src="`https://pipe.thhy-tj.com/${item.imgPath}`" ></u-image> -->
                            <u-album :urls="[`https://pipe.thhy-tj.com/${item.imgPath}`]"></u-album>
                            <!-- <u-image :src="`https://szpipe.thhy-tj.com/${item.imgPath}`" ></u-image> -->
                            <u-album :urls="[`https://szpipe.thhy-tj.com/${item.imgPath}`]"></u-album>
                        </view>
                    </view>
                </view>
@@ -161,7 +161,7 @@
                            status: 'success',
                            message: '',
                            data: data.data,
                            url: `https://pipe.thhy-tj.com/${data.data}`
                            url: `https://szpipe.thhy-tj.com/${data.data}`
                        })
                    },
                    fail: (error) => {

 xcx/labourPages/safetyIndex/index.vue

@@ -9,7 +9,7 @@
                <u-image 
                    width="35px" 
                    height="35px"
                    src="https://pipe.thhy-tj.com/group1/M00/00/01/bx5d1GSiWhCAEXQ6AAAHEMPF2H4526.png">
                    src="https://szpipe.thhy-tj.com/group1/M00/00/01/bx5d1GSiWhCAEXQ6AAAHEMPF2H4526.png">
                </u-image>
            </view>
            <view class="check_item_li">
@@ -74,7 +74,7 @@
        margin-bottom: 10px;
        width: 100%;
        height: 18%;
        background: url('https://pipe.thhy-tj.com/group1/M00/00/04/bx5d1GR29yOAI0n4AAMYLFxtvVs706.png') no-repeat;
        background: url('https://szpipe.thhy-tj.com/group1/M00/00/04/bx5d1GR29yOAI0n4AAMYLFxtvVs706.png') no-repeat;
        background-size: 100% 100%;
    }
    
@@ -110,7 +110,7 @@
                padding: 6px 12px;
                color: #FFFFFF;
                font-size: 12px;
                background: url('https://pipe.thhy-tj.com/group1/M00/00/04/bx5d1GR38HuAX1LDAAACuUYd2z4415.png') no-repeat;
                background: url('https://szpipe.thhy-tj.com/group1/M00/00/04/bx5d1GR38HuAX1LDAAACuUYd2z4415.png') no-repeat;
                background-size: 100% 100%;
                
                &:active {

 xcx/labourPages/safetyTrain/trainDetails.vue

@@ -48,7 +48,7 @@
                    mask: true
                })
                uni.downloadFile({
                  url: `https://pipe.thhy-tj.com/${item.securePathVideo}`,
                  url: `https://szpipe.thhy-tj.com/${item.securePathVideo}`,
                  success: function (res) {
                    var filePath = res.tempFilePath;
                    uni.hideLoading()

 xcx/labourPages/usersInfo/usersDetails.vue

@@ -10,8 +10,8 @@
                label="头像"
                prop="photo"
                borderBottom>
                <u-image :src="`https://pipe.thhy-tj.com/${formRegister.photo}`" width="100rpx" height="100rpx" v-if="formRegister.photo !==''"></u-image>
                <u-image src="https://pipe.thhy-tj.com/group1/M00/00/01/bx5d1GSc-FmAQYjnAAAN3YyC44Y541.png" width="100rpx" height="100rpx" v-if="formRegister.photo===''"></u-image>
                <u-image :src="`https://szpipe.thhy-tj.com/${formRegister.photo}`" width="100rpx" height="100rpx" v-if="formRegister.photo !==''"></u-image>
                <u-image src="https://szpipe.thhy-tj.com/group1/M00/00/01/bx5d1GSc-FmAQYjnAAAN3YyC44Y541.png" width="100rpx" height="100rpx" v-if="formRegister.photo===''"></u-image>
            </u-form-item>
            <u-form-item
                    label="编号"
@@ -282,7 +282,7 @@
                            status: 'success',
                            message: '',
                            data: data.data,
                            url: `https://pipe.thhy-tj.com/${data.data}`
                            url: `https://szpipe.thhy-tj.com/${data.data}`
                        })
                    },
                    fail: (error) => {

 xcx/pages/labourHome/index.vue

@@ -26,7 +26,7 @@
                </view>
                <view class="home_middle_img">
                    <!-- <u-image :src="`${basrUrl}/materials/steelPrint/test?num=${openId}`" width="280rpx" height="280rpx"></u-image> -->
                    <u-image :src="`https://pipe.thhy-tj.com/${works.photo}`" width="280rpx" height="280rpx" v-if="works.phone"></u-image>
                    <u-image :src="`https://szpipe.thhy-tj.com/${works.photo}`" width="280rpx" height="280rpx" v-if="works.phone"></u-image>
                    <u-image src="@/static/workers_icons.png" width="280rpx" height="280rpx" v-else></u-image>
                </view>
                <view class="home_middle_line"></view>
@@ -39,7 +39,7 @@
            </view>
            <view class="home_footer_menu">
                <view class="home_menu_items" v-for="(menuItems,menuIndex) in menuLists" :key="menuIndex">
                    <u-image class="home_menu_icons" :src="`https://pipe.thhy-tj.com/${menuItems.menuIcon}`" width="128rpx" height="128rpx" @click="menuClick(menuItems)"></u-image>
                    <u-image class="home_menu_icons" :src="`https://szpipe.thhy-tj.com/${menuItems.menuIcon}`" width="128rpx" height="128rpx" @click="menuClick(menuItems)"></u-image>
                    <view class="home_menu_text">{{menuItems.menuName}}</view>
                </view>
            </view>

 xcx/pages/loginIndex/index.vue

@@ -63,8 +63,8 @@
        data() {
            return {
                formLogin: {
                    // username: '18103009188',
                    username: '',
                    // username: '14798989898',
                    password: ''
                },
                rulesLogin: {
@@ -240,7 +240,7 @@
        width: 100%;
        height: 50%;
        // background: #556DFE;
        background: url('http://filemanage.thhy-tj.com:8888/group1/M00/00/04/bx5d1GR1awaAOSrGAADytgHWrpk815.png') no-repeat;
        background: url('https://szpipe.thhy-tj.com/group1/M00/00/04/bx5d1GR1awaAOSrGAADytgHWrpk815.png') no-repeat;
        background-size: 100% 100%;
        border-radius: 0 0 20px 20px;
        

 xcx/pages/registerIndex/index.vue

@@ -227,7 +227,7 @@
                this.fileList = [{
                    id: this.fileList.length + 1,
                    data: data.photoUrl,
                    url: `https://pipe.thhy-tj.com/${data.photoUrl}`
                    url: `https://szpipe.thhy-tj.com/${data.photoUrl}`
                }]
                this.$set(this.formRegister, 'realName', data.realName);
                this.$set(this.formRegister, 'sex', data.sex);
@@ -280,7 +280,7 @@
                            status: 'success',
                            message: '',
                            data: data.data,
                            url: `https://pipe.thhy-tj.com/${data.data}`
                            url: `https://szpipe.thhy-tj.com/${data.data}`
                        })
                    },
                    fail: (error) => {

 xcx/pages/robeHome/index.vue

@@ -34,7 +34,7 @@
                    <view class="users_content">
                        <view class="users_menu" v-for="(userItem,userIndex) in items.menuList" :key="userIndex">
                            <view class="users_menu_icons" @click="btnClick(userItem)">
                                <u-image :src="`https://pipe.thhy-tj.com/${userItem.menuIcon}`" width="128rpx" height="128rpx"></u-image>
                                <u-image :src="`https://szpipe.thhy-tj.com/${userItem.menuIcon}`" width="128rpx" height="128rpx"></u-image>
                            </view>
                            <view class="users_menu_text">{{userItem.menuName}}</view>
                        </view>

 xcx/robePages/goodDevices/rebarManage.vue

@@ -20,7 +20,7 @@
                    </view>
                    <view class="rebar_card_right_text">
                        <view class="rebar_card_titles">实时库存：</view>
                        <view class="rebar_card_datas">{{item.stock}}{{item.unit}}</view>
                        <view class="rebar_card_datas">{{item.stock===null?0:item.stock}}{{item.unit}}</view>
                    </view>
                </view>
            </view>

 xcx/robePages/incomingIndex/detail.vue

@@ -189,7 +189,7 @@
                    this.applyRecord = res.data.applyRecord;
                    this.formRegister = res.data.reginfo;
                    this.$set(this.formRegister, 'photoUrl', res.data.reginfo.photoUrl ? 
                    `https://pipe.thhy-tj.com/${res.data.reginfo.photoUrl}` : '');
                    `https://szpipe.thhy-tj.com/${res.data.reginfo.photoUrl}` : '');
                    this.$set(this.formRegister, 'sex', res.data.reginfo.sex == 0 ? '男' : '女');
                }
            })

 xcx/robePages/safeManage/addCheck.vue

@@ -52,7 +52,7 @@
                        :maxCount="6"
                        width="150"
                        height="150">
                        <image src="https://pipe.thhy-tj.com/group1/M00/00/02/bx5d1GSihuWAA-kBAAAICqDtUn8566.png" mode="widthFix" style="width:64px;height: 100px;display: flex;justify-content: center;"></image>
                        <image src="https://szpipe.thhy-tj.com/group1/M00/00/02/bx5d1GSihuWAA-kBAAAICqDtUn8566.png" mode="widthFix" style="width:64px;height: 100px;display: flex;justify-content: center;"></image>
                        <view style="text-align: center;font-size: 16px;color: #666666;">上传照片</view>
                    </u-upload>
                </u-form-item>
@@ -168,7 +168,7 @@
                            status: 'success',
                            message: '',
                            data: data.data,
                            url: `https://pipe.thhy-tj.com/${data.data}`
                            url: `https://szpipe.thhy-tj.com/${data.data}`
                        })
                    },
                    fail: (error) => {

 xcx/robePages/safeManage/addHidden.vue

@@ -17,7 +17,7 @@
                        :maxCount="6"
                        width="150"
                        height="150">
                        <image src="https://pipe.thhy-tj.com/group1/M00/00/02/bx5d1GSihuWAA-kBAAAICqDtUn8566.png" mode="widthFix" style="width:64px;height: 100px;display: flex;justify-content: center;"></image>
                        <image src="https://szpipe.thhy-tj.com/group1/M00/00/02/bx5d1GSihuWAA-kBAAAICqDtUn8566.png" mode="widthFix" style="width:64px;height: 100px;display: flex;justify-content: center;"></image>
                        <view style="text-align: center;font-size: 16px;color: #666666;">上传照片</view>
                    </u-upload>
                </u-form-item>
@@ -126,7 +126,7 @@
                            status: 'success',
                            message: '',
                            data: data.data,
                            url: `https://pipe.thhy-tj.com/${data.data}`
                            url: `https://szpipe.thhy-tj.com/${data.data}`
                        })
                    },
                    fail: (error) => {

 xcx/robePages/safeManage/approveHidden.vue

@@ -5,8 +5,8 @@
                <view class="check_details_card" >
                    <view class="hidden_text">问题照片</view>
                    <view class="check_details_phone hidden_datas" v-for="(item,index) in hiddenPhone">
                        <!-- <u-image :src="`https://pipe.thhy-tj.com/${item.imgPath}`" ></u-image> -->
                        <u-album :urls="[`https://pipe.thhy-tj.com/${item.imgPath}`]"></u-album>
                        <!-- <u-image :src="`https://szpipe.thhy-tj.com/${item.imgPath}`" ></u-image> -->
                        <u-album :urls="[`https://szpipe.thhy-tj.com/${item.imgPath}`]"></u-album>
                    </view>
                </view>
                <view class="check_details_card">

 xcx/robePages/safeManage/datumSafe.vue

@@ -82,7 +82,7 @@
                this.$api.reboSystem.detailsDatumInfo({materialId:item.materialId}).then(res=>{
                    if(res.statusMsg === 'ok'){
                        uni.downloadFile({
                          url: `https://pipe.thhy-tj.com/${res.data.materialPaths[0].materialPath}`,
                          url: `https://szpipe.thhy-tj.com/${res.data.materialPaths[0].materialPath}`,
                          success: function (res) {
                            uni.saveFile({
                                tempFilePath:res.tempFilePath,
@@ -123,7 +123,7 @@
                    mask: true
                })
                uni.downloadFile({
                  url: `https://pipe.thhy-tj.com/${val}`,
                  url: `https://szpipe.thhy-tj.com/${val}`,
                  success: function (res) {
                    var filePath = res.tempFilePath;
                    uni.hideLoading()

 xcx/robePages/safeManage/detailsCheck.vue

@@ -12,8 +12,8 @@
            <view class="check_details_contents">{{checkDetails.inspectContent}}</view>
            <view style="overflow:auto;height: 345px;">
                <view class="check_details_phone" v-for="(item,index) in checkPhone">
                    <!-- <u-image :src="`https://pipe.thhy-tj.com/${item.imgPath}`" ></u-image> -->
                    <u-album :urls="[`https://pipe.thhy-tj.com/${item.imgPath}`]"></u-album>
                    <!-- <u-image :src="`https://szpipe.thhy-tj.com/${item.imgPath}`" ></u-image> -->
                    <u-album :urls="[`https://szpipe.thhy-tj.com/${item.imgPath}`]"></u-album>
                </view>
            </view>
        </view>
@@ -28,8 +28,8 @@
            <view class="check_details_contents">{{checkDetails.feedbackContent}}</view>
            <view style="overflow:auto;height: 345px;">
                <view class="check_details_phone" v-for="(item,index) in overCheckPhone">
                    <!-- <u-image :src="`https://pipe.thhy-tj.com/${item.imgPath}`" ></u-image> -->
                    <u-album :urls="[`https://pipe.thhy-tj.com/${item.imgPath}`]"></u-album>
                    <!-- <u-image :src="`https://szpipe.thhy-tj.com/${item.imgPath}`" ></u-image> -->
                    <u-album :urls="[`https://szpipe.thhy-tj.com/${item.imgPath}`]"></u-album>
                </view>
            </view>
        </view>

 xcx/robePages/safeManage/detailsHidden.vue

@@ -4,8 +4,8 @@
            <view class="check_details_card" >
                <view class="hidden_text">问题照片</view>
                <view class="check_details_phone hidden_datas" v-for="(item,index) in hiddenPhone">
                    <!-- <u-image :src="`https://pipe.thhy-tj.com/${item.imgPath}`" ></u-image> -->
                    <u-album :urls="[`https://pipe.thhy-tj.com/${item.imgPath}`]"></u-album>
                    <!-- <u-image :src="`https://szpipe.thhy-tj.com/${item.imgPath}`" ></u-image> -->
                    <u-album :urls="[`https://szpipe.thhy-tj.com/${item.imgPath}`]"></u-album>
                </view>
            </view>
            <view class="check_details_card">

 xcx/robePages/safeManage/rectifyDetails.vue

@@ -27,14 +27,14 @@
                        <view class="notice_matter_datas">{{rectifyDetail.inspectContent}}</view>
                    </view>
                    <view class="notice_matter_phone" v-for="(item,index) in NoticePhone" :key="index">
                        <u-image :src="`https://pipe.thhy-tj.com/${item.imgPath}`" ></u-image>
                        <u-image :src="`https://szpipe.thhy-tj.com/${item.imgPath}`" ></u-image>
                    </view>
                    <view class="notice_matter_items">
                        <view class="notice_matter_titles">整改结果：</view>
                        <view class="notice_matter_datas">{{rectifyDetail.feedbackContent ===null?"":rectifyDetail.feedbackContent}}</view>
                    </view>
                    <view class="notice_matter_phone" v-for="(item,index) in overNoticePhone" :key="index">
                        <u-image :src="`https://pipe.thhy-tj.com/${item.imgPath}`" ></u-image>
                        <u-image :src="`https://szpipe.thhy-tj.com/${item.imgPath}`" ></u-image>
                    </view>
                </view>
            </view>

 xcx/robePages/safetyIndex/index.vue

@@ -9,7 +9,7 @@
                <u-image 
                    width="35px" 
                    height="35px"
                    src="https://pipe.thhy-tj.com/group1/M00/00/01/bx5d1GSiWhCAEXQ6AAAHEMPF2H4526.png">
                    src="https://szpipe.thhy-tj.com/group1/M00/00/01/bx5d1GSiWhCAEXQ6AAAHEMPF2H4526.png">
                </u-image>
            </view>
            <view class="check_item_li">
@@ -74,7 +74,7 @@
        margin-bottom: 10px;
        width: 100%;
        height: 18%;
        background: url('https://pipe.thhy-tj.com/group1/M00/00/04/bx5d1GR29yOAI0n4AAMYLFxtvVs706.png') no-repeat;
        background: url('https://szpipe.thhy-tj.com/group1/M00/00/04/bx5d1GR29yOAI0n4AAMYLFxtvVs706.png') no-repeat;
        background-size: 100% 100%;
    }
    
@@ -110,7 +110,7 @@
                padding: 6px 12px;
                color: #FFFFFF;
                font-size: 12px;
                background: url('https://pipe.thhy-tj.com/group1/M00/00/04/bx5d1GR38HuAX1LDAAACuUYd2z4415.png') no-repeat;
                background: url('https://szpipe.thhy-tj.com/group1/M00/00/04/bx5d1GR38HuAX1LDAAACuUYd2z4415.png') no-repeat;
                background-size: 100% 100%;
                
                &:active {

 xcx/robePages/usersManage/staffDetails.vue

@@ -13,7 +13,7 @@
                <div style="display: flex;flex-direction: row-reverse;">
                    <u-image src="@/static/agvor.png" width="100rpx" height="100rpx"></u-image>
                </div>
                <!-- <u-image :src="`https://pipe.thhy-tj.com/${formRegister.photo}`" width="100rpx" height="100rpx"></u-image> -->
                <!-- <u-image :src="`https://szpipe.thhy-tj.com/${formRegister.photo}`" width="100rpx" height="100rpx"></u-image> -->
            </u-form-item>
            <u-form-item
                    label="编号"

 xcx/robePages/usersManage/trainDetails.vue

@@ -177,7 +177,7 @@
                    mask: true
                })
                uni.downloadFile({
                  url: `https://pipe.thhy-tj.com/${val}`,
                  url: `https://szpipe.thhy-tj.com/${val}`,
                  success: function (res) {
                    var filePath = res.tempFilePath;
                    uni.hideLoading()