Merge branch 'hjw-222' into 'master'

互联网电视上线

See merge request spfm/spfm-market-front!468

public/index.html

@@ -32,8 +32,8 @@
   <div id="app"></div>
   <!-- built files will be auto injected -->
   <script type="text/javascript">
-    // window.staticHost = 'http://10.230.26.15:8000/mkt/'; // 正式
-    window.staticHost = 'http://10.149.85.91:8000/spfm/'; // 测试
+    window.staticHost = 'http://10.230.26.15:8000/mkt/'; // 正式
+    // window.staticHost = 'http://10.149.85.91:8000/spfm/'; // 测试
     // window.staticHost = 'http://192.168.2.92:9600';
     // window.staticHost = 'http://43.138.50.94:9600/';
 

src/components/workDeptThree.vue

@@ -11,8 +11,6 @@
       node-key="id"
       :default-checked-keys="defaultListc"
       :default-expanded-keys="defaultListc"
-      @node-click="handleNodeClick"
-      @node-expand="handleNodeClick"
     >
       <span
         class="custom-tree-node"

src/config/dev.js

@@ -65,7 +65,7 @@ let prod = {
     provincialWorkOrderAreafresourceId: 'db26384e-b984-11ed-afb6-e00084564cce',//通用工单地市
     provincialWorkOrderfresourceId: '9b83efc7-b984-11ed-afb6-e00084564cce',//通用工单省
     riskMaterialsfresourceId: 'canvas',//风险防控
-    internetAssessment: 'canvas',//互联网电视
+    internetAssessment: '433402bb-d52d-11ed-afb6-e00084564cce',//互联网电视
 }
 export const getConfig = () => {
     switch (process.env.VUE_APP_ENV) {

src/http/api.js

@@ -80,10 +80,10 @@ export function getNowdata(e) {
     let yy = new Date().getFullYear()
     let mm = new Date().getMonth() + 1 < 10 ? '0' + (new Date().getMonth() + 1) : new Date().getMonth() + 1
     let dd = new Date().getDate() < 10 ? '0' + new Date().getDate() : new Date().getDate()
-    let hh = new Date().getHours()
+    let hh = new Date().getHours() < 10 ? '0' + new Date().getHours() : new Date().getHours()
     let mf = new Date().getMinutes() < 10 ? '0' + new Date().getMinutes() : new Date().getMinutes()
     let ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds() : new Date().getSeconds()
     let time = yy + e.a + mm + e.a + dd + e.b + hh + e.c + mf + e.c + ss
     return time
 }
-export default { getTodoBase, getDoneBase, getInitiateBase, updateBase, getNowdata, queryReadBase,queryReadDoneBase };
+export default { getTodoBase, getDoneBase, getInitiateBase, updateBase, getNowdata, queryReadBase, queryReadDoneBase };

src/pages/main/workflowdef/index.vue

@@ -109,6 +109,7 @@ export default {
             }
             this.common.httpPost(obj, success)
             function success(data) {
+                console.log(data);
                 self.list = data.data.rows
                 self.total = data.data.total
             }