1

src/common/echart/index.vue

@@ -3,6 +3,7 @@
 </template>
 
 <script>
+import echarts from "echarts";
 import tdTheme from './theme.json' // 引入默认主题
 import '../map/fujian.js'
 
@@ -45,7 +46,7 @@ export default {
     }
   },
   mounted () {
-    this.$echarts.registerTheme('tdTheme', tdTheme); // 覆盖默认主题
+    echarts.registerTheme('tdTheme', tdTheme); // 覆盖默认主题
     this.initChart();
   },
   beforeDestroy () {
@@ -55,7 +56,7 @@ export default {
   methods: {
     initChart () {
       // 初始化echart
-      this.chart = this.$echarts.init(this.$el, 'tdTheme')
+      this.chart = echarts.init(this.$el, 'tdTheme')
       this.chart.setOption(this.options, true)
     }
   }

src/components/XyTable/index.vue

@@ -1131,7 +1131,7 @@ export default {
   }
 }
 
-Button + Button {
+.ivu-btn + .ivu-btn {
   margin-left: 6px;
 }
 </style>

src/components/echart/centerLeft/centerLeft1Chart/chart.vue

@@ -3,8 +3,8 @@
     <Echart
       :options="options"
       id="centreLeft1Chart"
-      height="220px"
-      width="260px"
+      height="420px"
+      width="400px"
     ></Echart>
   </div>
 </template>
@@ -60,9 +60,9 @@ export default {
           },
           series: [
             {
-              name: "通过率统计",
+              name: "调令统计",
               type: "pie",
-              radius: [10, 50],
+              radius: [20, 140],
               roseType: "area",
               center: ["50%", "40%"],
               data: newData.seriesData
@@ -78,4 +78,4 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-</style>
+</style>

src/components/echart/centerLeft/centerLeft1Chart/index.vue

@@ -26,11 +26,18 @@ export default {
     Chart,
   },
   mounted () {
+    this.$bus.$on('cdata',d => {
+      const types = ["待执行", "执行中", "已完成"]
+      this.cdata = {
+        xData: types,
+        seriesData: d.map((i,index) => ({ value: i, name: types[index] }))
+      }
+    })
   },
   methods: {
-  }
+  },
 }
 </script>
 
 <style lang="scss" scoped>
-</style>
+</style>

src/components/echart/centerLeft/centerLeft1Chart/theme.json

@@ -0,0 +1,490 @@
+{
+  "color": [
+    "#2d8cf0",
+    "#19be6b",
+    "#ff9900",
+    "#E46CBB",
+    "#9A66E4",
+    "#ed3f14"
+  ],
+  "backgroundColor": "rgba(0,0,0,0)",
+  "textStyle": {},
+  "title": {
+    "textStyle": {
+      "color": "#516b91"
+    },
+    "subtextStyle": {
+      "color": "#93b7e3"
+    }
+  },
+  "line": {
+    "itemStyle": {
+      "normal": {
+        "borderWidth": "2"
+      }
+    },
+    "lineStyle": {
+      "normal": {
+        "width": "2"
+      }
+    },
+    "symbolSize": "6",
+    "symbol": "emptyCircle",
+    "smooth": true
+  },
+  "radar": {
+    "itemStyle": {
+      "normal": {
+        "borderWidth": "2"
+      }
+    },
+    "lineStyle": {
+      "normal": {
+        "width": "2"
+      }
+    },
+    "symbolSize": "6",
+    "symbol": "emptyCircle",
+    "smooth": true
+  },
+  "bar": {
+    "itemStyle": {
+      "normal": {
+        "barBorderWidth": 0,
+        "barBorderColor": "#ccc"
+      },
+      "emphasis": {
+        "barBorderWidth": 0,
+        "barBorderColor": "#ccc"
+      }
+    }
+  },
+  "pie": {
+    "itemStyle": {
+      "normal": {
+        "borderWidth": 0,
+        "borderColor": "#ccc"
+      },
+      "emphasis": {
+        "borderWidth": 0,
+        "borderColor": "#ccc"
+      }
+    }
+  },
+  "scatter": {
+    "itemStyle": {
+      "normal": {
+        "borderWidth": 0,
+        "borderColor": "#ccc"
+      },
+      "emphasis": {
+        "borderWidth": 0,
+        "borderColor": "#ccc"
+      }
+    }
+  },
+  "boxplot": {
+    "itemStyle": {
+      "normal": {
+        "borderWidth": 0,
+        "borderColor": "#ccc"
+      },
+      "emphasis": {
+        "borderWidth": 0,
+        "borderColor": "#ccc"
+      }
+    }
+  },
+  "parallel": {
+    "itemStyle": {
+      "normal": {
+        "borderWidth": 0,
+        "borderColor": "#ccc"
+      },
+      "emphasis": {
+        "borderWidth": 0,
+        "borderColor": "#ccc"
+      }
+    }
+  },
+  "sankey": {
+    "itemStyle": {
+      "normal": {
+        "borderWidth": 0,
+        "borderColor": "#ccc"
+      },
+      "emphasis": {
+        "borderWidth": 0,
+        "borderColor": "#ccc"
+      }
+    }
+  },
+  "funnel": {
+    "itemStyle": {
+      "normal": {
+        "borderWidth": 0,
+        "borderColor": "#ccc"
+      },
+      "emphasis": {
+        "borderWidth": 0,
+        "borderColor": "#ccc"
+      }
+    }
+  },
+  "gauge": {
+    "itemStyle": {
+      "normal": {
+        "borderWidth": 0,
+        "borderColor": "#ccc"
+      },
+      "emphasis": {
+        "borderWidth": 0,
+        "borderColor": "#ccc"
+      }
+    }
+  },
+  "candlestick": {
+    "itemStyle": {
+      "normal": {
+        "color": "#edafda",
+        "color0": "transparent",
+        "borderColor": "#d680bc",
+        "borderColor0": "#8fd3e8",
+        "borderWidth": "2"
+      }
+    }
+  },
+  "graph": {
+    "itemStyle": {
+      "normal": {
+        "borderWidth": 0,
+        "borderColor": "#ccc"
+      }
+    },
+    "lineStyle": {
+      "normal": {
+        "width": 1,
+        "color": "#aaa"
+      }
+    },
+    "symbolSize": "6",
+    "symbol": "emptyCircle",
+    "smooth": true,
+    "color": [
+      "#2d8cf0",
+      "#19be6b",
+      "#f5ae4a",
+      "#9189d5",
+      "#56cae2",
+      "#cbb0e3"
+    ],
+    "label": {
+      "normal": {
+        "textStyle": {
+          "color": "#eee"
+        }
+      }
+    }
+  },
+  "map": {
+    "itemStyle": {
+      "normal": {
+        "areaColor": "#f3f3f3",
+        "borderColor": "#516b91",
+        "borderWidth": 0.5
+      },
+      "emphasis": {
+        "areaColor": "rgba(165,231,240,1)",
+        "borderColor": "#516b91",
+        "borderWidth": 1
+      }
+    },
+    "label": {
+      "normal": {
+        "textStyle": {
+          "color": "#000"
+        }
+      },
+      "emphasis": {
+        "textStyle": {
+          "color": "rgb(81,107,145)"
+        }
+      }
+    }
+  },
+  "geo": {
+    "itemStyle": {
+      "normal": {
+        "areaColor": "#f3f3f3",
+        "borderColor": "#516b91",
+        "borderWidth": 0.5
+      },
+      "emphasis": {
+        "areaColor": "rgba(165,231,240,1)",
+        "borderColor": "#516b91",
+        "borderWidth": 1
+      }
+    },
+    "label": {
+      "normal": {
+        "textStyle": {
+          "color": "#000"
+        }
+      },
+      "emphasis": {
+        "textStyle": {
+          "color": "rgb(81,107,145)"
+        }
+      }
+    }
+  },
+  "categoryAxis": {
+    "axisLine": {
+      "show": true,
+      "lineStyle": {
+        "color": "#cccccc"
+      }
+    },
+    "axisTick": {
+      "show": false,
+      "lineStyle": {
+        "color": "#333"
+      }
+    },
+    "axisLabel": {
+      "show": true,
+      "textStyle": {
+        "color": "#fff"
+      }
+    },
+    "splitLine": {
+      "show": false,
+      "lineStyle": {
+        "color": [
+          "#eeeeee"
+        ]
+      }
+    },
+    "splitArea": {
+      "show": false,
+      "areaStyle": {
+        "color": [
+          "rgba(250,250,250,0.05)",
+          "rgba(200,200,200,0.02)"
+        ]
+      }
+    }
+  },
+  "valueAxis": {
+    "axisLine": {
+      "show": true,
+      "lineStyle": {
+        "color": "#cccccc"
+      }
+    },
+    "axisTick": {
+      "show": false,
+      "lineStyle": {
+        "color": "#333"
+      }
+    },
+    "axisLabel": {
+      "show": true,
+      "textStyle": {
+        "color": "#fff"
+      }
+    },
+    "splitLine": {
+      "show": false,
+      "lineStyle": {
+        "color": [
+          "#eeeeee"
+        ]
+      }
+    },
+    "splitArea": {
+      "show": false,
+      "areaStyle": {
+        "color": [
+          "rgba(250,250,250,0.05)",
+          "rgba(200,200,200,0.02)"
+        ]
+      }
+    }
+  },
+  "logAxis": {
+    "axisLine": {
+      "show": true,
+      "lineStyle": {
+        "color": "#cccccc"
+      }
+    },
+    "axisTick": {
+      "show": false,
+      "lineStyle": {
+        "color": "#333"
+      }
+    },
+    "axisLabel": {
+      "show": true,
+      "textStyle": {
+        "color": "#999999"
+      }
+    },
+    "splitLine": {
+      "show": true,
+      "lineStyle": {
+        "color": [
+          "#eeeeee"
+        ]
+      }
+    },
+    "splitArea": {
+      "show": false,
+      "areaStyle": {
+        "color": [
+          "rgba(250,250,250,0.05)",
+          "rgba(200,200,200,0.02)"
+        ]
+      }
+    }
+  },
+  "timeAxis": {
+    "axisLine": {
+      "show": true,
+      "lineStyle": {
+        "color": "#cccccc"
+      }
+    },
+    "axisTick": {
+      "show": false,
+      "lineStyle": {
+        "color": "#333"
+      }
+    },
+    "axisLabel": {
+      "show": true,
+      "textStyle": {
+        "color": "#999999"
+      }
+    },
+    "splitLine": {
+      "show": true,
+      "lineStyle": {
+        "color": [
+          "#eeeeee"
+        ]
+      }
+    },
+    "splitArea": {
+      "show": false,
+      "areaStyle": {
+        "color": [
+          "rgba(250,250,250,0.05)",
+          "rgba(200,200,200,0.02)"
+        ]
+      }
+    }
+  },
+  "toolbox": {
+    "iconStyle": {
+      "normal": {
+        "borderColor": "#999"
+      },
+      "emphasis": {
+        "borderColor": "#666"
+      }
+    }
+  },
+  "legend": {
+    "textStyle": {
+      "color": "#fff"
+    }
+  },
+  "tooltip": {
+    "axisPointer": {
+      "lineStyle": {
+        "color": "#ccc",
+        "width": 1
+      },
+      "crossStyle": {
+        "color": "#ccc",
+        "width": 1
+      }
+    }
+  },
+  "timeline": {
+    "lineStyle": {
+      "color": "#8fd3e8",
+      "width": 1
+    },
+    "itemStyle": {
+      "normal": {
+        "color": "#8fd3e8",
+        "borderWidth": 1
+      },
+      "emphasis": {
+        "color": "#8fd3e8"
+      }
+    },
+    "controlStyle": {
+      "normal": {
+        "color": "#8fd3e8",
+        "borderColor": "#8fd3e8",
+        "borderWidth": 0.5
+      },
+      "emphasis": {
+        "color": "#8fd3e8",
+        "borderColor": "#8fd3e8",
+        "borderWidth": 0.5
+      }
+    },
+    "checkpointStyle": {
+      "color": "#8fd3e8",
+      "borderColor": "rgba(138,124,168,0.37)"
+    },
+    "label": {
+      "normal": {
+        "textStyle": {
+          "color": "#8fd3e8"
+        }
+      },
+      "emphasis": {
+        "textStyle": {
+          "color": "#8fd3e8"
+        }
+      }
+    }
+  },
+  "visualMap": {
+    "color": [
+      "#516b91",
+      "#59c4e6",
+      "#a5e7f0"
+    ]
+  },
+  "dataZoom": {
+    "backgroundColor": "rgba(0,0,0,0)",
+    "dataBackgroundColor": "rgba(255,255,255,0.3)",
+    "fillerColor": "rgba(167,183,204,0.4)",
+    "handleColor": "#a7b7cc",
+    "handleSize": "100%",
+    "textStyle": {
+      "color": "#333"
+    }
+  },
+  "markPoint": {
+    "label": {
+      "normal": {
+        "textStyle": {
+          "color": "#eee"
+        }
+      },
+      "emphasis": {
+        "textStyle": {
+          "color": "#eee"
+        }
+      }
+    }
+  }
+}

src/views/bigScreen/bigScreen.vue

@@ -36,8 +36,10 @@
               <span class="react-left"></span>
               <span class="text"></span>
             </div>
-            <div class="react-left bg-color-blue ml-3">
-              <span class="text"></span>
+            <div class="react-left bg-color-blue ml-3" @click="fullscreen">
+              <span class="text">
+                全屏
+              </span>
             </div>
           </div>
           <div class="d-flex aside-width">
@@ -136,15 +138,16 @@ export default {
     }
   },
   mounted() {
-    //document.documentElement.requestFullscreen();
     this.timeFn();
     this.cancelLoading();
   },
   beforeDestroy () {
     clearInterval(this.timing)
-    //document.documentElement.exitFullscreen();
   },
   methods: {
+    fullscreen () {
+      document.fullscreenElement ? document.exitFullscreen() : document.documentElement.requestFullscreen()
+    },
     timeFn() {
       this.timing = setInterval(() => {
         this.dateDay = this.$moment().format('HH:mm:ss')

src/views/bigScreen/component/backBtn.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="btn-container d-flex jc-center" @click="$router.back()">
+  <div class="btn-container d-flex jc-center" @click="back">
     <dv-decoration-7 style="width:160px;height:100%;">
       <span class="fw-b pr-5 pl-5">
         返回后台
@@ -14,7 +14,14 @@ export default {
   data() {
     return {}
   },
-  methods: {},
+  methods: {
+    back () {
+      if (document.fullscreenElement) {
+        document.exitFullscreen()
+      }
+      this.$router.back()
+    }
+  },
   computed: {},
 }
 </script>

src/views/bigScreen/component/centerLeft1.vue

@@ -10,8 +10,8 @@
           <dv-decoration-3 class="dv-dec-3" />
         </div>
       </div>
-      <div class="d-flex jc-center">
-<!--        <CenterLeft1Chart />-->
+      <div class="d-flex jc-center ai-center h-100">
+        <CenterLeft1Chart />
       </div>
       <!-- 4个主要的数据 -->
 <!--      <div class="bottom-data">-->

src/views/bigScreen/component/centerRight1.vue

@@ -98,6 +98,7 @@ export default {
         }
       })
 
+      this.$bus.$emit('cdata',[this.transfers1.length,this.transfers2.length,this.transfers3.length])
       this.cancelLoading()
     },
   },

src/views/bigScreen/component/detailTransfer.vue

@@ -24,9 +24,9 @@
                   </div>
                 </td>
                 <td>
-                  <div style="text-align: left;padding: 20px;height: 100%;">
+                  <div style="text-align: left;padding: 20px;height: 100%;display: flex;flex-direction: column;justify-content: space-between;">
                     {{ data.content }}
-                    <p style="text-align: right;padding: 10px 6px;">执行状态：{{ typeMap.get(data.status) }}</p>
+                    <p style="padding: 10px 0;">执行状态：{{ typeMap.get(data.status) }}</p>
                   </div>
                 </td>
               </tr>
@@ -92,7 +92,7 @@ export default {
     height: 100%;
 
     td,th {
-      border: 1px solid #d6e1f6;
+      border: 2px solid #d6e1f6;
     }
   }
 }

