diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 08867959..c4a17451 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -80,7 +80,7 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://192.168.34.221:12346' //郭圣雄本地
   // axios.defaults.baseURL = 'http://192.168.34.221:12350' //金林湾本地
   // axios.defaults.baseURL = 'http://192.168.34.122:8070' //彭洁本地
-  // axios.defaults.baseURL = 'http://192.168.34.221:8070/' //演示平台郭圣雄本地
+  axios.defaults.baseURL = 'http://192.168.34.221:8070' //演示平台郭圣雄本地
   // axios.defaults.baseURL = 'http://192.168.34.221:30000' //中建五局郭圣雄本地
   // axios.defaults.baseURL = 'http://101.43.164.214:11111' //百色线上
   // axios.defaults.baseURL = 'http://101.43.164.214:12345/'//内蒙古线上
diff --git a/src/store/index.js b/src/store/index.js
index 75e8f066..c2e7e314 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -93,6 +93,8 @@ export default new Vuex.Store({
     // FILEURL: 'http://192.168.34.221:30000/image/',//郭圣雄本地
     // UPLOADURL: 'http://101.43.164.214:12345/upload/image',//内蒙古
     // FILEURL: 'http://101.43.164.214:12345/image/',//内蒙古
+    // UPLOADURL: 'http://42.194.144.62:8088/upload/image',//中建四
+    // FILEURL: 'http://42.194.144.62:8088/image/',//中建四
 
     ACCOUNTTYPE: [
       "系统管理员",
diff --git a/src/views/projectAdmin/fourEngin/carbon/index.vue b/src/views/projectAdmin/fourEngin/carbon/index.vue
index 57b89951..166def28 100644
--- a/src/views/projectAdmin/fourEngin/carbon/index.vue
+++ b/src/views/projectAdmin/fourEngin/carbon/index.vue
@@ -1,19 +1,13 @@
 <template>
   <div class="carbon">
-    <div class="between">
-      <div class="top"><LeftTop /></div>
-      <div class="center"><LeftCenter /></div>
-      <div class="bottom"><RightBottom /></div>
-    </div>
-    <div class="center">
-      <div class="top"><CenterTop /></div>
-      <div class="bottom"><CenterBottom /></div>
-    </div>
-    <div class="between2">
-      <div class="top"><RightTop /></div>
-      <div class="center"><RightCenter /></div>
-      <div class="bottom"><LeftBottom /></div>
-    </div>
+    <iframe
+    style="margin: -5px -20px;"
+      src="https://cloud.dev.pkpm.cn/fourth/"
+      frameborder="0"
+      width="100%"
+      height="100%"
+      id="iframe"
+    ></iframe>
   </div>
 </template>
 
@@ -33,8 +27,8 @@ export default {
 
 <style lang="less" scoped>
 .carbon {
-  width: 100%;
-  height: 100%;
+  width: 101%;
+  height: 105%;
   display: flex;
   justify-content: space-between;
   // background: url(../assets/temp/7.png) no-repeat;
diff --git a/src/views/projectAdmin/fourEngin/quality/centerTop.vue b/src/views/projectAdmin/fourEngin/quality/centerTop.vue
index 55a021c2..e46c23bd 100644
--- a/src/views/projectAdmin/fourEngin/quality/centerTop.vue
+++ b/src/views/projectAdmin/fourEngin/quality/centerTop.vue
@@ -3,7 +3,9 @@
     <div class="list">
       <vue-scroll style="width: 100%; height: 550px">
         <div class="list-item" v-for="(item, index) in showList" :key="index">
+           
           <p>{{ item.title }}</p>
+
           <img
             :preview="item.imageUrl[0] ? item.imageUrl[0].url : []"
             :src="item.imageUrl[0] ? item.imageUrl[0].url : []"
@@ -110,11 +112,12 @@ export default {
     }
     p {
       width: 100%;
-      height: 25px;
+      height: 50px;
       line-height: 25px;
       position: absolute;
       background-color: rgba(0, 0, 0, 0.55);
       bottom: 0;
+      overflow: hidden;
     }
   }
 }
diff --git a/src/views/projectAdmin/fourEngin/sourse/rightTop.vue b/src/views/projectAdmin/fourEngin/sourse/rightTop.vue
index 7c90cd59..355e3e3b 100644
--- a/src/views/projectAdmin/fourEngin/sourse/rightTop.vue
+++ b/src/views/projectAdmin/fourEngin/sourse/rightTop.vue
@@ -288,7 +288,9 @@ export default {
             axisLabel: {
               textStyle: {
                 color: '#fff'
-              }
+              },
+              // formatter: function(value){ return (value*10)+'%'}
+            
             },
             axisLine: {
               show: true,
@@ -370,7 +372,6 @@ export default {
             this.isblock = true
           }
 
-          console.log('查询材料类别', res)
         }
       )
     },
@@ -379,7 +380,6 @@ export default {
         typeId: this.typeId,
         year: this.checkDate
       }).then((res) => {
-        console.log('查询g============================== ： ', res)
 
         let passList = []
         let consumeList = []
@@ -392,12 +392,10 @@ export default {
         // this.series[0].data = passList //计划用量  pass
         // this.series[1].data = consumeList //实际用量  consume
         // this.series[2].data = deviationRatioList //偏差比例  deviationRatio
-        console.log('查询getgetPassConsumeRatioList ： ', this.series)
         this.getEcharts(passList, consumeList, deviationRatioList)
       })
     },
     checkTypes(val) {
-      console.log('类型或者时间修改事件值 ：', val)
       this.getgetPassConsumeRatioList()
     }
     // getTime1(val) {
