Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web

shuishen

2026-02-05 e4ac24046c126ce9b18b31b25c590dfb032d5f67

Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web

 applications/task-work-order/src/styles/common/cockpit.scss

@@ -1201,10 +1201,12 @@
  .gd-date-picker {
    height: 36px;
  }

  .gd-input {
    height: 36px;
  }
  .gd-upload-btn {
    height: 36px;
  }
  .el-input,
  .el-input-number {
    min-width: 200px;

 applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue

@@ -163,7 +163,7 @@
                                class="upload-demo"
                            >
                                <template #trigger>
                                    <el-button type="primary">选择文件</el-button>
                                    <el-button class="gd-upload-btn" type="primary">选择文件</el-button>
                                </template>
                                <template #tip>
                                    <div class="el-upload__tip">支持上传 (.zip/.rar/.7z/.tar/.gz)格式</div>

 applications/task-work-order/src/views/orderView/orderManage/inspectionReport/index.vue

@@ -111,7 +111,7 @@
                </el-form-item>
                <el-form-item label="上传文件" prop="link" v-if="titleTxt === '上传巡查报告'">
                    <el-upload class="avatar-uploader" action="" :show-file-list="false" :before-upload="onUploadFileBefore">
                        <el-button size="small" type="primary">点击上传</el-button>
                        <el-button class="gd-upload-btn" type="primary">点击上传</el-button>
                    </el-upload>
                    <div class="upload-tip">
                        {{ uploadName }}

 applications/task-work-order/src/views/orderView/organizational/agenciesManagement/index.vue

@@ -102,7 +102,8 @@
        <el-form-item label="导出模板">
          <el-button 
            color="#F2F3F5"
            type="primary" 
            type="primary"
                        class="gd-upload-btn"
            @click="handleExportTemplate"
          >
            下载模板
@@ -111,7 +112,7 @@
        <el-form-item label="上传文件" prop="file">
         
          <el-upload class="avatar-uploader" action="" :show-file-list="false" :before-upload="onImportFileBefore">
            <el-button  type="primary">点击上传</el-button>
            <el-button class="gd-upload-btn" type="primary">点击上传</el-button>
          </el-upload>
          <div class="upload-tip">
           {{ importFileName }}

 uniapps/work-wx/src/static/fonts/font.css

@@ -43,3 +43,11 @@
  font-style: normal;
  font-display: swap;
}

@font-face {
  font-family: "PangMen";
  src: url("PANGMENZHENGDAOBIAOTITIMIANFEIBAN-2.TTF") format("truetype");
  font-weight: normal;
  font-style: normal;
  font-display: swap;
}