修改cnas

licp

2024-12-26 f0a1d1428a7a258a5493ad5f6c36161ce377c7b0

修改cnas

 src/assets/api/controller.js

@@ -867,7 +867,7 @@
  getPageResults: "/manageRiskAssessmentResults/getPageResults", // 危险因素辨识与风险评价结果一览 分页
  hazardIdentificationAndRiskApproval: "/manageRiskAssessmentResults/hazardIdentificationAndRiskApproval", // 危险因素辨识与风险评价结果一览 批准
  dangerousRiskApproval: "/manageRiskAssessmentResults/dangerousRiskApproval", // 危险因素辨识与风险评价结果一览 审批
  riskAssessmentImport: "manageRiskAssessmentResults/riskAssessmentImport", // 危险因素辨识与风险评价结果一览 导入
  riskAssessmentImport: "/manageRiskAssessmentResults/riskAssessmentImport", // 危险因素辨识与风险评价结果一览 导入
  addNewRiskFactors: "/manageRiskAssessmentResults/addNewRiskFactors", // 危险因素辨识与风险评价结果一览 新增
  removeRiskFactors: "/manageRiskAssessmentResults/removeRiskFactors", // 危险因素辨识与风险评价结果一览 删除
  exportHazardFactorIdentification: "/manageRiskAssessmentResults/exportHazardFactorIdentification", // 危险因素辨识与风险评价结果一览 导出

 src/components/caorui/ZTTable/index.vue

@@ -8,19 +8,19 @@
<template>
  <div>
    <!-- 表格 -->
    <el-table 
        ref="multipleTable" 
        v-loading="tableLoading" 
        :border="border" 
    <el-table
        ref="multipleTable"
        v-loading="tableLoading"
        :border="border"
        :data="tableData"
        :header-cell-style="{ background: '#0e3372', color: '#cccccc' }" 
        :header-cell-style="{ background: '#0e3372', color: '#cccccc' }"
        :height="height"
        :highlight-current-row="highlightCurrentRow" 
        :highlight-current-row="highlightCurrentRow"
        :row-class-name="rowClassName"
        :row-style="rowStyle"
        :row-key="rowKey"
        stripe
        style="width: 100%; " 
        style="width: 100%; "
        tooltip-effect="dark"
        @row-click="rowClick"
        @current-change="currentChange"
@@ -82,9 +82,9 @@
                    :disabled="o.disabled ? o.disabled(scope.row) : false"
                    :icon="o.icon | iconFn(scope.row)"
                    :plain="o.plain" :size="o.size"
                    :style="{ 'color': o.color }" 
                    :style="{ 'color': o.color }"
                    :type="o.type | typeFn(scope.row)"
                    @click="o.clickFun(scope.row)">
                    @click.stop="o.clickFun(scope.row)">
                  {{ o.name }}
                </el-button>
                <el-upload

 src/components/do/a7-Ensure-results-validity/detailFormDialog.vue

@@ -13,7 +13,7 @@
        <el-col :span="12">
          <el-form-item label="计划开展时间" prop="plannedTime">
            <!-- <el-input v-model="form.plannedTime" size="small" clearable></el-input> -->
            <el-date-picker v-model="form.plannedTime" class="date_box" format="yyyy-MM-dd" placeholder="选择日期"
            <el-date-picker v-model="form.plannedTime"  format="yyyy-MM-dd" placeholder="选择日期"
                size="small" type="date" value-format="yyyy-MM-dd">
            </el-date-picker>
          </el-form-item>
