Browse Source

增加设备管理相关界面
eqfixedit.vue
eqfixview.vue
equipment.vue

LongjoeDyy 5 years ago
parent
commit
6d2220291a

+ 23 - 46
src/assets/iconfont/demo_index.html

@@ -144,6 +144,12 @@
                 <div class="code-name">&amp;#xe611;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe667;</span>
+                <div class="name">维修</div>
+                <div class="code-name">&amp;#xe667;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe64c;</span>
                 <div class="name">选中</div>
@@ -672,12 +678,6 @@
                 <div class="code-name">&amp;#xe658;</div>
               </li>
           
-            <li class="dib">
-              <span class="icon iconfont">&#xe73f;</span>
-                <div class="name">指令</div>
-                <div class="code-name">&amp;#xe73f;</div>
-              </li>
-          
             <li class="dib">
               <span class="icon iconfont">&#xe913;</span>
                 <div class="name">步骤</div>
@@ -786,12 +786,6 @@
                 <div class="code-name">&amp;#xebf1;</div>
               </li>
           
-            <li class="dib">
-              <span class="icon iconfont">&#xe66d;</span>
-                <div class="name">指令</div>
-                <div class="code-name">&amp;#xe66d;</div>
-              </li>
-          
             <li class="dib">
               <span class="icon iconfont">&#xe60d;</span>
                 <div class="name">同意</div>
@@ -1343,6 +1337,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-weixiu"></span>
+            <div class="name">
+              维修
+            </div>
+            <div class="code-name">.icon-weixiu
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-check1"></span>
             <div class="name">
@@ -2135,15 +2138,6 @@
             </div>
           </li>
           
-          <li class="dib">
-            <span class="icon iconfont icon-zhiling"></span>
-            <div class="name">
-              指令
-            </div>
-            <div class="code-name">.icon-zhiling
-            </div>
-          </li>
-          
           <li class="dib">
             <span class="icon iconfont icon-shoucang-"></span>
             <div class="name">
@@ -2306,15 +2300,6 @@
             </div>
           </li>
           
-          <li class="dib">
-            <span class="icon iconfont icon-instructions"></span>
-            <div class="name">
-              指令
-            </div>
-            <div class="code-name">.icon-instructions
-            </div>
-          </li>
-          
           <li class="dib">
             <span class="icon iconfont icon-tongyi"></span>
             <div class="name">
@@ -2991,6 +2976,14 @@
                 <div class="code-name">#icon-address</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-weixiu"></use>
+                </svg>
+                <div class="name">维修</div>
+                <div class="code-name">#icon-weixiu</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-check1"></use>
@@ -3695,14 +3688,6 @@
                 <div class="code-name">#icon-cuowu1</div>
             </li>
           
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#icon-zhiling"></use>
-                </svg>
-                <div class="name">指令</div>
-                <div class="code-name">#icon-zhiling</div>
-            </li>
-          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-shoucang-"></use>
@@ -3847,14 +3832,6 @@
                 <div class="code-name">#icon-kongjianyixuan</div>
             </li>
           
-            <li class="dib">
-                <svg class="icon svg-icon" aria-hidden="true">
-                  <use xlink:href="#icon-instructions"></use>
-                </svg>
-                <div class="name">指令</div>
-                <div class="code-name">#icon-instructions</div>
-            </li>
-          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-tongyi"></use>

File diff suppressed because it is too large
+ 10 - 14
src/assets/iconfont/iconfont.css


BIN
src/assets/iconfont/iconfont.eot


File diff suppressed because it is too large
+ 1 - 1
src/assets/iconfont/iconfont.js


File diff suppressed because it is too large
+ 1276 - 0
src/assets/iconfont/iconfont.json


File diff suppressed because it is too large
+ 3 - 6
src/assets/iconfont/iconfont.svg


BIN
src/assets/iconfont/iconfont.ttf


BIN
src/assets/iconfont/iconfont.woff


BIN
src/assets/iconfont/iconfont.woff2


+ 336 - 0
src/pages/eqfixedit.vue

