diff --git a/src/views/iceWeather/icing/index.vue b/src/views/iceWeather/icing/index.vue
index ba72a8f..393134b 100644
--- a/src/views/iceWeather/icing/index.vue
+++ b/src/views/iceWeather/icing/index.vue
@@ -58,6 +58,7 @@
             </div>
             <div class="childTableShowBox" v-if="!echartsShow">
               <el-table
+                v-if="!gantatable"
                 :data="tableData"
                 style="width: 100%"
                 v-loading="loading"
@@ -73,16 +74,203 @@
                   min-width="120px"
                 >
                   <template slot-scope="scope">
-                    <span v-if="scope.row.updateTime">
+                    <span v-if="scope.row.lastLeadPulls !== null">
                       {{
-                        $moment(scope.row.updateTime * 1000).format(
-                          "YYYY-MM-DD HH:mm:ss"
-                        )
+                        $moment(
+                          scope.row.lastLeadPulls.updateTime * 1000
+                        ).format("YYYY-MM-DD HH:mm:ss")
                       }}</span
                     >
                     <span v-else> - </span>
                   </template>
                 </el-table-column>
+                <el-table-column prop="funcCode" label="功能单元识别码">
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.lastLeadPulls !== null">
+                      <span
+                        v-if="
+                          scope.row.lastLeadPulls.phase !== '' &&
+                          scope.row.lastLeadPulls.funcCode
+                        "
+                      >
+                        {{ scope.row.lastLeadPulls.phase }}({{
+                          scope.row.lastLeadPulls.funcCode
+                        }})</span
+                      ><span v-else-if="scope.row.lastLeadPulls.funcCode"
+                        >({{ scope.row.lastLeadPulls.funcCode }})</span
+                      >
+                    </span>
+                    <span v-else> - </span>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="maxpullPull" label="最大拉力(Kg)">
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.lastLeadPulls !== null">
+                      <span v-if="scope.row.lastLeadPulls.maxpullPull != 65535">
+                        {{ scope.row.lastLeadPulls.maxpullPull }}</span
+                      ><span v-else> - </span>
+                    </span>
+                    <span v-else> - </span>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="maxpullWind" label="最大拉力时风偏角(°)">
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.lastLeadPulls !== null">
+                      <span v-if="scope.row.lastLeadPulls.maxpullWind != 65535">
+                        {{ scope.row.lastLeadPulls.maxpullWind }}</span
+                      >
+                      <span v-else> - </span>
+                    </span>
+                    <span v-else> - </span>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="maxpullTilt" label="最大拉力时倾斜角(°)">
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.lastLeadPulls !== null">
+                      <span v-if="scope.row.lastLeadPulls.maxpullTilt != 65535">
+                        {{ scope.row.lastLeadPulls.maxpullTilt }}</span
+                      >
+                      <span v-else> - </span>
+                    </span>
+                    <span v-else> - </span>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="minpullPull" label="最小拉力(Kg)">
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.lastLeadPulls !== null">
+                      <span v-if="scope.row.lastLeadPulls.minpullPull != 65535">
+                        {{ scope.row.lastLeadPulls.minpullPull }}</span
+                      >
+                      <span v-else> - </span>
+                    </span>
+                    <span v-else> - </span>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="minpullWind" label="最小拉力时风偏角(°)">
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.lastLeadPulls !== null">
+                      <span v-if="scope.row.lastLeadPulls.minpullWind != 65535">
+                        {{ scope.row.lastLeadPulls.minpullWind }}</span
+                      >
+                      <span v-else> - </span>
+                    </span>
+                    <span v-else> - </span>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="minpullTilt" label="最小拉力时倾斜角(°)">
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.lastLeadPulls !== null">
+                      <span v-if="scope.row.lastLeadPulls.minpullTilt != 65535">
+                        {{ scope.row.lastLeadPulls.minpullTilt }}</span
+                      >
+                      <span v-else> - </span>
+                    </span>
+                    <span v-else> - </span>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="maxwindWind" label="最大风偏角(°)">
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.lastLeadPulls !== null">
+                      <span v-if="scope.row.lastLeadPulls.maxwindWind != 65535">
+                        {{ scope.row.lastLeadPulls.maxwindWind }}</span
+                      >
+                      <span v-else> - </span>
+                    </span>
+                    <span v-else> - </span>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="maxwindTilt"
+                  label="最大风偏角时倾斜角(°)"
+                >
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.lastLeadPulls !== null">
+                      <span v-if="scope.row.lastLeadPulls.maxwindTilt != 65535">
+                        {{ scope.row.lastLeadPulls.maxwindTilt }}</span
+                      >
+                      <span v-else> - </span>
+                    </span>
+                    <span v-else> - </span>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="maxwindPull"
+                  label="最大风偏角时拉力(Kg)"
+                >
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.lastLeadPulls !== null">
+                      <span v-if="scope.row.lastLeadPulls.maxwindPull != 65535">
+                        {{ scope.row.lastLeadPulls.maxwindPull }}</span
+                      >
+                      <span v-else> - </span>
+                    </span>
+                    <span v-else> - </span>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="minwindWind" label="最小风偏角(°)">
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.lastLeadPulls !== null">
+                      <span v-if="scope.row.lastLeadPulls.minwindWind != 65535">
+                        {{ scope.row.lastLeadPulls.minwindWind }}</span
+                      >
+                      <span v-else> - </span>
+                    </span>
+                    <span v-else> - </span>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="minwindTilt"
+                  label="最小风偏角时倾斜角(°)"
+                >
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.lastLeadPulls !== null">
+                      <span v-if="scope.row.lastLeadPulls.minwindTilt != 65535">
+                        {{ scope.row.lastLeadPulls.minwindTilt }}</span
+                      >
+                      <span v-else> - </span>
+                    </span>
+                    <span v-else> - </span>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="minwindPull"
+                  label="最小风偏角时拉力(Kg)"
+                >
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.lastLeadPulls !== null">
+                      <span v-if="scope.row.lastLeadPulls.minwindPull != 65535">
+                        {{ scope.row.lastLeadPulls.minwindPull }}</span
+                      >
+                      <span v-else> - </span>
+                    </span>
+                    <span v-else> - </span>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <el-table
+                v-else
+                :data="tableData"
+                style="width: 100%"
+                v-loading="loading"
+                height="calc(100% - 0px)"
+              >
+                <el-table-column
+                  prop="cmdid"
+                  label="监测终端编号"
+                ></el-table-column>
+                <el-table-column
+                  prop="updateTime"
+                  label="时间"
+                  min-width="120px"
+                >
+                  <template slot-scope="scope">
+                    {{
+                      $moment(scope.row.updateTime * 1000).format(
+                        "YYYY-MM-DD HH:mm:ss"
+                      )
+                    }}
+                  </template>
+                </el-table-column>
                 <el-table-column prop="funcCode" label="功能单元识别码">
                   <template slot-scope="scope">
                     <span v-if="scope.row.phase !== '' && scope.row.funcCode">
