Browse Source

7.21

master
fengdong777 2 years ago
parent
commit
823b6b495a
  1. 4
      supervise-crm-ui/src/api/project/project.js
  2. BIN
      supervise-crm-ui/src/assets/images/notAvailable.jpg
  3. 20
      supervise-crm-ui/src/views/project/projectInfo.vue
  4. 3
      warehousing-system/project_web_ui/src/main.js
  5. 21
      warehousing-system/project_web_ui/src/views/component/initial_value/add/storehouseAdd.vue

4
supervise-crm-ui/src/api/project/project.js

@ -90,9 +90,9 @@ export default {
method: 'delete' method: 'delete'
}) })
}, },
getStorehouseBySid: function() { getStorehouseBySid: function(sid) {
return request({ return request({
url: '/crm/v1/projectinformation/getStorehouseBySid/1', url: '/crm/v1/projectinformation/getStorehouseBySid/'+ sid,
method: 'get' method: 'get'
}) })
}, },

BIN
supervise-crm-ui/src/assets/images/notAvailable.jpg

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.3 KiB

20
supervise-crm-ui/src/views/project/projectInfo.vue

@ -189,9 +189,10 @@
</el-col> </el-col>
<el-col :span="20"> <el-col :span="20">
<el-form-item class="trightb_item"> <el-form-item class="trightb_item">
<div class="Images" v-for="(item,i) in temps" :key="i"> <div class="Images" v-for="(item,i) in temps" :key="i" v-show="item.name">
<a :href="'http://jianguan.yyundong.com/warehouse/#/pictureList/pictureList?id='+item.sid" target="_blank"> <a :href="'http://jianguan.yyundong.com/warehouse/#/pictureList/pictureList?id='+item.sid" target="_blank">
<img :src="item.picUrl" alt=""> <img v-if="item.picUrl" :src="item.picUrl" alt="">
<img v-else src="../../assets/images/notAvailable.jpg" alt="" />
<p><u class="Atext">{{ item.name }}</u></p> <p><u class="Atext">{{ item.name }}</u></p>
</a> </a>
</div> </div>
@ -217,7 +218,7 @@
} }
}, },
created() { created() {
this.getStorehouseBySid() //
}, },
methods: { methods: {
showAdd(sid) { showAdd(sid) {
@ -231,18 +232,17 @@
.catch(e => { .catch(e => {
this.$emit('doback') this.$emit('doback')
}) })
},
// req.getStorehouseBySid(sid).then((res) => {
handleReturn() {
this.$emit('doback')
},
getStorehouseBySid(){
req.getStorehouseBySid().then((res) => {
if (res.success) { if (res.success) {
this.temps=res.data this.temps=res.data
} }
}) })
}, },
//
handleReturn() {
this.$emit('doback')
},
} }
} }
</script> </script>

3
warehousing-system/project_web_ui/src/main.js

@ -24,7 +24,8 @@ Vue.use(ElementUI)
import axios from 'axios' import axios from 'axios'
/* 设定axios的请求根目录 */ /* 设定axios的请求根目录 */
axios.defaults.baseURL = 'http://jianguan.yyundong.com/warehouseapi/' axios.defaults.baseURL = 'http://192.168.1.193:9050/'
// axios.defaults.baseURL = 'http://jianguan.yyundong.com/warehouseapi/'
// import '@/permission' //权限控制 // import '@/permission' //权限控制
Vue.prototype.$http = axios Vue.prototype.$http = axios
Vue.prototype.$userInfo = null // 用户信息 Vue.prototype.$userInfo = null // 用户信息

21
warehousing-system/project_web_ui/src/views/component/initial_value/add/storehouseAdd.vue

@ -39,7 +39,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item class="trightbs_item"> <el-form-item class="trightbs_item">
<el-select v-model="form.projectSid" placeholder="请选择"> <el-select v-model="form.projectSid" placeholder="请选择" @change="changeLocationValue">
<el-option <el-option
v-for="(custName, i) in projectNames" v-for="(custName, i) in projectNames"
:key="i" :key="i"
@ -401,6 +401,7 @@ export default {
housingResource: "", housingResource: "",
linkerName: "", linkerName: "",
projectSid:'', projectSid:'',
projectName:'',
linkerPhone: "", linkerPhone: "",
picUrl: "", picUrl: "",
lon: "", lon: "",
@ -474,6 +475,7 @@ export default {
linkerName: "", linkerName: "",
linkerPhone: "", linkerPhone: "",
projectSid:'', projectSid:'',
projectName:'',
picUrl: '', picUrl: '',
lon: "", lon: "",
lat: "", lat: "",
@ -523,7 +525,7 @@ export default {
this.jingweidu=result.data.lon+','+result.data.lat this.jingweidu=result.data.lon+','+result.data.lat
} }
this.form = result.data; this.form = result.data;
this.form.projectSid = result.data.projectSid; console.log(this.form.projectSid)
let value=result.data.pics let value=result.data.pics
const picImg=result.data.picUrl const picImg=result.data.picUrl
this.imagesg.push({ this.imagesg.push({
@ -554,13 +556,14 @@ export default {
this.imgPrl=[] this.imgPrl=[]
this.imagesg=[] this.imagesg=[]
}, },
// changeLocationValue(val){ changeLocationValue(val){
// let obj = {}; let obj = {};
// obj = this.projectName.find((item)=>{ obj = this.projectNames.find((item)=>{
// return item.sid === val; return item.sid === val;
// }); });
// this.form.projectSid = obj.entryName; this.form.projectName = obj.entryName;
// }, console.log( this.form.projectName);
},
isLngAndLat() { isLngAndLat() {
var index = document.getElementById("lngAndLat").value; var index = document.getElementById("lngAndLat").value;
var array = index.split(","); var array = index.split(",");

Loading…
Cancel
Save