zzy+50

src/service/config.js

@@ -1,8 +1,8 @@
 //  export const baseUrl = process.env.NODE_ENV ==='production'?proBaseUrl:devBaseUrl
-//export const baseUrl = 'http://10.90.7.241:9443/data-business-prod/'
-export const baseUrl = 'http://localhost:9250'
+export const baseUrl = 'http://10.90.7.241:9443/data-business-prod/'
+//export const baseUrl = 'http://localhost:9250'
 // export const baseUrl = 'http://10.81.66.9:9250'
-export const baseUrl_Address = 'http://10.81.66.9:9250'
+export const baseUrl_Address = 'http://10.90.7.241:9443/data-business-prod/'
 // export const baseUrl_Address = 'http://10.81.66.9:9252'
 export const timeout = 30000
 export const withCredentials=true

src/service/index.js

@@ -40,8 +40,9 @@ requestInstance.interceptors.request.use((config) => {
     let isMatch = reg.test(config.url.split('?')[1])
     return {
         ...config,
+        url:localStorage.getItem("xyxx_userkeycode")?(isMatch?config.url:config.url+='?appkey='+localStorage.getItem("xyxx_userkeycode")):config.url
         // url:isMatch?config.url:config.url+='?appkey='+localStorage.getItem("xyxx_userkeycode")
-        url:isMatch?config.url:config.url
+        // url:isMatch?config.url:config.url
     }
 },(error) => {
     return new Error(error)

src/units/use-method/veritification-tools.js

@@ -8,6 +8,15 @@ export function getDateToString_zhh(date) {
     return year + "年" + formatDatePara(month) + "月" + formatDatePara(day) + "日 " + formatDatePara(hour) + ":" + formatDatePara(minute);
 }
 
+export  function  getDateToString(date) {
+    var year = date.getFullYear();
+    var month = date.getMonth() + 1;
+    var day = date.getDate();
+    var hour = date.getHours();
+    var minute = date.getMinutes();
+    var second = date.getSeconds();
+    return year + "-" + formatDatePara(month) + "-" + formatDatePara(day) + " " + formatDatePara(hour) + ":" + formatDatePara(minute) + ":" + formatDatePara(second);
+}
 
 function formatDatePara(str) {
     if (str.toString().length == 1) {

src/views/main/c-views/credit-data/apply-information/MatterApplySituationStatics.vue

@@ -99,7 +99,7 @@ export default {
       for(let i=0;i<date.Rows.length;i++){
         for(let j=0;j<firstData.length;j++){
           if(date.Rows[i].name==firstData[j].name){
-            firstData[j].value = date.Rows[i].value;
+            firstData[j].value = date.Rows[i].value?date.Rows[i].value:0;
           }
         }
       }

src/views/main/c-views/credit-information/commission-credit-information-manage/CommissionCreditInformationManageEdit.vue

@@ -23,6 +23,9 @@
           <template #DATE_MATTER_TYPE="{data}">
             <span>{{getXXSXName(forms.UNITTYPE)}}</span>
           </template>
+          <template #MARK_UPDATE_TIME="{data}">
+            <span>{{addSingleHour(data)}}</span>
+          </template>
         </my-table>
         <ele-pagination  ref="refEl"
                          @sizeOrPageChange="handleSizeChange"
@@ -142,7 +145,7 @@ import ElePagination from "@/components/common/ElePagination.vue";
 import {usePagination} from "@/units/use-method/usePagination";
 import DiyElForm from "@/components/common/DiyElForm.vue";
 import $ from 'jquery';
-import {getDateToString_zhh,isEmptyCheck} from "@/units/use-method/veritification-tools";
+import {getDateToString_zhh,isEmptyCheck,getDateToString} from "@/units/use-method/veritification-tools";
 import {InsertSyslog} from "@/units/use-method/user-log";
 import {closeShowLoading, showLoading} from "@/units/element-loading/element-loader";
 export default {
@@ -310,6 +313,24 @@ export default {
           break;
       }
     }
+    function addSingleHour(val){
+      if (isEmptyCheck(val["MARK_UPDATE_TIME"])) {
+        return "";
+      }
+      //判断质检状态
+      let zjjg = 0;
+      if (val["MARK_ZJBS"] != null) {
+        zjjg = val["MARK_ZJBS"].toString().substr(0, 1);
+      }
+      if (zjjg == 0) {
+        return;
+      }
+
+      let curTime = new Date(val["MARK_UPDATE_TIME"]);
+      let addHour = curTime.setHours(curTime.getHours() + 1);
+      let value = getDateToString(new Date(addHour));
+      return value.toString().substr(0,16);
+    }
     function clickTableTr(row){
       setCharts(row);
     }
@@ -667,6 +688,7 @@ export default {
       pageIndex,pageSize,tableData,totalCount,handleSizeChange,refEl,initSearch,
       showAllHeader,
       getXXSXName,
+      addSingleHour,
       clickTableTr,