@@ -0,0 +1,336 @@
+<template>
+  <div>
+    <div class="topbar">
+      <div class="topbar_left">
+        <svg class="icon" aria-hidden="true">
+          <use xlink:href="#icon-fanhui"></use>
+        </svg>
+      </div>
+      <div class="topbar_middle">
+        设备报修
+      </div>
+      <div class="topbar_right">
+        <!-- <svg class="icon" aria-hidden="true">
+          <use xlink:href="#icon-caidan"></use>
+        </svg> -->
+      </div>
+    </div>
+
+    <div class="taskedit">
+
+      <div class="taskedit_main">
+
+        <div class="taskedit_flex">
+          <div class="taskedit_title">设备编号</div>
+          <div class="taskedit_item">
+            <span>572-102</span>
+          </div>
+          <div class="taskedit_pzbtn" style="color:#000;font-size:20px">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-qrcode-scan"></use>
+            </svg>
+          </div>
+        </div>
+
+        <div class="taskedit_flex">
+          <div class="taskedit_title">设备名称</div>
+          <div class="taskedit_item">2#气密机</div>
+          <div class="taskedit_pzbtn">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-iconfontjiantou2"></use>
+            </svg>
+          </div>
+        </div>
+
+        <div class="taskedit_flex">
+          <div class="taskedit_title">负责人</div>
+          <div class="taskedit_item">李四<span style="margin-left:20px;color:#6495ed"> <svg class="icon"
+                aria-hidden="true">
+                <use xlink:href="#icon-dianhua"></use>
+              </svg>13600136000</span></div>
+          <div class="taskedit_pzbtn">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-iconfontjiantou2"></use>
+            </svg>
+          </div>
+        </div>
+
+
+
+        <div class="taskedit_flex">
+          <div class="taskedit_title">加急</div>
+          <div style="margin-left:10px;font-size:40px">
+            <svg class="icon" aria-hidden="true" v-if="ifcheck == 1">
+              <use xlink:href="#icon-kaiguanswitch-zhengque"></use>
+            </svg>
+
+            <svg class="icon" aria-hidden="true" v-if="ifcheck == 0">
+              <use xlink:href="#icon-uni_icon_kaiguan_guan"></use>
+            </svg>
+          </div>
+        </div>
+
+        <div class="taskedit_flex" style="line-height:40px">
+          <div class="taskedit_title">报修类型</div>
+          <div class="taskedit_item">
+            <div style="border-bottom: 1px solid #e5e5e5;">
+              <svg class="icon" aria-hidden="true">
+                <use xlink:href="#icon-kongjianweixuan"></use>
+              </svg>
+              机件损坏
+            </div>
+            <div style="border-bottom: 1px solid #e5e5e5;" class="check_color">
+              <svg class="icon" aria-hidden="true">
+                <use xlink:href="#icon-kongjianyixuan"></use>
+              </svg>
+              指示灯异常
+            </div>
+            <div style="border-bottom: 1px solid #e5e5e5;" class="check_color">
+              <svg class="icon" aria-hidden="true">
+                <use xlink:href="#icon-kongjianyixuan"></use>
+              </svg>
+              机器运转有异响
+
+            </div>
+            <div>
+              <svg class="icon" aria-hidden="true">
+                <use xlink:href="#icon-kongjianweixuan"></use>
+              </svg>
+              器件失电
+            </div>
+          </div>
+          <!-- <div style="flex: 0 0 80%;margin: 0 0 0 10px;color: #777;font-size:14px">
+            <div><span class="tip_nocheck">机件损坏</span></div>
+            <div><span class="tip_check">指示灯异常</span></div>
+            <div><span class="tip_check">机器运转有异响</span></div>
+            <div><span class="tip_nocheck">器件失电</span></div>
+          </div> -->
+
+        </div>
+
+        <div class="taskedit_flex">
+          <div class="taskedit_title">备注</div>
+          <div class="taskedit_dscrp">
+            <span>设备启动时发出咔咔吱吱呜呜哔哔的声音,明明绿灯转眼变成红灯。</span>
+          </div>
+        </div>
+
+
+      </div>
+
+      <div class="taskedit_fjarea">
+        <svg class="icon" aria-hidden="true">
+          <use xlink:href="#icon-fujian"></use>
+        </svg>
+        添加图片
+      </div>
+
+      <div style="display:flex;margin:10px 0 0 20px;">
+        <div>
+          <img src="../assets/taskview_01.jpeg" style="height: 60px;box-shadow: 0 2px 3px rgba(0, 0, 0, 0.302);"></img>
+        </div>
+
+        <div style="margin-left:10px">
+          <img src="../assets/taskview_02.jpg" style="height: 60px;box-shadow: 0 2px 3px rgba(0, 0, 0, 0.302);"></img>
+        </div>
+      </div>
+
+
+    </div>
+
+    <div class="quote_edit_btn_wrap">
+      <div class="quote_edit_btn">
+        <svg class="icon" aria-hidden="true">
+          <use xlink:href="#icon-tongyi"></use>
+        </svg>
+        确定
+      </div>
+    </div>
+
+  </div>
+</template>
+<script>
+  export default {
+    name: 'taskedit',
+    data() {
+      return {
+        tasktype: 0, //0-临时任务 1-客户走访 2-稽核检查
+        ifcheck: 1 //1-需要验收 0-不用验收
+      }
+    }
+
+  }
+
+</script>
+<style>
+  body {
+    margin: 0;
+    padding: 0;
+    background-color: #fff;
+    font-family: "微软雅黑";
+    font-size: 15px;
+  }
+
+
+  .topbar {
+    min-height: 44px;
+    border-bottom: 1px solid #e5e5e5;
+    background: #fff;
+    position: fixed;
+    width: 100%;
+    z-index: 9999;
+    display: flex;
+    font-size: 18px;
+    align-items: center;
+  }
+
+  .topbar_left {
+    flex: 0 0 20px;
+    margin-left: 10px;
+  }
+
+  .topbar_middle {
+    /* text-align: center; */
+    padding: 0 0 0 10px;
+    flex: 0 0 89%;
+  }
+
+  .topbar_right {
+    flex: 0 0 20px;
+    position: absolute;
+    right: 10px;
+  }
+
+  .taskedit {
+    position: absolute;
+    top: 44px;
+    width: 100%;
+    margin-bottom: 80px;
+  }
+
+  .taskedit_main {
+    padding: 5px 20px;
+  }
+
+  .taskedit_flex {
+    display: flex;
+    line-height: 45px;
+    align-items: flex-start
+  }
+
+
+  .taskedit_title {
+    font-size: 15px;
+    font-weight: bold;
+    flex: 0 0 60px;
+    text-align: justify;
+    text-align-last: justify;
+  }
+
+
+  .taskedit_item {
+    flex: 0 0 80%;
+    border-bottom: 1px solid #e5e5e5;
+    margin: 0 0 0 10px;
+    color: #777
+  }
+
+  .taskedit_pzbtn {
+    position: absolute;
+    right: 20px;
+    color: #ccc;
+    font-size: 16px;
+  }
+
+  .taskedit_date {
+    position: absolute;
+    right: 40px;
+    color: #777
+  }
+
+  .taskedit_dscrp {
+    padding: 10px;
+    line-height: 20px;
+    border: 1px solid #e5e5e5;
+    border-radius: 5px;
+    margin: 5px 0 5px 10px;
+    height: 100px;
+    color: #777;
+    width: 100%
+  }
+
+  .color_sub {
+    color: #999
+  }
+
+  .quote_edit_btn_wrap {
+    display: flex;
+    position: fixed;
+    bottom: 0;
+    /* background-color: #fc4e2c; */
+    width: 100%;
+    z-index: 9990;
+    align-items: center;
+    justify-content: center;
+    /* padding: 5px 0 2px 0; */
+    box-shadow: 0 -1px 3px #f1f1f1;
+  }
+
+  .quote_edit_btn {
+    /* background-color: #ffb732; */
+    background-color: #fc4e2c;
+    color: #ffffff;
+    font-size: 16px;
+    font-weight: bold;
+    text-align: center;
+    padding: 10px;
+    width: 100%;
+  }
+
+  .taskedit_fjarea {
+    margin: 10px 20px;
+    color: #777
+  }
+
+  .taskedit_fjlist {
+    padding: 0 20px;
+    align-items: center;
+    display: flex;
+    font-size: 15px;
+    height: 30px;
+    line-height: 30px;
+  }
+
+  .taskedit_fjsize {
+    font-size: 15px;
+    color: #aaa;
+    margin-left: 10px;
+  }
+
+  .taskedit_fjdel {
+    font-size: 15px;
+    color: #fc4e2c;
+    position: absolute;
+    right: 20px;
+  }
+
+  .check_color {
+    color: #fc4e2c
+  }
+
+  .tip_check {
+    padding: 5px 10px;
+    background-color: #fc4e2c;
+    color: #fff;
+    font-weight: bold;
+    border-radius: 15px;
+  }
+
+  .tip_nocheck {
+    padding: 5px 10px;
+    border-radius: 15px;
+    border: 1px solid #e5e5e5;
+    color: #aaa
+  }
+
+</style>