diff --git a/src/views/projectFront/contractManagement/evaluationRecords.vue b/src/views/projectFront/contractManagement/evaluationRecords.vue
index d8cab766..e39b54e7 100644
--- a/src/views/projectFront/contractManagement/evaluationRecords.vue
+++ b/src/views/projectFront/contractManagement/evaluationRecords.vue
@@ -145,6 +145,7 @@
               v-model="addEditForm.evaluationDate"
               type="date"
               placeholder="选择日期"
+              value-format="yyyy-MM-dd"
             >
             </el-date-picker>
           </el-form-item>
diff --git a/src/views/projectFront/equipmentManagement/leasingEquipment.vue b/src/views/projectFront/equipmentManagement/leasingEquipment.vue
index d29e811f..46c425fa 100644
--- a/src/views/projectFront/equipmentManagement/leasingEquipment.vue
+++ b/src/views/projectFront/equipmentManagement/leasingEquipment.vue
@@ -201,6 +201,7 @@
                   v-model="contractForm.liftFallArresterAppearanceLeftDate"
                   type="date"
                   placeholder="选择日期"
+                  value-format="yyyy-MM-dd"
                 >
                 </el-date-picker>
               </el-form-item>
@@ -213,6 +214,7 @@
                   v-model="contractForm.liftInspectionLeftDate"
                   type="date"
                   placeholder="选择日期"
+                  value-format="yyyy-MM-dd"
                 >
                 </el-date-picker>
               </el-form-item>
@@ -225,6 +227,7 @@
                   v-model="contractForm.liftFallArresterAppearanceRightDate"
                   type="date"
                   placeholder="选择日期"
+                  value-format="yyyy-MM-dd"
                 >
                 </el-date-picker>
               </el-form-item>
@@ -237,6 +240,7 @@
                   v-model="contractForm.liftInspectionRightDate"
                   type="date"
                   placeholder="选择日期"
+                  value-format="yyyy-MM-dd"
                 >
                 </el-date-picker>
               </el-form-item>
@@ -278,6 +282,7 @@
               v-model="contractForm.entryDate"
               type="date"
               placeholder="选择日期"
+              value-format="yyyy-MM-dd"
             >
             </el-date-picker>
           </el-form-item>
