jiangping
2025-04-16 9f1e7f80a3260c30e1e534437da5c79e17fc20af
代码初始化
已修改19个文件
119 ■■■■ 文件已修改
admin/src/components/business/OperaCategoryDcaProblemWindow.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/business/OperaCategoryWindow.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/business/OperaCompanyWindow.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/business/OperaWorkorderDetailDbhWindow.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/business/OperaWorkorderDetailDcaWindow.vue 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/router/index.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/category.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/categoryDbhLocaltion.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/categoryDbhType.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/categoryDcaLocaltion.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/categoryDcaProblem.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/categorySheLocaltion.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/categorySheType.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/companyNormal.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/workorderDbh.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/src/main/java/com/doumee/api/web/WebMemberController.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/src/main/java/com/doumee/dao/business/vo/WorkorderDbhDto.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/src/main/java/com/doumee/dao/business/vo/WorkorderDcaDto.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/business/OperaCategoryDcaProblemWindow.vue
@@ -125,7 +125,7 @@
    open (title, target, categorys, categoryType, parentId) {
      this.title = title
      this.categorys = JSON.parse(JSON.stringify(categorys||[]));
      console.log(this.categorys)
      console.log(parentId)
      this.visible = true
      this.form = {
        id: null,
admin/src/components/business/OperaCategoryWindow.vue
@@ -113,7 +113,7 @@
      this.title = title
      this.categorys = JSON.parse(JSON.stringify(categorys||[]));
      // this.categorys = this.getTreeData(this.categorys)
      console.log(this.categorys)
      console.log(parentId)
      this.visible = true
      this.form = {
        id: null,
@@ -122,7 +122,7 @@
        remark: '',
        categoryList: [],
        sortnum: null,
        parentId: parentId
        parentId: parentId || null
      }
      this.form.type = categoryType
      // 新建
admin/src/components/business/OperaCompanyWindow.vue
@@ -80,9 +80,9 @@
        status: '',
        sortnum: '',
        imgurl: '',
        type: '',
        parentId: '',
        code: '',
        type: null,
        parentId: null,
        code: null,
        qwId: '',
        namePath: '',
        idPath: ''
admin/src/components/business/OperaWorkorderDetailDbhWindow.vue
@@ -35,7 +35,7 @@
              <div class="value">{{ info.submitDate }}</div>
            </div>
            <div class="item">
              <div class="label">发生时间</div>
              <div class="label">发现时间</div>
              <div class="value">{{ info.happenTime}}</div>
            </div>
            <div class="item">
@@ -50,6 +50,10 @@
              <div class="label">风险描述</div>
              <div class="value">{{ info.riskInfo }}</div>
            </div>
            <div class="item">
              <div class="label">通知人</div>
              <div class="value">{{ info.memberNames }}</div>
            </div>
            <div class="item" style="width: 100%">
              <div class="label">图片</div>
              <div class="value" v-if="info.multifileList ==null || !info.multifileList.length">无</div>
admin/src/components/business/OperaWorkorderDetailDcaWindow.vue
@@ -79,6 +79,9 @@
        <div class="table_info">
          <div class="title">不符合项工单列表</div>
          <el-table :data="info.dcaChildList" border fit>
            <el-table-column prop="index" label="序号" width="55" fixed="left">
              <template slot-scope="scope">{{ scope.$index+1}}</template>
            </el-table-column>
            <el-table-column label="工单号" prop="code" min-width="100">
              <template slot-scope="{row}">
                <span style="color: #2E68EC;cursor: pointer" @click="$refs.OperaWorkorderDetailDcaInfoWindow.open('DCA不符合项工单详情', row)" >{{ row.code || '-'}}</span>
@@ -101,6 +104,17 @@
                <!--<el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:workorder:delete']">删除</el-button>-->
              </template>
            </el-table-column>
          </el-table>
        </div>
        <div class="table_info">
          <div class="title">符合项列表</div>
          <el-table :data="dataList2" border fit>
            <el-table-column prop="index" label="序号" width="55" fixed="left">
              <template slot-scope="scope">{{ scope.$index+1}}</template>
            </el-table-column>
            <el-table-column label="一级主题" prop="typeName" min-width="160"> </el-table-column>
            <el-table-column label="二级主题" prop="categoryName" min-width="150"> </el-table-column>
            <el-table-column label="观察项" prop="problemTitle" min-width="400"> </el-table-column>
          </el-table>
        </div>
      </div>
@@ -129,6 +143,7 @@
      type: null,
      title: '工单详情',
      info: {},
      dataList2: [],
      statusMap: {
        0: '待分配WTS',
        1: '待分配任务',
@@ -159,6 +174,7 @@
    getDetail () {
      getById(this.info.id).then(res => {
        this.info = res
        this.getDataListByRemak()
        if (this.info.logList && this.info.logList.length > 0) {
          this.info.logList.forEach(item => {
            if (item.approveList && item.approveList.length == 1 && item.type !== 1) {
@@ -172,6 +188,25 @@
        }
      })
    },
    getDataListByRemak () {
      this.dataList2 =[]
      if(this.info.remark){
        var obj = JSON.parse(this.info.remark)
        console.log(obj)
        if(obj && obj.childMapList){
          obj.childMapList.forEach(item =>{
            if(item && item.problemMapList){
              item.problemMapList.forEach(item1 =>{
                if(item1 && item1.status === 1){
                  this.dataList2.push({'typeName':this.info.typeName, 'categoryName':item.childTitle,'problemTitle':item1.title})
                }
              })
            }
          })
        }
      }
    },
    reject () { },
    handleAvatarSuccess () { },
    beforeAvatarUpload () { }
admin/src/router/index.js
@@ -111,9 +111,9 @@
    const height3 = getEleHeghtByClassName('main-header', 0)
    // const height4 = getEleHeghtByClassName('table-pagination', 0,-20)
    const height2 = getEleHeghtByClassName('toolbar', 0)
    console.log('defualtlength', document.getElementsByClassName('table-search-form').length)
    // console.log('defualtlength', document.getElementsByClassName('table-search-form').length)
    router.app.$store.commit('setTableHeightNew', height - height4 - height3 - height2 - height1 - height5 - height13)
    console.log('gableHeightNew', router.app.$store.state.tableHeightNew)
    // console.log('gableHeightNew', router.app.$store.state.tableHeightNew)
}
function getEleHeghtByClassName (name, dv, margin) {
admin/src/views/business/category.vue
@@ -132,7 +132,7 @@
        sortnum: '',
        imgurl: '',
        type: '',
        parentId: '',
        parentId: null,
        namePath: '',
        idPath: ''
      }
admin/src/views/business/categoryDbhLocaltion.vue
@@ -71,7 +71,7 @@
        keyword: '',
        type: 2,
        isRoot: 1,
        parentId: '',
        parentId: null,
        parentIdPath: null
      },
      loading: false,
admin/src/views/business/categoryDbhType.vue
@@ -70,7 +70,7 @@
        name: '',
        keyword: '',
        type: 1,
        parentId: '',
        parentId: null,
        isRoot: 1,
        parentIdPath: null
      },
admin/src/views/business/categoryDcaLocaltion.vue
@@ -71,7 +71,7 @@
        keyword: '',
        type: 3,
        isRoot: 1,
        parentId: '',
        parentId: null,
        parentIdPath: null
      },
      loading: false,
admin/src/views/business/categoryDcaProblem.vue
@@ -78,7 +78,7 @@
        name: '',
        keyword: '',
        type: 4,
        parentId: '',
        parentId: null,
        isRoot: 1,
        parentIdPath: null
      },
admin/src/views/business/categorySheLocaltion.vue
@@ -70,7 +70,7 @@
        name: '',
        keyword: '',
        type: 5,
        parentId: '',
        parentId: null,
        isRoot: 1,
        parentIdPath: null
      },