+ 674 - 0
src/pages/eqfixview.vue

@@ -0,0 +1,674 @@
+<template>
+  <div>
+    <div class="topbar">
+      <div class="topbar_left">
+        <svg class="icon" aria-hidden="true">
+          <use xlink:href="#icon-fanhui"></use>
+        </svg>
+      </div>
+      <div class="topbar_middle">
+        任务
+      </div>
+      <div class="topbar_right">
+        <!-- <svg class="icon" aria-hidden="true">
+          <use xlink:href="#icon-caidan"></use>
+        </svg> -->
+      </div>
+    </div>
+
+    <div class="taskview_toparea" :class="colortop">
+      <div class="taskview_top_type">设备维修</div>
+      <div class="taskview_top_flag">{{taskflag_dt}}</div>
+    </div>
+    <div class="taskview_toparea_sec" :class="colortop_sec"></div>
+    <div class="taskview_toparea_thr" :class="colortop_thr"></div>
+
+    <div class="taskview">
+
+      <div class="taskview_main">
+        <div class="taskview_flex">
+          <div class="taskview_title">设备编号</div>
+          <div class="taskview_item">572-102</div>
+        </div>
+        <div class="taskview_flex">
+          <div class="taskview_title">设备名称</div>
+          <div class="taskview_item">2#气密机</div>
+        </div>
+        <div class="taskview_flex">
+          <div class="taskview_title">报修人</div>
+          <div class="taskview_item">王大力</div>
+        </div>
+
+        <div class="taskview_flex">
+          <div class="taskview_title">报修时间</div>
+          <div class="taskview_item">2019/10/25 15:23</div>
+        </div>
+
+        <div class="taskview_flex">
+          <div class="taskview_title">报修项目</div>
+          <div class="taskview_item">
+            <div>指示灯异常</div>
+            <div>机器运转有异响</div>
+          </div>
+        </div>
+
+
+        <div class="taskview_flex">
+          <div class="taskview_title">备注</div>
+          <div class="taskview_item">设备启动时发出咔咔吱吱呜呜哔哔的声音,明明绿灯转眼变成红灯。</div>
+        </div>
+
+        <!-- 附件图片,直接显示缩略图 -->
+        <div style="display:flex;margin:10px 0 0 20px;" v-if="tasktype==2">
+          <div>
+            <img src="../assets/taskview_01.jpeg"
+              style="height: 60px;box-shadow: 0 2px 3px rgba(0, 0, 0, 0.302);"></img>
+          </div>
+
+          <div style="margin-left:10px">
+            <img src="../assets/taskview_02.jpg" style="height: 60px;box-shadow: 0 2px 3px rgba(0, 0, 0, 0.302);"></img>
+          </div>
+        </div>
+
+
+        <div class="liubai_dt"></div>
+
+
+        <div class="taskview_flex">
+          <div class="taskview_title">负责人</div>
+          <div class="taskview_item">李四<span style="margin-left:20px;color:#6495ed"> <svg class="icon"
+                aria-hidden="true">
+                <use xlink:href="#icon-dianhua"></use>
+              </svg>13600136000</span></div>
+        </div>
+
+
+        <div class="taskview_flex" v-if="taskflag_dt!='待接收'">
+          <div class="taskview_title">接收时间</div>
+          <div class="taskview_item">2019/10/25 15:27</div>
+        </div>
+
+        <div class="taskview_flex" v-if="taskflag_dt!='待接收'&&taskflag_dt!='待开工'">
+          <div class="taskview_title">开工时间</div>
+          <div class="taskview_item">2019/10/25 15:32</div>
+        </div>
+
+        <div class="taskview_flex" v-if="taskflag_dt=='待验收'||taskflag_dt=='完工'">
+          <div class="taskview_title">完工时间</div>
+          <div class="taskview_item">2019/10/25 15:50</div>
+        </div>
+
+
+        <div class="taskview_flex" v-if="taskflag_dt=='待验收'||taskflag_dt=='完工'">
+          <div class="taskview_title">维修项目</div>
+          <div class="taskview_item">
+            <div>指示灯异常</div>
+            <div>机器运转有异响</div>
+          </div>
+        </div>
+
+
+        <div class="taskview_flex" v-if="taskflag_dt=='待验收'||taskflag_dt=='完工'">
+          <div class="taskview_title">维修备注</div>
+          <div class="taskview_item">线路接触不良,已作紧固处理</div>
+        </div>
+
+
+        <!-- 完工状态下才显示验收评价信息 -->
+        <div v-if="taskflag_dt=='完工'">
+          <div class="liubai_dt"></div>
+
+
+          <div class="taskview_flex">
+            <div class="taskview_title">验收时间</div>
+            <div class="taskview_item">2019/10/25 15:58</div>
+          </div>
+
+          <div class="taskview_flex">
+            <div class="taskview_title">评分</div>
+            <div class="taskview_item" style="font-size:22px;">
+              <svg class="icon" aria-hidden="true">
+                <use xlink:href="#icon-xing1"></use>
+              </svg>
+              <svg class="icon" aria-hidden="true">
+                <use xlink:href="#icon-xing1"></use>
+              </svg>
+              <svg class="icon" aria-hidden="true">
+                <use xlink:href="#icon-xing1"></use>
+              </svg>
+              <svg class="icon" aria-hidden="true">
+                <use xlink:href="#icon-xing"></use>
+              </svg>
+              <svg class="icon" aria-hidden="true">
+                <use xlink:href="#icon-xing"></use>
+              </svg>
+            </div>
+          </div>
+
+          <div class="taskview_flex">
+            <div class="taskview_title">评语</div>
+            <div class="taskview_item">不及时赶赴现场,业务不熟练</div>
+          </div>
+        </div>
+      </div>
+
+    </div>
+
+    <div class="quote_edit_btn_wrap" v-if="taskflag_dt!='完工'">
+
+      <div class="quote_edit_btn" v-if="taskflag_dt!='待验收'">
+        <span v-if="taskflag_dt=='待接收'">接收</span>
+        <span v-if="taskflag_dt=='待开工'">开工</span>
+        <span v-if="taskflag_dt=='维修中'">完成</span>
+      </div>
+
+      <!-- 待验收状态下,底部按钮是两个:【返工】|【验收】 -->
+      <div class="quote_edit_btn" style="background-color: #ffb732" v-if="taskflag_dt=='待验收'">
+        返工
+      </div>
+      <div class="quote_edit_btn" v-if="taskflag_dt=='待验收'">
+        验收
+      </div>
+    </div>
+
+    <!-- 完成任务、验收任务弹出界面 -->
+    <div v-if="ifresponse>0">
+      <div class="taskview_mask"></div>
+
+      <div :class="response_height" class="taskview_response">
+        <div style="display:flex;align-items: center;">
+          <div style="font-size:15px;padding:0 20px;color:#888">
+            <span v-if="ifresponse==2">任务验收</span>
+            <span v-if="ifresponse==1">完成任务</span>
+          </div>
+
+          <div style="position: absolute;right: 20px;color: #ccc;font-size: 12px;">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-guanbi"></use>
+            </svg>
+          </div>
+        </div>
+
+        <!-- 评价星级 -->
+        <div class="taskview_flex" style="margin-top:15px;" v-if="ifresponse==2">
+          <div class="taskview_title">评分</div>
+          <div class="taskview_item" style="font-size:22px;">
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-xing1"></use>
+            </svg>
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-xing1"></use>
+            </svg>
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-xing1"></use>
+            </svg>
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-xing"></use>
+            </svg>
+            <svg class="icon" aria-hidden="true">
+              <use xlink:href="#icon-xing"></use>
+            </svg>
+          </div>
+        </div>
+        <!-- 评价任务时选择标签 -->
+        <div v-if="ifresponse == 2">
+          <div style="margin:10px 20px">请选择标签</div>
+          <div style="display:flex;margin:10px 20px;align-items: center;">
+            <div class="tip_check">不及时赶赴现场</div>
+            <div style="margin-left:20px;" class="tip_nocheck">工作态度不好</div>
+          </div>
+          <div style="display:flex;margin:10px 20px;align-items: center;">
+            <div class="tip_nocheck">维修时间太长</div>
+            <div style="margin-left:20px;" class="tip_check">业务不熟练</div>
+          </div>
+        </div>
+
+        <!-- 完成任务时选择维修项目 -->
+        <div style="margin-top:10px;padding: 0px 20px;" v-if="ifresponse == 1">
+          <div style="font-size:16px;font-weight:bold">维修项目</div>
+          <div style="margin-top:0px">
+
+            <div class="finishitem">指示灯异常
+              <span style="position: absolute;right: 30px;color:#999;font-size:12px">
+                <svg class="icon" aria-hidden="true">
+                  <use xlink:href="#icon-guanbi"></use>
+                </svg>
+              </span>
+            </div>
+
+            <div class="finishitem">机器运转有异响
+              <span style="position: absolute;right: 30px;color:#999;font-size:12px">
+                <svg class="icon" aria-hidden="true">
+                  <use xlink:href="#icon-guanbi"></use>
+                </svg>
+              </span>
+            </div>
+
+            <div style="color:#aaa;margin:10px 0 ">
+              <span style="color:#999;font-size:15px">
+                <svg class="icon" aria-hidden="true">
+                  <use xlink:href="#icon-shuliangjia1"></use>
+                </svg>
+              </span>增加维修项目
+
+            </div>
+          </div>
+        </div>
+
+        <!-- 评语 或 汇报 录入 -->
+        <div style="width: 100%;text-align: center;">
+          <textarea name="banreason" rows="5" placeholder="其它意见和建议" style="width: 90%;font-size: 15px;margin: 10px;"
+            v-if="ifresponse==2">
+            </textarea>
+
+          <textarea name="banreason" rows="5" placeholder="可录入维修情况" style="width: 90%;font-size: 15px;margin: 10px;"
+            v-if="ifresponse==1">
+            </textarea>
+
+        </div>
+
+
+        <!-- 提交按钮 -->
+        <div class="quote_edit_btn_wrap">
+          <div class="quote_edit_btn">
+            <span v-if="ifresponse==2">验收</span>
+            <span v-if="ifresponse==1">完成</span>
+          </div>
+        </div>
+
+      </div>
+    </div>
+
+
+
+  </div>
+</template>
+<script>
+  export default {
+    name: 'taskview',
+    data() {
+      return {
+        taskflag_dt: "完工", //待接收,待开工,维修中,待验收,完工
+        ifresponse: 0, //弹窗 0:不弹  1:完工界面 2:验收任务界面
+      }
+    },
+    computed: {
+      colortop: function () {
+        return {
+          taskview_toparea_red: this.taskflag_dt == "待接收" || this.taskflag_dt == "待开工",
+          taskview_toparea_green: this.taskflag_dt == "维修中" || this.taskflag_dt == "待验收",
+          taskview_toparea_blue: this.taskflag_dt == "完工"
+        };
+      },
+      colortop_sec: function () {
+        return {
+          taskview_toparea_red_sec: this.taskflag_dt == "待接收" || this.taskflag_dt == "待开工",
+          taskview_toparea_green_sec: this.taskflag_dt == "维修中" || this.taskflag_dt == "待验收",
+          taskview_toparea_blue_sec: this.taskflag_dt == "完工"
+        };
+      },
+      colortop_thr: function () {
+        return {
+          taskview_toparea_red_thr: this.taskflag_dt == "待接收" || this.taskflag_dt == "待开工",
+          taskview_toparea_green_thr: this.taskflag_dt == "维修中" || this.taskflag_dt == "待验收",
+          taskview_toparea_blue_thr: this.taskflag_dt == "完工"
+        };
+      },
+      response_height: function () {
+        return {
+          response_height_1: this.ifresponse == 1,
+          response_height_2: this.ifresponse == 2
+        };
+      }
+    }
+
+  }
+
+</script>
+<style>
+  body {
+    margin: 0;
+    padding: 0;
+    background-color: #fff;
+    font-family: "微软雅黑";
+    font-size: 14px;
+  }
+
+  .taskview_iffg {
+    background-color: #fdd1cd;
+    color: #ff6f61;
+    font-size: 12px;
+    margin: 0 4px 0 0;
+    padding: 3px 8px;
+    border-radius: 15px;
+    text-align: center;
+  }
+
+  .response_height_1 {
+    height: 370px;
+  }
+
+  .response_height_2 {
+    height: 370px;
+  }
+
+  .taskview_mask {
+    height: 100%;
+    width: 100%;
+    background-color: #1d1d1d;
+    opacity: 0.8;
+    position: fixed;
+    top: 0px;
+    z-index: 9998;
+  }
+
+  .taskview_response {
+    z-index: 9999;
+    background-color: #ffffff;
+    position: fixed;
+    bottom: 0px;
+    /* height: 330px; */
+    width: 100%;
+    border-top-left-radius: 15px;
+    border-top-right-radius: 15px;
+    padding: 10px 0;
+  }
+
+  .topbar {
+    min-height: 44px;
+    border-bottom: 1px solid #e5e5e5;
+    background: #fff;
+    position: fixed;
+    width: 100%;
+    z-index: 9997;
+    display: flex;
+    font-size: 18px;
+    align-items: center;
+  }
+
+  .topbar_left {
+    flex: 0 0 20px;
+    margin-left: 10px;
+  }
+
+  .topbar_middle {
+    /* text-align: center; */
+    padding: 0 0 0 10px;
+    flex: 0 0 89%;
+  }
+
+  .topbar_right {
+    flex: 0 0 20px;
+    position: absolute;
+    right: 10px;
+  }
+
+  .taskview_info {
+    font-size: 16px;
+    padding: 5px 20px;
+  }
+
+  .taskview_toparea {
+    position: absolute;
+    top: 44px;
+    width: 100%;
+    display: flex;
+    color: #fff;
+    background-color: #fc4e2c;
+    font-size: 16px;
+    font-weight: bold;
+    align-items: center;
+    height: 35px;
+  }
+
+  .taskview_toparea_red {
+    background-color: #fc4e2c;
+  }
+
+  .taskview_toparea_green {
+    background-color: #8dc026;
+  }
+
+  .taskview_toparea_blue {
+    background-color: #46a4da;
+  }
+
+  .taskview_toparea_sec {
+    position: absolute;
+    top: 79px;
+    height: 5px;
+    background-color: #fd8e78;
+    width: 100%;
+  }
+
+  .taskview_toparea_red_sec {
+    background-color: #fd8e78;
+  }
+
+  .taskview_toparea_green_sec {
+    background-color: #bbe26e;
+  }
+
+  .taskview_toparea_blue_sec {
+    background-color: #90cef1;
+  }
+
+  .taskview_toparea_thr {
+    position: absolute;
+    top: 84px;
+    height: 5px;
+    background-color: #ffdbd4;
+    width: 100%;
+  }
+
+  .taskview_toparea_red_thr {
+    background-color: #ffdbd4;
+  }
+
+  .taskview_toparea_green_thr {
+    background-color: #e3f8b8;
+  }
+
+  .taskview_toparea_blue_thr {
+    background-color: #d1edfd;
+  }
+
+  .taskview_top_type {
+    padding: 0 0 0 20px;
+  }
+
+  .taskview_top_flag {
+    position: absolute;
+    right: 20px;
+  }
+
+  .taskview_top_delay {
+    position: absolute;
+    right: 80px;
+    font-size: 12px;
+    height: 24px;
+    line-height: 24px;
+    background-color: #fdd1cd;
+    color: #ff6f61;
+    width: 45px;
+    border-radius: 15px;
+    text-align: center;
+  }
+
+  .taskview_finish_delay {
+    margin: 0 0 0 10px;
+    font-size: 12px;
+    height: 18px;
+    line-height: 18px;
+    background-color: #fdd1cd;
+    color: #ff6f61;
+    width: 40px;
+    border-radius: 15px;
+    text-align: center;
+  }
+
+  .taskview {
+    position: absolute;
+    top: 90px;
+    width: 100%;
+    margin-bottom: 80px;
+  }
+
+  .taskview_main {
+    padding: 0px 0px;
+  }
+
+  .taskview_flex {
+    display: flex;
+    line-height: 25px;
+    align-items: flex-start;
+    padding: 0px 20px;
+  }
+
+
+  .taskview_title {
+    font-size: 14px;
+    font-weight: bold;
+    flex: 0 0 60px;
+    text-align: justify;
+    text-align-last: justify;
+  }
+
+  .taskview_check_title {
+    font-size: 14px;
+    font-weight: bold;
+    padding: 5px 0 0 20px;
+  }
+
+  .taskview_check_dscrp {
+    color: #777;
+    padding: 0 20px;
+  }
+
+  .taskview_item {
+    /* flex: 0 0 80%; */
+    /* border-bottom: 1px solid #e5e5e5; */
+    margin: 0 0 0 10px;
+    color: #777
+  }
+
+  .taskview_pzbtn {
+    /* position: absolute;
+    right: 20px; */
+    margin-left: 20px;
+    color: #ccc;
+    font-size: 16px;
+  }
+
+  .taskview_date {
+    position: absolute;
+    right: 40px;
+    color: #777
+  }
+
+  .taskview_dscrp {
+    padding: 10px;
+    line-height: 20px;
+    border: 1px solid #e5e5e5;
+    border-radius: 5px;
+    margin: 5px 0 5px 10px;
+    height: 100px;
+    color: #777;
+    width: 100%
+  }
+
+  .color_sub {
+    color: #999
+  }
+
+  .quote_edit_btn_wrap {
+    display: flex;
+    position: fixed;
+    bottom: 0;
+    /* background-color: #fc4e2c; */
+    width: 100%;
+    z-index: 9990;
+    align-items: center;
+    justify-content: center;
+    /* padding: 5px 0 2px 0; */
+    box-shadow: 0 -1px 3px #f1f1f1;
+  }
+
+  .quote_edit_btn {
+    /* background-color: #ffb732; */
+    background-color: #fc4e2c;
+    color: #ffffff;
+    font-size: 16px;
+    font-weight: bold;
+    text-align: center;
+    padding: 10px;
+    width: 100%;
+  }
+
+  .taskview_fjarea {
+    margin: 10px 20px;
+    color: #777
+  }
+
+  .taskview_fjlist {
+    padding: 0px 0 0 20px;
+    align-items: center;
+    display: flex;
+    font-size: 14px;
+    height: 25px;
+    line-height: 25px;
+  }
+
+  .taskview_fjsize {
+    font-size: 14px;
+    color: #aaa;
+    margin-left: 10px;
+  }
+
+  .taskview_fjdel {
+    font-size: 15px;
+    color: #fc4e2c;
+    position: absolute;
+    right: 20px;
+  }
+
+  .taskview_addpic {
+    margin: 0 0 20px 15px;
+    background-color: #f6f6f6;
+    color: #bbb;
+    height: 100px;
+    flex: 0 0 100px;
+    text-align: center;
+    line-height: 100px;
+    font-size: 30px;
+  }
+
+  .liubai_dt {
+    width: 100%;
+    height: 10px;
+    background-color: #f6f6f6;
+    margin: 10px 0;
+  }
+
+  .finishitem {
+    line-height: 40px;
+    border-bottom: 1px solid #f5f5f5;
+    color: #666
+  }
+
+  .tip_check {
+    padding: 3px 10px;
+    background-color: #fc4e2c;
+    color: #fff;
+    font-weight: bold;
+    border-radius: 15px;
+  }
+
+  .tip_nocheck {
+    padding: 3px 10px;
+    border-radius: 15px;
+    border: 1px solid #e5e5e5;
+    color: #aaa
+  }
+
+</style>

