提交

ruoyi-ui/src/settings.js

@@ -1,7 +1,7 @@
 module.exports = {
   title: '项目管理系统',
-  // urls: 'https://qszs.qs163.cn/prod-api',
-  urls: 'http://192.168.101.245:8010',
+  urls: 'https://qszs.qs163.cn/prod-api',
+  // urls: 'http://192.168.101.245:8010',
 
 
   /**
@@ -37,6 +37,6 @@ module.exports = {
    */
   errorLog: 'production',
   // apiUrl: 'http://192.168.3.86:8010'
-  apiUrl: 'http://192.168.101.168:8010'
-  // apiUrl: 'https://qszs.qs163.cn/prod-api'
+  // apiUrl: 'http://192.168.101.168:8010'
+  apiUrl: 'https://qszs.qs163.cn/prod-api'
 }

ruoyi-ui/src/utils/request.js

@@ -16,9 +16,9 @@ const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   // http://47.99.82.249:80/prod-api
 
-  // baseURL: 'https://qszs.qs163.cn/prod-api',
+  baseURL: 'https://qszs.qs163.cn/prod-api',
   // baseURL: 'http://192.168.3.86:8010',
-  baseURL: 'http://192.168.101.245:8010',
+  // baseURL: 'http://192.168.101.245:8010',
   // 超时
   timeout: 720000
 })

ruoyi-ui/src/views/management/info/index.vue

@@ -201,7 +201,7 @@
     <el-table v-if="ksled" :max-height="tableMaxHeight" border v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="项目编号" align="center" prop="xmbh" width="130" :key="1"/>
-      <el-table-column label="项目名称" align="center" prop="xmxsmc"  :key="2" v-if="bseaawf == '1,2' || bseaawf == '0' "/>
+      <el-table-column label="项目名称" align="center" prop="xmxsmc"  :key="2" v-if="bseaawf == '1,2' || bseaawf == '0' " show-overflow-tooltip/>
       <el-table-column label="项目名称" align="center" prop="zsyzQyxx.xmmc" v-if="bseaawf == '3' || bseaawf == '4' " />
       <el-table-column label="项目名称" align="center" prop="zsyzQyxx.xmmc" v-if=" bseaawf == '5'" />
       <el-table-column label="领航项目" align="center" prop="sfwlhxxxm" :key="3">
@@ -224,12 +224,12 @@
       </el-table-column >
       <!-- <el-table-column label="审核状态" align="center" prop="totAmt" />
       <el-table-column label="督办单" align="center" prop="totAmt" /> -->
-      <el-table-column label="产业类型" align="center" prop="cylxName" :key="6"/>
-      <el-table-column label="承接地" align="center" prop="cjdName" :key="7"/>
+      <el-table-column label="产业类型" align="center" prop="cylxName" :key="6" show-overflow-tooltip/>
+      <!-- <el-table-column label="承接地" align="center" prop="cjdName" :key="7"/> -->
       <el-table-column label="首谈人" align="center" prop="name" :key="8"  v-if="bseaawf == '1,2' || bseaawf == '0' "/>
-      <el-table-column label="首谈日期" align="center" prop="strq" :key="9" v-if="bseaawf == '1,2' || bseaawf == '0'  "/>
+      <el-table-column label="首谈日期" align="center" prop="strq" :key="9" v-if="bseaawf == '1,2' || bseaawf == '0'  " show-overflow-tooltip/>
       <el-table-column label="投资类别" align="center" prop="tzlb" :key="10" v-if="bseaawf == '1,2' || bseaawf == '0'  "/>
-      <el-table-column label="上报单位" align="center" prop="sbdw" :key="11" v-if="bseaawf == '1,2' || bseaawf == '0'  " />
+      <el-table-column label="上报单位" align="center" prop="sbdw" :key="11" v-if="bseaawf == '1,2' || bseaawf == '0'  "  show-overflow-tooltip/>
       <el-table-column label="拟投资额（亿元）" width="130"  :key="12" align="center" prop="ntze" v-if="bseaawf == '1,2' || bseaawf == '0' "/>
 
         <!-- 签约 -->

ruoyi-ui/src/views/projectV2/qktj/index.vue

@@ -105,16 +105,12 @@
     <el-table v-loading="loading" :data="qktjList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="部门名称" align="center" width="100" prop="deptName" />
-      <el-table-column label="年" align="center" prop="year" >
+      <el-table-column label="年-月" align="center" prop="year" >
         <template slot-scope="scope">
-          <span>{{ scope.row.year}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="月" align="center" prop="month" >
-        <template slot-scope="scope">
-          <span>{{scope.row.month}}</span>
+          <span>{{ scope.row.year  + '-' + scope.row.month}}</span>
         </template>
       </el-table-column>
+
       <el-table-column label="招商外出天数" align="center" width="100" prop="numberOutings" />
        <el-table-column label="外出时间" align="center" prop="outsideTime" width="180" />
        <el-table-column label="外出人员" align="center" prop="outgoer"  />

ruoyi-ui/src/views/projectV2/qktjgs/index.vue

@@ -105,14 +105,9 @@
     <el-table v-loading="loading" :data="qktjList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="部门名称" align="center" width="100" prop="deptName" />
-      <el-table-column label="年" align="center" prop="year" width="180">
+      <el-table-column label="年-月" align="center" prop="year"  width="180">
         <template slot-scope="scope">
-          <span>{{ scope.row.year}}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="月" align="center" prop="month" width="180">
-        <template slot-scope="scope">
-          <span>{{scope.row.month}}</span>
+          <span>{{ scope.row.year  + '-' + scope.row.month}}</span>
         </template>
       </el-table-column>
       <el-table-column label="对接时间" align="center" prop="outsideTime" width="180">
@@ -122,7 +117,7 @@
       </el-table-column>
       <!-- <el-table-column label="招商外出天数" align="center" width="100" prop="numberOutings" /> -->
       <!-- <el-table-column label="对接客商次数" align="center" prop="numberDocking" /> -->
-      <el-table-column label="说明" align="center" prop="details" tooltip-effect width="180" />
+      <el-table-column label="说明" align="center" prop="details" tooltip-effect width="340" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ scope.row.createTime}}</span>