Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product

layouts/basic-layout/product.vue

@@ -363,15 +363,24 @@ export default {
     },
     shoucang() {
       if (this.showStar) {
-        let url = `${systemUrl}/favorite/delete`;
-        let menuId = [];
-        menuId.push(this.menuId);
-        this.$api.post(url, menuId).then((r) => {
-          if (r.success) {
-            this.showStar = false;
-            this.$Message.success("已取消收藏");
-            this.content = "收藏";
-          }
+        this.$Modal.confirm({
+          title: "取消收藏",
+          content: "<p>您确定要取消收藏吗</p>",
+          onOk: () => {
+            let url = `${systemUrl}/favorite/delete`;
+            let menuId = [];
+            menuId.push(this.menuId);
+            this.$api.post(url, menuId).then((r) => {
+              if (r.success) {
+                this.showStar = false;
+                this.$Message.success("已取消收藏");
+                this.content = "收藏";
+              }
+            });
+          },
+          onCancel: () => {
+            // this.$Message.info("Clicked cancel");
+          },
         });
       } else {
         let url = `${systemUrl}/favorite/create`;

pages/home/component/materielChart.vue

 <template>
-  <div class="stachart"  :style="setStatistics?{width:'620px',height:'300px'}:{width:'100%',height:'100%'}">
+  <div class="stachart">
     <div :gutter="16" class="row_head" v-if="setStatistics?false:true">
       <Icon type="ios-images" class="f20" />
       <span class="ml10">物料相关统计</span>
     </div>
     <div class="echarts-map">
-      <v-chart :options="braking" />
+      <v-chart :options="braking" style="width:'100%',height:'100%'" />
     </div>
   </div>
 </template>
@@ -201,7 +201,7 @@ export default {
   box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.16);
   border-radius: 8px;
   padding: 10px;
-   margin: 0 auto;
+  margin: 0 auto;
   .echarts-map {
     width: 100%;
     height: 280px;

pages/home/component/staChart.vue

@@ -7,10 +7,8 @@
           <span class="ml10">年度计划各产品类型总数量和各状态数量</span>
         </div>
         <div class="echarts-map">
-          <v-chart
-            :options="braking"
-            :style="setStatistics?{width:'400px',height:'270px'}:{width:'100%',height:'100%'}"
-          />
+          <!-- :style="setStatistics?{width:'400px',height:'270px'}:{width:'100%',height:'100%'}" -->
+          <v-chart :options="braking" style="width:'100%',height:'100%'" />
         </div>
       </Col>
       <Col :span="16" style="padding-right:20px;">

pages/home/component/suspendChart.vue

 <template>
   <div
     class="stachart"
-    :style="setStatistics?{width:'620px',height:'280px'}:{width:'100%',height:'100%'}"
+   style="width:'100%',height:'100%'"
   >
     <div class="row_head" v-if="setStatistics?false:true">
       <Icon type="ios-images" class="f20" />

pages/home/component/unqualifiedEcharts.vue

@@ -7,10 +7,7 @@
     <Row :gutter="16">
       <Col :span="8" style="padding-right:50px;">
         <div class="echarts-map">
-          <v-chart
-            :options="braking"
-            :style="setStatistics?{width:'380px',height:'280px'}:{width:'100%',height:'100%'}"
-          />
+          <v-chart :options="braking" style="width:'100%',height:'100%'" />
         </div>
       </Col>
       <Col :span="16">

pages/home/component/workChart.vue

 <template>
   <div
     class="stachart"
-    :style="setStatistics?{width:'620px',height:'280px'}:{width:'100%',height:'100%'}"
+    style="width:'100%',height:'100%'"
   >
     <div :gutter="16" class="row_head" v-if="setStatistics?false:true">
       <Icon type="ios-images" class="f20" />