quwangxin vor 2 Jahren
Ursprung
Commit
6460795692

+ 14 - 14
src/components/EquipmentDailog/equipment-dailog.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
   <ele-modal
   <ele-modal
     :visible.sync="visible"
     :visible.sync="visible"
-    title="添加工单-选择设备"
+    title="选择设备"
     width="65vw"
     width="65vw"
     append-to-body
     append-to-body
   >
   >
@@ -51,7 +51,7 @@
         default: false
         default: false
       }
       }
     },
     },
-    data () {
+    data() {
       return {
       return {
         visible: false,
         visible: false,
         current: null,
         current: null,
@@ -65,7 +65,7 @@
       };
       };
     },
     },
     computed: {
     computed: {
-      columns () {
+      columns() {
         const list = [
         const list = [
           {
           {
             label: '设备编码',
             label: '设备编码',
@@ -110,7 +110,7 @@
         }
         }
         return list;
         return list;
       },
       },
-      datasourceShow () {
+      datasourceShow() {
         return this.datasource?.filter((item) => {
         return this.datasource?.filter((item) => {
           if (this.name) {
           if (this.name) {
             return item.name.includes(this.name);
             return item.name.includes(this.name);
@@ -121,23 +121,23 @@
       }
       }
     },
     },
     methods: {
     methods: {
-      open (list = []) {
+      open(list = []) {
         this.memoList = list;
         this.memoList = list;
         this.isSingle = false;
         this.isSingle = false;
         this.visible = true;
         this.visible = true;
         this._getList();
         this._getList();
       },
       },
-      openSingle (list, callback) {
+      openSingle(list, callback) {
         this.memoList = list;
         this.memoList = list;
-		if(list.length){
-			this.radio = list[0].deviceId
-		}
+        if (list.length) {
+          this.radio = list[0].deviceId;
+        }
         this.callback = callback;
         this.callback = callback;
         this.isSingle = true;
         this.isSingle = true;
         this.visible = true;
         this.visible = true;
         this._getList();
         this._getList();
       },
       },
-      handleDone ({ data }) {
+      handleDone({ data }) {
         if (this.memoList.length) {
         if (this.memoList.length) {
           this.$nextTick(() => {
           this.$nextTick(() => {
             if (this.isSingle) {
             if (this.isSingle) {
@@ -158,7 +158,7 @@
           });
           });
         }
         }
       },
       },
-      async _getList () {
+      async _getList() {
         const fn = this.isPlan ? getPlanDeviceList : getDeviceList;
         const fn = this.isPlan ? getPlanDeviceList : getDeviceList;
         const data = await fn({
         const data = await fn({
           name: this.name,
           name: this.name,
@@ -166,7 +166,7 @@
         });
         });
         this.datasource = data || [];
         this.datasource = data || [];
       },
       },
-      confirm () {
+      confirm() {
         if (this.isSingle) {
         if (this.isSingle) {
           if (!this.current) return this.$message.error('请选择数据');
           if (!this.current) return this.$message.error('请选择数据');
 
 
@@ -178,7 +178,7 @@
 
 
         this.cancel();
         this.cancel();
       },
       },
-      cancel () {
+      cancel() {
         this.$refs.table.setCurrentRow();
         this.$refs.table.setCurrentRow();
         this.$refs.table.clearSelection();
         this.$refs.table.clearSelection();
         this.radio = '';
         this.radio = '';
@@ -186,7 +186,7 @@
         this.visible = false;
         this.visible = false;
       },
       },
       // 单击获取id
       // 单击获取id
-      choose (row) {
+      choose(row) {
         this.current = row;
         this.current = row;
         this.radio = row.id;
         this.radio = row.id;
       }
       }

+ 3 - 1
src/views/produceOrder/components/report/Common.vue

@@ -234,7 +234,9 @@
           workReportDeviceList.path
           workReportDeviceList.path
         }}</el-descriptions-item>
         }}</el-descriptions-item>
         <el-descriptions-item label="操作"
         <el-descriptions-item label="操作"
-          ><el-link @click="getEquip">更改设备</el-link></el-descriptions-item
+          ><el-link @click="getEquip" type="primary"
+            >选择设备</el-link
+          ></el-descriptions-item
         >
         >
       </el-descriptions>
       </el-descriptions>
     </el-card>
     </el-card>

+ 2 - 2
src/views/produceOrder/components/report/Extrusion.vue

@@ -239,8 +239,8 @@
           workReportDeviceList.path
           workReportDeviceList.path
         }}</el-descriptions-item>
         }}</el-descriptions-item>
         <el-descriptions-item label="操作" :span="2"
         <el-descriptions-item label="操作" :span="2"
-          ><el-link @click="getEquip" type="primary"
-            >更改设备</el-link
+          ><el-link type="primary" @click="getEquip"
+            >选择设备</el-link
           ></el-descriptions-item
           ></el-descriptions-item
         >
         >
         <el-descriptions-item label="模具编码/名称"
         <el-descriptions-item label="模具编码/名称"

+ 3 - 1
src/views/produceOrder/components/report/Furnace.vue

@@ -83,7 +83,9 @@
           workReportDeviceList.path
           workReportDeviceList.path
         }}</el-descriptions-item>
         }}</el-descriptions-item>
         <el-descriptions-item label="操作"
         <el-descriptions-item label="操作"
-          ><el-link @click="getEquip">更改设备</el-link></el-descriptions-item
+          ><el-link @click="getEquip" type="primary"
+            >选择设备</el-link
+          ></el-descriptions-item
         >
         >
       </el-descriptions>
       </el-descriptions>
     </el-card>
     </el-card>

+ 3 - 1
src/views/produceOrder/components/report/HalfAdded.vue

@@ -246,7 +246,9 @@
           workReportDeviceList.path
           workReportDeviceList.path
         }}</el-descriptions-item>
         }}</el-descriptions-item>
         <el-descriptions-item label="操作"
         <el-descriptions-item label="操作"
