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

pages/crm/statistical/costomer/todolist.vue

 
 <style lang="less" scoped>
-@import '../card.less';
+@import "../card.less";
 </style>
 <template>
   <div class="todolist">
@@ -18,9 +18,12 @@
           :key="index"
         >
           <div class="leftIcon">
-            <div class="Icon_bg" :class="item.name=='物料复验' ? 'img_bg02':(item.name=='产品合格证' ? 'img_bg03':(item.name=='生产执行' ? 'img_bg04' : 'img_bg01'))" >
+            <div
+              class="Icon_bg"
+              :class="item.name=='物料复验' ? 'img_bg02':(item.name=='产品合格证' ? 'img_bg03':(item.name=='生产执行' ? 'img_bg04' : 'img_bg01'))"
+            >
               <!-- <div > -->
-              <img class="Icon_icon" src="@/assets/imgicon/u1640.png" alt="">
+              <img class="Icon_icon" :src="imgUrl + item.image" alt />
               <!-- <img class="Icon_icon" :src="imgUrl + item.image" alt /> -->
             </div>
           </div>
@@ -35,44 +38,44 @@
 </template>
 <script>
 export default {
-  name: 'todolist',
+  name: "todolist",
   data() {
     return {
       imgUrl: iconImg,
       listTask: []
-    }
+    };
   },
   created() {
-    this.get()
+    this.get();
   },
   methods: {
     topage() {
-      var info = { id: '123', message: '成功' }
-      this.$router.push({ name: 'handle', params: info })
+      var info = { id: "123", message: "成功" };
+      this.$router.push({ name: "handle", params: info });
       // tab(1)
     },
     get() {
-      let list = []
-      let url = `${systemUrl}/backlog/get`
-      this.$api.get(url).then((r) => {
+      let list = [];
+      let url = `${systemUrl}/backlog/get`;
+      this.$api.get(url).then(r => {
         //   console.log(r.result)
-        list = r.result
-        list.forEach((data) => {
+        list = r.result;
+        list.forEach(data => {
           //   console.log(data.totalUrl)
-          let ulrt = `http://${address}:` + data.totalUrl
-          data.totalUrl = ''
+          let ulrt = `http://${address}:` + data.totalUrl;
+          data.totalUrl = "";
 
-          this.$api.get(ulrt).then((r) => {
-            return (data.totalUrl = r.result)
-          })
-        })
-        let arr = list.slice(0, 6)
-        this.listTask = arr
-      })
+          this.$api.get(ulrt).then(r => {
+            return (data.totalUrl = r.result);
+          });
+        });
+        let arr = list.slice(0, 6);
+        this.listTask = arr;
+      });
     },
     goPage(u) {
-      this.$router.push(u.menuUrl)
+      this.$router.push(u.menuUrl);
     }
   }
-}
+};
 </script>
\ No newline at end of file

pages/handle/task.vue

@@ -9,14 +9,12 @@
       :key="index"
     >
      <div class="leftIco">
-        <!-- color:rgba(36, 158, 145, 1) -->
-        <!-- <span class="iconfont">&#xe607;</span> -->
-        <div :class="item.name=='物料复验' ? 'img_bg02':(item.name=='产品合格证' ? 'img_bg03':(item.name=='生产执行' ? 'img_bg04' : 'img_bg01'))" >
-          <!-- <img class="img_icon" :src="imgUrl + item.image" alt /> -->
-          <img class="img_icon" src="@/assets/imgicon/u1640.png" alt="">
+        <div
+          class="img_bg"
+          :class="item.name=='物料复验' ? 'img_bg02': item.name=='料单'? 'img_bg02':item.name=='产品合格证' ? 'img_bg03':item.name=='质量检验' ? 'img_bg03':item.name=='工艺数据审查' ? 'img_bg04':item.name=='主工艺规程' ? 'img_bg04':item.name=='专业工艺规程' ? 'img_bg04' : 'img_bg01'"
+        >
+          <img class="img_icon" :src="imgUrl + item.image" alt />
         </div>
-        <!-- <command icon="@/assets/imgicon/u1638.png"> -->
-        <!-- <Icon type="md-analytics" size="36" color="#249e91" /> -->
       </div>
       <div style="width:145px;">
         <p>{{item.name}}</p>

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,

pages/resourceManagement/deviceManagementCP/components/newEquipment.vue

@@ -237,7 +237,8 @@ export default {
           isimportant: this.isimportant,
           location: this.formItem.location,
           capability_value: this.formItem.capability_value,
-          property: this.property
+          property: this.property,
+          shop_name: this.formItem.shop_name
         };
         // console.log(paramsdata);
         service.post(`${url}`, { equipInfo: paramsdata }).then(res => {
@@ -279,7 +280,8 @@ export default {
           isimportant: this.isimportant,
           location: this.formItem.location,
           capability_value: this.formItem.capability_value,
-          property: this.property
+          property: this.property,
+          shop_name: this.formItem.shop_name
         };
         //console.log(this.formItem.equip_type);
         service.post(`${url}`, { equipInfo: paramsdata }).then(res => {

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 dist/ .
+COPY  . .
 COPY nginx.conf /etc/nginx/nginx.conf 
 RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
 EXPOSE 3006