src/views/bigScreen/component/transferBoard.vue

@@ -22,7 +22,7 @@
                 执行时间：{{ item.start_time }}
               </div>
               <div class="final-time">
-                倒计时：{{ $moment(new Date(item.start_time)).diff($moment(),'minutes') }}分
+                倒计时：{{ $moment(new Date(item.start_time)).diff($moment(),'minutes') > 0 ? $moment(new Date(item.start_time)).diff($moment(),'minutes') : '-' }}分
               </div>
             </div>
             <div v-if="setTransferStatusNumber !== -1" @click.stop="setTransferStatus(4,item)">

src/views/order/component/createDispatch.vue

@@ -48,6 +48,7 @@
           <el-radio-button :label="2">周</el-radio-button>
         </el-radio-group>
         <el-date-picker
+          size="small"
           v-model="date"
           :type="createType === 1 ? 'date' : 'week'"
           value-format="yyyy-MM-dd"
@@ -86,6 +87,7 @@ export default {
     return {
       createType: 1,
       pickerOptions: {
+        firstDayOfWeek: 1,
         shortcuts: [{
           text: '今天',
           onClick(picker) {
@@ -332,10 +334,6 @@ export default {
     };
   },
   methods: {
-    datePick (e) {
-      console.log(e)
-    },
-
     clear () {
       this.select = {
         area: [],
@@ -381,19 +379,38 @@ export default {
       }
 
       const uid = uuid();
-      let promiseAll = submitData.map(i => {
+      let promiseAll = [];
+      submitData.forEach(i => {
         delete i['equipment_id-span']
         delete i['_index']
         delete i['_rowKey']
-        i.start_time = `${this.date} ${i.start_time}`;
-        i.end_time = `${this.date} ${i.end_time}`;
-        i.no = uid;
-        i.status = 1;
 
-        return save({
-          table_name: 'transfers',
-          ...i
-        },false)
+        if (this.createType === 2) {
+          const startDay = this.$moment(this.date).startOf('week')
+          let weekArr = [];
+          for(let a = 1;a <= 7;a++) {
+            weekArr.push(this.$moment(startDay).add(a,'days').format('YYYY-MM-DD'))
+          }
+          weekArr.forEach(j => {
+            promiseAll.push(save({
+              ...i,
+              table_name: 'transfers',
+              start_time: `${j} ${i.start_time}`,
+              end_time: `${j} ${i.end_time}`,
+              no: uid,
+              status: 1
+            },false))
+          })
+        } else {
+          i.start_time = `${this.date} ${i.start_time}`;
+          i.end_time = `${this.date} ${i.end_time}`;
+          i.no = uid;
+          i.status = 1;
+          promiseAll.push(save({
+            table_name: 'transfers',
+            ...i
+          },false))
+        }
       })
       let loadingInstance = this.$loading({
         lock:true,