@@ -90,84 +278,150 @@
                     ><span v-else-if="scope.row.funcCode"
                       >({{ scope.row.funcCode }})</span
                     >
+
                     <span v-else> - </span>
                   </template>
                 </el-table-column>
                 <el-table-column prop="maxpullPull" label="最大拉力(Kg)">
                   <template slot-scope="scope">
-                    <span v-if="scope.row.maxpullPull != 65535">
-                      {{ scope.row.maxpullPull }}</span
-                    >
+                    <span v-if="scope.row !== null">
+                      <span v-if="scope.row.maxpullPull != 65535">
+                        {{ scope.row.maxpullPull }}</span
+                      ><span v-else> - </span>
+                    </span>
                     <span v-else> - </span>
                   </template>
                 </el-table-column>
                 <el-table-column prop="maxpullWind" label="最大拉力时风偏角(°)">
                   <template slot-scope="scope">
-                    <span v-if="scope.row.maxpullWind != 65535">
-                      {{ scope.row.maxpullWind }}</span
-                    >
+                    <span v-if="scope.row !== null">
+                      <span v-if="scope.row.maxpullWind != 65535">
+                        {{ scope.row.maxpullWind }}</span
+                      >
+                      <span v-else> - </span>
+                    </span>
                     <span v-else> - </span>
                   </template>
                 </el-table-column>
                 <el-table-column prop="maxpullTilt" label="最大拉力时倾斜角(°)">
                   <template slot-scope="scope">
