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

pages/account/login/index.vue

@@ -14,9 +14,9 @@
         <div class="bg bg3">1</div>
       </CarouselItem>
     </Carousel>
-    <div v-if="showI18n" class="page-account-header">
+    <!-- <div v-if="showI18n" class="page-account-header">
       <i-header-i18n />
-    </div>
+    </div> -->
     <div class="main">
       <div class="ad">
         <img src="@/assets/images/login/ad.png" />

pages/aps/dispatch/index.vue

@@ -25,6 +25,7 @@
               </RadioGroup>
             </span>
           </p>
+          <h4 class="tc" v-if="this.listTask.length==0">暂无数据</h4>
           <div class="dispatch_part_body" v-if="listShow == '订单'" :style="{height:byheight}">
             <!-- {{ids}} -->
             <!-- <Collapse simple> -->
@@ -134,6 +135,7 @@
             </span>
           </p>
           <div class="dispatch_part_body" :style="{height:byheight}">
+            <h4 class="tc" v-if="listMan.length==0 || listSheBei.length==0">暂无数据</h4>
             <div class="shebei" v-if="button2 == '设备'">
               <Row :gutter="15">
                 <!-- {{shebeiId}} -->
@@ -228,10 +230,10 @@
               <UserSelect
                 ref="userSelected"
                 v-model="entity.userIds"
-                :type="3"
                 :multiple="true"
                 style="width: 500px"
               />
+              <!-- :type="3" -->
             </FormItem>
           </Col>
           <Col span="24" class="drawer_midell">
@@ -482,19 +484,6 @@ export default {
         this.listTask = savedUl;
       });
     },
