!14 删除log

Merge pull request !14 from 打豆豆/master

src/views/abnormalityAlarm/AGValarm/abnormalAGV.vue

@@ -383,7 +383,6 @@ export default {
     getList() {
       this.loading = true;
       list(this.queryParams).then((response) => {
-        console.log(response);
         this.dvsubjectList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -426,24 +425,19 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      console.log(selection);
       this.ids = selection.map((item) => item.codeId);
-      console.log(this.ids);
-
       this.queryParams.ids = this.ids.join(",");
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
     /** 查看 **/
     handleExportArr(row) {
-      console.log(row);
       this.formQuery = row;
       this.openQuery = true;
       this.title = "查看";
     },
     /** 处理 */
     handleUpdate(row) {
-      console.log(row);
       this.reset();
       this.open = true;
       this.title = "处理";
@@ -468,7 +462,6 @@ export default {
     },
     /** 置顶操作 */
     handleDelete(row) {
-      console.log(row);
       this.reset();
       this.openTop = true;
     },

src/views/abnormalityAlarm/AGValarm/historicalAGV.vue

@@ -286,7 +286,6 @@ export default {
     getList() {
       this.loading = true;
       list(this.queryParams).then((response) => {
-        console.log(response);
         this.dvsubjectList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -319,17 +318,13 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      console.log(selection);
       this.ids = selection.map((item) => item.codeId);
-      console.log(this.ids);
-
       this.queryParams.ids = this.ids.join(",");
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
     /** 查看 **/
     handleExportArr(row) {
-      console.log(row);
       this.formQuery = row;
       this.openQuery = true;
       this.title = "查看";

src/views/abnormalityAlarm/liku/abnormalLiku.vue

@@ -383,7 +383,6 @@ export default {
     getList() {
       this.loading = true;
       list(this.queryParams).then((response) => {
-        console.log(response);
         this.dvsubjectList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -426,24 +425,19 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      console.log(selection);
       this.ids = selection.map((item) => item.codeId);
-      console.log(this.ids);
-
       this.queryParams.ids = this.ids.join(",");
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
     /** 查看 **/
     handleExportArr(row) {
-      console.log(row);
       this.formQuery = row;
       this.openQuery = true;
       this.title = "查看";
     },
     /** 处理 */
     handleUpdate(row) {
-      console.log(row);
       this.reset();
       this.open = true;
       this.title = "处理";
@@ -468,7 +462,6 @@ export default {
     },
     /** 置顶操作 */
     handleDelete(row) {
-      console.log(row);
       this.reset();
       this.openTop = true;
     },

src/views/abnormalityAlarm/liku/historicalLiku.vue

@@ -286,7 +286,6 @@ export default {
     getList() {
       this.loading = true;
       list(this.queryParams).then((response) => {
-        console.log(response);
         this.dvsubjectList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -319,17 +318,13 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      console.log(selection);
       this.ids = selection.map((item) => item.codeId);
-      console.log(this.ids);
-
       this.queryParams.ids = this.ids.join(",");
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
     /** 查看 **/
     handleExportArr(row) {
-      console.log(row);
       this.formQuery = row;
       this.openQuery = true;
       this.title = "查看";

src/views/abnormalityAlarm/machineTool/abnormalAlarm.vue

@@ -383,7 +383,6 @@ export default {
     getList() {
       this.loading = true;
       list(this.queryParams).then((response) => {
-        console.log(response);
         this.dvsubjectList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -426,24 +425,19 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      console.log(selection);
       this.ids = selection.map((item) => item.codeId);
-      console.log(this.ids);
-
       this.queryParams.ids = this.ids.join(",");
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
     /** 查看 **/
     handleExportArr(row) {
-      console.log(row);
       this.formQuery = row;
       this.openQuery = true;
       this.title = "查看";
     },
     /** 处理 */
     handleUpdate(row) {
-      console.log(row);
       this.reset();
       this.open = true;
       this.title = "处理";

src/views/abnormalityAlarm/machineTool/historicalAnomalyAlarm.vue

@@ -286,7 +286,6 @@ export default {
     getList() {
       this.loading = true;
       list(this.queryParams).then((response) => {
-        console.log(response);
         this.dvsubjectList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -319,17 +318,13 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      console.log(selection);
       this.ids = selection.map((item) => item.codeId);
-      console.log(this.ids);
-
       this.queryParams.ids = this.ids.join(",");
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
     /** 查看 **/
     handleExportArr(row) {
-      console.log(row);
       this.formQuery = row;
       this.openQuery = true;
       this.title = "查看";

src/views/abnormalityAlarm/robotic/historicalAlarm.vue

@@ -286,7 +286,6 @@ export default {
     getList() {
       this.loading = true;
       list(this.queryParams).then((response) => {
-        console.log(response);
         this.dvsubjectList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -319,17 +318,13 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      console.log(selection);
       this.ids = selection.map((item) => item.codeId);
-      console.log(this.ids);
-
       this.queryParams.ids = this.ids.join(",");
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
     /** 查看 **/
     handleExportArr(row) {
-      console.log(row);
       this.formQuery = row;
       this.openQuery = true;
       this.title = "查看";

src/views/abnormalityAlarm/robotic/roboticAlarm.vue

@@ -383,7 +383,6 @@ export default {
     getList() {
       this.loading = true;
       list(this.queryParams).then((response) => {
-        console.log(response);
         this.dvsubjectList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -426,24 +425,19 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      console.log(selection);
       this.ids = selection.map((item) => item.codeId);
-      console.log(this.ids);
-
       this.queryParams.ids = this.ids.join(",");
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
     /** 查看 **/
     handleExportArr(row) {
-      console.log(row);
       this.formQuery = row;
       this.openQuery = true;
       this.title = "查看";
     },
     /** 处理 */
     handleUpdate(row) {
-      console.log(row);
       this.reset();
       this.open = true;
       this.title = "处理";

src/views/deviceConsole/robotic/index.vue

@@ -378,7 +378,6 @@ export default {
             },
           })
           .then((res) => {
-            console.log(res);
             if (res.data.code === 200) {
               this.elimage = false;
               this.Powersupply = false;
@@ -404,7 +403,6 @@ export default {
             },
           })
           .then((res) => {
-            console.log(res);
             if (res.data.code === 200) {
               this.elimage = true;
               this.Powersupply = true;

src/views/management/codeprogram.vue

@@ -390,7 +390,6 @@ export default {
     getList() {
       this.loading = true;
       list(this.queryParams).then((response) => {
-        console.log(response);
         this.dvsubjectList = response.data;
         this.total = response.data.length;
         this.loading = false;
@@ -426,10 +425,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      console.log(selection);
       this.ids = selection.map((item) => item.codeId);
-      console.log(this.ids);
-
       this.queryParams.ids = this.ids.join(",");
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
@@ -471,7 +467,6 @@ export default {
 
     // 节点单击事件
     handleNodeClick(data) {
-      console.log(data);
       this.machineryIdsArr = [];
       this.form.machineryTypeName = data.machineryTypeName;
       let arr = {
@@ -482,7 +477,6 @@ export default {
       arr.machineryTypeId = data.machineryTypeId;
 
       listMachinery(arr).then((response) => {
-        console.log(response);
         this.listTypeArr = response.rows;
       });
     },
@@ -501,7 +495,6 @@ export default {
       this.files = e;
     },
     customUploadChangeImage2(files) {
-      console.log(files);
       if (files.status === "ready") return;
       if (files.status === "success") {
         const res = files.response || {};
@@ -543,7 +536,6 @@ export default {
 
     //预览文件
     previewFile() {
-      console.log(this.form);
       if (this.form.url != undefined && this.form.url != "") {
         var url = this.form.url;
         window.open(url);
@@ -554,7 +546,6 @@ export default {
 
     /** 修改按钮操作 */
     handleUpdate(row) {
-      console.log(row);
       this.reset();
       this.fileList = [];
       this.machineryIdsArr = {};
@@ -563,7 +554,6 @@ export default {
       if (row.originalName != undefined && row.originalName != "") {
         this.$set(name, "name", row.originalName);
         this.fileList.push(name);
-        console.log(this.fileList);
       }
       let arr = {
         pageNum: 1,
@@ -571,18 +561,13 @@ export default {
         machineryTypeId: null,
       };
       arr.machineryTypeId = row.machineryTypeId;
-
       listMachinery(arr).then((response) => {
-        console.log(response);
         this.listTypeArr = response.rows;
       });
-
       let arr1 = row.cadCodeMachineryList.map((item) => item.machineryName);
       this.machineryIdsArr = arr1;
-
       let arr2 = row.cadCodeMachineryList.map((item) => item.machineryId);
       this.form.machineryIds = arr2.join(",");
-
       this.form.subjectId = row.codeId || this.ids;
       this.open = true;
       this.title = "修改代码";
@@ -625,7 +610,6 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      console.log(row);
       const subjectIds = row.codeId || this.ids;
       this.$modal
         .confirm("是否确认删除当前的数据项？")
@@ -651,7 +635,6 @@ export default {
 
     /** 单选导出按钮操作 */
     handleExportArr(e) {
-      console.log(e);
       this.queryParams.ids = e.codeId;
       this.download(
         "/cad/code/export",

src/views/management/document.vue

@@ -439,7 +439,6 @@ export default {
         this.loading = false;
       });
       listType().then((response) => {
-        console.log(response);
         this.listTypeArr = response.rows;
       });
     },
@@ -478,7 +477,6 @@ export default {
     handleSelectionChange(selection) {
       this.id = selection.map((item) => item.id);
       this.queryParams.ids = this.id.join(",");
-      console.log(this.queryParams.ids);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -487,7 +485,6 @@ export default {
       this.reset();
       this.fileList = [];
       listType().then((response) => {
-        console.log(response);
         this.listTypeArr = response.rows;
       });
       this.open = true;
@@ -495,7 +492,6 @@ export default {
     },
 
     typeNameArr(e) {
-      console.log(e);
       this.form.typeName = e.name;
       this.form.type = e.id;
     },
@@ -505,7 +501,6 @@ export default {
       this.files = e;
     },
     customUploadChangeImage2(files) {
-      console.log(files);
       if (files.status === "ready") return;
       if (files.status === "success") {
         const res = files.response || {};
@@ -547,7 +542,6 @@ export default {
 
     //预览文件
     previewFile() {
-      console.log(this.form);
       if (this.form.url != undefined && this.form.url != "") {
         var url = this.form.url;
         window.open(url);
@@ -558,14 +552,12 @@ export default {
 
     /** 修改按钮操作 */
     handleUpdate(row) {
-      console.log(row);
       this.reset();
       this.fileList = [];
       this.form = row;
       var name = {};
       this.$set(name, "name", row.originalName);
       this.fileList.push(name);
-      console.log(this.fileList);
       this.form.subjectId = row.id || this.id;
       this.open = true;
       this.title = "修改文档";

src/views/management/documentType.vue

@@ -323,7 +323,6 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      console.log(row);
       this.reset();
       this.form = row;
       this.form.subjectId = row.id;

src/views/mes/dv/machinery/index.vue

@@ -724,7 +724,6 @@ export default {
     },
     // 节点单击事件
     handleNodeClick(data) {
-      console.log(data);
       this.queryParams.machineryTypeId = data.machineryTypeId;
       this.queryParamsdata = data;
       this.handleQuery();

src/views/mes/dv/route/index.vue

@@ -323,7 +323,6 @@ export default {
     getList() {
       this.loading = true;
       findProAgvline(this.queryParams).then((response) => {
-        console.log(response);
         this.dvsubjectList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -377,13 +376,11 @@ export default {
       this.open = true;
       this.title = "新增AGV线路";
       findLineCode().then((response) => {
-        console.log(response);
         this.form.lineCode = response.data.lineCode;
       });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      console.log(row);
       this.reset();
       this.getWorkshops();
       this.form = row;

src/views/mes/dv/siteConfiguration/index.vue

@@ -349,9 +349,8 @@ export default {
   methods: {
     /** 列表 */
     getList() {
-      //   this.loading = true;
+        this.loading = true;
       findProAgvsite(this.queryParams).then((response) => {
-        console.log(response);
         this.dvsubjectList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -406,13 +405,11 @@ export default {
       this.open = true;
       this.title = "新增AGV站点";
       findSiteCode().then((response) => {
-        console.log(response);
         this.form.siteCode = response.data.siteCode;
       });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      console.log(row);
       this.reset();
       this.getWorkshops();
       this.form = row;
@@ -454,7 +451,6 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      console.log(row);
       deleteProAgvsite({ proAgvsiteId: row.proAgvsiteId }).then((response) => {
         this.$modal
           .confirm("是否确认删除当前的数据项？")

src/views/mes/md/mditem/components/sop.vue

@@ -160,12 +160,10 @@ export default{
         },
         //图片上传成功
         handleImgUplaoded(imgUrl){
-            console.log(imgUrl);
             this.form.sopUrl = imgUrl;
         },
         //图片移除
         handleImgRemoved(imgUrl){
-            console.log(imgUrl);
             this.form.sopUrl = null;            
         },
         //提交

src/views/mes/md/vendor/index.vue

@@ -113,6 +113,16 @@
           v-hasPermi="['mes:md:vendor:export']"
         >导出</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-upload2"
+          size="mini"
+          @click="handleImport"
+          v-hasPermi="['system:user:import']"
+        >导入</el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -334,11 +344,43 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 供应商导入对话框 -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <div class="el-upload__tip" slot="tip">
+            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
+          </div>
+          <span>仅允许导入xls、xlsx格式文件。</span>
+          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+        </div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
 import { listVendor, getVendor, delVendor, addVendor, updateVendor } from "@/api/mes/md/vendor";
+import { getToken } from "@/utils/auth";
 import {genCode} from "@/api/system/autocode/rule"
 export default {
   name: "Vendor",
@@ -366,6 +408,21 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      // 数据导入参数
+      upload: {
+        // 是否显示弹出层
+        open: false,
+        // 弹出层标题
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/mes/md/vendor/importData"
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -542,10 +599,36 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('md/vendor/export', {
+      this.download('/mes/md/vendor/export', {
         ...this.queryParams
       }, `vendor_${new Date().getTime()}.xlsx`)
     },
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.title = "供应商导入";
+      this.upload.open = true;
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+      this.download('mes/md/vendor/importTemplate', {
+      }, `vendor_template_${new Date().getTime()}.xlsx`)
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+      this.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    },
     //自动生成编码
     handleAutoGenChange(autoGenFlag){
       debugger;

src/views/mes/pro/proroute/routeprocess.vue

@@ -330,7 +330,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
+          <el-col :span="12" v-if="TypeId">
             <el-form-item label="选择线路" prop="lineId">
               <el-select
                 v-model="form.lineId"
@@ -347,7 +347,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="12" v-if="TypeId">
             <el-form-item label="选择点位" prop="lineId">
               <el-select
                 v-model="form.pointId"
@@ -457,6 +457,7 @@ export default {
       dvsubjectList: [],
       lineName:"",
       pointName:"",
+      TypeId:false,
       // 表单参数
       form: {},
       // 表单校验
@@ -546,7 +547,11 @@ export default {
     },
     // 节点单击事件
     handleNodeClick(data) {
-      console.log(data);
+      if(data.machineryTypeId == 229){
+        this.TypeId = true
+      }else{
+        this.TypeId = false
+      }
       this.form.machineryTypeName = data.machineryTypeName;
     },
     // 取消按钮
@@ -559,7 +564,6 @@ export default {
       this.files = e;
     },
     customUploadChangeImage2(files) {
-      console.log(files);
       if (files.status === "ready") return;
       if (files.status === "success") {
         const res = files.response || {};
@@ -601,7 +605,6 @@ export default {
 
     //预览文件
     previewFile() {
-      console.log(this.form);
       if (this.form.url != undefined && this.form.url != "") {
         var url = this.form.url;
         window.open(url);
@@ -667,6 +670,11 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
+      if(row.machineryTypeId == 229){
+        this.TypeId = true
+      }else{
+        this.TypeId = false
+      }
       var name = {};
       if (row.originalName != undefined && row.originalName != "") {
         this.$set(name, "name", row.originalName);

src/views/mes/qc/iqc/iqc.vue

@@ -712,7 +712,6 @@ export default {
         debugger;
         let blob = new Blob([res],{type:'application/pdf'});        
         let href = URL.createObjectURL(blob);
-        console.log(href);
         window.open(`/pdf/web/viewer.html?file=${encodeURIComponent(href)}`);
       });
     }

src/views/system/FactoryInformation/index.vue

@@ -192,7 +192,6 @@
               })
             } else {
               ownerServer.modifyOwnerContBaseById(this.contractForm).then(result => {
-                console.log(this.contractForm);
                 if (result.code === 200) {
                   this.$notify({
                     title: '成功',

src/views/system/role/index.vue

@@ -606,7 +606,6 @@ export default {
     },
     // 恢复默认菜单权限
     restoreRole(roleId) {
-      console.log(roleId);
       this.$confirm("确定恢复默认菜单权限吗?", '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',