-                    <span v-if="scope.row.maxpullTilt != 65535">
-                      {{ scope.row.maxpullTilt }}</span
-                    >
+                    <span v-if="scope.row !== null">
+                      <span v-if="scope.row.maxpullTilt != 65535">
+                        {{ scope.row.maxpullTilt }}</span
+                      >
+                      <span v-else> - </span>
+                    </span>
                     <span v-else> - </span>
                   </template>
                 </el-table-column>
                 <el-table-column prop="minpullPull" label="最小拉力(Kg)">
                   <template slot-scope="scope">
-                    <span v-if="scope.row.minpullPull != 65535">
-                      {{ scope.row.minpullPull }}</span
-                    >
+                    <span v-if="scope.row !== null">
+                      <span v-if="scope.row.minpullPull != 65535">
+                        {{ scope.row.minpullPull }}</span
+                      >
+                      <span v-else> - </span>
+                    </span>
+                    <span v-else> - </span>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="minpullWind" label="最小拉力时风偏角(°)">
+                  <template slot-scope="scope">
+                    <span v-if="scope.row !== null">
+                      <span v-if="scope.row.minpullWind != 65535">
+                        {{ scope.row.minpullWind }}</span
+                      >
+                      <span v-else> - </span>
+                    </span>
+                    <span v-else> - </span>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="minpullTilt" label="最小拉力时倾斜角(°)">
+                  <template slot-scope="scope">
+                    <span v-if="scope.row !== null">
+                      <span v-if="scope.row.minpullTilt != 65535">
+                        {{ scope.row.minpullTilt }}</span
+                      >
+                      <span v-else> - </span>
+                    </span>
+                    <span v-else> - </span>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="maxwindWind" label="最大风偏角(°)">
+                  <template slot-scope="scope">
+                    <span v-if="scope.row !== null">
+                      <span v-if="scope.row.maxwindWind != 65535">
+                        {{ scope.row.maxwindWind }}</span
+                      >
+                      <span v-else> - </span>
+                    </span>
                     <span v-else> - </span>
                   </template>
                 </el-table-column>
-                <el-table-column
-                  prop="minpullWind"
-                  label="最小拉力时风偏角(°)"
-                ></el-table-column>
-                <el-table-column
-                  prop="minpullTilt"
-                  label="最小拉力时倾斜角(°)"
-                ></el-table-column>
-                <el-table-column
-                  prop="maxwindWind"
-                  label="最大风偏角(°)"
-                ></el-table-column>
                 <el-table-column
                   prop="maxwindTilt"
                   label="最大风偏角时倾斜角(°)"
-                ></el-table-column>
+                >
+                  <template slot-scope="scope">
+                    <span v-if="scope.row !== null">
+                      <span v-if="scope.row.maxwindTilt != 65535">
+                        {{ scope.row.maxwindTilt }}</span
+                      >
+                      <span v-else> - </span>
+                    </span>
+                    <span v-else> - </span>
+                  </template>
+                </el-table-column>
                 <el-table-column
                   prop="maxwindPull"
                   label="最大风偏角时拉力(Kg)"
                 >
                   <template slot-scope="scope">
-                    <span v-if="scope.row.maxwindPull != 65535">
-                      {{ scope.row.maxwindPull }}</span
-                    >
+                    <span v-if="scope.row !== null">
+                      <span v-if="scope.row.maxwindPull != 65535">
+                        {{ scope.row.maxwindPull }}</span
+                      >
+                      <span v-else> - </span>
+                    </span>
+                    <span v-else> - </span>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="minwindWind" label="最小风偏角(°)">
+                  <template slot-scope="scope">
+                    <span v-if="scope.row !== null">
+                      <span v-if="scope.row.minwindWind != 65535">
+                        {{ scope.row.minwindWind }}</span
+                      >
+                      <span v-else> - </span>
+                    </span>
                     <span v-else> - </span>
                   </template>
                 </el-table-column>