+ 339 - 0
src/pages/equipment.vue

@@ -0,0 +1,339 @@
+<template>
+  <div>
+    <!-- 标题栏 -->
+    <div class="topbar">
+      <div class="topbar_left">
+        <svg class="icon" aria-hidden="true">
+          <use xlink:href="#icon-fanhui"></use>
+        </svg>
+      </div>
+      <div class="topbar_middle">
+        设备管理
+      </div>
+      <div class="topbar_right" style="font-size:23px">
+        <!-- 报修按钮 -->
+        <svg class="icon" aria-hidden="true" style="margin-right:30px">
+          <use xlink:href="#icon-weixiu"></use>
+        </svg>
+
+        <!-- 扫描按钮 -->
+        <svg class="icon" aria-hidden="true">
+          <use xlink:href="#icon-qrcode-scan"></use>
+        </svg>
+      </div>
+    </div>
+
+
+    <div class="maininfo">
+
+      <!-- 设备信息 -->
+      <div class="eqinfo">
+        <div class="eqname">
+          <div>2#气密机</div>
+          <div class="eqstatus">正常</div>
+        </div>
+        <div v-for="(info,index) in eqinfo " :key="index" class="eqinfolist">
+          <span class="eqlable">{{info.lable}}:</span>
+          <span class="eqvalue">{{info.value}}</span>
+        </div>
+      </div>
+
+      <div class="liubai_dt"></div>
+
+      <!-- 维护计划列表,按计划开始时间倒序排列,列出前5条 -->
+      <div class="subtitle_dt">维护计划</div>
+
+      <div
+        style="display:flex;font-size:13px;margin-top:5px;border-bottom: 1px solid #eee;padding:10px 10px 0px 10px;color:#666;line-height:30px">
+        <div style="flex:0 0 10%;text-align: center;">完成</div>
+        <div style="flex:0 0 25%;text-align: center;">计划时间</div>
+        <div style="flex:0 0 15%;text-align: center;">负责人</div>
+        <div style="flex:0 0 12%;text-align: center;">工时</div>
+        <div style="flex:0 0 38%;text-align: center;">计划摘要</div>
+      </div>
+
+      <div style="padding:0 0 10px 0 ">
+        <div v-for="(plan,index) in eqplan" :key="index"
+          style="display:flex;margin-top:5px;border-bottom: 1px solid #eee;line-height:20px;font-size:12px;padding:5px 10px;align-items: center">
+          <div style="flex:0 0 10%;text-align: center;font-size:18px;">
+            <svg class="icon" aria-hidden="true" v-if="plan.status == 0">
+              <use xlink:href="#icon-jianzhanbuzhouweiwan"></use>
+            </svg>
+            <svg class="icon" aria-hidden="true" v-if="plan.status == 1">
+              <use xlink:href="#icon-zhengque1"></use>
+            </svg>
+          </div>
+          <div style="flex:0 0 25%;text-align: center;">
+            <div>{{plan.stime}}</div>
+            <div>{{plan.etime}}</div>
+          </div>
+          <div style="flex:0 0 15%;text-align: center;">{{plan.emp}}</div>
+          <div style="flex:0 0 12%;text-align: center;">{{plan.workhour}}</div>
+          <div style="flex:0 0 38%;text-align: center;">{{plan.dscrp}}</div>
+        </div>
+      </div>
+      
+      <div class="liubai_dt"></div>
+
+      <div class="subtitle_dt">维修记录</div>
+
+      <div
+        style="display:flex;font-size:13px;margin-top:5px;border-bottom: 1px solid #eee;padding:10px 10px 0px 10px;color:#666;line-height:30px">
+        <div style="flex:0 0 15%;text-align: center;">状态</div>
+        <div style="flex:0 0 30%;text-align: center;">维修时间</div>
+        <div style="flex:0 0 15%;text-align: center;">负责人</div>
+        <div style="flex:0 0 40%;text-align: center;">项目摘要</div>
+      </div>
+
+      <div style="padding:0 0 10px 0 ">
+        <div v-for="(fix,index) in eqfix" :key="index"
+          style="display:flex;margin-top:5px;border-bottom: 1px solid #eee;line-height:20px;font-size:12px;padding:5px 10px;align-items: center">
+          <div style="flex:0 0 15%;text-align: center;" class="fixstatus" v-bind:class="{bg_red:(fix.status == '维修中')}">
+            <span >{{fix.status}}</span>
+          </div>
+          <div style="flex:0 0 30%;text-align: center;">
+            <div>{{fix.stime}}</div>
+            <div>{{fix.etime}}</div>
+          </div>
+          <div style="flex:0 0 15%;text-align: center;">{{fix.emp}}</div>
+          <div style="flex:0 0 40%;text-align: center;">{{fix.dscrp}}</div>
+        </div>
+      </div>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'equipment',
+    data() {
+      return {
+        eqinfo: [{
+            lable: "设备类型",
+            value: "生产设备"
+          },
+          {
+            lable: "设备种类",
+            value: "气密机"
+          },
+          {
+            lable: "设备编号",
+            value: "572-102"
+          },
+          {
+            lable: "型号规格",
+            value: "BD-QM"
+          },
+          {
+            lable: "制造厂家",
+            value: "浙江联风机械设备有限公司"
+          },
+          {
+            lable: "启用年月",
+            value: "2010年6月"
+          },
+          {
+            lable: "生产线",
+            value: "减震器焊接6线"
+          },
+          {
+            lable: "所属车间",
+            value: "焊接车间"
+          },
+          {
+            lable: "重要设备",
+            value: "是"
+          },
+          {
+            lable: "维护人员",
+            value: "李四 13600136000"
+          },
+          {
+            lable: "本月累计故障次数",
+            value: "4"
+          },
+          {
+            lable: "本月累计故障时间",
+            value: "14分17秒"
+          },
+          {
+            lable: "本月累计故障率",
+            value: "1.22%"
+          }
+        ],
+        eqplan: [{
+            status: 0,
+            stime: "2019/11/1",
+            etime: "13:00~14:00",
+            emp: "李四",
+            workhour: 1,
+            dscrp: '检查后档板、刀架运行时有无震动噪音等现象'
+          },
+          {
+            status: 1,
+            stime: "2019/10/4",
+            etime: "13:00~14:00",
+            emp: "李四",
+            workhour: 1,
+            dscrp: '检查后档板、刀架运行时有无震动噪音等现象'
+          },
+          {
+            status: 1,
+            stime: "2019/9/15",
+            etime: "17:30~18:00",
+            emp: "张三",
+            workhour: 0.5,
+            dscrp: '紧固所有螺栓'
+          },
+          {
+            status: 1,
+            stime: "2019/9/1",
+            etime: "18:00~19:00",
+            emp: "李四",
+            workhour: 1,
+            dscrp: '检查后档板、刀架运行时有无震动噪音等现象'
+          },
+          {
+            status: 1,
+            stime: "2019/8/1",
+            etime: "18:00~19:00",
+            emp: "李四",
+            workhour: 1,
+            dscrp: '检查后档板、刀架运行时有无震动噪音等现象'
+          }
+        ],
+        eqfix:[
+            {status:"维修中",stime:"2019/10/25",etime:"15:20~现在",emp:"李四",dscrp:"设备部分器件失电"},
+            {status:"完工",stime:"2019/10/12",etime:"16:40~17:04",emp:"李四",dscrp:"回程压力阀损坏"},
+            {status:"完工",stime:"2019/9/19",etime:"13:20~14:40",emp:"李四",dscrp:"机器运转有异响"},
+        ]
+
+      }
+
+    }
+
+
+  }
+
+</script>
+
+<style>
+  body {
+    margin: 0;
+    padding: 0;
+    background-color: #fff;
+    font-family: "微软雅黑";
+    font-size: 15px;
+  }
+
+
+  .topbar {
+    min-height: 44px;
+    border-bottom: 1px solid #e5e5e5;
+    background: #fff;
+    position: fixed;
+    width: 100%;
+    z-index: 9999;
+    display: flex;
+    font-size: 18px;
+    align-items: center;
+  }
+
+  .topbar_left {
+    flex: 0 0 20px;
+    margin-left: 10px;
+  }
+
+  .topbar_middle {
+    /* text-align: center; */
+    padding: 0 0 0 10px;
+    flex: 0 0 89%;
+  }
+
+  .topbar_right {
+    /* flex: 0 0 20px; */
+    position: absolute;
+    right: 20px;
+  }
+
+  .maininfo {
+    position: absolute;
+    top: 44px;
+    width: 100%;
+    margin-bottom: 80px;
+  }
+
+  .eqinfo {
+    padding: 10px 20px;
+  }
+
+  .eqname {
+    display: flex;
+    font-size: 20px;
+    font-weight: bold;
+    margin-bottom: 10px;
+    align-items: center
+  }
+
+  .eqstatus {
+    position: absolute;
+    right: 20px;
+    width: 55px;
+    font-size: 13px;
+    font-weight: bold;
+    color: #fff;
+    border-radius: 15px;
+    padding: 3px;
+    text-align: center;
+    margin-right: 5px;
+    background-color: #8dc026;
+  }
+
+  .eqinfolist {
+    line-height: 25px;
+  }
+
+  .eqlable {
+    font-size: 15px;
+    font-weight: bold;
+    color: #555
+  }
+
+  .eqvalue {
+    font-size: 15px;
+    color: #777;
+  }
+
+  .liubai_dt {
+    width: 100%;
+    height: 10px;
+    background-color: #f6f6f6;
+    margin: 10px 0;
+  }
+
+  .subtitle_dt {
+    font-size: 17px;
+    font-weight: 700;
+    text-align: center;
+    margin: 0 20px;
+    /* height: 42px; */
+    /* line-height: 43px; */
+  }
+  .fixstatus {
+    width: 50px;
+    font-size: 12px;
+    font-weight: bold;
+    color: #fff;
+    border-radius: 15px;
+    padding: 2px;
+    text-align: center;
+    margin-right: 5px;
+    background-color: #8dc026;
+  }
+
+  .bg_red{
+      background-color:red
+  }
+</style>

