liyuanpeng 3 lat temu
rodzic
commit
7012afa1f9

+ 2 - 2
public/index.html

@@ -18,8 +18,8 @@
   <div id="app"></div>
   <!-- built files will be auto injected -->
   <script type="text/javascript">
-    // window.staticHost = 'http://10.230.26.15:8000/spfm';
-    window.staticHost = 'http://114.215.71.182:29600';
+    window.staticHost = 'http://10.230.26.15:8000/spfm';
+    // window.staticHost = 'http://114.215.71.182:29600';
     // window.staticHost = 'http://192.168.2.143:9600/';
   </script>
 </body>

+ 6 - 2
public/static/views/publiAccount.html

@@ -297,8 +297,12 @@
                     data.tempType = tempType
                     data.colHeaderNum = 1
                     data.tempTypeDesc = ''
-					console.log(data)
-                    util.ajaxJson("正在加载中", ctx + '/market/cadvLedger/save', {
+					var urlsave = '/market/cadvLedger/save';
+					
+					if(lockFlag == 'updata' && r == 'type=2'){
+						urlsave = '/market/cadvLedger/saveProv';
+					}
+                    util.ajaxJson("正在加载中", ctx + urlsave, {
                         data: data
                     }, function (data) {
                         getData()

+ 10 - 2
src/pages/main/leader/processInitiation.vue

@@ -8,8 +8,16 @@
 						<div class="f-box-tit">{{ item.unitName }}</div>
 						<div v-for="items in item.modList" :key="items.moduleName" class="f-box-info">
 							<el-badge :value="items.noTaskNum" :max="99" :hidden="items.noTaskNum == 0">
-								<i @click="jumpTo(items)" :class="'iconfont icon-tongji'" v-if="items.sts == '0'"
-									style="background: #0b82ff"></i>
+								
+								<i @click="jumpTo(items)" class="el-icon-document" v-if="items.sts == '0' && items.moduleName == '竞争对手信息上报'" style="background: #0b82ff"></i>
+								<i @click="jumpTo(items)" class="el-icon-user" v-if="items.sts == '0' && items.moduleName == '广告宣传设计审批'" style="background: #0b82ff"></i>
+								<i @click="jumpTo(items)" class="el-icon-files" v-if="items.sts == '0' && items.moduleName == '广告发布审批及验收'" style="background: #0b82ff"></i>
+								<i @click="jumpTo(items)" class="el-icon-document" v-if="items.sts == '0' && items.moduleName == '绩效管理'" style="background: #0b82ff"></i>
+								<i @click="jumpTo(items)" class="el-icon-user" v-if="items.sts == '0' && items.moduleName == '预算管理'" style="background: #0b82ff"></i>
+								<i @click="jumpTo(items)" class="el-icon-files" v-if="items.sts == '0' && items.moduleName == '科室绩效管理'" style="background: #0b82ff"></i>
+								<i @click="jumpTo(items)" class="el-icon-location-information" v-if="items.sts == '0' && items.moduleName == '重点工作清单'" style="background: #0b82ff"></i>
+								<i @click="jumpTo(items)" class="el-icon-user" v-if="items.sts == '0' && items.moduleName == '测试资源管理'" style="background: #0b82ff"></i>
+									
 								<i :class="'iconfont icon-tongji'" v-if="items.sts != '0'" style="background: #ddd"></i>
 								<el-tooltip class="item" effect="dark" :content="items.moduleName" placement="bottom">
 									<span>{{ items.moduleName }}</span>

+ 2 - 2
vue.config.js

@@ -93,8 +93,8 @@ module.exports = {
                 // target: 'http://192.168.2.145:9600/spfm',
                 // target: 'http://192.168.2.149:9600',
                 // target: 'http://10.64.42.70:8088/',
-                target: 'http://114.215.71.182:29600',
-                // target: 'http://10.230.26.15:8000/spfm',
+                // target: 'http://114.215.71.182:29600',
+                target: 'http://10.230.26.15:8000/spfm',
                 // target: 'http://192.168.2.143:9600/',
                 // target: 'http://192.168.2.170:9600/',
                 // target: 'http://192.168.2.169:9600/',