@@ -310,6 +315,7 @@
               v-model="contractForm.appearanceDate"
               type="date"
               placeholder="选择日期"
+              value-format="yyyy-MM-dd"
             >
             </el-date-picker>
           </el-form-item>
@@ -446,6 +452,7 @@
                   disabled
                   type="date"
                   placeholder="选择日期"
+                  value-format="yyyy-MM-dd"
                 >
                 </el-date-picker>
               </el-form-item>
@@ -459,6 +466,7 @@
                   disabled
                   type="date"
                   placeholder="选择日期"
+                  value-format="yyyy-MM-dd"
                 >
                 </el-date-picker>
               </el-form-item>
@@ -472,6 +480,7 @@
                   disabled
                   type="date"
                   placeholder="选择日期"
+                  value-format="yyyy-MM-dd"
                 >
                 </el-date-picker>
               </el-form-item>
@@ -485,6 +494,7 @@
                   disabled
                   type="date"
                   placeholder="选择日期"
+                  value-format="yyyy-MM-dd"
                 >
                 </el-date-picker>
               </el-form-item>
@@ -530,6 +540,7 @@
               disabled
               type="date"
               placeholder="选择日期"
+              value-format="yyyy-MM-dd"
             >
             </el-date-picker>
           </el-form-item>
@@ -560,6 +571,7 @@
               disabled
               type="date"
               placeholder="选择日期"
+              value-format="yyyy-MM-dd"
             >
             </el-date-picker>
           </el-form-item>
@@ -811,6 +823,7 @@
               v-model="tenderRecordsForm.maintenanceTime"
               type="date"
               placeholder="选择日期"
+              value-format="yyyy-MM-dd"
               style="width: 320px !important"
             >
             </el-date-picker>
@@ -820,6 +833,7 @@
               v-model="tenderRecordsForm.nextMaintenanceTime"
               type="date"
               placeholder="选择日期"
+              value-format="yyyy-MM-dd"
               style="width: 320px !important"
             >
             </el-date-picker>
@@ -902,6 +916,7 @@
               v-model="tenderListForm.inspectionTime"
               type="date"
               placeholder="选择日期"
+              value-format="yyyy-MM-dd"
               style="width: 320px !important"
             >
             </el-date-picker>
@@ -911,6 +926,7 @@
               v-model="tenderListForm.nextInspectionTime"
               type="date"
               placeholder="选择日期"
+              value-format="yyyy-MM-dd"
               style="width: 320px !important"
             >
             </el-date-picker>
diff --git a/src/views/projectFront/equipmentManagement/ownEquipment.vue b/src/views/projectFront/equipmentManagement/ownEquipment.vue
index ad6d6750..6831a9c7 100644
--- a/src/views/projectFront/equipmentManagement/ownEquipment.vue
+++ b/src/views/projectFront/equipmentManagement/ownEquipment.vue
@@ -74,11 +74,11 @@
           align="center"
           label="额定载重重量"
         ></el-table-column>
-        <el-table-column
+        <!-- <el-table-column
           prop="rentalUnit"
           align="center"
           label="租赁单位"
-        ></el-table-column>
+        ></el-table-column> -->
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <div class="tableBtns" style="margin-left: 10px !important">
@@ -161,12 +161,12 @@
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
           </el-form-item>
-          <el-form-item label="租赁单位" prop="remarks" label-width="70px">
+          <!-- <el-form-item label="租赁单位" prop="remarks" label-width="70px">
             <el-input
               v-model="contractForm.rentalUnit"
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="额定载重重量" prop="remarks" label-width="100px">
             <el-input
               v-model="contractForm.ratedLoadCapacity"
@@ -201,6 +201,7 @@
                   v-model="contractForm.liftFallArresterAppearanceLeftDate"
                   type="date"
                   placeholder="选择日期"
+                  value-format="yyyy-MM-dd"
                 >
                 </el-date-picker>
               </el-form-item>
@@ -213,6 +214,7 @@
                   v-model="contractForm.liftInspectionLeftDate"
                   type="date"
                   placeholder="选择日期"
+                  value-format="yyyy-MM-dd"
                 >
                 </el-date-picker>
               </el-form-item>
@@ -225,6 +227,7 @@
                   v-model="contractForm.liftFallArresterAppearanceRightDate"
                   type="date"
                   placeholder="选择日期"
+                  value-format="yyyy-MM-dd"
                 >
                 </el-date-picker>
               </el-form-item>
@@ -237,6 +240,7 @@
                   v-model="contractForm.liftInspectionRightDate"
                   type="date"
                   placeholder="选择日期"
+                  value-format="yyyy-MM-dd"
                 >
                 </el-date-picker>
               </el-form-item>
@@ -278,6 +282,7 @@
               v-model="contractForm.entryDate"
               type="date"
               placeholder="选择日期"
+              value-format="yyyy-MM-dd"
             >
             </el-date-picker>
           </el-form-item>
@@ -310,6 +315,7 @@
               v-model="contractForm.appearanceDate"
               type="date"
               placeholder="选择日期"
+              value-format="yyyy-MM-dd"
             >
             </el-date-picker>
           </el-form-item>
@@ -401,13 +407,13 @@
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
           </el-form-item>
-          <el-form-item label="租赁单位" prop="remarks" label-width="70px">
+          <!-- <el-form-item label="租赁单位" prop="remarks" label-width="70px">
             <el-input
               v-model="detailData.rentalUnit"
               disabled
               :placeholder="$t('message.companyDiagram.PleaseEnter')"
             ></el-input>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="额定载重重量" prop="remarks" label-width="100px">
             <el-input
               v-model="detailData.ratedLoadCapacity"
@@ -446,6 +452,8 @@
                   disabled
                   type="date"
                   placeholder="选择日期"
+                  value-format="yyyy-MM-dd"
+
                 >
                 </el-date-picker>
               </el-form-item>
@@ -459,6 +467,8 @@
                   disabled
                   type="date"
                   placeholder="选择日期"
+                  value-format="yyyy-MM-dd"
+
                 >
                 </el-date-picker>
               </el-form-item>
@@ -472,6 +482,8 @@
                   disabled
                   type="date"
                   placeholder="选择日期"
+                  value-format="yyyy-MM-dd"
+
                 >
                 </el-date-picker>
               </el-form-item>
@@ -485,6 +497,8 @@
                   disabled
                   type="date"
                   placeholder="选择日期"
+                  value-format="yyyy-MM-dd"
+
                 >
                 </el-date-picker>
               </el-form-item>
@@ -530,6 +544,8 @@
               disabled
               type="date"
               placeholder="选择日期"
+              value-format="yyyy-MM-dd"
+
             >
             </el-date-picker>
           </el-form-item>
@@ -560,6 +576,8 @@
               disabled
               type="date"
               placeholder="选择日期"
+              value-format="yyyy-MM-dd"
+
             >
             </el-date-picker>
           </el-form-item>
@@ -812,6 +830,8 @@
               type="date"
               placeholder="选择日期"
               style="width: 320px !important"
+              value-format="yyyy-MM-dd"
+
             >
             </el-date-picker>
           </el-form-item>
@@ -820,6 +840,7 @@
               v-model="tenderRecordsForm.nextMaintenanceTime"
               type="date"
               placeholder="选择日期"
+              value-format="yyyy-MM-dd"
               style="width: 320px !important"
             >
             </el-date-picker>
@@ -902,6 +923,7 @@
               v-model="tenderListForm.inspectionTime"
               type="date"
               placeholder="选择日期"
+              value-format="yyyy-MM-dd"
               style="width: 320px !important"
             >
             </el-date-picker>
@@ -911,6 +933,8 @@
               v-model="tenderListForm.nextInspectionTime"
               type="date"
               placeholder="选择日期"