-                <el-table-column
-                  prop="minwindWind"
-                  label="最小风偏角(°)"
-                ></el-table-column>
                 <el-table-column
                   prop="minwindTilt"
                   label="最小风偏角时倾斜角(°)"
-                ></el-table-column>
+                >
+                  <template slot-scope="scope">
+                    <span v-if="scope.row !== null">
+                      <span v-if="scope.row.minwindTilt != 65535">
+                        {{ scope.row.minwindTilt }}</span
+                      >
+                      <span v-else> - </span>
+                    </span>
+                    <span v-else> - </span>
+                  </template>
+                </el-table-column>
                 <el-table-column
                   prop="minwindPull"
                   label="最小风偏角时拉力(Kg)"
                 >
                   <template slot-scope="scope">
-                    <span v-if="scope.row.minwindPull != 65535">
-                      {{ scope.row.minwindPull }}</span
-                    >
+                    <span v-if="scope.row !== null">
+                      <span v-if="scope.row.minwindPull != 65535">
+                        {{ scope.row.minwindPull }}</span
+                      >
+                      <span v-else> - </span>
+                    </span>
                     <span v-else> - </span>
                   </template>
                 </el-table-column>
@@ -236,6 +490,8 @@ export default {
       chartsData: [],
       dyFlag: true,
       lineFlag: false,
+
+      gantatable: false, //点击了装置之后，显示的数据
     };
   },
   watch: {
@@ -281,9 +537,10 @@ export default {
         console.log("电压-公司");
         this.dyFlag = true;
         this.lineFlag = true;
+        this.gantatable = false;
         pullParams = {
           dyId: data.id,
-          pageNum: this.page,
+          pageNum: 1,
           pageSize: this.pageSize,
           start: sTime,
           end: eTime,
@@ -293,10 +550,11 @@ export default {
       } else if (data.bsManufacturer) {
         this.dyFlag = false;
         this.lineFlag = true;
+        this.gantatable = false;
         console.log("线路-电压");
         pullParams = {
           lineId: data.id,
-          pageNum: this.page,
+          pageNum: 1,
           pageSize: this.pageSize,
           start: sTime,
           end: eTime,
@@ -307,16 +565,18 @@ export default {
         this.dyFlag = false;
         this.lineFlag = false;
         console.log("装置-杆塔");
+        this.gantatable = true;
         // const sTime = Math.floor(this.formdata.starttime / 1000);
         // const eTime = Math.floor(this.formdata.endtime / 1000);
         console.log(data);
+
         pullParams = {
           lineId: data.lineid,
           termId: data.id,
           towerId: data.towerid,
           start: sTime,
           end: eTime,
-          pageNum: this.page,
+          pageNum: 1,
           pageSize: this.pageSize,
         };
         this.getIcingListData(pullParams);
@@ -331,8 +591,8 @@ export default {
         .then((res) => {
           console.log(res);
 
-          this.tableData = res.data.list.map((item) => item.lastLeadPulls);
-          // this.tableData = res.data.list;
+          // this.tableData = res.data.list.map((item) => item.lastLeadPulls);
+          this.tableData = res.data.list;
           this.total = res.data.total;
           this.loading = false;
           this.echartsShow = false;
diff --git a/vue.config.js b/vue.config.js
index 759ac7c..fd91d71 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -23,8 +23,8 @@ module.exports = defineConfig({
         //表示拦截以/api开头的请求路径
 
         //target: "http://192.168.1.190:8080", //190 需要去掉/Api
-        target: "http://61.169.135.146:9911/", //运维 覆冰
-        //target: "http://61.169.135.146:40080/", //dell
+        // target: "http://61.169.135.146:9911/", //运维 覆冰
+        target: "http://61.169.135.146:40080/", //dell
         changOrigin: true, //是否开启跨域
         pathRewrite: {
           "^/api": "/api", //重写api，把api变成空字符，因为我们真正请求的路径是没有api的