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

components/page/Vcard.vue

@@ -74,7 +74,6 @@
               <slot name="leftBottom" v-if="leftOneName">
                 <Icon :type="leftOneIcon" class="iconStyle" />
                 {{ leftOneName }}
-                <!--   v-show="leftBtmicon" -->
               </slot>
             </span>
             <span class="overdue f14 fwBold mr20">
@@ -84,9 +83,9 @@
               </slot>
             </span>
           </div>
-          <span class="rightMore">
+          <div class="rightMore">
             <slot name="rightBottom"> </slot>
-          </span>
+          </div>
         </div>
       </div>
     </div>
@@ -283,7 +282,7 @@ export default {
       }
     }
     .bottomCard {
-      justify-content: space-between;
+      // justify-content: space-between;
       padding-bottom: 20px;
       padding-left: 14px;
       .leftBtm {
@@ -307,9 +306,6 @@ export default {
 }
 .cardBox:hover {
   box-shadow: 0px 0px 10px rgba(38, 128, 235, 0.4);
-  // .topCard {
-  //   background: rgba(38, 128, 235, 0.4);
-  // }
 }
 .borderCss {
   border: 2px solid #2680eb;

components/page/life.vue

 <template>
-  <div class="datalife">
-    <div class="bigBing" :style="{width:220*bigNum+'px'}" v-if="mode">
+  <div class="datalife ">   
+    <div class="bigBing" :style="{width:220*bigNum+100+'px'}" v-if="mode">
       <div v-for="(item, index) in data" :key="index" class="linebox">
         <div  class="box" :class="curIndex == index ? 'boxBorder1':curIndex<index ? ' boxBorder2':' boxBorder' " >
            <Tag type="dot"  :color="item.color?item.color:tagColor" >{{ item.name }}</Tag>
@@ -9,8 +9,21 @@
           <span  class="item arrow-right" :class="[curIndex==index? 'boxBorder1' :curIndex<index? 'boxBorder2':'boxBorder']" ></span>
         </div>
       </div>
+      <div class='rightCode '>
+        <Poptip  :content="code" placement='left-start'>
+           <a
+              data-clipboard-action="copy"
+              :data-clipboard-text="code"
+              @click="copy"       
+              id="code"
+              class="tag-read"
+              ><Icon type="ios-more" /></a
+            >
+           
+        </Poptip> 
+      </div> 
     </div>
-    <div class="bigBing"  :style="{width:240*bigNum+'px'}" v-else>
+    <div class="bigBing"  :style="{width:240*bigNum+100+'px'}" v-else>
       <div class="lifeBox" v-for="(item, index) in data" :key="index">
         <div class="arrow-left">
           <b class="right" v-if="index != 0">
@@ -26,11 +39,26 @@
           ></b>
         </div>
       </div>
+      <div class='rightCode'>
+        <Poptip  :content="code" placement='left-start'>
+           <a
+              data-clipboard-action="copy"
+              :data-clipboard-text="code"
+              @click="copy"       
+              id="code"
+              class="tag-read"
+              ><Icon type="ios-more" /></a
+            >
+           
+        </Poptip> 
+      </div> 
     </div>
+    
   </div>
 </template>
 
 <script>
+import Clipboard from "clipboard";
 export default {
   name: "life",
   data() {
@@ -60,6 +88,9 @@ export default {
       type:String,
       default:""
     }
+  },
+   async fetch({ store, params }) {
+    await store.dispatch("loadDictionary"); // 加载数据字典
   },
   created() {
       this.data = this.$store.getters.dictionaryByKey(this.code) || [];
@@ -71,13 +102,35 @@ export default {
      })
   },
   methods: {
+    copy() {
+      var clipboard = new Clipboard(".tag-read");
+      clipboard.on("success", (e) => {
+        this.$Message.success("复制成功:" + this.code);
+        clipboard.destroy();
+      });
+      clipboard.on("error", (e) => {
+        // 不支持复制
+        console.log("该浏览器不支持自动复制"); // 释放内存
+        clipboard.destroy();
+      });
+    },
   },
 };
 </script>
 <style lang="less" >
 .datalife {
   overflow-x: auto;
-  
+  width: auto;
+  .bigBing{
+    position: relative;
+     .rightCode{
+    position: absolute;
+    right: 0;
+    top: 0;
+  }
+  }
+ 
+
   .linebox {
     display: inline-flex;
     .box {
@@ -270,5 +323,9 @@ export default {
       }
     }
   }
+  // .ivu-poptip-popper{
+  //       top: 27px;
+  //       right:0
+  // }
 }
 </style>
\ No newline at end of file

components/page/rightM.vue

 <template>
-  <div
-    class="rightM flex"
-    :class="{ mr10: num == 1 }"
-    v-if="rightM && rightList"
-    @mouseleave="outPut"
-  >
-    <slot >
-      <op   v-if="rightList && rightList.slice(0, num).length > 0"
-        v-for="(v, i) in rightList.slice(0, num)"
-        :key="i"
-        :title="v.name"
-        :type="v.type"
-        :msg="v.msg"
-        :disable="v.disable" 
-        @click="v.click(row,$event)"
-      >
-       <Icon :type="v.icon==null || v.icon==undefined ? 'ios-paper':v.icon" v-if="v.type=='icon'||  v.type=='' || v.type==undefined || v.type==null "/>
-        <span v-if="v.name">
-          {{ v.name }}
-        </span>
-      </op>
-      <span
-        class="elliPsis fwBold"
-        slot="elliPsis"
-        v-if="rightList && rightList.length > num > 0"
-      >
-        <span :class="{ hide: inlines, mr10: !inlines }" @mouseenter="inFo"
-          >•••</span >
-        <span class="mr10" :class="{ inline: inlines, hide: !inlines }">
-          <op
-            v-for="(value, index) in rightList.slice(num)"
-            :key="index"
-            :title="value.name"
-            :type="value.type"
-            :msg="value.msg"
-            :disable="value.disable"
-            @click="value.click(row,$event)"
-            v-if="rightList &&  rightList.slice(num).length >= num"
-          >
-            <Icon :type="value.icon==''?'ios-paper':value.icon" v-if="value.type=='icon'|| value.type=='' || value.type==undefined || value.type==null"/>
-            <span v-if="value.name">
-              {{ value.name }}
-            </span>
-          </op>
-        </span>
-      </span>
-    </slot>
+  <div class="rightM pr" v-if="rightM && rightList">
+    <div class="flex rightMbtns mr10" :class="{'pa':!more}"  @mouseleave="more=true" >
+      <slot>
+        <op
+          class="mr5 opBtns tc"
+          v-if="btnBoxList && btnBoxList.length > 0"
+          v-for="(v, i) in btnBoxList"
+          :key="i"
+          :title="v.name"
+          :type="v.type"
+          :msg="v.msg"
+          :disable="v.disable == null || v.disable == undefined ? false : true"
+          @click.native="v.click(row,$event)"
+        >
+          <Icon
+            :type="v.icon == null || v.icon == undefined ? 'ios-paper' : v.icon"
+            v-if="
+              v.type == 'icon' ||
+              v.type == '' ||
+              v.type == undefined ||
+              v.type == null
+            "
+          />
+          <span v-if="v.name">
+            {{ v.name }}
+          </span>
+        </op>
+         <div
+          class="elliPsis fwBold mr10"
+          v-if="num<rightList.length&&more"
+          @mouseenter="more=false"
+        >
+          •••
+        </div>
+      </slot>
+    </div>
+   
   </div>
 </template>
 <script>
 export default {
+  name: "rm",
   data() {
     return {
-      inlines: false,
-      btnBoxList: [],
+      more: true,
     };
   },
   props: {
     row: {
-     type:[Object,Array],
-      default: []
+      type: [Object, Array],
+      default: [],
     },
     rightList: {
-       type:[Object,Array],
+      type: Array,
       default: [],
     },
     num: {
@@ -75,25 +65,44 @@ export default {
     },
   },
   mounted() {
-    //   console.log("$slots",this.$slots,this.$slots.default)
   },
   methods: {
-    inFo() {
-      this.inlines = true;
-    },
-    outPut() {
-      this.inlines = false;
-    },
+  //  hello(row,event){
+  //   console.log('111',row,event)
+  //  }
   },
+  computed:{
+    btnBoxList(){
+      if(this.num>=this.rightList.length){
+        return this.rightList;
+      }else {
+         if(this.more)
+          return  this.rightList.slice(0, this.num);
+          else
+          return this.rightList;
+      }
+    
+    }
+  }
 };
 </script>
-
-<style lang="less" scoped>
+<style lang="less" >
 .rightM {
+  overflow: visible;
   cursor: pointer;
-  height: auto;
+  width: 100%;
+  height: 100%;
   .elliPsis {
     color: #2680eb;
   }
+  .rightMbtns{
+    background: #ffffff;
+    right: 0;
+    top:-12px;
+    z-index: 99;
+  }
+  .opBtns{
+    min-width: 55px;
+  }
 }
 </style>
\ No newline at end of file

pages/bigScreen/consume.vue

@@ -52,7 +52,7 @@ export default {
         // },
         series: [
           {
-            name: "访问来源",
+            name: "产品消耗工时占比",
             type: "pie",
             radius: ["25%", "33%"],
             center: ["28%", "60%"],
@@ -92,10 +92,10 @@ export default {
               },
             },
             data: [
-              { value: 335, name: "直接访问" },
-              { value: 310, name: "邮件营销" },
-              { value: 234, name: "联盟广告" },
-              { value: 135, name: "视频广告" },
+              { value: 335, name: "V+圆锥齿轮" },
+              { value: 310, name: "A类螺旋齿轮" },
+              { value: 234, name: "AV单齿轮风力装置" },
+              { value: 135, name: "DF-变级齿轮箱" },
             ],
           },
         ],

pages/bigScreen/monthlyPlan.vue

@@ -34,7 +34,7 @@ export default {
           text: "月度计划进行情况",
           left: "left",
           left: 160,
-          top: 28,
+          top: 25,
           textStyle: {
             color: "#106FFE",
           },
@@ -64,7 +64,7 @@ export default {
         // },
         series: [
           {
-            name: "访问来源",
+            name: "月度计划进行情况",
             type: "pie",
             radius: "55%",
             center: ["40%", "60%"],

pages/bigScreen/multiple.vue

@@ -81,7 +81,7 @@ export default {
             name: "来源",
             type: "pie",
             radius: ["16%", "18%"],
-            center: ["13%", "24%"],
+            center: ["13%", "22%"],
             avoidLabelOverlap: false,
             hoverAnimation: false,
             label: {
@@ -133,7 +133,7 @@ export default {
             name: "来源",
             type: "pie",
             radius: ["16%", "18%"],
-            center: ["10%", "24%"],
+            center: ["10%", "22%"],
             avoidLabelOverlap: false,
             hoverAnimation: false,
             label: {

pages/bigScreen/passRate.vue

@@ -38,7 +38,7 @@ export default {
         title: {
           text: "本月质量合格率",
           left: "22%",
-          top: 16,
+          top: 8,
           textStyle: {
             color: "#106FFE",
           },

pages/bigScreen/qualityProblem.vue

+<!--
+ * @Author: your name
+ * @Date: 2020-11-20 09:47:27
+ * @LastEditTime: 2020-11-27 18:24:31
+ * @LastEditors: Please set LastEditors
+ * @Description: In User Settings Edit
+ * @FilePath: \mes-ui\pages\bigScreen\qualityProblem.vue
+-->
 <template>
   <div class="quality">
     <h4>质量问题滚动播报</h4>
@@ -74,7 +82,7 @@ export default {
 
   h4 {
     height: 50px;
-    line-height: 50px;
+    line-height: 35px;
     font-size: 17px;
     padding-top: 2px;
     color: #106ffe;
@@ -85,6 +93,7 @@ export default {
     height: 36px;
     line-height: 36px;
     background: #2f2f57;
+    margin-top: -10px;
   }
   .item-row {
     height: 44px;

pages/bigScreen/suspend.vue

@@ -39,7 +39,7 @@ export default {
         title: {
           text: "年度计划完成情况",
           left: "42%",
-          top: 16,
+          top: 8,
           textStyle: {
             color: "#106FFE",
           },

pages/bigScreen/taskType.vue

@@ -33,7 +33,7 @@ export default {
         title: {
           text: "暂停任务类型分布",
           left: "11%",
-          top: 20,
+          top: 8,
           textStyle: {
             color: "#106FFE",
           },

pages/project/project/add.vue

@@ -199,7 +199,7 @@ export default {
           }
           Api.create(this.entity)
             .then((r) => {
-              debugger;
+
               if (r.success) {
                 this.$Message.success("保存成功");
                 //添加当前登陆人为项目经理

plugins/iview.js

@@ -171,12 +171,10 @@ Vue.component("FilesViewer", FilesViewer)
 Vue.use(Contextmenu);
 
 //注入mock
-// require("../mock")
-// Vue.component("Vcard", Vcard)
-// Vue.component("BtnBox", BtnBox)
-// Vue.component("RightM", RightM)
-//注入mock
-// require("../mock")
+require("../mock")
+Vue.component("Vcard", Vcard)
+Vue.component("BtnBox", BtnBox)
+Vue.component("RightM", RightM)
 
 Vue.prototype.$api = request;
 Vue.prototype.$http = Api;