Merge branch 'bjxz-rain' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-rain

src/assets/i18n/langs/cn/messageCenter.js

@@ -10,58 +10,58 @@ export default {
     content: '内容',
     sendTime: '发送时间',
     noMsg: '暂无消息',
-    options:[{
+    options: [{
         label: "高空火警",
         value: "8"
-      },{
+    }, {
         label: "考勤提醒",
         value: "1"
-      },{
+    }, {
         label: "防疫人员通知",
         value: "2"
-      },{
+    }, {
         label: "防疫车辆通知",
         value: "3"
-      },{
+    }, {
         label: "访客通知",
         value: "16"
-      },{
+    }, {
         label: "混凝土监测",
         value: "4"
-      },{
+    }, {
         label: "卸料平台",
         value: "5"
-      },{
+    }, {
         label: "配电箱",
         value: "6"
-      },{
+    }, {
         label: "扬尘",
         value: "7"
-      },{
+    }, {
         label: "标养室",
         value: "9"
-      },{
+    }, {
         label: "安全检查",
         value: "10"
-      },{
+    }, {
         label: "质量检查",
         value: "11"
-      },{
+    }, {
         label: "塔吊",
         value: "12"
-      },{
+    }, {
         label: "升降机",
         value: "13"
-      },{
+    }, {
         label: "电表",
         value: "14"
-      },{
+    }, {
         label: "水表",
         value: "15"
     }],
     msgCenter: '消息中心',
     hint: '提示',
-    hintContent: '此操作将永久删除该文件, 是否继续?',
+    hintContent: '此操作将永久删除该消息, 是否继续?',
     confirm: '确定',
     cancel: '取消',
     removeSuccess: '删除成功！',

src/assets/js/http.js

@@ -172,7 +172,7 @@ if (process.env.NODE_ENV == "development") {
     // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
     // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
     // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
-    axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地
+    // axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地
     // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
     // axios.defaults.baseURL = 'http://182.90.224.237:51234/' //郭圣雄远程
     // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
@@ -183,11 +183,10 @@ if (process.env.NODE_ENV == "development") {
     // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址
     // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址
     // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用)
-    // axios.defaults.baseURL = 'http://42.180.188.17:9809/' //鞍钢正式地址
+    axios.defaults.baseURL = 'http://42.180.188.17:9809/' //鞍钢正式地址
-    // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用)
+        // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用)
-    // axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址
+        // axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址
-    // axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址
+        // axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址
-    axios.defaults.baseURL = 'http://1.13.185.209:9820/' //中科佳成正式地址
 } else if (process.env.NODE_ENV == "debug") {
     axios.defaults.baseURL = "https://www.ceshi.com";
 } else if (process.env.NODE_ENV == "production") {

src/store/index.js

@@ -52,21 +52,21 @@ export default new Vuex.Store({
         // FILEURL:'http://182.90.224.237:51234/image/',
         // UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地
         // FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地
-        UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地
+        // UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地
-        FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地
+        // FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地
         // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
-        WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地)
+        // WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地)
         // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程
         // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程
         // UPLOADURL: 'http://42.180.188.17:11211/upload/image', //测试
         // FILEURL: 'http://42.180.188.17:11211/image/', //测试
-        // BASEURL: baseUrl ?
+        BASEURL: baseUrl ?
-        // baseUrl: window.location.protocol + "//" + window.location.host + "/", //正式环境
+            baseUrl : window.location.protocol + "//" + window.location.host + "/", //正式环境
-        // UPLOADURL: window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境
+        UPLOADURL: window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境
-        // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
+        FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
         // // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用)
         // // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用)
-        // WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms', //鞍钢平台工作流地址
+        WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms', //鞍钢平台工作流地址
         // WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址
         //---------------------------------------------------------------------------------------------
         // BASEURL: baseUrl

src/views/projectFront/projectSummary/extendInfo.vue

@@ -234,6 +234,7 @@
               clearable
               value-format="yyyy-MM-dd"
               format="yyyy-MM-dd"
+              style="width: 100%"
               @input="getContractTime"
             >
             </el-date-picker>
@@ -251,6 +252,7 @@
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               clearable
+              style="width: 100%"
               value-format="yyyy-MM-dd"
               format="yyyy-MM-dd"
               @input="getRealTime"