+              value-format="yyyy-MM-dd"
+
               style="width: 320px !important"
             >
             </el-date-picker>
diff --git a/src/views/projectFront/inOutboundManagement/inspectionWarehousing.vue b/src/views/projectFront/inOutboundManagement/inspectionWarehousing.vue
index 99e5242c..ce0b64bb 100644
--- a/src/views/projectFront/inOutboundManagement/inspectionWarehousing.vue
+++ b/src/views/projectFront/inOutboundManagement/inspectionWarehousing.vue
@@ -98,7 +98,7 @@
         <el-table-column
           prop="category"
           align="center"
-          label="类别"
+          label="类型"
         ></el-table-column>
         <el-table-column
           prop="department"
diff --git a/src/views/projectFront/inOutboundManagement/materialOutbound.vue b/src/views/projectFront/inOutboundManagement/materialOutbound.vue
index 38737e03..cb8f6973 100644
--- a/src/views/projectFront/inOutboundManagement/materialOutbound.vue
+++ b/src/views/projectFront/inOutboundManagement/materialOutbound.vue
@@ -98,7 +98,7 @@
         <el-table-column
           prop="category"
           align="center"
-          label="类别"
+          label="类型"
         ></el-table-column>
         <el-table-column
           prop="department"
@@ -173,7 +173,7 @@
       :visible.sync="dialogShow"
       width="1167px"
     >
-      <p>入库单信息</p>
+      <p>出库单信息</p>
       <div class="dialog_content">
         <el-form
           style="margin: 0 28px"
@@ -740,15 +740,14 @@ export default {
       this.materialData.splice(index, 1)
     },
     add() {
-      this.title = '新增入库'
+      this.title = '新增出库'
       this.dialogShow = true
       this.materialData = []
       this.addForm = {}
     },
 
     edit(obj) {
-      console.log('obj=======', obj);
-      this.title = '编辑入库'
+      this.title = '编辑出库'
       this.dialogShow = true
       this.addForm = JSON.parse(JSON.stringify(obj))
       this.gtMaterialInOutWarehouseId = obj.id
@@ -761,15 +760,14 @@ export default {
       params.type = 20
       this.$refs.addForm.validate((valid) => {
         if (valid) {
-          if (this.title == '新增入库') {
+          if (this.title == '新增出库') {
             addGtMaterialInOutWarehouseApi(params).then((result) => {
               if (result.success) {
                 this.$message.success(result.message)
                 this.getList()
               }
             })
-          } else if (this.title === '编辑入库') {
-            console.log('编辑信息', this.addEditForm)
+          } else if (this.title === '编辑出库') {
             editGtMaterialInOutWarehouseApi(params).then((result) => {
               if (result.success) {
                 this.$message.success(result.message)
diff --git a/src/views/projectFront/procurementManagement/materialSupplierManagement.vue b/src/views/projectFront/procurementManagement/materialSupplierManagement.vue
index 3b77121b..7ff7a254 100644
--- a/src/views/projectFront/procurementManagement/materialSupplierManagement.vue
+++ b/src/views/projectFront/procurementManagement/materialSupplierManagement.vue
@@ -79,11 +79,11 @@
         </el-table-column>
         <el-table-column prop="mail" label="邮件" align="center">
         </el-table-column>
-        <el-table-column prop="mail" label="法人代表" align="center">
+        <el-table-column prop="legalRepresentative" label="法人代表" align="center">
         </el-table-column>
-        <el-table-column prop="mail" label="开户银行" align="center">
+        <el-table-column prop="openedBankAccount" label="开户银行" align="center">
         </el-table-column>
-        <el-table-column prop="mail" label="银行账号" align="center">
+        <el-table-column prop="bankAccount" label="银行账号" align="center">
         </el-table-column>
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
diff --git a/src/views/projectFront/turnoverMaterialManagement/entryRegistration.vue b/src/views/projectFront/turnoverMaterialManagement/entryRegistration.vue
index 75e5e6b5..ffdf7543 100644
--- a/src/views/projectFront/turnoverMaterialManagement/entryRegistration.vue
+++ b/src/views/projectFront/turnoverMaterialManagement/entryRegistration.vue
@@ -98,7 +98,7 @@
         <el-table-column
           prop="category"
           align="center"
-          label="类别"
+          label="类型"
         ></el-table-column>
         <el-table-column
           prop="department"
@@ -173,7 +173,7 @@
       :visible.sync="dialogShow"
       width="1167px"
     >
-      <p>入库单信息</p>
+      <p>进场登记信息</p>
       <div class="dialog_content">
         <el-form
           style="margin: 0 28px"
@@ -740,15 +740,14 @@ export default {
       this.materialData.splice(index, 1)
     },
     add() {
-      this.title = '新增入库'
+      this.title = '新增进场登记'
       this.dialogShow = true
       this.materialData = []
       this.addForm = {}
     },
 
     edit(obj) {
-      console.log('obj=======', obj);
-      this.title = '编辑入库'
+      this.title = '编辑进场登记'
       this.dialogShow = true
       this.addForm = JSON.parse(JSON.stringify(obj))
       this.gtMaterialInOutWarehouseId = obj.id
@@ -761,14 +760,14 @@ export default {
       params.type = 30
       this.$refs.addForm.validate((valid) => {
         if (valid) {
-          if (this.title == '新增入库') {
+          if (this.title == '新增进场登记') {
             addGtMaterialInOutWarehouseApi(params).then((result) => {
               if (result.success) {
                 this.$message.success(result.message)
                 this.getList()
               }
             })
-          } else if (this.title === '编辑入库') {
+          } else if (this.title === '编辑进场登记') {
             console.log('编辑信息', this.addEditForm)
             editGtMaterialInOutWarehouseApi(params).then((result) => {
               if (result.success) {
diff --git a/src/views/projectFront/turnoverMaterialManagement/exitRegistration.vue b/src/views/projectFront/turnoverMaterialManagement/exitRegistration.vue
index 5146342d..a0365394 100644
--- a/src/views/projectFront/turnoverMaterialManagement/exitRegistration.vue
+++ b/src/views/projectFront/turnoverMaterialManagement/exitRegistration.vue
@@ -98,7 +98,7 @@
         <el-table-column
           prop="category"
           align="center"
-          label="类别"
+          label="类型"
         ></el-table-column>
         <el-table-column
           prop="department"
@@ -173,7 +173,7 @@
       :visible.sync="dialogShow"
       width="1167px"
     >
-      <p>入库单信息</p>
+      <p>出场登记信息</p>
       <div class="dialog_content">
         <el-form
           style="margin: 0 28px"
@@ -740,15 +740,14 @@ export default {
       this.materialData.splice(index, 1)
     },
     add() {
-      this.title = '新增入库'
+      this.title = '新增出场登记'
       this.dialogShow = true
       this.materialData = []
       this.addForm = {}
     },
 
     edit(obj) {
-      console.log('obj=======', obj);
-      this.title = '编辑入库'
+      this.title = '编辑出场登记'
       this.dialogShow = true
       this.addForm = JSON.parse(JSON.stringify(obj))
       this.gtMaterialInOutWarehouseId = obj.id
@@ -761,15 +760,14 @@ export default {
       params.type = 40
       this.$refs.addForm.validate((valid) => {
         if (valid) {
-          if (this.title == '新增入库') {
+          if (this.title == '新增出场登记') {
             addGtMaterialInOutWarehouseApi(params).then((result) => {
               if (result.success) {
                 this.$message.success(result.message)
                 this.getList()
               }
             })
-          } else if (this.title === '编辑入库') {
-            console.log('编辑信息', this.addEditForm)
+          } else if (this.title === '编辑出场登记') {
             editGtMaterialInOutWarehouseApi(params).then((result) => {
               if (result.success) {
                 this.$message.success(result.message)