no message

public/config.js

@@ -551,7 +551,7 @@ const company_hyduralicsMenus = [
 
 if (pipeConfigInfo.currentType == pipeConfigInfo.type.company) {
   temp_esriConfig = company_esriConfig;
-  temp_lcInfo = company_lcInfo;
+  temp_lcInfo = client_lcInfo;
   temp_appconfig = company_appconfig;
   temp_notificationInterval = company_notificationInterval;
   temp_homeInterval = company_homeInterval;

src/utils/request.js

@@ -12,7 +12,7 @@ import { pipeConfigInfo } from 'staticPub/config'
 
 let tempIP = "";
 if (pipeConfigInfo.currentType == pipeConfigInfo.type.company) {
-  tempIP = 'http://221.182.8.141:8077';
+  tempIP = 'http://221.182.8.141:7077';
 } else {
   tempIP = 'http://172.16.0.4:10077';
   // tempIP = 'http://172.16.0.2:11020';
@@ -22,7 +22,7 @@ export const IP = tempIP;
 // export const IP=tempIP
 // export const NewIp = 'http://58.17.241.6:1212'
 const service = axios.create({
-  // baseURL: tempIP,
+  baseURL: tempIP,
   // baseURL:"",
   withCredentials: true, // 跨域请求时发送cookiesokies
   timeout: 60000 // 请求超时

src/views/currentSystem/regionalMetering/components/LayoutForZoning.vue

@@ -53,7 +53,7 @@
           </template>
         </el-table>
         <div class="pagination-container">
-          <el-pagination :current-page="pagination.current" :page-sizes="[10, 20, 30, 50, 100, 1000]" :page-size="pagination.size" layout="sizes, prev, pager, next, jumper, total" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+          <el-pagination :current-page="pagination.current" :page-sizes="[10, 20, 30, 50, 100, 1000]" :page-size="pagination.size" layout="total,sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
         </div>
       </el-col>
     </el-row>

src/views/currentSystem/waterHotline/manualSeat/SchedulSee/index.vue

@@ -260,7 +260,8 @@ export default {
         console.log(tableData);
         this.calendarData = tableData.result;
         var data = tableData.result.filter((item) => item.isHis === "0");
-        this.calendarData_show = this.process(data);
+        // this.calendarData_show = this.process(data);
+        this.calendarData_show = data;
         this.RightQuest = false;
       } catch (err) {
         console.log(err);

src/views/currentSystem/waterHotline/manualSeat/scheduling/index.vue

@@ -585,7 +585,8 @@ export default {
         this.calendarData = tableData.result
         // 只获取已删除的排班
         var data = tableData.result.filter(item => item.isHis === '0')
-        this.calendarData_show = this.process(data)
+        // this.calendarData_show = this.process(data)
+        this.calendarData_show = data
         console.log(this.calendarData_show, '111')
         this.RightQuest = false
         this.deployUpdate(null, this.clickDay)

src/views/currentSystem/work/order/register/register_merge.vue

@@ -1930,6 +1930,7 @@ export default {
     });
   },
   mounted() {
+    console.log(this.data,'dada')
     if (this.gdlx) this.registerForm.gdlx = this.gdlx;
     if (this.leakPosition[0]) {
       // this.getPoint({ x: this.leakPosition[0], y: this.leakPosition[1] })

src/views/zhpt/scada/scadaCraftMap/widget.vue

@@ -643,6 +643,7 @@ export default {
     renderSiteInfo(siteInfoList){
       const data = { type: 1 };
       this.getScadaData(data).then(res=>{
+        console.log(res,'getScadaData')
         const tempValue=[];
         if(res&&res.result){
           for(let i=0;i<res.result.length;i++){
@@ -651,7 +652,7 @@ export default {
                 const tempData=res.result[i].allocations[j];
                 if(tempData&&tempData.scada&&tempData.scada.code){
                   tempValue[tempData.scada.code]={
-                    value:((tempData.scada.value||"-")+" "+(tempData.unit||'')),
+                    value:((Number(tempData.scada.value).toFixed(2)||"-")+" "+(tempData.unit||'')),
                     isAlarm:tempData.isAlarm,
                     name:tempData.displayName
                   };

src/views/zhpt/scada/scadaYearReport/widget.vue

@@ -234,7 +234,7 @@ export default {
         censusDateType: '1', // 按yue查询
         indexId: this.indexName + ''
       }
-
+      Object.assign(data, this.pageInfo)
       this.dataList = []
       reportFormCensus(data).then(res => {
         if (res.code == 1) {

src/views/zhpt/xjDayilyManagement/xjPlanForMission/model.js

@@ -1004,6 +1004,7 @@ export default {
         })
       } else {
         this.addPlan(tempValue, editInfo)
+        debugger
       }
     },
 

vue.config.js

@@ -86,10 +86,10 @@ module.exports = {
         // target:"http://221.182.8.141:10077",
         // target:"http://192.168.2.15:10077",
         // //公司环境
-        // target:"http://221.182.8.141:8077",
+        // target:"http://221.182.8.141:7077",
         //客户环境
-        target:currentType==type.company?"http://221.182.8.141:8077":"http://172.16.0.4:10077",
-        // target:currentType==type.company?"http://221.182.8.141:8077":"http://172.16.0.2:11020",
+        target:currentType==type.company?"http://221.182.8.141:7077":"http://172.16.0.4:10077",
+        // target:currentType==type.company?"http://221.182.8.141:7077":"http://172.16.0.2:11020",
         changeOrigin: true,
         }
     },