前端问题修改

sgzb-screen/config/dev.env.js

@@ -5,8 +5,8 @@ var prodEnv = require('./prod.env')
 // var testUrl = '172.16.2.82:8802'
 // var testUrl = '14.29.196.32:8802'
 // var testUrl = '10.14.16.165:8802'
-var testUrl = '112.29.103.165:21624'    //线上
+// var testUrl = '112.29.103.165:21624'    //线上
-// var testUrl = '192.168.0.14:21624'    //线上
+var testUrl = '192.168.0.14:21624'    //线上
 // var testUrl = '192.168.0.166:8080'
 // var testUrl = '223.243.184.53:8480'
 // var testUrl = 'www.lingyangplat.com'

sgzb-screen/config/index.js

@@ -20,7 +20,7 @@ module.exports = {
     cssSourceMap: true,
     proxyTable: {
         '/screen': {
-          target: 'http://112.29.103.165:21624',
+          target: 'http://192.168.0.14:21624',
           changeOrigin: true,
           // secure: true, //如果是https接口，需要配置这个参数
           pathRewrite: {

sgzb-ui/package.json

@@ -60,6 +60,7 @@
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.5.5",
     "vue-easy-print": "0.0.8",
+    "vue-json-excel": "^0.3.0",
     "vue-meta": "2.4.0",
     "vue-router": "3.4.9",
     "vuedraggable": "2.24.3",

sgzb-ui/src/api/claimAndRefund/constructionSite.js

@@ -19,7 +19,14 @@ export function getUseringData(query) {
   }
 
   
-
+//提交直转申请W
+export function submitWorkSite(params = {}){
+  return request({
+    url:'/material/workSite/submit',
+    method: 'post',
+    data:params
+  })
+}
 
 
 

sgzb-ui/src/api/store/label.js

@@ -31,7 +31,7 @@ export function delLabelBind(maIds) {
 // 绑定历史
 export function listLabelHistoryList(query) {
   return request({
-    url: '/base//maLabelBind/historyList',
+    url: '/base/maLabelBind/historyList',
     method: 'get',
     params: query
   })

sgzb-ui/src/main.js

@@ -37,6 +37,8 @@ import DictTag from '@/components/DictTag'
 import VueMeta from 'vue-meta'
 // 字典数据组件
 import DictData from '@/components/DictData'
+// 前端Excel组件
+import JsonExcel from 'vue-json-excel'
 Vue.prototype.$eventBus = new Vue()
 
 // 全局方法挂载
@@ -59,6 +61,7 @@ Vue.component('Editor', Editor)
 Vue.component('FileUpload', FileUpload)
 Vue.component('ImageUpload', ImageUpload)
 Vue.component('ImagePreview', ImagePreview)
+Vue.component('downloadExcel', JsonExcel)
 
 Vue.use(directive)
 Vue.use(plugins)

sgzb-ui/src/views/base/comeAndGo/people.vue

@@ -431,7 +431,7 @@ export default {
       form: {},
       defaultProps: {
         children: "children",
-        label: "userName"
+        label: "nickName"
       },
       // 用户导入参数
       upload: {

sgzb-ui/src/views/claimAndRefund/constructionSite/constructionSite.vue

@@ -89,16 +89,29 @@
 
     <el-table v-loading="loading" :data="tableList" >
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <el-table-column label="序号" align="center" prop="dictId" />
+      <el-table-column label="序号" align="center" type="index"/>
-      <el-table-column label="转让方单位名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
+      <el-table-column label="转让方单位名称" align="center" prop="backUnitName" :show-overflow-tooltip="true" />
-      <el-table-column label="转让方工程名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
+      <el-table-column label="转让方工程名称" align="center" prop="backProName" :show-overflow-tooltip="true" />
-      <el-table-column label="接收方单位名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
+      <el-table-column label="接收方单位名称" align="center" prop="leaseUnitName" :show-overflow-tooltip="true" />
-      <el-table-column label="接收方工程名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
+      <el-table-column label="接收方工程名称" align="center" prop="leaseProName" :show-overflow-tooltip="true" />
-      <el-table-column label="转让方联系人及电话" align="center" prop="dictName" :show-overflow-tooltip="true" />
+      <el-table-column label="转让方联系人及电话" align="center" prop="backMan" :show-overflow-tooltip="true">
-      <el-table-column label="接收方联系人及电话" align="center" prop="dictName" :show-overflow-tooltip="true" />
+        <template slot-scope="scope">
-      <el-table-column label="办理时间" align="center" prop="dictName" :show-overflow-tooltip="true" />
+          <span>{{ scope.row.backMan || '/'}}</span><span>{{ scope.row.backPhone || '/' }}</span>
-      <el-table-column label="状态" align="center" prop="dictName" :show-overflow-tooltip="true" />
+        </template>
-      <el-table-column label="不通过原因" align="center" prop="dictName" :show-overflow-tooltip="true" />
+      </el-table-column>
+      <el-table-column label="接收方联系人及电话" align="center" prop="leaseMan" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span>{{ scope.row.leaseMan || '/'}}</span><span>{{ scope.row.leasePhone || '/' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="办理时间" align="center" prop="createTime" :show-overflow-tooltip="true" />
+      <el-table-column label="状态" align="center" prop="status" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span v-if="scope.row.status==0">待审批</span>
+          <span v-if="scope.row.status==1">审批同意</span>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="不通过原因" align="center" prop="dictName" :show-overflow-tooltip="true" /> -->
 
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -170,9 +183,9 @@
           </el-form-item>
         </el-row>
         <el-row>
-          <el-form-item label="退料人" prop="backUserName">
+          <el-form-item label="退料人" prop="backMan">
             <el-input
-              v-model="dialogParams.backUserName"
+              v-model="dialogParams.backMan"
               placeholder="请输入退料人"
               clearable maxlength="50"
               style="width: 240px"
@@ -218,9 +231,9 @@
           </el-form-item>
         </el-row>
         <el-row>
-          <el-form-item label="领料人" prop="leaseUserName">
+          <el-form-item label="领料人" prop="leaseMan">
             <el-input
-              v-model="dialogParams.leaseUserName"
+              v-model="dialogParams.leaseMan"
               placeholder="请输入领料人"
               clearable maxlength="50"
               style="width: 240px"
@@ -256,14 +269,14 @@
       <el-table v-loading="dialogLoading" :data="deviceList" height="350px" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="序号" align="center" type="index" />
-        <el-table-column label="机具名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
+        <el-table-column label="机具名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
-        <el-table-column label="机具规格" align="center" prop="dictName" :show-overflow-tooltip="true" />
+        <el-table-column label="机具规格" align="center" prop="typeModelName" :show-overflow-tooltip="true" />
-        <el-table-column label="编码" align="center" prop="dictName" :show-overflow-tooltip="true" />
+        <el-table-column label="编码" align="center" prop="maCode" :show-overflow-tooltip="true" />
-        <el-table-column label="当前在用量" align="center" prop="dictName" :show-overflow-tooltip="true" />
+        <el-table-column label="当前在用量" align="center" prop="num" :show-overflow-tooltip="true" />
         <el-table-column label="直转数量" align="center" class-name="small-padding fixed-width" width="200">
           <template slot-scope="scope">
             <el-input
-              v-model="scope.row.dictName"
+              v-model="scope.row.directNum"
               placeholder="请输入直转数量"
               clearable
             />
@@ -275,17 +288,13 @@
         <el-button type="primary" @click="submitForm">保存</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-<!--      <div slot="footer" class="dialog-footer" style="text-align: center">-->
-<!--        <el-button type="primary" @click="submitForm">通过</el-button>-->
-<!--        <el-button type="warning" @click="cancel">不通过</el-button>-->
-<!--      </div>-->
     </el-dialog>
   </div>
 </template>
 
 <script>
 import { getUnitList, getProjectList, getProData, getUnitData, getAgreementInfoById,} from "@/api/claimAndRefund/receive";
-import { getWorkSiteList,getUseringData} from "@/api/claimAndRefund/constructionSite";
+import { getWorkSiteList,getUseringData,submitWorkSite} from "@/api/claimAndRefund/constructionSite";
 
 export default {
   name: "ConstructionSite",
@@ -295,7 +304,7 @@ export default {
       // 遮罩层
       loading: false,
       // 选中数组
-      ids: [],
+      selectedList: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -350,7 +359,7 @@ export default {
   created() {
     this.getUnitList();
     this.getProjectList();
-    // this.getList();
+    this.getList();
 
     this.GetUnitData()
     this.GetProData()
@@ -455,8 +464,14 @@ export default {
         agreementId:this.dialogParams.backAgreementId
       }
       getUseringData(param).then(response => {
+        // console.log(response)
+        if(response.code==200){
           this.deviceList = response.rows;
           this.dialogLoading = false;
+        }else{
+          this.dialogLoading = false;
+        }
+          
         }
       );
     },
@@ -490,6 +505,7 @@ export default {
           projectId: this.dialogParams.leaseProId
         }
         const res = await getAgreementInfoById(params)
+        console.log(res,'GetAgreementInfoById2')
         if( !(res.data && res.data.agreementId) ){
           this.$message.error('当前单位和工程未上传');
           this.dialogParams.leaseUnitId = null
@@ -497,8 +513,10 @@ export default {
           this.GetUnitData2()
           this.GetProData2()
         }else{
-          this.dialogParams.leaseAgreementId = res.data.agreementId;
+          // this.dialogParams.leaseAgreementId = res.data.agreementId;
-          this.dialogParams.leaseAgreementCode = res.data.agreementCode;
+          // this.dialogParams.leaseAgreementCode = res.data.agreementCode;
+          this.$set(this.dialogParams,'leaseAgreementId',res.data.agreementId)
+          this.$set(this.dialogParams,'leaseAgreementCode',res.data.agreementCode)
         }
       }
     },
@@ -506,6 +524,7 @@ export default {
       this.resetForm("dialogForm");
       this.getDialogList();
     },
+
     /** 工地直转--打开弹窗 */
     handleAdd() {
       this.resetForm("dialogForm");
@@ -515,7 +534,8 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item)
+      this.selectedList = selection.map(item => item)
+      console.log(this.selectedList)
       this.single = selection.length!=1
       this.multiple = !selection.length
     },
@@ -526,20 +546,33 @@ export default {
     },
     /** 提交按钮 */
     submitForm: function() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["dialogForm"].validate(valid => {
         if (valid) {
+            let arr = []
+            this.deviceList.forEach((item,index)=>{
+              arr[index] = {
+                typeId:item.typeId,
+                maId:item.maId,
+                directNum:item.directNum,
+              }
+            })
             
-            // addType(this.form).then(response => {
+            let param = {
-            //   this.$modal.msgSuccess("新增成功");
+              directApplyInfo:this.dialogParams,
-            //   this.open = false;
+              directApplyInfoDetails:arr
-            //   this.getList();
+            }
-            // }); 
+            console.log(param)
+            submitWorkSite(param).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }); 
         }
       });
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      // const dictIds = row.dictId || this.ids;
+      // const dictIds = row.dictId || this.selectedList;
       // this.$modal.confirm('是否确认删除该数据项？').then(function() {
       //   return delType(dictIds);
       // }).then(() => {

sgzb-ui/src/views/dashboard.vue

@@ -15,7 +15,7 @@
     },
     methods: {
         openNewWindow() {
-            window.open('http://112.29.103.165:21624/index01.html?token='+localStorage.getItem('token'), '_blank');
+            window.open('http://192.168.0.14:21624/index01.html?token='+localStorage.getItem('token'), '_blank');
         }
     }
   };  

sgzb-ui/src/views/login.vue

@@ -170,7 +170,9 @@ export default {
     $route: {
       handler: function (route) {
         this.redirect = route.query && route.query.redirect;
-        if(this.$route.query.redirect.split("?").length>0){
+        // console.log(this.$route.query.redirect.split("?"))
+        // console.log(this.$route.query.redirect.split("?")[1].split("&"))
+        if(this.$route.query.redirect.split("?").length>1){
           let arr = this.$route.query.redirect.split("?")[1].split("&")||[]
           arr.forEach((item,index)=>{
             this.$set(this.loginParams, item.split("=")[0]+"", item.split("=")[1]);

sgzb-ui/src/views/store/label/labelBinding.vue

@@ -101,6 +101,14 @@
           >
         </el-col>
         <el-col :span="1.5">
+          <!-- 下载二维码地址Excel -->
+          <download-excel
+              class="export-excel-wrapper"
+              :data="checkboxModel"
+              :fields="json_fields"
+              name="二维码地址.xls"
+            >
+            <!-- 下载二维码图片 -->
             <el-button
             type="success"
             plain
@@ -108,9 +116,20 @@
             size="mini"
             :disabled="multiple"
             @click="labelUpload"
-            >标签下载</el-button
+            >标签下载</el-button>
-          >
+            </download-excel>       
         </el-col>
+        <!-- <el-col :span="1.5">
+            <download-excel
+              class="export-excel-wrapper"
+              :data="checkboxModel"
+              :fields="json_fields"
+              name="二维码地址.xls"
+            >
+            <el-button :disabled="multiple">导出地址</el-button>
+            </download-excel>         
+        </el-col> -->
+
 
         <!-- <el-col :span="1.5">
         <el-button
@@ -488,6 +507,8 @@ export default {
       codeId: true,
       isShowQrCode: -1,
       labelmaCode: '',
+      qrUrl:'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode=',
+      json_fields:{"二维码地址":'exportUrl',"标签编号":'labelCode',"设备编码":'maCode'},
     };
   },
   created() {
@@ -711,7 +732,7 @@ export default {
           new QRCode(captureId[i], {
             width: width,
             height: height,
-            text: element.maCode,
+            text: this.qrUrl+ element.labelCode,
             colorDark: "#000",
             colorLight: "#fff"
           });
@@ -756,7 +777,7 @@ export default {
         that.$modal.closeLoading();
       }
     },
-
+    //打包压缩
     packageImages() {
       let that = this;
       const zip = new JSZip();
@@ -773,8 +794,7 @@ export default {
       that.getList();
       that.qrcodeArr = [];
     },
-
+    //二维码查看
-
     labelUploadCode(row) {
       // if (row.maCode == null) {
       //   this.$message.error('当前设备没有设备编码');
@@ -785,7 +805,7 @@ export default {
       this.uploadOpen = true;
       this.title = "二维码查看";
       this.labelmaCode = row.labelCode
-      let str = 'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode='+row.labelCode
+      let str = this.qrUrl+row.labelCode
       this.$nextTick(() => {
         // this.selectionList.forEach((item, index) => {
         this.$refs.codeItem.innerHTML = "";
@@ -860,6 +880,9 @@ export default {
       console.log('thhis,', selection);
       this.selectionList = selection
       this.checkboxModel = selection
+      this.checkboxModel.forEach(item=>{
+        item.exportUrl = this.qrUrl+item.labelCode;
+      })
       this.ids = selection.map(item => item)
       this.single = selection.length != 1
       this.multiple = !selection.length

sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue

@@ -536,15 +536,19 @@ export default {
         let rowData = row
         rowData.checkNum = rowData.purchaseNum;
         rowData.checkResult = rowData.checkResult || "通过";
-        this.fileList = []
+        // this.fileList = []
+        // this.checkUrlList = []
+        // this.checkUrlNameList = []
         this.form = rowData;
         this.open = true;
         this.title = "验收";
     },
      /** 批量验收按钮操作 */
      handleListCheck() {
-        console.log(this.ids)
+        // console.log(this.ids)
-        this.fileList1 = []
+        // this.fileList1 = [];
+        // this.checkUrlList1 = []
+        // this.checkUrlNameList1 = []
         this.aform = {
           checkResult:'通过',
           checkUrl:'',
@@ -570,6 +574,9 @@ export default {
                   type: 'success'
                 })
                 this.open = false;
+                this.fileList = []
+                this.checkUrlList = []
+                this.checkUrlNameList = []
                 this.getTaskInfo();
               }
           });
@@ -599,6 +606,9 @@ export default {
                 })
                 this.openAll = false;
                 this.open = false;
+                this.fileList1 = []
+                this.checkUrlList1 = []
+                this.checkUrlNameList1 = []
                 this.getTaskInfo();
               }
           });

sgzb-ui/src/views/store/tools/devices.vue

@@ -384,6 +384,7 @@ export default {
       title: "",
       uploadOpen: false,
       qrCode: '',
+      qrUrl:'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode=',
       rowObj:{},
       // 是否显示弹出层
       open: false,
@@ -496,7 +497,7 @@ export default {
       this.uploadOpen = true;
       this.title = "二维码查看";
       this.qrCode = row.qrCode
-      let str = 'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode='+row.qrCode
+      let str = this.qrUrl+row.qrCode
       this.$nextTick(() => {
         this.$refs.codeItem.innerHTML = "";
         var qrcode = new QRCode(this.$refs.codeItem, {

sgzb-ui/src/views/store/tools/toolsType.vue

@@ -172,7 +172,7 @@
                 <el-option
                   v-for="keeper in repairUserList"
                   :key="keeper.userId"
-                  :label="keeper.userName"
+                  :label="keeper.nickName"
                   :value="keeper.userId"
                 ></el-option>
               </el-select>
@@ -243,7 +243,7 @@
                 <el-option
                   v-for="keeper in keeperList"
                   :key="keeper.userId"
-                  :label="keeper.userName"
+                  :label="keeper.nickName"
                   :value="keeper.userId"
                 ></el-option>
               </el-select>
@@ -363,7 +363,9 @@ import {getListByMaType, getMaTypeList,getMaType, addMaType, updateMaType, delMa
 import { getUserByRoleList } from "@/api/system/user";
 import { getProLists } from "@/api/base/base";
 import { imgUpLoad,fileUpLoad } from "@/api/system/upload";
-
+import {
+  getInfo
+} from "@/api/login";
 export default {
   name: "ToolsType",
   // dicts: ['sys_normal_disable', 'sys_user_sex'],
@@ -463,6 +465,7 @@ export default {
         //   }
         // ] 
       },
+      companyId:undefined,
       dialogImageUrl: '',
       dialogVisible: false,
       configOpen: false,
@@ -489,6 +492,7 @@ export default {
     }
   },
   created() {
+    this.getInfo()
     this.getList();
     this.getTreeData();
     this.getUserList()
@@ -496,6 +500,11 @@ export default {
     
   },
   methods: {
+    getInfo(){
+      getInfo().then(res => {
+        this.companyId = res.user.companyId
+      })
+    },
     /** 查询用户列表--库管员，维修员 */
     getUserList() {
       getUserByRoleList({roleId:'101'}).then(response => {
@@ -613,6 +622,7 @@ export default {
               
             });
           } else {
+            this.form.companyId = this.companyId;
             addMaType(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;

sgzb-ui/vue.config.js

@@ -35,16 +35,24 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target:  `http://112.29.103.165:21626`,//线上环境-重庆
+        target:  `http://112.29.103.165:21626`,//线上环境-重庆
         // target: `http://112.29.103.165:21624`,//线上环境-宁夏
         // target: `http://192.168.0.14:21624`,//线上环境
         // target: `http://1.12.248.179:23028`,//线上环境-南网
         // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
         // target: `https://z.csgmall.com.cn`,
 
-        target: `http://10.40.92.14:8080`,//超
+        // target: `http://10.40.92.12:8080`,//超
-        // target: `http://10.40.92.12:8080`,//韩
+        // target: `http://10.40.92.2:8080`,//韩
-        // target: `http://10.40.92.209:8080`,//川
+        // target: `http://10.40.92.209:8080`,//川/
+
+        //******** 注意事项  ********* */
+        //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址;
+        //qrUrl:'http://112.29.103.165:21624/qrCode/qrCodePage?qrCode='
+        //2.打开view文件夹根目录dashboard.vue 更换大屏项目发布的跳转地址;
+        //3.只有南网项目产线gl发布打包时候需要注意：
+        //  将 assetsDir:'static' 改为 assetsDir:'gl/static',还有env.development中的VUE_APP_BASE_API改为'/gl/dev-api';登录跳转地址从/login换成/gl/;
+        //******** 注意事项  ********* */
 
         changeOrigin: true,
         pathRewrite: {