+ 1 - 1
src/pages/taskview.vue

@@ -413,7 +413,7 @@
     name: 'taskview',
     data() {
       return {
-        tasktype: 0, //0-临时任务 1-客户走访 2-稽核检查
+        tasktype: 2, //0-临时任务 1-客户走访 2-稽核检查
         taskflag_dt: "未完成", //未完成,待验收,已验收
         ifresponse: 0, //弹窗 0:不弹  1:完成任务界面 2:验收任务界面
         iffg: 1 //0-不是返工 1-返工

+ 127 - 0
src/pages/wkpmxlist.vue

@@ -0,0 +1,127 @@
+<template>
+  <div>
+    <div class="about_topbar">
+      <div class="about_topbar_left">
+        <svg class="icon" aria-hidden="true">
+          <use xlink:href="#icon-fanhui"></use>
+        </svg>
+      </div>
+      <div class="about_topbar_middle">
+        木工组 8月1日
+      </div>
+      <div class="about_topbar_right">
+
+      </div>
+    </div>
+    <div class="about_wrap">
+      <div
+        style="display:flex;font-size:14px;margin-top:5px;border-bottom: 1px solid #eee;padding:0 0 5px 0;color:#666;line-height:35px;">
+        <div style="flex:0 0 35%;text-align: center;">指令单号</div>
+        <div style="flex:0 0 35%;text-align: center;">产品名称</div>
+        <div style="flex:0 0 15%;text-align: center;">工时数</div>
+        <div style="flex:0 0 10%;text-align: center;">占比</div>
+      </div>
+
+      <div
+        style="display:flex;margin-top:5px;border-bottom: 1px solid #eee;line-height:25px;font-size:14px;padding:5px 0"
+        v-for="(wkpitem,index) in wkplist" :key="index">
+        <div style="flex:0 0 35%;text-align: center;">{{wkpitem.ordercode}}</div>
+        <div style="flex:0 0 35%;text-align: left;">{{wkpitem.mtrlname}}</div>
+        <div style="flex:0 0 15%;text-align: center;">{{wkpitem.workhour}}</div>
+        <div style="flex:0 0 10%;text-align: center;">{{wkpitem.percent}}</div>
+      </div>
+
+      <div style="font-size: 12px; color: rgb(102, 102, 102); margin: 30px 0px 10px 20px;">*点击可查看指令单详情数据</div>
+
+    </div>
+  </div>
+</template>
+<script>
+  export default {
+    name: "wkpmxlist",
+    data() {
+      return {
+        wkplist: [{
+            ordercode: "SC190801001",
+            workhour: 2,
+            percent: '12.5%',
+            mtrlname: 'W-161D黑色四个装 FHD6605'
+          },
+          {
+            ordercode: "SC190801002",
+            workhour: 1,
+            percent: '12.5%',
+            mtrlname: '7-87单只装 FHD59301'
+          },
+          {
+            ordercode: "SC190801003",
+            workhour: 1,
+            percent: '12.5%',
+            mtrlname: '7-96A五只装 FHD59301'
+          },
+          {
+            ordercode: "SC190801004",
+            workhour: 1,
+            percent: '12.5%',
+            mtrlname: 'W-135 无扶手 FHLWQ6401'
+          },
+          {
+            ordercode: "SC190801005",
+            workhour: 1,
+            percent: '12.5%',
+            mtrlname: '7-07C四个一箱 FHLWY101'
+          },
+          {
+            ordercode: "SC190801006",
+            workhour: 1,
+            percent: '12.5%',
+            mtrlname: 'W-132 FHZYQ4401'
+          }
+        ]
+      }
+    }
+  }
+
+</script>
+<style>
+  body {
+    margin: 0;
+    padding: 0;
+    background-color: #ffffff;
+    font-family: "微软雅黑";
+  }
+
+  .about_topbar {
+    min-height: 44px;
+    border-bottom: 1px solid #e5e5e5;
+    background: #fff;
+    position: fixed;
+    width: 100%;
+    z-index: 9999;
+    display: flex;
+    font-size: 18px;
+    align-items: center;
+  }
+
+  .about_topbar_left {
+    /* flex: 0 0 %; */
+    margin-left: 10px;
+  }
+
+  .about_topbar_middle {
+    text-align: center;
+    flex: 0 0 85%;
+  }
+
+  .about_topbar_right {
+    /* flex: 0 0 10%; */
+    position: absolute;
+    right: 10px;
+  }
+
+
+  .about_wrap {
+    padding: 45px 0
+  }
+
+</style>

+ 24 - 0
src/router/index.js

@@ -44,6 +44,10 @@ import HomeRp from '@/pages/homerp'
 import OrderZl from '@/pages/orderzl'
 import OrderZLMX from '@/pages/orderzlmx'
 import OrderWkpMx from '@/pages/orderwkpmx'
+import Wkpmxlist from '@/pages/wkpmxlist'
+import Equipment from '@/pages/equipment'
+import Eqfixedit from '@/pages/eqfixedit'
+import Eqfixview from '@/pages/eqfixview'
 
 Vue.use(Router)
 
@@ -54,6 +58,26 @@ export default new Router({
       name: 'Home',
       component: Home
     },
+    {
+      path: '/wkpmxlist',
+      name: 'Wkpmxlist',
+      component: Wkpmxlist
+    },
+    {
+      path: '/eqfixedit',
+      name: 'Eqfixedit',
+      component: Eqfixedit
+    },
+    {
+      path: '/eqfixview',
+      name: 'Eqfixview',
+      component: Eqfixview
+    },
+    {
+      path: '/equipment',
+      name: 'Equipment',
+      component: Equipment
+    },
     {
       path: '/aboutcses',
       name: 'AboutCses',