admin/src/views/business/categorySheType.vue
@@ -70,7 +70,7 @@
        name: '',
        keyword: '',
        type: 0,
        parentId: '',
        parentId: null,
        isRoot: 1,
        parentIdPath: null
      },
admin/src/views/business/companyNormal.vue
@@ -88,7 +88,7 @@
        sortnum: '',
        imgurl: '',
        type: '',
        parentId: '',
        parentId: null,
        code: '',
        qwId: '',
        namePath: '',
admin/src/views/business/workorderDbh.vue
@@ -71,6 +71,7 @@
          </template>
        </el-table-column>
        <el-table-column prop="companyName" label="所属部门" min-width="100px"></el-table-column>
        <el-table-column prop="memberNames" label="通知人" min-width="100px"></el-table-column>
        <el-table-column prop="createDate" label="创建时间" min-width="150px"></el-table-column>
        <el-table-column
          v-if="containPermissions(['business:workorder:update', 'business:workorder:delete'])"
server/src/main/java/com/doumee/api/web/WebMemberController.java
@@ -19,6 +19,12 @@
import org.springframework.web.server.ServerWebExchange;
import javax.annotation.Resource;
import java.math.BigInteger;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
/**
 * JWT获取令牌和刷新令牌接口
@@ -90,4 +96,33 @@
        return ApiResponse.failed( "登录已失效");
    }
    @ApiOperation("获取企业微信JS签名")
    @PostMapping("/getQwSignature")
    @ResponseBody
    public ApiResponse<Object> getQwSignature(@RequestBody  String url) {
       /* Map jsapiTicket = s;
        String ticket = jsapiTicket.get("ticket").toString();
        String noncestr = UUID.randomUUID().toString();
        Long timestamp = System.currentTimeMillis() / 1000;
        String jsapiTicketStr = ticket + "&noncestr=" + noncestr + "&timestamp=" + timestamp + "&url=" + url;
        try {
            MessageDigest instance = MessageDigest.getInstance("SHA-1");
            instance.update(jsapiTicketStr.getBytes());
            byte[] digest = instance.digest();
            BigInteger bigInteger = new BigInteger(1, digest);
            String string = bigInteger.toString();
            Map<String, Object> result = new HashMap<>();
            result.put("noncestr", noncestr);
            result.put("jsapi_ticket", string);
            result.put("timestamp", timestamp);
            result.put("url", url);
            result.put("ticket", ticket);
            return ApiResponse.success( result);
        } catch (NoSuchAlgorithmException e) {
            throw new RuntimeException(e);
        }*/
        return ApiResponse.failed( "获取签名失败");
    }
}
server/src/main/java/com/doumee/dao/business/vo/WorkorderDbhDto.java
@@ -49,8 +49,11 @@
    @ApiModelProperty("提报人员所属部门")
    @ExcelColumn(name="所属部门",index =14,width = 8)
    private String companyName;
    @ApiModelProperty("通知人")
    @ExcelColumn(name="通知人",index =15,width = 10)
    private String memberNames;
    @ApiModelProperty(value = "提交时间")
    @ExcelColumn(name="提交时间",index =15 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
    @ExcelColumn(name="提交时间",index =16 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
    private Date createDate;
server/src/main/java/com/doumee/dao/business/vo/WorkorderDcaDto.java
@@ -32,10 +32,10 @@
    @ExcelColumn(name="发现时间",index =6 ,dateFormat = "yyyy-MM-dd HH:mm:ss",width = 10)
    private Date happenTime;
    @ApiModelProperty(value = "符合项数量", example = "1")
    @ExcelColumn(name="符合项数量",index =7,width = 4)
    @ExcelColumn(name="符合项数量",index =7,width = 8)
    private Integer dcaYesNum;
    @ApiModelProperty(value = "不符合项数量", example = "1")
    @ExcelColumn(name="不符合项数量",index =8,width = 4)
    @ExcelColumn(name="不符合项数量",index =8,width = 8)
    private Integer dcaNoNum;
    @ApiModelProperty(value = "位置", example = "1")
    @ExcelColumn(name="位置",index =9 ,width = 10)
server/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
@@ -199,6 +199,7 @@
    @Override
    public List<Category> findList(Category category) {
        category.setIsdeleted(Constants.ZERO);
        MPJLambdaWrapper<Category> queryWrapper = new MPJLambdaWrapper<>();
        queryWrapper.selectAll(Category.class);
        queryWrapper.selectAs(SystemUser::getUsername,Category::getEditorName);