全局“实绩”改为“实际”

itdmWeb/src/api/api.js

@@ -46,9 +46,9 @@ const getWeituoRq = (params)=>getAction("/gongdandetail/itdmGongdanDetail/gongda
 const getWeituoGdh = (params)=>getAction("/gongdandetail/itdmGongdanDetail/gongdanWoIdList",params);
 // 根据日期和工单号获取唯一的实验类型
 const getWeiYi = (params)=>getAction("/gongdandetail/itdmGongdanDetail/gongdanDateListByWoId",params);
-// 根据日期和工单号，实验类型获取实绩试验设备
+// 根据日期和工单号，实验类型获取实际试验设备
 const getWeiSb = (params)=>getAction("/gongdandetail/itdmGongdanDetail/gongdanShebeiListByWoId",params);
-// 根据日期和工单号，实验类型，实际试验设备获取实绩开始时间，实绩结束时间
+// 根据日期和工单号，实验类型，实际试验设备获取实际开始时间，实际结束时间
 const getWeiSj = (params)=>getAction("/gongdandetail/itdmGongdanDetail/gongdanDateListByWoId1",params);
 // 日历
 const getDeviceCalendar = (params)=>getAction("/deviceCalendar/list",params);

itdmWeb/src/components/Gantt.vue

@@ -255,7 +255,7 @@ export default {
       gantt.templates.task_class=function(start, end, task){
         // console.log("变颜色",start, end, task)
             switch (task.izShiji){
-              case "实绩":
+              case "实际":
                   return "high";
                   break;
               // case "2":
@@ -335,7 +335,7 @@ export default {
       gantt.attachEvent("onBeforeTaskMove", function(id, parent, tindex){
           const task = gantt.getTask(id);
           // console.log("yidoong",task)
-          if(task.izShiji == "实绩"){
+          if(task.izShiji == "实际"){
             return false;
           }else{
             return true;
@@ -346,7 +346,7 @@ export default {
           // console.log("右侧",id, mode, e)
           const task = gantt.getTask(id);
           console.log("yidoong",task)
-          if(task.izShiji == "实绩"){
+          if(task.izShiji == "实际"){
             return false;
           }else{
             return true;
@@ -357,7 +357,7 @@ export default {
         gantt.resetLightbox();
         var task = gantt.getTask(task_id);
         console.log(task)
-        if (task.izShiji == "实绩") {
+        if (task.izShiji == "实际") {
           return false;
         } else {
           gantt.config.lightbox.sections = restricted_lightbox;

itdmWeb/src/views/module-iTDM/gongdandetail/ItdmGongdanDetailList.vue

@@ -139,7 +139,7 @@ export default {
           dataIndex: 'woId'
         },
         {
-          title: '实绩设备',
+          title: '实际设备',
           align: 'center',
           dataIndex: 'shijiShebeiId_dictText'
         },
@@ -149,7 +149,7 @@ export default {
           dataIndex: 'chuanganqi_dictText'
         },
         {
-          title: '实绩试验类型',
+          title: '实际试验类型',
           align: 'center',
           dataIndex: 'shijiShiiyanType_dictText'
         },
@@ -172,7 +172,7 @@ export default {
           dataIndex: 'endTime'
         },
         {
-          title: '实绩任务日期',
+          title: '实际任务日期',
           align: 'center',
           dataIndex: 'shijiWorkDate',
           customRender: function(text) {
@@ -180,12 +180,12 @@ export default {
           }
         },
         {
-          title: '实绩试验开始时间',
+          title: '实际试验开始时间',
           align: 'center',
           dataIndex: 'shijiStartTime'
         },
         {
-          title: '实绩试验结束时间',
+          title: '实际试验结束时间',
           align: 'center',
           dataIndex: 'shijiEndTime'
         },
@@ -293,16 +293,16 @@ export default {
     getSuperFieldList() {
       let fieldList = []
       fieldList.push({ type: 'string', value: 'woId', text: '工单id', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'shijiShebeiId_dictText', text: '实绩设备id' })
+      fieldList.push({ type: 'string', value: 'shijiShebeiId_dictText', text: '实际设备id' })
       fieldList.push({ type: 'string', value: 'chuanganqi_dictText', text: '传感器' })
 
-      fieldList.push({ type: 'int', value: 'shijiShiiyanType_dictText', text: '实绩试验类型', dictCode: 'shiyan_type' })
+      fieldList.push({ type: 'int', value: 'shijiShiiyanType_dictText', text: '实际试验类型', dictCode: 'shiyan_type' })
       fieldList.push({ type: 'date', value: 'workDate', text: '任务日期' })
       fieldList.push({ type: 'string', value: 'startTime', text: '试验开始时间', dictCode: '' })
       fieldList.push({ type: 'string', value: 'endTime', text: '试验结束时间', dictCode: '' })
-      fieldList.push({ type: 'date', value: 'shijiWorkDate', text: '实绩任务日期' })
-      fieldList.push({ type: 'string', value: 'shijiStartTime', text: '实绩试验开始时间', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'shijiEndTime', text: '实绩试验结束时间', dictCode: '' })
+      fieldList.push({ type: 'date', value: 'shijiWorkDate', text: '实际任务日期' })
+      fieldList.push({ type: 'string', value: 'shijiStartTime', text: '实际试验开始时间', dictCode: '' })
+      fieldList.push({ type: 'string', value: 'shijiEndTime', text: '实际试验结束时间', dictCode: '' })
       // fieldList.push({type:'int',value:'status',text:'状态',dictCode:'test_plan_status'})
       fieldList.push({ type: 'string', value: 'remark', text: '备注', dictCode: '' })
       this.superFieldList = fieldList

itdmWeb/src/views/module-iTDM/gongdandetail/modules/ItdmGongdanDetailForm.vue

@@ -25,7 +25,7 @@
 
           <a-col :span="24">
             <a-form-model-item label="试验类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shijiShiiyanType">
-              <j-multi-select-tag type="list_multi" v-model="model.shijiShiiyanType" dictCode="shiiyan_type" placeholder="请选择实绩试验类型" />
+              <j-multi-select-tag type="list_multi" v-model="model.shijiShiiyanType" dictCode="shiiyan_type" placeholder="请选择实际试验类型" />
             </a-form-model-item>
           </a-col>
 
@@ -34,21 +34,21 @@
 
 
           <a-col :span="24">
-            <a-form-model-item label="实绩任务日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shijiWorkDate">
-              <j-date placeholder="请选择实绩任务日期" v-model="model.shijiWorkDate" style="width: 100%" />
+            <a-form-model-item label="实际任务日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shijiWorkDate">
+              <j-date placeholder="请选择实际任务日期" v-model="model.shijiWorkDate" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="实绩试验开始时间" :labelCol="labelCol" :wrapperCol="wrapperCol"
+            <a-form-model-item label="实际试验开始时间" :labelCol="labelCol" :wrapperCol="wrapperCol"
                                prop="shijiStartTime">
-              <a-time-picker placeholder="请选择实绩试验开始时间" v-model="model.shijiStartTime" :valueFormat="'HH:mm'"
+              <a-time-picker placeholder="请选择实际试验开始时间" v-model="model.shijiStartTime" :valueFormat="'HH:mm'"
                       :format="'HH:mm'" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="实绩试验结束时间" :labelCol="labelCol" :wrapperCol="wrapperCol"
+            <a-form-model-item label="实际试验结束时间" :labelCol="labelCol" :wrapperCol="wrapperCol"
                                prop="shijiEndTime">
-              <a-time-picker placeholder="请选择实绩试验结束时间" v-model="model.shijiEndTime" :valueFormat="'HH:mm'"
+              <a-time-picker placeholder="请选择实际试验结束时间" v-model="model.shijiEndTime" :valueFormat="'HH:mm'"
                       :format="'HH:mm'" style="width: 100%" />
             </a-form-model-item>
           </a-col>

itdmWeb/src/views/module-iTDM/gongdanshuju/ItdmGongdanShujuList2.vue

@@ -396,7 +396,7 @@ export default {
                 })
             })
         },
-        // 获取实绩开始时间结束时间
+        // 获取实际开始时间结束时间
         getSj(){
             this.queryParam2 = {...this.queryParam2}
             // this.queryParam2.shiyanKaishitime = ''

itdmWeb/src/views/module-iTDM/itdmGongdanDetail/ItdmGongdanDetailList.vue

@@ -31,14 +31,14 @@
 <!--            </a-form-item>-->
 <!--          </a-col>-->
 <!--          <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
-<!--            <a-form-item label="实绩设备id">-->
-<!--              <j-search-select-tag placeholder="请选择实绩设备id" v-model="queryParam.shijiShebeiId" dict="itdm_device,device_name,id"/>-->
+<!--            <a-form-item label="实际设备id">-->
+<!--              <j-search-select-tag placeholder="请选择实际设备id" v-model="queryParam.shijiShebeiId" dict="itdm_device,device_name,id"/>-->
 <!--            </a-form-item>-->
 <!--          </a-col>-->
           <template v-if="toggleSearchStatus">
 <!--            <a-col :xl="6" :lg="7" :md="8" :sm="24">-->
-<!--              <a-form-item label="实绩试验类型">-->
-<!--                <a-input placeholder="请输入实绩试验类型" v-model="queryParam.shijiShiiyanType"></a-input>-->
+<!--              <a-form-item label="实际试验类型">-->
+<!--                <a-input placeholder="请输入实际试验类型" v-model="queryParam.shijiShiiyanType"></a-input>-->
 <!--              </a-form-item>-->
 <!--            </a-col>-->
             <a-col :xl="10" :lg="11" :md="12" :sm="24">
@@ -49,7 +49,7 @@
               </a-form-item>
             </a-col>
             <a-col :xl="10" :lg="11" :md="12" :sm="24">
-              <a-form-item label="实绩任务日期">
+              <a-form-item label="实际任务日期">
                 <j-date placeholder="请选择开始日期" class="query-group-cust" v-model="queryParam.shijiWorkDate_begin"></j-date>
                 <span class="query-group-split-cust"></span>
                 <j-date placeholder="请选择结束日期" class="query-group-cust" v-model="queryParam.shijiWorkDate_end"></j-date>
@@ -277,17 +277,17 @@ export default {
           // dataIndex: 'chuanganqi'
         },
         // {
-        //   title:'实绩设备',
+        //   title:'实际设备',
         //   align:"center",
         //   dataIndex: 'shijiShebeiId_dictText'
         // },
         // {
-        //   title:'实绩试验类型',
+        //   title:'实际试验类型',
         //   align:"center",
         //   dataIndex: 'shijiShiiyanType_dictText'
         // },
         // {
-        //   title:'实绩任务日期',
+        //   title:'实际任务日期',
         //   align:"center",
         //   dataIndex: 'shijiWorkDate',
         //   customRender:function (text) {
@@ -295,12 +295,12 @@ export default {
         //   }
         // },
         // {
-        //   title:'实绩试验开始时间',
+        //   title:'实际试验开始时间',
         //   align:"center",
         //   dataIndex: 'shijiStartTime'
         // },
         // {
-        //   title:'实绩试验结束时间',
+        //   title:'实际试验结束时间',
         //   align:"center",
         //   dataIndex: 'shijiEndTime'
         // },
@@ -382,15 +382,15 @@ export default {
     },
     getSuperFieldList(){
       let fieldList=[];
-      fieldList.push({type:'int',value:'shijiShiiyanType_dictText',text:'实绩试验类型',dictCode:'shiyan_type'})
+      fieldList.push({type:'int',value:'shijiShiiyanType_dictText',text:'实际试验类型',dictCode:'shiyan_type'})
       fieldList.push({type:'string',value:'woId',text:'工单id',dictCode:''})
-      fieldList.push({type:'sel_search',value:'shijiShebeiId',text:'实绩设备id',dictTable:"itdm_device", dictText:'device_name', dictCode:'id'})
+      fieldList.push({type:'sel_search',value:'shijiShebeiId',text:'实际设备id',dictTable:"itdm_device", dictText:'device_name', dictCode:'id'})
       fieldList.push({type:'date',value:'workDate',text:'任务日期'})
       fieldList.push({type:'string',value:'startTime',text:'试验开始时间',dictCode:''})
       fieldList.push({type:'string',value:'endTime',text:'试验结束时间',dictCode:''})
-      fieldList.push({type:'date',value:'shijiWorkDate',text:'实绩任务日期'})
-      fieldList.push({type:'string',value:'shijiStartTime',text:'实绩试验开始时间',dictCode:''})
-      fieldList.push({type:'string',value:'shijiEndTime',text:'实绩试验结束时间',dictCode:''})
+      fieldList.push({type:'date',value:'shijiWorkDate',text:'实际任务日期'})
+      fieldList.push({type:'string',value:'shijiStartTime',text:'实际试验开始时间',dictCode:''})
+      fieldList.push({type:'string',value:'shijiEndTime',text:'实际试验结束时间',dictCode:''})
       fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})
       fieldList.push({type:'string',value:'chuanganqi',text:'传感器',dictCode:''})
       this.superFieldList = fieldList

itdmWeb/src/views/module-iTDM/itdmGongdanDetail/modules/ItdmGongdanDetailForm.vue

@@ -14,14 +14,14 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="实绩设备" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shijiShebeiId">
+            <a-form-model-item label="实际设备" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shijiShebeiId">
               <j-search-select-tag v-model="model.shijiShebeiId" dict="itdm_device,device_name,id"  />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="实绩试验类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shijiShiiyanType">
-<!--              <a-input v-model="model.shijiShiiyanType" placeholder="请输入实绩试验类型"  ></a-input>-->
-              <j-multi-select-tag type="list_multi" v-model="model.shijiShiiyanType" dictCode="shiiyan_type" placeholder="请选择实绩试验类型" />
+            <a-form-model-item label="实际试验类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shijiShiiyanType">
+<!--              <a-input v-model="model.shijiShiiyanType" placeholder="请输入实际试验类型"  ></a-input>-->
+              <j-multi-select-tag type="list_multi" v-model="model.shijiShiiyanType" dictCode="shiiyan_type" placeholder="请选择实际试验类型" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -40,18 +40,18 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="实绩任务日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shijiWorkDate">
-              <j-date placeholder="请选择实绩任务日期" v-model="model.shijiWorkDate"  style="width: 100%" />
+            <a-form-model-item label="实际任务日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shijiWorkDate">
+              <j-date placeholder="请选择实际任务日期" v-model="model.shijiWorkDate"  style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="实绩试验开始时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shijiStartTime">
-              <a-input v-model="model.shijiStartTime" placeholder="请输入实绩试验开始时间"  ></a-input>
+            <a-form-model-item label="实际试验开始时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shijiStartTime">
+              <a-input v-model="model.shijiStartTime" placeholder="请输入实际试验开始时间"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="实绩试验结束时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shijiEndTime">
-              <a-input v-model="model.shijiEndTime" placeholder="请输入实绩试验结束时间"  ></a-input>
+            <a-form-model-item label="实际试验结束时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shijiEndTime">
+              <a-input v-model="model.shijiEndTime" placeholder="请输入实际试验结束时间"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">