Skip to content

D
dsk-cr20g
Commit adb0d27a authored by lcl's avatar lcl
Browse files
Options

Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

parents b54c462e 105b9a6f
Expand all Show whitespace changes
Inline Side-by-side
Showing with 4651 additions and 146 deletions
dsk-operate-ui/src/assets/styles/project.scss
View file @ adb0d27a
......@@ -82,12 +82,6 @@
&:hover{
background: #F3F4F5;
}
.txt{
padding-left: 8px;
opacity: 0.4;
display: inline-block;
width: 100%;
}
.el-input{
margin-right: 8px;
.el-input__inner{
......@@ -100,11 +94,46 @@
text-indent: 8px;
}
}
.el-date-editor--date{
.el-input__prefix{
display: none;
}
}
&.i{
.el-input{
.el-input__inner{
width: 100px;
}
}
}
}
.txt{
padding-left: 8px;
color: rgba(35,35,35,0.4);
display: inline-block;
width: 100%;
}
width: 438px;
&.i{
width: auto;
}
.inputime{
display: inline-block;
width: 184px;
height: 28px;
border-radius: 2px;
line-height: 28px;
cursor: pointer;
>span{
padding-left: 8px;
}
.el-icon-caret-bottom{
color: rgba(35,35,32,0.4);
margin-left: 4px;
}
}
}
}
.tipinput{
display: inline-block;
margin-top: 1px;
......@@ -163,8 +192,6 @@
}
}
}
}
}
.textarea{
margin: 0 16px 24px;
......@@ -543,7 +570,7 @@
.el-input__prefix{
left: 8px;
top: 4px;
top: -2px;
}
.el-input__suffix{
height: 32px;
......@@ -673,6 +700,15 @@
text-align: center;
display: inline-block;
margin-left: 10px;
&.on{
background: #FF3C3C;
color: #FF3C3C;
}
&:hover{
border: 1px solid #FF3C3C;
color: #FF3C3C;
background: #FFEBEB;
}
}
}
.tasklist{
......@@ -701,6 +737,21 @@
border-radius: 4px;
right: 16px;
top: 30px;
padding: 8px 12px;
line-height: 16px;
box-sizing: border-box;
&.on{
background: #D3F0E8;
.color_text{
color: #0CBC6D;
}
}
.select-popper{
margin: 0;
}
.el-icon-caret-bottom{
color:rgba(35,35,35,0.4) ;
}
}
}
}
......
dsk-operate-ui/src/router/index.js
View file @ adb0d27a
......@@ -150,6 +150,20 @@ export const constantRoutes = [
meta: { title: '土地交易详情', icon: 'radar' }
}
]
},
{
path: '/Establishment',
component: Layout,
hidden: true,
redirect: 'noredirect',
children: [
{
path: '/radar/Establishment/details/:id(\\d+)',
component: () => import('@/views/radar/Establishment/details'),
name: 'EstablishmentDetails',
meta: { title: '拟建项目详情', icon: 'radar' }
}
]
}
]
......
dsk-operate-ui/src/views/detail/party-a/overview/component/operations.vue
View file @ adb0d27a
......@@ -2,7 +2,7 @@
<div class="app-container operations-container">
<div class="common-title">公司经营</div>
<div class="part-swiper">
<div class="swiper-containers">
<div class="swiper-containers swiper-oper" :style="operList.length<=6?'margin-left:0px; width: 100%;':''">
<ul class="swiper-wrapper">
<li class="swiper-slide" v-for="(item, index) in operList" :key="index">
<div class="swiper-div">
......@@ -15,8 +15,8 @@
</li>
</ul>
</div>
<div class="swiper-button-prev" slot="button-prev" style="left: 0;"><i class="el-icon-arrow-left"></i></div>
<div class="swiper-button-next" slot="button-next" style="right: 0"><i class="el-icon-arrow-right"></i></div>
<div class="swiper-button-prev swiper-oper-prev" slot="button-prev" style="left: 0;"><i class="el-icon-arrow-left"></i></div>
<div class="swiper-button-next swiper-oper-next" slot="button-next" style="right: 0"><i class="el-icon-arrow-right"></i></div>
</div>
<div class="flex-box operations-list">
<div class="list-item" v-for="(item, index) in gsjyList" :key="index">
......@@ -35,7 +35,6 @@ export default {
data() {
return {
operList: [
{name:'债务信用评级', rate:'中国标普信用', range:'AA', year:'2021'},
{name:'债务信用评级', rate:'中国标普信用', range:'AA', year:'2021'},
{name:'债务信用评级', rate:'中国标普信用', range:'AA', year:'2021'},
{name:'债务信用评级', rate:'中国标普信用', range:'AA', year:'2021'},
......@@ -57,12 +56,12 @@ export default {
},
methods: {
companySwiper(){
new Swiper('.swiper-containers', {
slidesPerView: 4,
new Swiper('.swiper-oper', {
slidesPerView: 6,
// 设置点击箭头
navigation: {
nextEl: '.swiper-button-next',
prevEl: '.swiper-button-prev',
nextEl: '.swiper-oper-next',
prevEl: '.swiper-oper-prev',
}
})
}
......@@ -78,7 +77,7 @@ export default {
.part-swiper{
position: relative;
margin-top: 16px;
.swiper-containers{
.swiper-oper{
width: calc(100% - 38px);
height: 96px;
margin-top: 8px;
......@@ -117,7 +116,7 @@ export default {
}
}
}
.swiper-button-prev, .swiper-button-next{
.swiper-oper-prev, .swiper-oper-next{
width: 16px;
height: 96px;
background: #F0F5FC;
......
dsk-operate-ui/src/views/detail/party-a/overview/overview.vue
View file @ adb0d27a
<template>
<div class="app-container part-container">
企业速览
<div class="view-content"><Infoheader /></div><!-- 企业信息 -->
<div class="view-content"><Operations /></div><!-- 公司经营 -->
<div class="view-content"><Bidding /></div><!--招标偏好、业务往来-->
<div class="view-content"><Busclue /></div><!--商机线索-->
......@@ -12,6 +12,7 @@
</template>
<script>
import Infoheader from "./component/infoheader"
import Operations from "./component/operations"
import Bidding from "./component/bidding"
import Busclue from './component/busclue'
......@@ -23,6 +24,7 @@ export default {
name: 'Overview',
props: ['companyId'],
components: {
Infoheader,
Operations,
Bidding,
Busclue,
......
dsk-operate-ui/src/views/project/projectList/component/gzdb.vue
View file @ adb0d27a
......@@ -28,16 +28,36 @@
</div>
</div>
</div>
<div class="tasktitle"><strong>我的任务</strong><span>4条已逾期</span></div>
<div class="tasktitle"><strong>我的任务</strong><span>4条已逾期</span><!--<span class="on">4条已逾期</span>--></div>
<div class="tasklist">
<div class="task_name">周二拜访交通局李主任</div>
<div class="task_con"><span>发起时间：2023-01-24</span><span>关联客户：<font class="wordprimary">重庆市交通局</font></span><span>完成时间：2023-0.-03</span></div>
<div class="select">未完成</div>
<div class="select" :class="{'on':status == 1}">
<div class="select-popper">
<span class="color_text">
{{status == 0?"未完成":"已完成"}}
<i class="el-icon-caret-bottom"></i>
</span>
<el-select placeholder="请选择" v-model="status" class="select-multiple">
<el-option label="未完成" value="0"></el-option>
<el-option label="已完成" value="1"></el-option>
</el-select>
</div></div>
</div>
<div class="tasklist">
<div class="task_name">周二拜访交通局李主任</div>
<div class="task_con"><span>发起时间：2023-01-24</span><span>关联客户：<font class="wordprimary">重庆市交通局</font></span><span>完成时间：2023-0.-03</span></div>
<div class="select">未完成</div>
<div class="select" :class="{'on':status == 1}">
<div class="select-popper">
<span class="color_text">
{{status == 0?"未完成":"已完成"}}
<i class="el-icon-caret-bottom"></i>
</span>
<el-select placeholder="请选择" v-model="status" class="select-multiple">
<el-option label="未完成" value="0"></el-option>
<el-option label="已完成" value="1"></el-option>
</el-select>
</div></div>
</div>
</div>
</el-card>
......@@ -46,12 +66,14 @@
<script>
import "@/assets/styles/project.scss"
import "@/assets/styles/public.css"
export default {
name: 'gjjl',
data(){
return{
isEdit:false,
value:''
value:'',
status:0,
}
},
methods:{
......
dsk-operate-ui/src/views/project/projectList/component/jsnr.vue
View file @ adb0d27a
......@@ -9,7 +9,7 @@
<span>总投资额（万元） ：</span>
<div class="inputxt">
<div class="flex" v-if="nowedit == 1">
<el-input placeholder="待添加"></el-input>
<el-input placeholder="待添加" v-model="money" @input="number"></el-input>
<div class="flex">
<div class="btnsmall btn_primary h28" style="width: 56px">确定</div>
<div class="cancels h28" @click="nowedit = -1" style="">取消</div>
......@@ -48,8 +48,46 @@
</div>
<div class="con i">
<span>计划招标 ：</span>
<div class="inputxt">
<span class="txt">待添加</span>
<div class="inputime">
<div class="flex" style="opacity: 0;height: 0">
<el-date-picker v-if="nowedit == 11" showWordLimit="true"
v-model="value1"
type="date"
value-format="yyyy-MM-dd"
placeholder="待添加" @change="nowedit = -1">
</el-date-picker>
</div>
<span :class="{'txt':!value1}" @click="nowedit = 11">{{value1||"待添加"}}<i class="el-icon-caret-bottom"></i></span>
</div>
</div>
</div>
<div class="row">
<div class="con">
<span>计划开工 ：</span>
<div class="inputime">
<div class="flex" style="opacity: 0;height: 0">
<el-date-picker v-if="nowedit == 12" showWordLimit="true"
v-model="value1"
type="date"
value-format="yyyy-MM-dd"
placeholder="待添加" @change="nowedit = -1">
</el-date-picker>
</div>
<span :class="{'txt':!value1}" @click="nowedit = 12">{{value1||"待添加"}}<i class="el-icon-caret-bottom"></i></span>
</div>
</div>
<div class="con i">
<span>计划竣工 ：</span>
<div class="inputime">
<div class="flex" style="opacity: 0;height: 0">
<el-date-picker v-if="nowedit == 13" showWordLimit="true"
v-model="value1"
type="date"
value-format="yyyy-MM-dd"
placeholder="待添加" @change="nowedit = -1">
</el-date-picker>
</div>
<span :class="{'txt':!value1}" @click="nowedit = 13">{{value1||"待添加"}}<i class="el-icon-caret-bottom"></i></span>
</div>
</div>
</div>
......@@ -86,8 +124,16 @@
</div>
<div class="con i">
<span>开标时间 ：</span>
<div class="inputxt">
<span class="txt">待添加</span>
<div class="inputime">
<div class="flex" style="opacity: 0;height: 0">
<el-date-picker v-if="nowedit == 14" showWordLimit="true"
v-model="value1"
type="date"
value-format="yyyy-MM-dd"
placeholder="待添加" @change="nowedit = -1">
</el-date-picker>
</div>
<span :class="{'txt':!value1}" @click="nowedit = 14">{{value1||"待添加"}}<i class="el-icon-caret-bottom"></i></span>
</div>
</div>
</div>
......@@ -160,9 +206,23 @@
return{
textarea:"",
nowedit:-1,//当前正在编辑的文本
value1:'',
money:'',
}
},
watch:{
// nowedit(oldvalue,newvalue){
// if (newvalue == 13){
// this.$ref.newvalue13.=true
// }
// }
},
methods:{
//输入数字
number(value){
console.log(value)
this.money = value.replace(/^\D*(\d*(?:\.\d{0,6})?).*$/g, '$1')//输入6位小数
},
}
}
</script>
......
dsk-operate-ui/src/views/project/projectList/component/lxr.vue
View file @ adb0d27a
......@@ -80,33 +80,27 @@
<span>重庆市轨道交通3号线二期工程4标段施工总承包</span>
</div>
<el-form class="popform" label-width="137px">
<div class="row">
<span class="left">联系人姓名：</span>
<el-form-item label="联系人姓名：" class="row">
<el-input type="text" placeholder="请输入"></el-input>
</div>
<div class="row">
<span class="left">联系人角色：</span>
</el-form-item>
<el-form-item label="联系人角色：" class="row">
<el-select placeholder="请选择">
<el-option label="cccc" value="11"></el-option>
<el-option label="cccc" value="121"></el-option>
</el-select>
</div>
<div class="row">
<span class="left">联系人职位：</span>
</el-form-item>
<el-form-item label="联系人职位：" class="row">
<el-input type="text" placeholder="请输入"></el-input>
</div>
<div class="row">
<span class="left">联系人公司/机关：</span>
</el-form-item>
<el-form-item label="联系人公司/机关：" class="row">
<el-input type="text" placeholder="请输入"></el-input>
</div>
<div class="row">
<span class="left">内部维护人：</span>
</el-form-item>
<el-form-item label="内部维护人：" class="row">
<el-input type="text" placeholder="请输入"></el-input>
</div>
<div class="row">
<span class="left">联系方式：</span>
</el-form-item>
<el-form-item label="联系方式：" class="row">
<el-input type="text" placeholder="请输入"></el-input>
</div>
</el-form-item>
<div class="popbot">
<div class="btn btn_cancel h32" @click="cancel">返回</div>
<div class="btn btn_primary h32">保存</div>
......
dsk-operate-ui/src/views/project/projectList/component/xgqy.vue
View file @ adb0d27a
......@@ -104,43 +104,37 @@
<img src="@/assets/images/economies/icon.png">
<span>新建相关企业-{{types==1?"业主单位":""}}{{types==2?"合作伙伴":""}}{{types==3?"竞争对手":""}}</span>
</div>
<el-form class="popform i" label-width="85px">
<div class="row">
<span class="left"><i>*</i>企业名称：</span>
<el-form class="popform i" label-width="85px" :rules="rules" ref="ruleForm" >
<el-form-item label="企业名称：" prop="projectName" class="row">
<el-input type="text" placeholder="请输入"></el-input>
</div>
<div class="row" v-if="types == 1">
<span class="left">对接深度：</span>
</el-form-item>
<el-form-item v-if="types == 1" label="对接深度：" class="row">
<el-select placeholder="请选择">
<el-option label="cccc" value="11"></el-option>
<el-option label="cccc" value="121"></el-option>
</el-select>
</div>
<div class="row" v-if="types == 2">
<span class="left">合作阶段：</span>
</el-form-item>
<el-form-item v-if="types == 2" label="合作阶段：" class="row">
<el-select placeholder="请选择">
<el-option label="cccc" value="11"></el-option>
<el-option label="cccc" value="121"></el-option>
</el-select>
</div>
<div class="row" v-if="types == 3">
<span class="left">竞争力度：</span>
</el-form-item>
<el-form-item v-if="types == 3" label="竞争力度：" prop="projectName" class="row">
<el-select placeholder="请选择">
<el-option label="cccc" value="11"></el-option>
<el-option label="cccc" value="121"></el-option>
</el-select>
</div>
<div class="row">
<span class="left">企业角色：</span>
</el-form-item>
<el-form-item label="企业角色：" prop="projectName" class="row">
<el-select placeholder="请选择">
<el-option label="cccc" value="11"></el-option>
<el-option label="cccc" value="121"></el-option>
</el-select>
</div>
<div class="row">
<span class="left">负责人：</span>
</el-form-item>
<el-form-item label="负责人：" class="row">
<el-input type="text" placeholder="请输入"></el-input>
</div>
</el-form-item>
<div class="popbot">
<div class="btn btn_cancel h32" @click="cancel">返回</div>
<div class="btn btn_primary h32">添加</div>
......@@ -182,7 +176,12 @@
name: '王小虎',
address: '上海市普陀区金沙江路 1516 弄'
}
]
],
rules:{
projectName:[{ required: true, message: '请输入非空格字符！', trigger: 'blur' },],
ownerCompany:[{ required: true, message: '请输入非空格字符！', trigger: 'blur' },],
},
}
},
methods:{
......
dsk-operate-ui/src/views/project/projectList/component/xmsl.vue
View file @ adb0d27a
......@@ -20,7 +20,16 @@
</div>
<div class="con i">
<span>项目阶段 ：</span>
<div class="inputxt"><span class="txt">待添加</span></div>
<div class="select-popper " >
<span class="color_text" :class="{'txt':xmjd == '待添加'}">
{{xmjd}}
<i class="el-icon-caret-bottom"></i>
</span>
<el-select v-model="xmjd" class="select-multiple" placeholder="请选择">
<el-option v-for="(item,index) in projectStage" :key="index" :label="item.dictLabel" :value="item.dictValue"></el-option>
</el-select>
</div>
</div>
</div>
<div class="row">
......@@ -159,6 +168,7 @@
<script>
import "@/assets/styles/project.scss"
import {getDictType,} from '@/api/main'
export default {
name: 'xmsl',
data(){
......@@ -166,8 +176,17 @@
nowedit:-1,//当前正在编辑的文本
tipslit:[],//项目标签
tipsvalue:"",//标签填写内容
xmjd:'待添加',
projectStage:[],//项目阶段
}
},
created(){
//项目阶段
getDictType('project_stage_type').then(result=>{
this.projectStage = result.code == 200 ? result.data:[]
})
},
methods:{
//验证电话号码
isphone(value){
......
dsk-operate-ui/src/views/project/projectList/index.vue
View file @ adb0d27a
......@@ -147,6 +147,7 @@
<script>
import "@/assets/styles/project.scss"
import "@/assets/styles/public.css"
import prvinceTree from '@/assets/json/provinceTree'
import {getProjectlist} from '@/api/project/project'
import {getDictType,} from '@/api/main'
......@@ -207,7 +208,7 @@ export default {
},
created() {
this.prvinceTree()
// this.getList(1)
this.getList(1)
//项目阶段
getDictType('project_stage_type').then(result=>{
this.projectStage = result.code == 200 ? result.data:[]
......@@ -225,6 +226,8 @@ export default {
//获取商机列表
getList(pageNum){
this.searchParam.pageNum = pageNum
console.log(this.searchParam)
return false
getProjectlist(this.searchParam).then(result=>{
console.log(result)
})
......@@ -288,9 +291,6 @@ export default {
let Id = '111'
this.$router.push({ path: '/project/projectList/detail', query: Id });
},
getxmdq(){
console.log(888)
},
handleClick(){
},
......
dsk-operate-ui/src/views/radar/Establishment/details.vue 0 → 100644
View file @ adb0d27a
This diff is collapsed.
dsk-operate-ui/src/views/radar/components/Establishment/index.vue
View file @ adb0d27a
......@@ -197,7 +197,7 @@
<ul class="bottomlist-content">
<li class="bottomlist-list" >
<p class="list-titel">
<router-link :to="'/radar/Land/details/'+ 1" tag="a" class="list-titel-a" >绿色节能型压缩机基础件、汽车零配件新建项目 (芜湖旭日机械制造有限公司)</router-link>
<router-link :to="'/radar/Establishment/details/'+ 1" tag="a" class="list-titel-a" >绿色节能型压缩机基础件、汽车零配件新建项目 (芜湖旭日机械制造有限公司)</router-link>
<!-- <div v-else-if="item.projectName" v-html="item.projectName"></div> -->
</p>
<div class="content-label">
......
dsk-operate-ui/src/views/radar/components/bxprozbgg/index.vue 0 → 100644
View file @ adb0d27a
This diff is collapsed.
dsk-operate-ui/src/views/radar/index.vue
View file @ adb0d27a
......@@ -19,6 +19,8 @@
<Land v-if="personnelHerf=='Land'" />
<!-- 拟建项目 -->
<Establishment v-if="personnelHerf=='Establishment'" />
<!-- 标讯pro -->
<bxprozbgg v-if="personnelHerf=='bxprozbgg'" />
</div>
......@@ -27,10 +29,11 @@
import debtProject from "./components/debtProject/index.vue";
import Land from "./components/Land/index.vue";
import Establishment from "./components/Establishment/index.vue";
import bxprozbgg from "./components/bxprozbgg/index.vue";
import "@/assets/styles/public.css";
export default {
name: 'radar',
components: { debtProject,Land,Establishment },
components: { debtProject,Land,Establishment,bxprozbgg },
data() {
return {
// tablist
......@@ -59,7 +62,7 @@
},
{
key: 'KeyPersonnel',
key: 'bxprozbgg',
status: false,
value: '标讯pro',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment