diff --git a/src/server/request.js b/src/server/request.js
index 0f7a192..0d4d008 100644
--- a/src/server/request.js
+++ b/src/server/request.js
@@ -2,8 +2,8 @@ import axios from "axios";
 import { ElMessage } from "element-plus";
 let switchValue = true;
 const service = axios.create({
-  baseURL: process.env.VUE_APP_BASE_URL || "http://101.201.121.115:9003/",
-  // baseURL: process.env.VUE_APP_BASE_URL || "http://192.168.0.36:9003/",
+  //baseURL: process.env.VUE_APP_BASE_URL || "http://101.201.121.115:9003/",
+  baseURL: process.env.VUE_APP_BASE_URL || "http://192.168.0.36:9003/",
   timeout: 1000 * 60 * 2, // request timeout
 });
 service.interceptors.request.use(
diff --git a/src/store/productionPlanning/customerForecastDemandReview.js b/src/store/productionPlanning/customerForecastDemandReview.js
index d0830e0..900e434 100644
--- a/src/store/productionPlanning/customerForecastDemandReview.js
+++ b/src/store/productionPlanning/customerForecastDemandReview.js
@@ -65,7 +65,7 @@ const customerForecastDemandReview = {
 
     evaluationLoadPercent: 0,
 
-    evaluationLoadInterval: {}
+    evaluationLoadInterval: {},
   },
   mutations: {
     // 初始化所有数据
@@ -235,7 +235,6 @@ const customerForecastDemandReview = {
           load++
           state.evaluationLoadPercent = parseInt(load / temp * 100)
         }, 1000)
-
       } else {
         state.evaluationLoadPercent = 100
         clearInterval(state.evaluationLoadInterval)
diff --git a/src/utils/dragChangeSize.js b/src/utils/dragChangeSize.js
index f953d1d..fe90ce0 100644
--- a/src/utils/dragChangeSize.js
+++ b/src/utils/dragChangeSize.js
@@ -1,59 +1,58 @@
-
-// 托在改变文字大小
+// 上下拖拽改变窗口大小
 export function dragChangeSize(
-    onmouseupCallback = ()=>{}, // 停止拖拽回调函数
-    config = {
-        minTopValue:50, // 顶部最小高度
-        minBottomValue:50,  // 底部最小高度
-        barHeight:35    // 拖拽条高度
-    },
-    dragBarId = 'resize', // 拖拽条ID
-    boxId = 'box', // 父控件ID
-    TopId = 'top',  // 上部divID
-    BottomId = 'bottom' // 下部divID
-    ){
-    // 获得滚动条对象
-    let resize = document.getElementById(dragBarId);
-    // 获得容器对象
-    let box = document.getElementById(boxId);
-    // 移动长度
-    let moveLen = 0
-    // 鼠标按下事件
-    resize.onmousedown = event => {
-        // 获得鼠标按下后Y轴坐标
-        let startY = event.clientY
-        // 设置拖拽条距离顶部位置
-        resize.top = resize.offsetTop
-        // 鼠标移动事件
-        document.onmousemove = e => {
-            // 获得移动长度
-            moveLen = resize.top +(e.clientY - startY)
-            // 距离顶部最大长度
-            let maxT = box.clientHeight - resize.offsetHeight
-            // 限制顶部最小高度
-            if(moveLen < config.minTopValue) moveLen = config.minTopValue
-            // 限制底部最小高度
-            if(moveLen > maxT - config.minBottomValue) moveLen = maxT - config.minBottomValue
-            // 设置拖拽条高度
-            resize.style.top = moveLen
-            // 设置上部div高度
-            document.getElementById(TopId).style.height = moveLen + "px"
-            // 设置下部div高度
-            document.getElementById(BottomId).style.height = (box.clientHeight - moveLen - config.barHeight) + "px"
-        }
-        // 鼠标停止事件
-        document.onmouseup = () => {
-            // 事件初始化
-            document.onmousemove = null
-            document.onmouseup = null
-            // 释放拖捕获鼠标
-            resize.releaseCapture && resize.releaseCapture()
-            // 回调函数
-            onmouseupCallback(moveLen,box.clientHeight - moveLen - config.barHeight)
-        }
-        // 捕获鼠标
-        resize.setCapture && resize.setCapture()
-        
-        return false
+  onmouseupCallback = () => {}, // 停止拖拽回调函数
+  config = {
+    minTopValue: 50, // 顶部最小高度
+    minBottomValue: 50, // 底部最小高度
+    barHeight: 35 // 拖拽条高度
+  },
+  dragBarId = 'resize', // 拖拽条ID
+  boxId = 'box', // 父控件ID
+  TopId = 'top', // 上部divID
+  BottomId = 'bottom' // 下部divID
+) {
+  // 获得滚动条对象
+  let resize = document.getElementById(dragBarId);
+  // 获得容器对象
+  let box = document.getElementById(boxId);
+  // 移动长度
+  let moveLen = 0
+  // 鼠标按下事件
+  resize.onmousedown = event => {
+    // 获得鼠标按下后Y轴坐标
+    let startY = event.clientY
+    // 设置拖拽条距离顶部位置
+    resize.top = resize.offsetTop
+    // 鼠标移动事件
+    document.onmousemove = e => {
+      // 获得移动长度
+      moveLen = resize.top + (e.clientY - startY)
+      // 距离顶部最大长度
+      let maxT = box.clientHeight - resize.offsetHeight
+      // 限制顶部最小高度
+      if (moveLen < config.minTopValue) moveLen = config.minTopValue
+      // 限制底部最小高度
+      if (moveLen > maxT - config.minBottomValue) moveLen = maxT - config.minBottomValue
+      // 设置拖拽条高度
+      resize.style.top = moveLen
+      // 设置上部div高度
+      document.getElementById(TopId).style.height = moveLen + "px"
+      // 设置下部div高度
+      document.getElementById(BottomId).style.height = (box.clientHeight - moveLen - config.barHeight) + "px"
+    }
+    // 鼠标停止事件
+    document.onmouseup = () => {
+      // 事件初始化
+      document.onmousemove = null
+      document.onmouseup = null
+      // 释放拖捕获鼠标
+      resize.releaseCapture && resize.releaseCapture()
+      // 回调函数
+      onmouseupCallback(moveLen, box.clientHeight - moveLen - config.barHeight)
     }
+    // 捕获鼠标
+    resize.setCapture && resize.setCapture()
+
+    return false
+  }
 }
\ No newline at end of file
diff --git a/src/views/factoryModel/customer/addOrEdit.vue b/src/views/factoryModel/customer/addOrEdit.vue
index df76b1c..3e61e58 100644
--- a/src/views/factoryModel/customer/addOrEdit.vue
+++ b/src/views/factoryModel/customer/addOrEdit.vue
@@ -160,14 +160,14 @@
 						<el-input v-model.number="formData['Customer-LockWeeks']" placeholder="请输入" />
 					</el-form-item>
 				</el-col>
-					<el-col :span="8">
+					<!-- <el-col :span="8">
 						<el-form-item
 						:label="getColumnName('Customer-EnableDemandLockToggle')"
 						prop="Customer-EnableDemandLockToggle" >
 						<el-switch v-model="formData['Customer-EnableDemandLockToggle']" active-color="#35B0A6" inactive-color="#FF3B31" />
 					</el-form-item>
 
-				</el-col>
+				</el-col> -->
 			</el-row>
 		</el-form>
 		<template #footer>
diff --git a/src/views/factoryModel/customer/index.vue b/src/views/factoryModel/customer/index.vue
index 346d83f..dfd20f1 100644
--- a/src/views/factoryModel/customer/index.vue
+++ b/src/views/factoryModel/customer/index.vue
@@ -90,7 +90,6 @@ export default {
 				"Customer-LastModify",
 				"Customer-LastUser",
 				"Customer-CreateTime",
-				"Customer-EnableDemandLockToggle",
 				"Customer-LockWeeks"
 			],
 			tableHeight:0
diff --git a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue
index b5bd265..227b0a5 100644
--- a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue
+++ b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue
@@ -1,38 +1,43 @@
 <template>
-  <div :style="{width: Width}" class="articleDemand-wrapper">
-    <div ref="topTableRef" :style="{width: tableWidth}" class="content-table-wrap">
-      <el-form :inline="true" class="clearfix search-content">
+  <div :style="{width: Width}"
+      class="articleDemand-wrapper">
+    <div ref="topTableRef"
+        :style="{width: tableWidth}"
+        class="content-table-wrap">
+      <el-form :inline="true"
+          class="clearfix search-content">
         <el-form-item :label="getColumnName('Customer-Planner')">
-          <el-input
-            v-model.trim="queryParams.planner"
-            clearable
-            placeholder="请输入查询内容"
-            style="width: 200px"
-          />
+          <el-input v-model.trim="queryParams.planner"
+              clearable
+              placeholder="请输入查询内容"
+              style="width: 200px" />
         </el-form-item>
         <el-form-item :label="getColumnName('Customer-CustomerId')">
-          <el-input
-            v-model.trim="queryParams.customerid"
-            clearable
-            placeholder="请输入客户编码"
-            style="width: 200px"
-          />
+          <el-input v-model.trim="queryParams.customerid"
+              clearable
+              placeholder="请输入客户编码"
+              style="width: 200px" />
         </el-form-item>
         <el-form-item :label="getColumnName('AP_ArticleStockLevel-ArtId')">
-          <el-input
-            v-model.trim="queryParams.artid"
-            clearable
-            placeholder="请输入查询内容"
-            style="width: 200px"
-          />
+          <el-input v-model.trim="queryParams.artid"
+              clearable
+              placeholder="请输入查询内容"
+              style="width: 200px" />
         </el-form-item>
         <el-form-item>
-          <el-button class="search-button-style" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-          <el-button class="reset-button-style" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          <el-button class="search-button-style"
+              icon="el-icon-search"
+              size="mini"
+              @click="handleQuery"
+              :disabled="articleDemandLoading">搜索</el-button>
+          <el-button class="reset-button-style"
+              icon="el-icon-refresh"
+              size="mini"
+              @click="resetQuery">重置</el-button>
         </el-form-item>
-         <div class="prompt-message">
+        <div class="prompt-message">
           当前数据发布版本：{{promptMessage}}
-         </div>
+        </div>
       </el-form>
       <div class="tool_list">
         <div class="search">
@@ -40,352 +45,361 @@
             MPS策略
           </div>
           <div style="width: 200px;">
-            <el-select v-model="mode" placeholder="请选择">
-              <el-option
-                v-for="item in mpsPlanModeOptions"
-                :key="item.key"
-                :label="item.label"
-                :value="item.key"
-              />
+            <el-select v-model="mode"
+                placeholder="请选择">
+              <el-option v-for="item in mpsPlanModeOptions"
+                  :key="item.key"
+                  :label="item.label"
+                  :value="item.key" />
             </el-select>
           </div>
           <div style="margin-left:15px">
-            <el-button :disabled="!mode" class="add-button-style " icon="el-icon-edit" @click="openModelDialog('edit')">
+            <el-button :disabled="!mode"
+                class="add-button-style "
+                icon="el-icon-edit"
+                @click="openModelDialog('edit')">
               修改
             </el-button>
           </div>
           <div style="margin-left:15px">
-            <el-button class="add-button-style " icon="el-icon-plus" @click="openModelDialog('add')">新增</el-button>
+            <el-button class="add-button-style "
+                icon="el-icon-plus"
+                @click="openModelDialog('add')">新增</el-button>
           </div>
           <div style="margin-left:15px">
-            <el-button class="add-button-style mps-button" @click="calcHandle">
+            <el-button class="add-button-style mps-button"
+                @click="calcHandle">
               <div class="icon-upload"></div>
               MPS计算
             </el-button>
           </div>
         </div>
         <div class="button_list">
-          <img :src="require('@/assets/icon/reload.png')" class="image_button" title="初始化" @click="reloadData">
+          <img :src="require('@/assets/icon/reload.png')"
+              class="image_button"
+              title="初始化"
+              @click="reloadData">
           <div class="button_split"></div>
-          <img :src="require('@/assets/icon/save.png')" class="image_button" title="保存" @click="saveDemandData">
+          <img :src="require('@/assets/icon/save.png')"
+              class="image_button"
+              title="保存"
+              @click="saveDemandData">
           <div class="button_split"></div>
-          <img :class="publicButtonClass" :src="require('@/assets/icon/public.png')"  title="发布数据" @click="publicData">
+          <img :class="publicButtonClass"
+              :src="require('@/assets/icon/public.png')"
+              title="发布数据"
+              @click="publicData">
           <div class="button_split"></div>
-          <img :src="require('@/assets/img/download.png')" class="image_button" title="导出" @click="exportData">
+          <img :src="require('@/assets/img/download.png')"
+              class="image_button"
+              title="导出"
+              @click="exportData">
           <!-- <div class="button_split"></div>
           <img :class="editButtonClass" :src="require('@/assets/icon/outsourcing_demand.png')" title="外购需求" @click="editRow('外购需求')"> -->
           <div class="button_split"></div>
-          <img :class="editButtonClass" :src="require('@/assets/icon/net_production.png')" title="净生产量" @click="editRow('净生产量')">
-        
+          <img :class="editButtonClass"
+              :src="require('@/assets/icon/net_production.png')"
+              title="净生产量"
+              @click="editRow('净生产量')">
           <!-- <div class="button_split"></div>
           <img :src="require('@/assets/icon/refresh.png')" class="image_button" title="刷新数据" @click="refreshData"> -->
-      
-          
-          
-        
         </div>
       </div>
-      <el-table
-        ref="articleDemandTable"
-        v-loading="articleDemandLoading"
-        :cell-class-name="tableCellClassName"
-        :data="TableData"
-        :height="articleDemandHeight"
-        :row-class-name="rowClassName"
-        border
-        class="articleDemand-table"
-        highlight-current-row
-        size="mini"
-        @row-dblclick="rowDblclick">
-        <el-table-column
-          v-for="(item,index) in Headers"
-          :key="index"
-          :label="showTitle(item,index)"
-          :prop="item"
-          show-overflow-tooltip
-          :width="calcWidth(index)">
+      <el-table ref="articleDemand"
+          v-loading="articleDemandLoading"
+          :cell-class-name="tableCellClassName"
+          :data="TableData"
+          :height="articleDemandHeight"
+          :row-class-name="rowClassName"
+          border
+          class="articleDemand-table"
+          highlight-current-row
+          size="mini"
+          @row-dblclick="rowDblclick">
+        <el-table-column v-for="(item,index) in Headers"
+            :key="index"
+            :label="showTitle(item,index)"
+            :prop="item"
+            show-overflow-tooltip
+            :width="calcWidth(index)">
           <template #default="scope">
             <el-input v-if="scope.row['Label'] ==  editField && scope.row['key'] ==  editKey && index > KeyStartIndex "
-                      v-model="scope.row[item]"
-                      :disabled="item.charAt(item.length - 1) == '*'"
-                      size="mini"
-            ></el-input>
+                v-model="scope.row[item]"
+                :disabled="item.charAt(item.length - 1) == '*'"
+                size="mini"></el-input>
             <span v-else>{{ scope.row[item] }}</span>
           </template>
         </el-table-column>
 
       </el-table>
+      <Pagination v-model:pagination="pagination" @change="handleQuery" />
     </div>
 
     <div class="wrapper-button">
-      <img :src="require('@/assets/img/bar.png')" class="toggle-char-btn" @click="toggleChar()">
+      <img :src="require('@/assets/img/bar.png')"
+          class="toggle-char-btn"
+          @click="toggleChar()">
     </div>
     <div style="background-color:#FFF">
       <Char v-if="showChar" />
     </div>
 
-    <AddOrEdit
-      v-if="showModeDialog"
-      v-model="showModeDialog"
-      :mode="mode"
-      :modeType="modeType"
-      @cancelHandle="cancelAddModel"
-    />
-      <Public
-      v-if="showPublicDialog"
-      v-model="showPublicDialog"
-      @cancelHandle="cancelPublicDialog"
-    />
-    
+    <AddOrEdit v-if="showModeDialog"
+        v-model="showModeDialog"
+        :mode="mode"
+        :modeType="modeType"
+        @cancelHandle="cancelAddModel" />
+    <Public v-if="showPublicDialog"
+        v-model="showPublicDialog"
+        @cancelHandle="cancelPublicDialog" />
+
   </div>
 </template>
 <script>
+  import AddOrEdit from "./addOrEdit";
+  import Public from "./public";
+  import Char from "./char";
+  import { mapActions, mapMutations, mapState } from "vuex";
+  import {
+    getArtIdList,
+    publishedVersion,
+    refreshData,
+    reloadData,
+    saveDemand,
+    searchResource,
+    exportData
+  } from "@/server/productionPlanning/customerForecastDemandReview";
+  import { getColumnName } from "@/utils/allField.js";
 
-import AddOrEdit from "./addOrEdit";
-import Public from "./public";
-import Char from "./char";
-import { mapActions, mapMutations, mapState } from "vuex";
-import {
-  getArtIdList,
-  publishedVersion,
-  refreshData,
-  reloadData,
-  saveDemand,
-  searchResource,
-  exportData
-} from "@/server/productionPlanning/customerForecastDemandReview";
-import { getColumnName } from "@/utils/allField.js";
-
-export default {
-  components: {
-    AddOrEdit,
-    Char,
-    Public
-  },
-  emits: ["calculateTableHeight", "editTableData","searchData"],
-  props: {
-    Width: {
-      type: String,
-      default: "90%"
+  export default {
+    components: {
+      AddOrEdit,
+      Char,
+      Public
+    },
+    emits: ["calculateTableHeight", "editTableData", "searchData"],
+    props: {
+      Width: {
+        type: String,
+        default: "90%"
+      },
+      Headers: {
+        type: Array,
+        default: []
+      },
+      TableData: {
+        type: Array,
+        default: []
+      },
+      Height: {
+        type: String
+      },
+      KeyStartIndex: {
+        type: Number
+      },
+      
     },
-    Headers: {
-      type: Array,
-      default: []
+    data() {
+      return {
+        queryParams: {},
+        mode: "",
+        showPublicDialog: false,
+        showModeDialog: false,
+        modeType: "",
+        editField: "",
+        editKey: "",
+        selectKey: "",
+        tableWidth: "calc(100% - 15px)",
+        promptMessage: "",
+        editKeyList: [],
+        pagination:{ 
+          pageNumber: 1,
+          pageSize: 20,
+          total: 0,
+        }
+      };
     },
-    TableData: {
-      type: Array,
-      default: []
+    created() {
+      this.getMpsModeList();
+      this.getArticleList();
     },
-    Height: {
-      type: String
+    mounted() {
+      this.$nextTick(() => {
+        this.SET_articleDemandHeight(this.calculationTableHeight(
+          this.$refs.topTableRef,
+          125
+        ));
+      });
     },
-    KeyStartIndex: {
-      type: Number
-    }
-  },
-  data() {
-    return {
-      queryParams: {},
-      mode: "",
-      showPublicDialog:false,
-      showModeDialog: false,
-      modeType: "",
-      editField: "",
-      editKey: "",
-      selectKey: "",
-      tableWidth: "calc(100% - 15px)",
-      promptMessage:"",
-      editKeyList:[],
-    };
-  },
-  created() {
-    this.getMpsModeList();
-    this.getArticleList();
-  },
-  mounted() {
-    this.$nextTick(() => {
-      this.SET_articleDemandHeight(this.calculationTableHeight(
-        this.$refs.topTableRef,
-        85
-      ));
-    });
-  },
-  computed: {
-    ...mapState("customerForecastDemandReview", ["customerId",
-      "resourceId",
-      "mpsPlanModeOptions",
-      "articleDemandLoading",
-      "artId",
-      "xAxis",
-      "articleDemandData",
-      "articleDemandHeight",
-      "showChar",
-      "selectArticleDemandRow",
-      "editButtonClass",
-      "publicButtonClass"
-    ]),
-    calcWidth(){
-      return function(index) {
+    computed: {
+      ...mapState("customerForecastDemandReview", [
+        "customerId",
+        "resourceId",
+        "mpsPlanModeOptions",
+        "articleDemandLoading",
+        "artId",
+        "xAxis",
+        "articleDemandData",
+        "articleDemandHeight",
+        "showChar",
+        "selectArticleDemandRow",
+        "editButtonClass",
+        "publicButtonClass",
+      ]),
+      calcWidth() {
+        return function (index) {
           let width = "100px"
           switch (index) {
-            case 0:
-              width = "150px"
-              break;
-            case 2:
-              width = "350px"
-              break;
+          case 0:
+            width = "150px"
+            break;
+          case 2:
+            width = "350px"
+            break;
           }
           return width
-      }
-    },
-    showTitle() {
-      return function(item, index) {
-        if (item == "Label") {
-          return "标签";
-        } else {
-          if (index < 8) {
-            return getColumnName(item);
+        }
+      },
+      showTitle() {
+        return function (item, index) {
+          if (item == "Label") {
+            return "标签";
           } else {
-            if (item.charAt(item.length - 1) == "*") {
-              return item.substr(0, item.length - 1);
+            if (index < 8) {
+              return getColumnName(item);
             } else {
-              return item;
+              if (item.charAt(item.length - 1) == "*") {
+                return item.substr(0, item.length - 1);
+              } else {
+                return item;
+              }
             }
           }
+        };
+      }
+    },
+   
+    methods: {
+      ...mapActions("customerForecastDemandReview", ["getMpsModeList"]),
+      ...mapMutations("customerForecastDemandReview", [
+        "INIT_yAxis",
+        "INIT_all",
+        "INIT_evaluationMainResourceData",
+        "INIT_evaluationSecondResourceListData",
+        "TOGGLE_showChar",
+        "SET_artId",
+        "SET_resourceId",
+        "SET_resourceType",
+        "SET_yAxis",
+        "SET_changeMpsPlanParam",
+        "SET_articleDemandHeight",
+        "SET_selectArticleDemandRow",
+        "SET_editButtonClass",
+        "SET_publicButtonClass",
+        "SET_selectArticleDemandRowIndex",
+        "SET_articleDemandData",
+        "SET_evaluationMainResourceData",
+        "SET_evaluationSecondResourceListData",
+        "SET_evaluationMainResourceLoading",
+        "SET_evaluationSecondResourceLoading",
+        "SET_articleDemandLoading"
+      ]),
+
+      getPublishedVersion() {
+        publishedVersion().then(({ data = "" }) => {
+          this.promptMessage = data
+        }).catch(() => {
+          this.$message({ type: "error", message: "获取消息失败" });
+        });
+      },
+      handleQuery() {
+        this.getPublishedVersion()
+        this.$emit("searchData", {...this.pagination,...this.queryParams });
+      },
+      resetQuery() {
+        this.queryParams = {};
+        this.INIT_all();
+        this.$emit("resetQuery");
+      },
+      // 物料列表
+      getArticleList() {
+        getArtIdList().then(({ data = [] }) => {
+          this.articleList = data;
+        });
+      },
+      publicData() {
+        if (this.publicButtonClass == "image_button") {
+          this.showPublicDialog = true
+          // publicData({}).then(({ data = [] }) => {
+          //   this.$message({ type: "success", message: "发布成功" });
+          // }).catch(() => {
+          //   this.$message({ type: "error", message: "发布失败" });
+          // });
         }
-      };
-    }
-  },
-  watch: {
-    selectArticleDemandRow: {
-      handler(row) {
-        this.setSelectRow(row);
       },
-      deep: true
-    }
-  },
-  methods: {
-    ...mapActions("customerForecastDemandReview", ["getMpsModeList"]),
-    ...mapMutations("customerForecastDemandReview", [
-      "INIT_yAxis",
-      "INIT_all",
-      "INIT_evaluationMainResourceData",
-      "INIT_evaluationSecondResourceListData",
-      "TOGGLE_showChar",
-      "SET_artId",
-      "SET_resourceId",
-      "SET_resourceType",
-      "SET_yAxis",
-      "SET_changeMpsPlanParam",
-      "SET_articleDemandHeight",
-      "SET_selectArticleDemandRow",
-      "SET_editButtonClass",
-      "SET_publicButtonClass",
-      "SET_selectArticleDemandRowIndex",
-      "SET_articleDemandData",
-      "SET_evaluationMainResourceData",
-      "SET_evaluationSecondResourceListData",
-      "SET_evaluationMainResourceLoading",
-      "SET_evaluationSecondResourceLoading",
-      "SET_articleDemandLoading"
-    ]),
+      cancelPublicDialog(opt) {
+        this.showPublicDialog = false
+        if (opt == "submit") {
+          this.handleQuery()
+        }
+      },
+      toggleChar() {
+        this.TOGGLE_showChar();
+        if (this.showChar) {
+          this.tableWidth = "calc(100% - 700px)";
+        } else {
+          this.tableWidth = "calc(100% - 15px)";
+        }
+      },
+      // 打开模型框
+      openModelDialog(type) {
+        this.modeType = type;
+        this.showModeDialog = true;
+      },
+      // 取消添加
+      cancelAddModel() {
+        this.mode = "";
+        this.showModeDialog = false;
+      },
+      // 行样式
+      rowClassName({ row }) {
+        return row.show ? "show_row" : "hide_row";
+      },
+      // 编辑航
+      editRow(data) {
 
-    handleQuery() {
-      this.SET_articleDemandLoading(true)
-      publishedVersion().then( ({ data = ""}) => {
-        this.SET_articleDemandLoading(false)
-        this.promptMessage = data
-      }).catch(() => {
-        this.SET_articleDemandLoading(false)
-        this.$message({ type: "error", message: "获取消息失败" });
-      });
-      this.$emit("searchData", this.queryParams);
-    },
-    resetQuery() {
-      this.queryParams = {};
-      this.INIT_all();
-      this.$emit("resetQuery");
-    },
-    // 物料列表
-    getArticleList() {
-      getArtIdList().then(({ data = [] }) => {
-        this.articleList = data;
-      });
-    },
-    publicData() {
-      if (this.publicButtonClass == "image_button") {
-        this.showPublicDialog = true
-        // publicData({}).then(({ data = [] }) => {
-        //   this.$message({ type: "success", message: "发布成功" });
-        // }).catch(() => {
-        //   this.$message({ type: "error", message: "发布失败" });
-        // });
-      }
-    },
-    cancelPublicDialog(opt){
-      this.showPublicDialog = false
-      if(opt == "submit" ) {
-        this.handleQuery()
-      }
-    },
-    toggleChar() {
-      this.TOGGLE_showChar();
-      if (this.showChar) {
-        this.tableWidth = "calc(100% - 700px)";
-      } else {
-        this.tableWidth = "calc(100% - 15px)";
-      }
-    },
-    // 打开模型框
-    openModelDialog(type) {
-      this.modeType = type;
-      this.showModeDialog = true;
-    },
-    // 取消添加
-    cancelAddModel() {
-      this.mode = "";
-      this.showModeDialog = false;
-    },
-    // 行样式
-    rowClassName({ row }) {
-      return row.show ? "show_row" : "hide_row";
-    },
-    // 编辑航
-    editRow(data) {
+        if (!this.editKeyList.includes(this.selectKey)) this.editKeyList.push(this.selectKey)
+        this.editKey = this.selectKey;
+        this.editField = data;
+      },
+      getTableDataJson() {
+        let maplist = JSON.parse(JSON.stringify(this.TableData));
+        maplist.forEach(item => {
+          item["AP_ArticleDemand-ArtId"] = item.key;
+          delete item.index;
+          delete item.show;
+          delete item.key;
+          delete item.Label;
+        });
+        return JSON.stringify(maplist);
+      },
+      exportData() {
+        if (this.TableData.length == 0) {
+          this.$message({ type: "error", message: "请先查询数据" });
+          return false
+        }
+        let maplist = JSON.parse(JSON.stringify(this.articleDemandData));
+        maplist.Item.forEach(item => {
+          item["AP_ArticleDemand-ArtId"] = item.key;
+          delete item.index
+          delete item.show
+          delete item.key
+          delete item.Label
+          delete item["AP_ArticleDemand-CustomerId"]
+        });
+        maplist["SortKeys"].splice(maplist["SortKeys"].indexOf("Label"), 1);
 
-      if( !this.editKeyList.includes(this.selectKey) ) this.editKeyList.push(this.selectKey)
-      console.log('%cindex.vue line:353 this.editKeyList', 'color: #007acc;', this.editKeyList);
-      this.editKey = this.selectKey;
-      this.editField = data;
-    },
-    getTableDataJson() {
-      let maplist = JSON.parse(JSON.stringify(this.TableData));
-      maplist.forEach(item => {
-        item["AP_ArticleDemand-ArtId"] = item.key;
-        delete item.index;
-        delete item.show;
-        delete item.key;
-        delete item.Label;
-      });
-      return JSON.stringify(maplist);
-    },
-    exportData(){
-      if(this.TableData.length == 0) {
-        this.$message({ type: "error", message: "请先查询数据" });
-        return false
-      }
-      let maplist = JSON.parse(JSON.stringify(this.articleDemandData));
-      maplist.Item.forEach(item => {
-        item["AP_ArticleDemand-ArtId"] = item.key;
-        delete item.index
-        delete item.show
-        delete item.key
-        delete item.Label
-        delete item["AP_ArticleDemand-CustomerId"]
-      });
-      maplist["SortKeys"].splice(maplist["SortKeys"].indexOf("Label"),1);
-      
-      exportData(JSON.stringify(maplist)).then(({ data = "" }) => {
+        exportData(JSON.stringify(maplist)).then(({ data = "" }) => {
           let link = document.createElement('a');
           link.style.display = 'none';
           link.href = (process.env.VUE_APP_BASE_URL || "http://101.201.121.115:9003/") + data;
@@ -393,286 +407,295 @@ export default {
           link.setAttribute('download', dataInfo[dataInfo.length - 1]);
           document.body.appendChild(link);
           link.click();
-      }).catch((e) => {
-        this.$message({ type: "error", message: "导出失败"+e });
-      });
-    },
-    // 刷新数据
-    refreshData() {
-      let param = {};
-      // param.customerid = this.customerId;
-      if(!this.artId) {
-        this.$message({type:"error", message:"请先选择一条物料"})
-        return 
-      }
-      param.artid = this.artId;
-      param.maplist = this.getTableDataJson();
-      refreshData(param).then(({ data = [] }) => {
-        this.SET_articleDemandData(data || []);
+        }).catch((e) => {
+          this.$message({ type: "error", message: "导出失败" + e });
+        });
+      },
+      // 刷新数据
+      refreshData() {
+        let param = {};
+        // param.customerid = this.customerId;
+        if (!this.artId) {
+          this.$message({ type: "error", message: "请先选择一条物料" })
+          return
+        }
+        param.artid = this.artId;
+        param.maplist = this.getTableDataJson();
+        refreshData(param).then(({ data = [] }) => {
+          this.SET_articleDemandData(data || []);
+          this.editField = "";
+          this.$message({ type: "success", message: "保存成功" });
+        }).catch(() => {
+          this.$message({ type: "error", message: "保存失败" });
+        });
+      },
+      // 重载数据
+      reloadData() {
+        this.SET_articleDemandLoading(true)
+        reloadData({ "customerid": this.customerId }).then(({ msg }) => {
+          setTimeout(() => {
+            this.handleQuery()
+          }, 2000)
+          this.SET_articleDemandLoading(false)
+          this.$message({ type: "success", message: msg });
+        }).catch(() => {
+          this.SET_articleDemandLoading(false)
+          // this.$message({ type: "error", message: "访问失败" });
+        });
+      },
+      getEditTableDataJson() {
+
+        let editMapList = JSON.parse(JSON.stringify(this.TableData)).filter(item => this.editKeyList.includes(item.key))
+        editMapList.forEach(item => {
+          item["AP_ArticleDemand-ArtId"] = item.key;
+          delete item.index;
+          delete item.show;
+          delete item.key;
+          delete item.Label;
+        });
+        console.log('%cindex.vue line:435 editMapList', 'color: #007acc;', editMapList);
+        return JSON.stringify(editMapList);
+      },
+      // 保存数据
+      saveDemandData() {
         this.editField = "";
-        this.$message({ type: "success", message: "保存成功" });
-      }).catch(() => {
-        this.$message({ type: "error", message: "保存失败" });
-      });
-    },
-    // 重载数据
-    reloadData() {
-      this.SET_articleDemandLoading(true)
-      reloadData({ "customerid": this.customerId }).then(({ msg }) => {
-        setTimeout(()=>{
+        let param = {};
+        param.customerid = this.customerId;
+        param.artid = this.artId;
+        param.maplist = this.getEditTableDataJson();
+        this.INIT_evaluationSecondResourceListData();
+        this.INIT_evaluationMainResourceData();
+        this.setLoading(true)
+        saveDemand(param).then(({ data = [] }) => {
+          this.SET_evaluationMainResourceData(data["ArticleResourceMpsGroupLst"] || []);
+          this.SET_evaluationSecondResourceListData(data["ArticleSecondResourceMpsGroupLst"] || []);
+          this.setLoading(false)
           this.handleQuery()
-        },2000)
-        this.SET_articleDemandLoading(false)
-        this.$message({ type: "success", message: msg });
-      }).catch(() => {
-        this.SET_articleDemandLoading(false)
-        // this.$message({ type: "error", message: "访问失败" });
-      });
-    },
-    getEditTableDataJson(){
-  
-      let editMapList = JSON.parse(JSON.stringify(this.TableData)).filter(item => this.editKeyList.includes(item.key))
-      editMapList.forEach(item => {
-        item["AP_ArticleDemand-ArtId"] = item.key;
-        delete item.index;
-        delete item.show;
-        delete item.key;
-        delete item.Label;
-      });
-      console.log('%cindex.vue line:435 editMapList', 'color: #007acc;', editMapList);
-      return JSON.stringify(editMapList); 
-    },
-    // 保存数据
-    saveDemandData() {
-      // if (!this.editField) {
-      //   this.$message({ type: "error", message: "请先编辑数据" });
-      //   return false;
-      // }
-      this.editField = "";
-      let param = {};
-      param.customerid = this.customerId;
-      param.artid = this.artId;
-      param.maplist = this.getEditTableDataJson();
-      this.INIT_evaluationSecondResourceListData();
-      this.INIT_evaluationMainResourceData();
-      this.SET_evaluationMainResourceLoading(true);
-      this.SET_evaluationSecondResourceLoading(true);
-      this.SET_articleDemandLoading(true)
-      saveDemand(param).then(({ data = [] }) => {
-        this.SET_evaluationMainResourceData(data["ArticleResourceMpsGroupLst"] || []);
-        this.SET_evaluationSecondResourceListData(data["ArticleSecondResourceMpsGroupLst"] || []);
-        this.SET_evaluationSecondResourceLoading(false);
-        this.SET_evaluationMainResourceLoading(false);
-        this.SET_articleDemandLoading(false)
-        this.handleQuery()
-        this.editKeyList = []
-        this.$message({ type: "success", message: "保存成功" });
-      }).catch(() => {
-        this.SET_evaluationSecondResourceLoading(false);
-        this.SET_evaluationMainResourceLoading(false);
-        this.SET_articleDemandLoading(false)
-        this.$message({ type: "error", message: "保存失败" });
-      });
-
-    },
-    // 计算MPS
-    calcHandle() {
-      if (!this.customerId) {
-        this.$message({ type: "error", message: "请选择客户" });
-        return false;
-      }
-      if (!this.resourceId) {
-        this.$message({ type: "error", message: "请选择资源" });
-        return false;
-      }
-      if (!this.artId) {
-        this.$message({ type: "error", message: "请选择物料" });
-        return false;
-      }
-      if (!this.mode) {
-        this.$message({ type: "error", message: "请选择模式" });
-        return false;
-      }
-      this.SET_changeMpsPlanParam({
-        resouceid: this.resourceId,
-        mpssettingnr: this.mode,
-        customerid: this.customerId,
-        artid: this.artId
-      });
-    },
-    // 合并单元格
-    arraySpanMethod({ rowIndex, columnIndex }) {
-      if (rowIndex % 10 > 0 && columnIndex < 8) {
-        if (rowIndex % 10 == 1 && columnIndex == 0) {
-          return [9, 8];
-        } else {
-          return [0, 0];
+          this.editKeyList = []
+          this.$message({ type: "success", message: "保存成功" });
+        }).catch(() => {
+          this.setLoading(false)
+          this.$message({ type: "error", message: "保存失败" });
+        });
+      },
+      setLoading(flag) {
+        this.SET_evaluationSecondResourceLoading(flag);
+        this.SET_evaluationMainResourceLoading(flag);
+        this.SET_articleDemandLoading(flag)
+      },
+      // 计算MPS
+      calcHandle() {
+        if (!this.customerId) {
+          this.$message({ type: "error", message: "请选择客户" });
+          return false;
         }
-      }
-    },
-    // 设置航选中状态
-    setRowStatus(key) {
-      if (this.artId != key) {
-        this.SET_artId(key);
-        searchResource(key).then(({ data = [] }) => {
-          this.SET_resourceId(data["AP_ArticleResource-ResourceId"]);
-          this.SET_resourceType("-1");
+        if (!this.resourceId) {
+          this.$message({ type: "error", message: "请选择资源" });
+          return false;
+        }
+        if (!this.artId) {
+          this.$message({ type: "error", message: "请选择物料" });
+          return false;
+        }
+        if (!this.mode) {
+          this.$message({ type: "error", message: "请选择模式" });
+          return false;
+        }
+        this.SET_changeMpsPlanParam({
+          resouceid: this.resourceId,
+          mpssettingnr: this.mode,
+          customerid: this.customerId,
+          artid: this.artId
         });
+      },
+      // 合并单元格
+      arraySpanMethod({ rowIndex, columnIndex }) {
+        if (rowIndex % 10 > 0 && columnIndex < 8) {
+          if (rowIndex % 10 == 1 && columnIndex == 0) {
+            return [9, 8];
+          } else {
+            return [0, 0];
+          }
+        }
+      },
+      // 设置航选中状态
+      setRowStatus(key) {
+        if (this.artId != key) {
+          this.SET_artId(key);
+          searchResource(key).then(({ data = [] }) => {
+            this.SET_resourceId(data["AP_ArticleResource-ResourceId"]);
+            this.SET_resourceType("-1");
+          });
+        }
+        // this.editField = ""
+        if(this.selectKey == "") {
+          this.selectKey = key
+          this.SET_editButtonClass("image_button");
+        }else {
+          if( this.selectKey != key) {
+            this.selectKey = key
+            this.SET_editButtonClass("image_button");
+          } else {
+            this.selectKey = ""
+            this.SET_editButtonClass("disable_button");
+          }
+        }
+        
+      },
+      // 设置选中行
+      setSelectRow(row) {
+        if (row.Label == "净生产量") {
+          this.$refs.articleDemand.setCurrentRow(row);
+          this.SET_artId(row.artid)
+          this.setRowStatus(row.key);
+          this.$emit("editTableData", row);
+        }
+      },
+      setCurrentRow(row) {
+        // this.$refs.articleDemand.setCurrentRow(row);
+      },
+      tableCellClassName({ row, column, rowIndex, columnIndex }) {
+        row.index = rowIndex;
+        column.index = columnIndex;
+      },
+      // 双击触发事件
+      rowDblclick(row) {
+        this.setSelectRow(row)
+        this.SET_selectArticleDemandRow(row);
+        this.SET_selectArticleDemandRowIndex(row.index);
       }
-      // this.editField = ""
-      this.selectKey = key;
-      this.SET_editButtonClass("image_button");
-    },
-    // 设置选中行
-    setSelectRow(row) {
-
-      if (row.Label == "净生产量") {
-        this.SET_artId(row.artid)
-        this.setRowStatus(row.key);
-        this.$emit("editTableData", row);
-      }
-    },
-    setCurrentRow(row) {
-      this.$refs.articleDemandTable.setCurrentRow(row);
-    },
-    tableCellClassName({ row, column, rowIndex, columnIndex }) {
-      row.index = rowIndex;
-      column.index = columnIndex;
-    },
-    // 双击触发事件
-    rowDblclick(row) {
-      this.SET_selectArticleDemandRow(row);
-      this.SET_selectArticleDemandRowIndex(row.index);
     }
-  }
-};
+  };
 </script>
-<style lang="less" scoped>
-.articleDemand-wrapper {
-  height: 100%;
-  background-color: #F1F1F1;
-  display: flex;
-
-  .wrapper-button {
+<style lang="less"
+    scoped>
+  .articleDemand-wrapper {
     height: 100%;
-    width: 15px;
-    background-color: #eee;
-    flex-shrink: 0;
+    background-color: #F1F1F1;
     display: flex;
-    flex-direction: column;
-    justify-content: center;
 
-    .toggle-char-btn {
-      display: block;
-      height: 56px;
-      width: 12px;
-    }
+    .wrapper-button {
+      height: 100%;
+      width: 15px;
+      background-color: #eee;
+      flex-shrink: 0;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
 
-    .custom-button {
-      display: block;
-      height: 56px;
-      width: 12px;
-      background: #D8D7DA;
-      box-shadow: 1px 1px 1px 0px #FFFFFF, -2px 0px 0px 0px rgba(0, 0, 0, 0.5);
-      border-radius: 0px 4px 4px 0px;
-      border: 1px solid #9D9CA2;
-    }
-  }
+      .toggle-char-btn {
+        display: block;
+        height: 56px;
+        width: 12px;
+      }
 
-  .content-table-wrap {
-    height: 100%;
-    .prompt-message{
-      float:right;
-      padding:5px;
-      margin-right:35px;
-      font-size:16px;
-      color:#073A35;
-    }
-    :deep(.show_row) {
-      cursor: pointer;
-      transform: scale(1)
+      .custom-button {
+        display: block;
+        height: 56px;
+        width: 12px;
+        background: #D8D7DA;
+        box-shadow: 1px 1px 1px 0px #FFFFFF, -2px 0px 0px 0px rgba(0, 0, 0, 0.5);
+        border-radius: 0px 4px 4px 0px;
+        border: 1px solid #9D9CA2;
+      }
     }
 
-    :deep(.hide_row) {
-      display: none;
-      transform: scale(0)
-    }
+    .content-table-wrap {
+      height: 100%;
 
-    .search-content {
-      margin-left: 8px;
-    }
+      .prompt-message {
+        float: right;
+        padding: 5px;
+        margin-right: 35px;
+        font-size: 16px;
+        color: #073A35;
+      }
 
-    .tool_list {
-      width: 100%;
-      height: 30px;
-      padding-top: 12px;
-      display: flex;
-      justify-content: space-between;
+      :deep(.show_row) {
+        cursor: pointer;
+        transform: scale(1)
+      }
+
+      :deep(.hide_row) {
+        display: none;
+        transform: scale(0)
+      }
+
+      .search-content {
+        margin-left: 8px;
+      }
 
-      .search {
-        width: 800px;
+      .tool_list {
+        width: 100%;
+        height: 30px;
+        padding-top: 12px;
         display: flex;
+        justify-content: space-between;
 
-        .mps-button {
-          width: 98px;
-          height: 32px;
-          box-shadow: 1px 1px 1px 0px #FFFFFF;
-          border-radius: 2px;
-          border: 1px solid #073A35;
-          line-height: 20px;
+        .search {
+          width: 800px;
+          display: flex;
+
+          .mps-button {
+            width: 98px;
+            height: 32px;
+            box-shadow: 1px 1px 1px 0px #FFFFFF;
+            border-radius: 2px;
+            border: 1px solid #073A35;
+            line-height: 20px;
 
-          .icon-upload {
-            width: 18px;
-            height: 18px;
-            background: url("../../../../../assets/icon/mps_button_icon.png");
-            float: left;
-            margin-left: 5px;
+            .icon-upload {
+              width: 18px;
+              height: 18px;
+              background: url("../../../../../assets/icon/mps_button_icon.png");
+              float: left;
+              margin-left: 5px;
+            }
           }
         }
-      }
 
-      .button_list {
-        width: 250px;
-        height: 32px;
-        display: flex;
-        align-items: center;
+        .button_list {
+          width: 250px;
+          height: 32px;
+          display: flex;
+          align-items: center;
 
-        .image_button {
-          margin: 2px 5px;
-          width: 24px;
-          height: 24px;
-          box-shadow: 2px 2px 0px 0px #DADADA;
-        }
+          .image_button {
+            margin: 2px 5px;
+            width: 24px;
+            height: 24px;
+            box-shadow: 2px 2px 0px 0px #DADADA;
+          }
 
-        .disable_button {
-          margin: 2px 5px;
-          width: 24px;
-          height: 24px;
-          background: #ccc;
-          border-radius: 1px;
-          border: 1px solid #ccc;
-        }
+          .disable_button {
+            margin: 2px 5px;
+            width: 24px;
+            height: 24px;
+            background: #ccc;
+            border-radius: 1px;
+            border: 1px solid #ccc;
+          }
 
-        .image_button:hover {
-          background: #DFDFDF;
-          box-shadow: 2px 2px 0px 0px #FFFFFF;
-        }
+          .image_button:hover {
+            background: #DFDFDF;
+            box-shadow: 2px 2px 0px 0px #FFFFFF;
+          }
 
-        .button_split {
-          width: 1px;
-          height: 30px;
-          background: #DFDFDF;
-          box-shadow: 1px 0px 0px 0px #FFFFFF;
-          border-radius: 1px;
+          .button_split {
+            width: 1px;
+            height: 30px;
+            background: #DFDFDF;
+            box-shadow: 1px 0px 0px 0px #FFFFFF;
+            border-radius: 1px;
+          }
         }
       }
-    }
 
-    .articleDemand-table {
-      margin-top: 10px;
-      width: 100%;
-      border: 0;
+      .articleDemand-table {
+        margin-top: 10px;
+        width: 100%;
+        border: 0;
+      }
     }
   }
-}
 </style>
\ No newline at end of file
diff --git a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/index.vue b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/index.vue
index 6f77bc7..685d2f2 100644
--- a/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/index.vue
+++ b/src/views/productionPlanning/customerForecastDemandReview/demandPlanning/index.vue
@@ -79,11 +79,6 @@
       ])
     },
     watch: {
-      // customerId:function(id){
-      //   if(id){
-      //     this.getDataList(id)
-      //   }
-      // },
       articleDemandData: function (data) {
         if (data) {
           this.dealArticleDemandData(data);
@@ -110,7 +105,7 @@
         this.tableData.forEach(item => {
           if (item.key == row.key) {
             if (item.Label != "净生产量") {
-              item.show = true;
+              item.show = !item.show;
             }
             charData.push(item);
           } else {
@@ -120,7 +115,7 @@
           }
         });
         this.setCharData(charData);
-        this.$refs.articleDemandTable.setCurrentRow(this.tableData[this.selectArticleDemandRowIndex]);
+        // this.$refs.articleDemandTable.setCurrentRow(this.tableData[this.selectArticleDemandRowIndex]);
       },
       // 设置侧边栏图形数据
       setCharData(data) {
@@ -152,10 +147,11 @@
       },
       getDataList(param) {
         this.SET_articleDemandLoading(true);
-
         getCustomerArticleDemand(param).then(({ data = [] }) => {
           this.SET_articleDemandData(data);
           this.SET_articleDemandLoading(false);
+          this.$refs.articleDemandTable.pagination.total = data.count
+          console.log('%cindex.vue line:154 this.$refs.articleDemandTable.pagination', 'color: #007acc;', this.$refs.articleDemandTable.pagination);
         }).catch(() => {
           this.SET_articleDemandLoading(false);
         });
diff --git a/src/views/productionPlanning/customerForecastDemandReview/index.vue b/src/views/productionPlanning/customerForecastDemandReview/index.vue
index a66d4c6..55d26b4 100644
--- a/src/views/productionPlanning/customerForecastDemandReview/index.vue
+++ b/src/views/productionPlanning/customerForecastDemandReview/index.vue
@@ -110,7 +110,7 @@
     },
     mounted() {
       this.dragChangeSize((moveLen, bottomHeight) => {
-        this.SET_articleDemandHeight((moveLen - 145) + "px");
+        this.SET_articleDemandHeight((moveLen - 175) + "px");
         this.SET_calculateTableHeight((bottomHeight - 60) + "px");
       });
     },
diff --git a/src/views/productionPlanning/customerForecastDemandReview/resourceContent/evaluation/index.vue b/src/views/productionPlanning/customerForecastDemandReview/resourceContent/evaluation/index.vue
index f934eee..9c2cadb 100644
--- a/src/views/productionPlanning/customerForecastDemandReview/resourceContent/evaluation/index.vue
+++ b/src/views/productionPlanning/customerForecastDemandReview/resourceContent/evaluation/index.vue
@@ -1,115 +1,117 @@
 <template>
   <div class="wrapper">
-      <div class="tool_list">
-				<div class="button_list">
-					<!-- <img class="image_button" :src="refreshImageUrl" @click="refreshData" title="刷新数据"> -->
-          <el-switch v-model="showChar"
-                    inactive-text="显示图表"
-                    active-color="#35B0A6"
-                    inactive-color="#FF3B31" title="显示图表" />
-				</div>
-        
-			</div>
-      <template v-if="showChar">
-
-        
-        <div class="char_box"   v-if="evaluationMainResourceData.length">
-          <Char :DataList="evaluationMainResourceData" Title="主要资源"></Char>
-        </div>
-
-        <el-progress type="circle" :percentage="evaluationLoadPercent" v-if="evaluationLoadPercent"></el-progress>
-
-        <template   v-if="evaluationSecondResourceListData.length">
-          <template v-for="(evaluationSecondResourceData,index) in evaluationSecondResourceListData" :key="index">
-              <div class="char_box"  v-loading='evaluationSecondResourceLoading'>
-                <Char  :DataList="evaluationSecondResourceData" :Opacity=0.8 :Title="'次要资源('+(index+1)+')'"></Char>
-              </div>
-          </template>
+    <div class="tool_list">
+      <div class="button_list">
+        <!-- <img class="image_button" :src="refreshImageUrl" @click="refreshData" title="刷新数据"> -->
+        <el-switch v-model="showChar"
+            inactive-text="显示图表"
+            active-color="#35B0A6"
+            inactive-color="#FF3B31"
+            title="显示图表" />
+      </div>
+    </div>
+    <template v-if="showChar">
+      <el-progress type="circle"
+          :percentage="evaluationLoadPercent"
+          v-if="evaluationLoadPercent"></el-progress>
+      <div class="char_box"
+          v-if="evaluationMainResourceData.length && evaluationLoadPercent==0">
+        <Char :DataList="evaluationMainResourceData"
+            Title="主要资源"></Char>
+      </div>
+      <template v-if="evaluationSecondResourceListData.length">
+        <template v-for="(evaluationSecondResourceData,index) in evaluationSecondResourceListData"
+            :key="index">
+          <div class="char_box"
+              v-loading='evaluationSecondResourceLoading'>
+            <Char :DataList="evaluationSecondResourceData"
+                :Opacity=0.8
+                :Title="'次要资源('+(index+1)+')'"></Char>
+          </div>
         </template>
-
       </template>
+    </template>
   </div>
 </template>
 <script>
-import Char from './char'
-import refreshImageUrl from '@/assets/icon/refresh.png'
-import {mapState,mapMutations} from 'vuex'
+  import Char from './char'
+  import refreshImageUrl from '@/assets/icon/refresh.png'
+  import { mapState, mapMutations } from 'vuex'
 
-export default {
-  components: {
-    Char,
-  },
-  data() {
-    return {
-      showChar:true,
-      refreshImageUrl:refreshImageUrl,
-    };
-  },
-  created(){
+  export default {
+    components: {
+      Char,
+    },
+    data() {
+      return {
+        showChar: false,
+        refreshImageUrl: refreshImageUrl,
+      };
+    },
+    created() {
 
-  },
-  computed: {
-    ...mapState("customerForecastDemandReview",[
-          'evaluationLoadPercent',
-          'evaluationSecondResourceLoading',
-          'evaluationMainResourceLoading',
-          'evaluationSecondResourceListData',
-          'evaluationMainResourceData'
+    },
+    computed: {
+      ...mapState("customerForecastDemandReview", [
+        'evaluationLoadPercent',
+        'evaluationSecondResourceLoading',
+        'evaluationMainResourceLoading',
+        'evaluationSecondResourceListData',
+        'evaluationMainResourceData'
       ])
-  },
-  methods: {
-    ...mapMutations("customerForecastDemandReview",["SET_evaluationLoadPercent"])
-  },
-};
+    },
+    methods: {
+      ...mapMutations("customerForecastDemandReview", ["SET_evaluationLoadPercent"])
+    },
+  };
 </script>
-<style lang="less" scoped>
-.wrapper {
-  min-height: 100%;
-  width: 100%;
-  display: flex;
-  flex-direction: column;
+<style lang="less"
+    scoped>
+  .wrapper {
+    min-height: 100%;
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    :deep(.el-progress-circle) {
 
-  :deep(.el-progress-circle) {
-    
-    margin: 100px auto;
-  }
-  .tool_list{
-			width: 100%;
-			height: 30px;
-			display: flex;
-			justify-content: flex-end;
-      
-			.button_list {
-				width: 120px;
-				height: 32px;
-				display: flex;
+      margin: 100px auto;
+    }
+    .tool_list {
+      width: 100%;
+      height: 30px;
+      display: flex;
+      justify-content: flex-end;
+      .button_list {
+        width: 120px;
+        height: 32px;
+        display: flex;
         margin-right: 50px;
-				align-items: center;
-				.image_button {
-					margin: 2px 5px;
-					width: 24px;
-					height: 24px;
-					box-shadow: 2px 2px 0px 0px #DADADA;
-					border: 1px solid #FFFFFF;
-				}
-				.image_button:hover {
-					background: #DFDFDF;
-					box-shadow: 2px 2px 0px 0px #FFFFFF;
-					border-radius: 1px;
-					border: 1px solid #DADADA;
-				}
-				.button_split {
-					width: 1px;
-					height: 30px;
-					background: #DFDFDF;
-					box-shadow: 1px 0px 0px 0px #FFFFFF;
-					border-radius: 1px;
-				}
-			}
-	}
-  .char_box{
-    width:100%; 
-    height: 300px
+        align-items: center;
+        .image_button {
+          margin: 2px 5px;
+          width: 24px;
+          height: 24px;
+          box-shadow: 2px 2px 0px 0px #DADADA;
+          border: 1px solid #FFFFFF;
+        }
+        .image_button:hover {
+          background: #DFDFDF;
+          box-shadow: 2px 2px 0px 0px #FFFFFF;
+          border-radius: 1px;
+          border: 1px solid #DADADA;
+        }
+        .button_split {
+          width: 1px;
+          height: 30px;
+          background: #DFDFDF;
+          box-shadow: 1px 0px 0px 0px #FFFFFF;
+          border-radius: 1px;
+        }
+      }
+    }
+    .char_box {
+      width: 100%;
+      height: 300px
+    }
   }
-}
 </style>
\ No newline at end of file