-    // 数组去重
-    getArray(a) {
-      const hash = {};
-      const len = a.length;
-      const result = [];
-      for (let i = 0; i < len; i++) {
-        if (!hash[a[i]]) {
-          hash[a[i]] = true;
-          result.push(a[i]);
-        }
-      }
-      return result;
-    },
     // 时间改变方法
     handleChange(daterange) {
       this.newList.map(u => {
@@ -520,7 +509,7 @@ export default {
       let timebegin = formData[0].beginTime;
       let timend = formData[0].endTime;
       this.newList = [];
-      console.log("选中的id",chekids)
+      // console.log("选中的id",chekids)
       chekids.forEach(v => {
         var item = formData.filter(u => {
           return u.id == v;
@@ -546,60 +535,64 @@ export default {
         // }
         this.manModal = true;
       }
-      console.log("选中的数据", this.newList);
+      // console.log("选中的数据", this.newList);
     },
     // 设备派工
     sendSheBei() {
       let item = this.newList;
-      console.log(item)
+      // console.log(item)
       item.map(u => {
         u.userIds = this.entity.userIds;
         u.remark = this.entity.remark;
         u.equipId = this.shebeiId;
       });
-      // this.$refs["formValidate"].validate(valid => {
-      //   if (valid) {
-      //     Api.saveTeamentry(item).then(res => {
-      //       if (res.success) {
-      //         this.$Message.success("设备派工成功。");
-      //         this.getUserInfoFn();
-      //         this.facilityModal = false;
-      //       } else {
-      //         this.$Message.error("设备派工失败...");
-      //       }
-      //     });
-      //   } else {
-      //     this.$Message.error("校验不通过...");
-      //   }
-      // });
+      this.$refs["formValidate"].validate(valid => {
+        if (valid) {
+          let params = {
+            isDispatch: 1, //派工是1，保存是0
+            entryList: item
+          };
+          Api.saveTeamentry(params).then(res => {
+            if (res.success) {
+              this.$Message.success("设备派工成功。");
+              this.getUserInfoFn();
+              this.facilityModal = false;
+            } else {
+              this.$Message.error("设备派工失败...");
+            }
+          });
+        } else {
+          this.$Message.error("校验不通过...");
+        }
+      });
     },
     // 人员派工
     sendUser() {
       let item = this.newList;
-      console.log("派工的数据",item)
+      // console.log("派工的数据",item)
       item.map(u => {
         u.userIds = this.peploeId;
         u.remark = this.pentity.remark;
       });
-      // this.$refs["formpepole"].validate(valid => {
-      //   if (valid) {
-      //     let params = {
-      //       isDispatch: 1, //派工是1，保存是0
-      //       entryList: item
-      //     };
-      //     Api.saveTeamentry(params).then(res => {
-      //       if (res.success) {
-      //         this.$Message.success("人员派工成功。");
-      //         this.getUserInfoFn();
-      //         this.manModal = false;
-      //       } else {
-      //         this.$Message.error("人员派工失败...");
-      //       }
-      //     });
-      //   } else {
-      //     this.$Message.error("校验不通过...");
-      //   }
-      // });
+      this.$refs["formpepole"].validate(valid => {
+        if (valid) {
+          let params = {
+            isDispatch: 1, //派工是1，保存是0
+            entryList: item
+          };
+          Api.saveTeamentry(params).then(res => {
+            if (res.success) {
+              this.$Message.success("人员派工成功。");
+              this.getUserInfoFn();
+              this.manModal = false;
+            } else {
+              this.$Message.error("人员派工失败...");
+            }
+          });
+        } else {
+          this.$Message.error("校验不通过...");
+        }
+      });
     },
     // 拆分方法
     setChai(item, index) {
@@ -673,7 +666,7 @@ export default {
       let orders = this.$u.group(this.listTask, u => {
         return u.mesCode;
       });
-      console.warn("listOrder", orders);
+      // console.warn("listOrder", orders);
       return orders;
     },
     peploeId() {

pages/mordent/Sluggish/placode/index.vue

@@ -62,7 +62,7 @@ import Edit from './edit'
 import Detail from './detail'
 import Search from './search'
 import Inventory from './inventory'
-import StoreHouseLeft from '@/components/modalTree/StoreHouseLeft.vue'
+import StoreHouseLeft from '@/components/modalTree/storeHouseLeft.vue'
 export default {
   name: 'list',
   components: {

pages/mordent/Sluggish/powder/index.vue

@@ -84,7 +84,7 @@ import Detail from './detail'
 import Search from './search'
 import Inventory from './inventory'
 import tableGrid from '../../components/grid'
-import StoreHouseLeft from '@/components/modalTree/StoreHouseLeft.vue'
+import StoreHouseLeft from '@/components/modalTree/storeHouseLeft.vue'
 export default {
   components: {
     Add,

pages/mordent/Sluggish/scraper/index.vue

@@ -62,7 +62,7 @@ import Edit from './edit'
 import Detail from './detail'
 import Search from './search'
 import Inventory from './inventory'
-import StoreHouseLeft from '@/components/modalTree/StoreHouseLeft.vue'
+import StoreHouseLeft from '@/components/modalTree/storeHouseLeft.vue'
 export default {
   name: 'list',
   components: {

pages/resource/material/placode/index.vue

@@ -62,7 +62,7 @@ import Edit from './edit'
 import Detail from './detail'
 import Search from './search'
 import Inventory from './inventory'
-import StoreHouseLeft from '@/components/modalTree/StoreHouseLeft.vue'
+import StoreHouseLeft from '@/components/modalTree/storeHouseLeft.vue'
 export default {
   name: 'list',
   components: {

pages/resource/material/powder/index.vue

@@ -72,7 +72,7 @@ import Edit from "./edit";
 import Detail from "./detail";
 import Search from "./search";
 import Inventory from "./inventory";
-import StoreHouseLeft from "@/components/modalTree/StoreHouseLeft.vue";
+import StoreHouseLeft from "@/components/modalTree/storeHouseLeft.vue";
 export default {
   name: "list",
   components: {

pages/resource/material/scraper/index.vue

@@ -62,7 +62,7 @@ import Edit from './edit'
 import Detail from './detail'
 import Search from './search'
 import Inventory from './inventory'
-import StoreHouseLeft from '@/components/modalTree/StoreHouseLeft.vue'
+import StoreHouseLeft from '@/components/modalTree/storeHouseLeft.vue'
 export default {
   name: 'list',
   components: {

pages/resource/resource/index.vue

@@ -65,7 +65,7 @@ import Search from "./search";
 import Cart from "./cart";
 import Return from "./return";
 import Log from "./log";
-import StoreHouseLeft from "@/components/modalTree/StoreHouseLeft.vue";
+import StoreHouseLeft from "@/components/modalTree/storeHouseLeft.vue";
 const root = {
   id: 0,
   typeId: -1,

plugins/iview.js

@@ -17,11 +17,11 @@ import '@/styles/index.less';
 import Tools from '@/components/page/tool.vue'
 import State from '@/components/page/state.vue'
 import Dictionary from '@/components/page/dictionary.vue'
-import UserSelect from '@/components/page/UserSelect.vue'
+import UserSelect from '@/components/page/userSelect.vue'
 import RoleSelect from '@/components/page/roleSelect.vue'
-import UserExamSelect from '@/components/page/UserExamSelect.vue'
+import UserExamSelect from '@/components/page/userExamSelect.vue'
 import DepartmentSelect from '@/components/page/departmentSelect.vue'
-import WorkShopSelect from '@/components/page/WorkShopSelect.vue'
+import WorkShopSelect from '@/components/page/workShopSelect.vue'
 import workShopDefault from '@/components/page/workShopDefault.vue'
 import WorkShop from '@/components/page/workShop.vue'
 import EquipSelect from '@/components/page/equipSelect.vue'

static/Dockerfile

+FROM  nginx
+WORKDIR /usr/share/nginx/html
+COPY  . .
+COPY nginx.conf /etc/nginx/nginx.conf 
+RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+EXPOSE 3006
+ENTRYPOINT ["nginx", "-g","daemon off;"]

static/nginx.conf

+
+user nginx;
+worker_processes auto;
+error_log /var/log/nginx/error.log;
+pid /run/nginx.pid;
+
+include /usr/share/nginx/modules/*.conf;
+
+events {
+    worker_connections 1024;
+}
+
+http {
+	  log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+						  '$status $body_bytes_sent "$http_referer" '
+						  '"$http_user_agent" "$http_x_forwarded_for"';
+	  access_log  /var/log/nginx/access.log  main;
+	  
+	  sendfile            on;
+	  tcp_nopush          on;
+	  tcp_nodelay         on;
+	  keepalive_timeout   65;
+	  types_hash_max_size 2048;
+
+	  include             /etc/nginx/mime.types;
+	  default_type        application/octet-stream;
+	  include /etc/nginx/conf.d/*.conf;
+
+	  server {
+	   listen 3006;
+	   root  /usr/share/nginx/html;
+
+	   location / {
+			 try_files  $uri $uri/ @router;
+			 index  index.html  index.htm;
+	   }
+	   location @router {
+		  rewrite ^.*$.index.html last;
+	   }
+	 }
+  
+}
+