操作子页面

package-lock.json

@@ -7665,7 +7665,8 @@
         },
         "ansi-regex": {
           "version": "2.1.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -7683,11 +7684,13 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -7700,15 +7703,18 @@
         },
         "code-point-at": {
           "version": "1.1.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -7811,7 +7817,8 @@
         },
         "inherits": {
           "version": "2.0.4",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -7821,6 +7828,7 @@
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "bundled": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -7833,17 +7841,20 @@
         "minimatch": {
           "version": "3.0.4",
           "bundled": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
         },
         "minimist": {
           "version": "1.2.5",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.9.0",
           "bundled": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -7860,6 +7871,7 @@
         "mkdirp": {
           "version": "0.5.3",
           "bundled": true,
+          "optional": true,
           "requires": {
             "minimist": "^1.2.5"
           }
@@ -7915,7 +7927,8 @@
         },
         "npm-normalize-package-bin": {
           "version": "1.0.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "npm-packlist": {
           "version": "1.4.8",
@@ -7940,7 +7953,8 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -7950,6 +7964,7 @@
         "once": {
           "version": "1.4.0",
           "bundled": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -8018,7 +8033,8 @@
         },
         "safe-buffer": {
           "version": "5.1.2",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -8048,6 +8064,7 @@
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -8065,6 +8082,7 @@
         "strip-ansi": {
           "version": "3.0.1",
           "bundled": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -8103,11 +8121,13 @@
         },
         "wrappy": {
           "version": "1.0.2",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.1.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         }
       }
     },
@@ -9538,7 +9558,7 @@
       "dependencies": {
         "deepmerge": {
           "version": "2.2.1",
-          "bundled": true
+          "resolved": false
         }
       }
     },
@@ -19895,7 +19915,8 @@
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
       "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "rx-lite-aggregates": {
       "version": "4.0.8",

pages/produce/execute/MaterialCollec/index.vue

-<style lang="less">
-@import "../execute.less";
-</style>
+
 <template>
     <div class="">
         <div class="star" v-if="!starmodal">

pages/produce/execute/ProcessCase/index.vue

-<style lang="less">
-@import "../execute.less";
-</style>
+
 <template>
     <div class="">
         <div class="star" v-if="!starmodal">

pages/produce/execute/ProcessCheck/index.vue

-<style lang="less">
-@import "../execute.less";
-</style>
+
 <template>
     <div class="">
         <div class="star" v-if="!starmodal">

pages/produce/execute/components/functional.vue

-<style lang="less">
-@import "../execute.less";
-</style>
+
 <template>
     <div class="addd">
         <ul>

pages/produce/execute/components/orderlist.vue

-<style lang="less">
-@import "../execute.less";
-</style>
+
 <template>
     <div class="order_list">
         <!-- <div slot="header">

pages/produce/execute/datafilling/index.vue

-<style lang="less">
-@import "../execute.less";
-</style>
+
 <template>
     <div class="">
         <div class="star" v-if="!starmodal">

pages/produce/execute/execute.less

@@ -174,10 +174,37 @@
 .gs_set{
     height: 100vh;
     .gs_top{
-        margin: 0 auto;
+        margin: 15px auto;
         width: 1000px;
         height: 120px;
         background: #2680EB;
         color: #fff;
+        border-radius:4px;
+        .line_slit{
+            height: 5em;
+            float: left;
+        }
+        .gs_top_box{
+            float: left;
+            width: 46%;
+            text-align: center;
+            line-height: 140px;
+            i{
+                font-size: 71px;
+
+            }
+            .gs_bo01{
+                display: inline-block;  
+            }
+            span{
+                display: inline-block;
+            }
+            .shi{
+
+            }
+            .number{
+                font-size: 32px;
+            }
+        }
     }
 }
\ No newline at end of file

pages/produce/execute/judgment/index.vue

-<style lang="less">
-@import "../execute.less";
-</style>
+
 <template>
     <div class="">
         <div class="star" v-if="!starmodal">

pages/produce/execute/preparation/index.vue

-<style lang="less">
-@import "../execute.less";
-</style>
+
 <template>
     <div class="">
         <div class="star" v-if="!starmodal">

pages/produce/execute/productSet/index.vue

-<style lang="less">
-@import "../execute.less";
-</style>
+
 <template>
     <div class="">
         <div class="star" v-if="!starmodal">

pages/produce/execute/starOrder/index.vue

-<style lang="less">
-@import "../execute.less";
-</style>
+
 <template>
     <div class="">
         <div class="star" v-if="!starmodal">

pages/produce/execute/taskTime/index.vue

-<style lang="less">
-@import "../execute.less";
-</style>
+
 <template>
     <div class="gs_set">
         <div class="gs_top">
-            <div class="total_time">
+            <div class="gs_top_box total_time">
                 <Icon type="md-pie" />
+                <div class="gs_bo01">
+                    <span class="shi">总工时</span>
+                    <span class="number">250</span>
+                </div>
             </div>
-            <Divider type="vertical" />
-            <div class="allocated">
+            <Divider type="vertical" class="line_slit"/>
+            <div class="gs_top_box allocated">
                 <Icon type="md-pie" />
+                <div class="gs_bo01">
+                    <span class="shi">待分配</span>
+                    <span class="number">200</span>
+                </div>                
             </div>
         </div>
         <div class="gs_card_box"></div>

pages/produce/execute/testdata/index.vue

-<style lang="less">
-@import "../execute.less";
-</style>
+
 <template>
     <div class="">
         <div class="star" v-if="!starmodal">