@@ -80,6 +80,9 @@
      operationType: '',
    };
  },
  mounted() {

  },
  // 方法集合
  methods: {
    openDia(type, row) {
@@ -91,6 +94,7 @@
    },
    searchInfo (row) {
      this.form = {...row}
      console.log('this is current instance', this.form);
    },
    // 提交表单
    submitForm () {

 src/components/do/a7-changes-standard-methods/formDIaChange.vue

@@ -216,7 +216,7 @@
            <p>参加确认人签名:</p>
          </td>
          <td colspan="5">
            <el-select v-model="form.confirmUser" multiple placeholder="请选择" size="small" style="width: 100%">
            <el-select v-model="form.confirmUser" multiple placeholder="请选择" size="small" style="width: 100%" :multiple-limit="5">
              <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id"></el-option>
            </el-select>
          </td>

 src/components/do/a7-method-verification/formDIa.vue

@@ -216,7 +216,7 @@
            <p>参加确认人签名:</p>
          </td>
          <td colspan="5">
            <el-select v-model="form.confirmUser" multiple placeholder="请选择" size="small" style="width: 100%">
            <el-select v-model="form.confirmUser" multiple placeholder="请选择" size="small" style="width: 100%" :multiple-limit="5">
              <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id"></el-option>
            </el-select>
          </td>

 src/components/do/a8-file-handling/ControlledFileApplication.vue

@@ -7,11 +7,11 @@
        <div class="search_input"><el-input size="small" placeholder="请输入" clearable v-model="componentData.entity.documentCode"
            @keyup.enter.native="refreshTable()"></el-input></div>
      </div>
      <div class="search_thing">
      <!-- <div class="search_thing">
        <div class="search_label">申请人：</div>
        <div class="search_input"><el-input size="small" placeholder="请输入" clearable v-model="componentData.entity.createUserName"
          @keyup.enter.native="refreshTable()"></el-input></div>
      </div>
      </div> -->
      <div class="search_thing" style="padding-left: 30px;">
        <el-button size="small" @click="refresh()">重 置</el-button>
        <el-button size="small" type="primary" @click="refreshTable()">查 询</el-button>
@@ -188,7 +188,7 @@
      componentData: {
        entity: {
          documentCode: null,
          createUserName: null,
          // createUserName: null,
          orderBy: {
            field: 'createTime',
            order: 'desc'

 src/components/do/a8-file-handling/DistributionCollectionRecord.vue

@@ -516,11 +516,32 @@
      }else{
        let {documentCode,id,issueUser,recycleUser,receiveUser,name,version,documentState,issueCode,recycleCode,issueDate,recycleDate,issueNote,recycleNote} = this.addInfo
        // 添加回收记录
        this.$axios.post(this.$api.manageDocumentList.doManageDocumentIssueRecycle,{
          documentCode,id,issueUser,recycleUser,receiveUser,name,version,documentState,issueCode,recycleCode,issueDate,recycleDate,issueNote,recycleNote
        },{headers: {
            'Content-Type': 'application/json'
          },noQS:true}).then(res=>{
        let obj = {
          documentCode,
          id,
          issueUser,
          recycleUser,
          receiveUser,
          name,
          version,
          documentState,
          issueCode,
          recycleCode,
          issueDate,
          recycleDate,
          issueNote,
          recycleNote
        }
        let fd = new FormData();
        for(let key in obj){
          fd.append(key,obj[key])
        }
        this.$axios.post(this.$api.manageDocumentList.doManageDocumentIssueRecycle,fd,{
            headers: {
              'Content-Type': 'multipart/form-data'
            },
            noQs:true
          }).then(res=>{
            this.addLoading = false;
          if(res.code==200){
            this.$message.success('提交成功')

 src/components/do/a8-measures_deal_risks_opportunities/hazard_identification_risk_assessment.vue

@@ -272,6 +272,7 @@
      });
    },
    addFun() {
      this.form = {}
      this.dialogVisible = true
    },
    // 删除

 src/components/do/a8-measures_deal_risks_opportunities/list_risk_analysis_control_plans.vue

@@ -240,6 +240,7 @@
      });
    },
    addFun() {
      this.form = {}
      this.dialogVisible = true
    },
    // 删除

 src/components/view/a7-Ensure-results-validity.vue

@@ -225,7 +225,7 @@
          minWidth: '160'
        }, {
          label: '创建人',
          prop: 'createUser',
          prop: 'createUserName',
          minWidth: '100'
        }, {
          dataType: 'action',

 src/components/view/a7-quality-control-plan.vue

@@ -185,7 +185,7 @@
          minWidth: '160'
        }, {
          label: '创建人',
          prop: 'createUser',
          prop: 'createUserName',
          minWidth: '100'
        }, {
          dataType: 'action',

 src/main.js

@@ -22,11 +22,11 @@
//本地
// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://127.0.0.1:8001';
// const javaApi = 'http://172.20.10.5:8001';
const javaApi = 'http://172.20.10.5:8001';

//通信测试库
Vue.prototype.LOCATIONVUE = "http://10.1.13.77:8080";
const javaApi = 'http://10.1.13.77:8001';
// Vue.prototype.LOCATIONVUE = "http://10.1.13.77:8080";
// const javaApi = 'http://10.1.13.77:8001';

// 通信正式库
Vue.prototype.LOCATIONVUE = "http://10.193.45.63:8080";