-          ><el-link @click="getEquip">更改设备</el-link></el-descriptions-item
+          ><el-link @click="getEquip" type="primary"
+            >选择设备</el-link
+          ></el-descriptions-item
         >
         >
       </el-descriptions>
       </el-descriptions>
     </el-card>
     </el-card>

+ 3 - 1
src/views/produceOrder/components/report/Heating.vue

@@ -252,7 +252,9 @@
           workReportDeviceList.path
           workReportDeviceList.path
         }}</el-descriptions-item>
         }}</el-descriptions-item>
         <el-descriptions-item label="操作"
         <el-descriptions-item label="操作"
-          ><el-link @click="getEquip">更改设备</el-link></el-descriptions-item
+          ><el-link @click="getEquip" type="primary"
+            >选择设备</el-link
+          ></el-descriptions-item
         >
         >
       </el-descriptions>
       </el-descriptions>
     </el-card>
     </el-card>

+ 1 - 1
src/views/produceOrder/components/report/Sinter.vue

@@ -73,7 +73,7 @@
           >kooriookami</el-descriptions-item
           >kooriookami</el-descriptions-item
         >
         >
         <el-descriptions-item label="操作"
         <el-descriptions-item label="操作"
-          ><el-link>更改设备</el-link></el-descriptions-item
+          ><el-link>选择设备</el-link></el-descriptions-item
         >
         >
       </el-descriptions>
       </el-descriptions>
     </el-card>
     </el-card>

+ 4 - 4
vue.config.js

@@ -3,7 +3,7 @@ const { transformElementScss } = require('ele-admin/lib/utils/dynamic-theme');
 const path = require('path');
 const path = require('path');
 const { name } = require('./package.json');
 const { name } = require('./package.json');
 
 
-function resolve (dir) {
+function resolve(dir) {
   return path.join(__dirname, dir);
   return path.join(__dirname, dir);
 }
 }
 
 
@@ -31,8 +31,8 @@ module.exports = {
     proxy: {
     proxy: {
       // 当我们的本地的请求 有/api的时候,就会代理我们的请求地址向另外一个服务器发出请求
       // 当我们的本地的请求 有/api的时候,就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
       '/api': {
-        // target: 'http://192.168.3.51:18086', // 测试
-        target: 'http://192.168.3.35:8080', // kang杨威
+        target: 'http://192.168.3.51:18086', // 测试
+        // target: 'http://192.168.3.35:8080', // kang杨威
         // target: 'http://192.168.3.25:8080', // 黄峥嵘
         // target: 'http://192.168.3.25:8080', // 黄峥嵘
         // target: 'http://192.168.3.41:8080', // 何江鹏
         // target: 'http://192.168.3.41:8080', // 何江鹏
         // target: 'http://192.168.3.33:8080', // 谢一平
         // target: 'http://192.168.3.33:8080', // 谢一平
@@ -44,7 +44,7 @@ module.exports = {
       }
       }
     }
     }
   },
   },
-  chainWebpack (config) {
+  chainWebpack(config) {
     config.plugins.delete('prefetch');
     config.plugins.delete('prefetch');
     // set svg-sprite-loader
     // set svg-sprite-loader
     // config.module.rule('svg').exclude.add(resolve('./src/icons')).end();
     // config.module.rule('svg').exclude.add(resolve('./src/icons')).end();